From 358530e1d3b52c514dd2511e64e0976d5a9d0fb1 Mon Sep 17 00:00:00 2001
From: David Kopf <dak664@embarqmail.com>
Date: Fri, 2 Mar 2012 15:28:26 -0500
Subject: [PATCH] Add higher baud rates, option for link-local address
 assignment

---
 tools/tunslip6.c | 57 +++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 54 insertions(+), 3 deletions(-)

diff --git a/tools/tunslip6.c b/tools/tunslip6.c
index 4192dae4f..3b6a51601 100644
--- a/tools/tunslip6.c
+++ b/tools/tunslip6.c
@@ -29,7 +29,6 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: tunslip6.c,v 1.6 2010/11/29 18:14:54 joxe Exp $
  *
  */
 
@@ -596,6 +595,49 @@ ifconf(const char *tundev, const char *ipaddr)
   ssystem("ifconfig %s inet `hostname` up", tundev);
   if (timestamp) stamptime();
   ssystem("ifconfig %s add %s", tundev, ipaddr);
+
+/* radvd needs a link local address for routing */
+#if 0
+/* fe80::1/64 is good enough */
+  ssystem("ifconfig %s add fe80::1/64", tundev);
+#elif 1
+/* Generate a link local address a la sixxs/aiccu */
+/* First a full parse, stripping off the prefix length */
+{
+char lladdr[40];
+char c,*ptr=(char *)ipaddr;
+uint16_t digit,ai,a[8],cc,scc,i;
+  for(ai=0;ai<8;ai++) a[ai]=0;
+  ai=0;cc=scc=0;
+  while(c=*ptr++) {
+    if(c=='/') break;
+    if(c==':') {
+      if(cc) scc = ai;
+      cc = 1;
+      if (++ai>7) break;
+    } else {
+      cc=0;
+      digit = c-'0'; if (digit > 9) digit = 10 + (c & 0xdf) - 'A';
+      a[ai] = (a[ai] << 4) + digit;
+    }
+  }
+ /* Get # elided and shift what's after to the end */
+  cc=8-ai;
+  for(i=0;i<cc;i++) {
+    if ((8-i-cc) <= scc) {
+      a[7-i] = 0;
+    } else {
+      a[7-i] = a[8-i-cc];
+      a[8-i-cc]=0;
+    }
+  }
+  sprintf(lladdr,"fe80::%x:%x:%x:%x",a[1]&0xfefd,a[2],a[3],a[7]);
+
+  if (timestamp) stamptime();
+  ssystem("ifconfig %s add %s/64", tundev, lladdr);
+
+#endif /* link local */
+
 #else
   if (timestamp) stamptime();
   ssystem("ifconfig %s inet `hostname` %s up", tundev, ipaddr);
@@ -684,7 +726,7 @@ main(int argc, char **argv)
 fprintf(stderr,"usage:  %s [options] ipaddress\n", prog);
 fprintf(stderr,"example: tunslip6 -L -v2 -s ttyUSB1 aaaa::1/64\n");
 fprintf(stderr,"Options are:\n");
-fprintf(stderr," -B baudrate    9600,19200,38400,57600,115200 (default)\n");
+fprintf(stderr," -B baudrate    9600,19200,38400,57600,115200 default),230400,460800,921600\n");
 fprintf(stderr," -H             Hardware CTS/RTS flow control (default disabled)\n");
 fprintf(stderr," -L             Log output format (adds time stamps)\n");
 fprintf(stderr," -s siodev      Serial device (default /dev/ttyUSB0)\n");
@@ -733,6 +775,15 @@ exit(1);
   case 115200:
     b_rate = B115200;
     break;
+  case 230400:
+    b_rate = B230400;
+    break;
+  case 460800:
+    b_rate = B460800;
+    break;
+  case 921600:
+    b_rate = B921600;
+    break;
   default:
     err(1, "unknown baudrate %d", baudrate);
     break;
@@ -905,4 +956,4 @@ exit(1);
       }
     }
   }
-}
+}
\ No newline at end of file