deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

tunslip6: show progres with -P argument

Browse source
This commit is contained in:
Michael Richardson 2014-05-10 17:15:23 -04:00
parent 6232cc488c
commit ab2c110c70
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tools/tunslip6.c
View file

@ -62,7 +62,7 @@ const char *netmask;
int slipfd = 0; int slipfd = 0;
uint16_t basedelay=0,delaymsec=0; uint16_t basedelay=0,delaymsec=0;
uint32_t startsec,startmsec,delaystartsec,delaystartmsec; uint32_t startsec,startmsec,delaystartsec,delaystartmsec;
int timestamp = 0, flowcontrol=0; int timestamp = 0, flowcontrol=0, showprogress=0;
int ssystem(const char *fmt, ...) int ssystem(const char *fmt, ...)
__attribute__((__format__ (__printf__, 1, 2))); __attribute__((__format__ (__printf__, 1, 2)));
@ -71,8 +71,7 @@ void write_to_serial(int outfd, void *inbuf, int len);
void slip_send(int fd, unsigned char c); void slip_send(int fd, unsigned char c);
void slip_send_char(int fd, unsigned char c); void slip_send_char(int fd, unsigned char c);
//#define PROGRESS(s) fprintf(stderr, s) #define PROGRESS(s) if(showprogress) fprintf(stderr, s)
#define PROGRESS(s) do { } while (0)
char tundev[1024] = { "" }; char tundev[1024] = { "" };
@ -187,7 +186,7 @@ serial_to_tun(FILE *inslip, int outfd)
clearerr(inslip); clearerr(inslip);
return; return;
} }
/* fprintf(stderr, ".");*/ PROGRESS(".");
switch(c) { switch(c) {
case SLIP_END: case SLIP_END:
if(inbufptr > 0) { if(inbufptr > 0) {
@ -704,7 +703,7 @@ main(int argc, char **argv)
prog = argv[0]; prog = argv[0];
setvbuf(stdout, NULL, _IOLBF, 0); /* Line buffered output. */ setvbuf(stdout, NULL, _IOLBF, 0); /* Line buffered output. */
while((c = getopt(argc, argv, "B:HLhs:t:v::d::a:p:T")) != -1) { while((c = getopt(argc, argv, "B:HLPhs:t:v::d::a:p:T")) != -1) {
switch(c) { switch(c) {
case 'B': case 'B':
baudrate = atoi(optarg); baudrate = atoi(optarg);
@ -718,6 +717,10 @@ main(int argc, char **argv)
timestamp=1; timestamp=1;
break; break;
case 'P':
showprogress=1;
break;
case 's': case 's':
if(strncmp("/dev/", optarg, 5) == 0) { if(strncmp("/dev/", optarg, 5) == 0) {
siodev = optarg + 5; siodev = optarg + 5;