From 30f69b08529e347c0b9d6b46e74af50c56fc814a Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Tue, 13 Oct 2015 09:35:25 +0200 Subject: [PATCH 1/2] Revert "tunslip6: make printing of sensible strings from mote more reliable" This reverts commit 6608b62b01953b8a263ffda65802c1bc9052c06c. --- tools/tunslip6.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/tools/tunslip6.c b/tools/tunslip6.c index 4f3ff7e3e..b7a66ad3d 100644 --- a/tools/tunslip6.c +++ b/tools/tunslip6.c @@ -238,21 +238,13 @@ serial_to_tun(FILE *inslip, int outfd) slip_send(slipfd, SLIP_END); } #define DEBUG_LINE_MARKER '\r' - if(uip.inbuf[0] == DEBUG_LINE_MARKER || - is_sensible_string(uip.inbuf, inbufptr)) { - unsigned char *out = uip.inbuf; - unsigned int len = inbufptr; - if(uip.inbuf[0] == DEBUG_LINE_MARKER) { - out++; - len--; - } - fprintf(stderr, "\n***"); - fwrite(out, len, 1, stderr); - fprintf(stderr, "***\n"); - } else { - fprintf(stderr, - "serial_to_tun: drop packet len=%d\n", inbufptr); - } + } else if(uip.inbuf[0] == DEBUG_LINE_MARKER) { + fwrite(uip.inbuf + 1, inbufptr - 1, 1, stdout); + } else if(is_sensible_string(uip.inbuf, inbufptr)) { + if(verbose==1) { /* strings already echoed below for verbose>1 */ + if (timestamp) stamptime(); + fwrite(uip.inbuf, inbufptr, 1, stdout); + } } else { if(verbose>2) { if (timestamp) stamptime(); From a9a46b29ccabe81bb4ed3d226b6a39e04c36fc0d Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Tue, 13 Oct 2015 09:54:06 +0200 Subject: [PATCH 2/2] tunslip6: disable IP address inquiry by default. Document -I flag --- tools/tunslip6.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/tunslip6.c b/tools/tunslip6.c index b7a66ad3d..75659e270 100644 --- a/tools/tunslip6.c +++ b/tools/tunslip6.c @@ -701,7 +701,7 @@ main(int argc, char **argv) const char *port = NULL; const char *prog; int baudrate = -2; - int ipa_enable = 1; + int ipa_enable = 0; int tap = 0; slipfd = 0; @@ -735,8 +735,8 @@ main(int argc, char **argv) break; case 'I': - ipa_enable = 0; - fprintf(stderr, "Will not inquire about IP address using IPA=\n"); + ipa_enable = 1; + fprintf(stderr, "Will inquire about IP address using IPA=\n"); break; case 't': @@ -781,6 +781,7 @@ fprintf(stderr," -B baudrate 9600,19200,38400,57600,115200 (default),230400,4 fprintf(stderr," -B baudrate 9600,19200,38400,57600,115200 (default),230400\n"); #endif fprintf(stderr," -H Hardware CTS/RTS flow control (default disabled)\n"); +fprintf(stderr," -I Inquire IP address\n"); fprintf(stderr," -L Log output format (adds time stamps)\n"); fprintf(stderr," -s siodev Serial device (default /dev/ttyUSB0)\n"); fprintf(stderr," -T Make tap interface (default is tun interface)\n");