Changeset 2889

Timestamp:

11/20/09 17:15:48 (4 months ago)

Author:

stevedh

Message:

port to osx- still broken

Location:

code/b6lowpan/branches/devel/support/sdk/c/blip

Files:

• configure.ac (modified) (3 diffs)
• driver/Makefile.am (modified) (2 diffs)
• driver/config.c (modified) (1 diff)
• driver/mcast.c (modified) (4 diffs)
• driver/netlink-darwin.c (added)
• driver/netlink-linux.c (moved) (moved from code/b6lowpan/branches/devel/support/sdk/c/blip/driver/netlink.c)
• driver/radvd-1.0/config.h.in (modified) (1 diff)
• driver/radvd-1.0/configure.in (modified) (1 diff)
• driver/radvd-wrapper.c (modified) (1 diff)
• driver/router-config.h (moved) (moved from code/b6lowpan/branches/devel/support/sdk/c/blip/driver/config.h) (1 diff)
• driver/routing-common.c (moved) (moved from code/b6lowpan/branches/devel/support/sdk/c/blip/driver/routing.c) (6 diffs)
• driver/routing-darwin.c (added)
• driver/routing-linux.c (added)
• driver/routing.h (modified) (2 diffs)
• driver/serial_tun.c (modified) (8 diffs)
• driver/tun_dev_darwin.c (added)
• driver/tun_dev_linux.c (moved) (moved from code/b6lowpan/branches/devel/support/sdk/c/blip/driver/tun_dev.c)
• driver/tun_ioctls_darwin.h (added)
• lib6lowpan/6lowpan.h (modified) (2 diffs)
• lib6lowpan/Makefile.am (modified) (1 diff)
• lib6lowpan/blip-pc-includes.h (added)
• lib6lowpan/blip-tinyos-includes.h (added)
• lib6lowpan/ip.h (modified) (1 diff)
• lib6lowpan/lib6lowpan-includes.h (added)
• lib6lowpan/lib6lowpan.c (modified) (1 diff)
• lib6lowpan/lib6lowpan.h (modified) (1 diff)
• lib6lowpan/lib6lowpanFrag.c (modified) (1 diff)
• lib6lowpan/nwbyte.h (modified) (1 diff)
• serial_tun.conf (modified) (1 diff)

code/b6lowpan/branches/devel/support/sdk/c/blip/configure.ac

@@ -1 +1 @@
 AC_INIT([blip], [2.1], [stevedh@eecs.berkeley.edu])
+AC_CANONICAL_SYSTEM
+echo $ac_n "building for architecture""... $ac_c" 1>&6
+case "$target" in
+        *linux*)
+                AC_MSG_RESULT(linux)
+                arch=linux
+        ;;
+        *darwin*)
+                AC_MSG_RESULT(darwin)
+                arch=darwin
+        ;;
+        *)      
+                AC_MSG_RESULT(unknown)
+                AC_MSG_ERROR([currently only Linux and OSX are supported])
+        ;;
+esac
+dnl AC_DEFINE([PLATFORM], [${arch}])
+
+dnl check programs
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_PROG_RANLIB
@@ -11 +30 @@
 ])
 
+dnl check various platform include files
+AC_CHECK_HEADERS([stdint.h inttypes.h])
+AC_CHECK_HEADERS([netinet/in.h ])
+AC_CHECK_HEADERS([linux/if_tun.h])
+AC_CHECK_HEADERS([arpa/inet.h])
+AC_CHECK_HEADERS([sys/socket.h net/route.h net/if.h], [], [], 
+[[#if HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#if HAVE_NET_ROUTE_H
+#include <net/route.h>
+#endif]])
+
+AC_MSG_CHECKING(whether struct in6_addr has u6_addrXX and defines s6_addrXX)
+AC_TRY_COMPILE([#include <netinet/in.h>], [static struct in6_addr in6_u; 
+int u =  in6_u.s6_addr16;], [AC_MSG_RESULT(yes); AC_DEFINE([HAVE_IN6_ADDR_S6_ADDR],
+1, [whether struct in6_addr has u6_addrXX and defines s6_addrXX])],
+AC_MSG_RESULT(no))
+
+AC_MSG_CHECKING(for SIOCADDRT)
+AC_TRY_COMPILE([#include <sys/ioctl.h>], [int x = SIOCADDRT;],
+[AC_MSG_RESULT(yes); AC_DEFINE([HAVE_SIOCADDRT], 1, [weather the SIOCADDRT ioctl is defined])],
+AC_MSG_RESULT(no))
+
+dnl sockoption for joining an ipv6 group
+AC_MSG_CHECKING(if IPV6_JOIN_GROUP is defined)
+AC_TRY_COMPILE([#include <netinet/in.h>], [int x = IPV6_JOIN_GROUP;],
+[AC_MSG_RESULT(yes); AC_DEFINE([HAVE_IPV6_JOIN_GROUP], 1, 
+                     [weather IPV6_JOIN_GROUP is defined])],
+AC_MSG_RESULT(no))
+
+AC_MSG_CHECKING(if IPV6_ADD_MEMBERSHIP is defined)
+AC_TRY_COMPILE([#include <netinet/in.h>], [int x = IPV6_ADD_MEMBERSHIP;],
+[AC_MSG_RESULT(yes); AC_DEFINE([HAVE_IPV6_ADD_MEMBERSHIP], 1, 
+                     [weather IPV6_ADD_MEMBERSHIP is defined])],
+AC_MSG_RESULT(no))
+
+dnl if htons requires -lc
+dnl AC_MSG_CHECKING(if htons requires -lc)
+dnl AC_TRY_COMPILE([#include <arpa/inet.h>], [int x = htons(10);],
+dnl [AC_MSG_RESULT(no)],
+dnl [AC_MSG_RESULT(yes); LDFLAGS+=-lc])
+
+dnl Check where to put the pidfile
+AC_MSG_CHECKING(where to put seqno file)
+AC_ARG_WITH(seqfile,
+[AC_HELP_STRING([--with-seqfile], [Path to the radvd pidfile (/var/run/ip-driver.seq)])],
+        PATH_BLIP_SEQFILE=$withval,
+        PATH_BLIP_SEQFILE=/var/run/ip-driver.seq.pid)
+AC_MSG_RESULT($PATH_BLIP_SEQFILE)
+AC_SUBST(PATH_BLIP_SEQFILE)
+
 AC_ARG_ENABLE([lpl],
         [AS_HELP_STRING([--enable-lpl], [assume LPL is in use])],
@@ -16 +88 @@
         [])
 
-
+AC_LINK_FILES(driver/tun_dev_${arch}.c, driver/tun_dev.c)
+AC_LINK_FILES(driver/routing-${arch}.c, driver/routing-platform.c)
+AC_LINK_FILES(driver/netlink-${arch}.c, driver/netlink.c)
 AC_CONFIG_SUBDIRS([driver/radvd-1.0])
 AC_OUTPUT

code/b6lowpan/branches/devel/support/sdk/c/blip/driver/Makefile.am

@@ -2 +2 @@
 # SUBDIRS = radvd-1.0
 
+DEFS = -DPATH_BLIP_SEQFILE=\"$(PATH_BLIP_SEQFILE)\"
+
 sbin_PROGRAMS = ip-driver
 
+ip_driver_LDFLAGS = @LDFLAGS@ -lc
+
 radvddir = radvd-1.0
-ip_driver_SOURCES=serial_tun.c tun_dev.c hashtable.c routing.c nwstate.c \
+ip_driver_SOURCES=serial_tun.c tun_dev.c hashtable.c routing-common.c nwstate.c \
         logging.c config.c radvd-wrapper.c  vty/vty.c vty/vty-util.c vty/vty.h \
-        netlink.c mcast.c \
+        netlink.c mcast.c routing-platform.c\
   $(radvddir)/log.c $(radvddir)/socket.c $(radvddir)/recv.c $(radvddir)/util.c $(radvddir)/radvd.h \
         $(radvddir)/defaults.h $(radvddir)/pathnames.h \
@@ -13 +17 @@
   $(radvddir)/timer.c $(radvddir)/send.c $(radvddir)/process.c $(radvddir)/interface.c \
   $(radvddir)/device.c $(radvddir)/device-common.c $(radvddir)/gram.h \
-        config.h  hashtable.h  hashtable_private.h  \
+        router-config.h  hashtable.h  hashtable_private.h  \
         logging.h  mcast.h  netlink.h  nwstate.h  \
         routing.h  tun_dev.h    

code/b6lowpan/branches/devel/support/sdk/c/blip/driver/config.c

@@ -32 +32 @@
 
 #include <lib6lowpan/ip.h>
-#include "config.h"
+#include "router-config.h"
 #include "logging.h"
 #include "vty/vty.h"

code/b6lowpan/branches/devel/support/sdk/c/blip/driver/mcast.c

@@ -27 +27 @@
 #include <unistd.h>
 
-#include <net/if.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <arpa/inet.h>
+// includes all the plaform defs
+#include <lib6lowpan/lib6lowpan.h>
 
 #include "mcast.h"
 #include "logging.h"
+
+#if HAVE_IPV6_ADD_MEMBERSHIP
+#define IPV6_JOIN IPv6_ADD_MEMBERSHIP
+#else
+# if HAVE_IPV6_JOIN_GROUP
+#  define IPV6_JOIN IPV6_JOIN_GROUP
+# endif
+#endif
 
 int __mcast_sock;
@@ -87 +91 @@
   }
 
+#if 0
   /* bind it to the device we're going to join the link-local
      multicast group on */
@@ -96 +101 @@
     goto fail;
   }
+#endif
 
   /* the loopback on linux doesn't support multicast. that's okay,
@@ -128 +134 @@
   join.ipv6mr_interface = ifindex;
 
-  if (setsockopt(__mcast_sock, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &join, sizeof(join)) < 0) {
+  if (setsockopt(__mcast_sock, IPPROTO_IPV6, IPV6_JOIN, &join, sizeof(join)) < 0) {
     log_fatal_perror("error joining group");
     goto fail;

code/b6lowpan/branches/devel/support/sdk/c/blip/driver/radvd-1.0/config.h.in

@@ -79 +79 @@
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION

code/b6lowpan/branches/devel/support/sdk/c/blip/driver/radvd-1.0/configure.in

@@ -30 +30 @@
                 AC_MSG_RESULT(bsd44)
                 arch=bsd44
+        ;;
+        *darwin*)
+                AC_MSG_RESULT(darwin)
+                arch=darwin
         ;;
         *)      

code/b6lowpan/branches/devel/support/sdk/c/blip/driver/radvd-wrapper.c

@@ -51 +51 @@
 
 #include "logging.h"
-#include "config.h"
+#include "router-config.h"
 
 struct Interface *iface;

code/b6lowpan/branches/devel/support/sdk/c/blip/driver/router-config.h

@@ -27 +27 @@
 #define _CONFIG_H
 
-#include <netinet/in.h>
-#include <net/if.h>
+// #include <lib6lowpan/lib6lowpan.h>
 
 struct config {

code/b6lowpan/branches/devel/support/sdk/c/blip/driver/routing-common.c

@@ -24 +24 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/socket.h>
 #include <net/if.h>
 #include <arpa/inet.h>
@@ -40 +41 @@
 #include "netlink.h"
 
-static ieee154_saddr_t my_short_addr;
-static uint16_t current_seqno;
+ieee154_saddr_t my_short_addr;
+uint16_t current_seqno;
 extern struct in6_addr  __my_address;
 
@@ -49 +50 @@
 char report_buf[ROUTMSGSIZ];
 
-/*
- * Call to setup routing tables.
- *
- */
-int routing_init(struct config *c, char *tun_name) {
-  FILE *fd;
-  char buf[256];
-  my_short_addr = ntohs(__my_address.s6_addr16[7]);
-  strncpy(proxy_dev, c->proxy_dev, IFNAMSIZ);
-  strncpy(tun_dev, tun_name, IFNAMSIZ);
-
-  // set up the network state data structures
-  nw_init();
-
-  // start a netlink session to the kernel
-  nl_init();
-
-  mcast_sock = mcast_start(proxy_dev);;
-
-  if ((fd = fopen("/proc/sys/net/ipv6/conf/all/forwarding", "w")) == NULL) {
-    log_fatal_perror("enable forwarding");
-    return -1;
-  }
-  fprintf(fd, "1");
-  fclose(fd);
-
-  snprintf(buf, sizeof(buf), "/proc/sys/net/ipv6/conf/%s/proxy_ndp", proxy_dev);
-  if ((fd = fopen(buf, "w")) == NULL) {
-    warn("unable to enable IPv6 ND proxy on %s\n", proxy_dev);
-  } else {
-    fprintf(fd, "1");
-    fclose(fd);
-  }
-
-  if ((fd = fopen("/var/run/ip-driver.seq", "r")) != NULL) {
-    if (fscanf(fd, "%hi\n", &current_seqno) != 1) {
-      current_seqno = 0;
-    }
-    fclose(fd);
-  }
-
-  return (mcast_sock >= 0) ? 0 : -1;
-}
 
 int routing_add_fds(fd_set *fds) {
@@ -99 +57 @@
   return mcast_sock;
 }
-
-int route_cmd(int cmd, struct in6_addr *dest, char *dev) {
-  struct in6_rtmsg rt;
-  memset((char *) &rt, 0, sizeof(struct in6_rtmsg));
-  memcpy(&rt.rtmsg_dst, dest, sizeof(struct in6_addr));
-
-  rt.rtmsg_flags = RTF_UP | RTF_HOST;
-  rt.rtmsg_metric = 1;
-  rt.rtmsg_dst_len = 128;
-  rt.rtmsg_ifindex = if_nametoindex(dev);
-
-  return ioctl(mcast_sock, cmd, &rt);
-}        
-
 
 int routing_process(fd_set *fds) {
@@ -260 +204 @@
 
 /*
- * Identical to routing_insert_route, except allows for a detour route
- */
-/*uint8_t routing_insert_route_indirect(struct split_ip_msg *orig, ip6_addr_t detour) {
-  int offset = 0;
-  path_t *path = nw_get_route(my_short_addr, l2fromIP(detour));
-  path_t *path_second = nw_get_route(l2fromIP(detour), l2fromIP(orig->hdr.dst_addr));
-  path_t *i;
-  struct generic_header *g_hdr = (struct generic_header *)malloc(sizeof(struct generic_header));
-  struct source_header *sh;
-
-  debug("routing_insert_route_indirect len1: 0x%x, len2: 0x%x\n", path->length, path_second->length);
-
-  if (ntoh16(orig->hdr.plen) + sizeof(struct source_header) + ((path->length + path_second->length) * sizeof(uint16_t)) + sizeof(struct ip6_hdr) > INET_MTU) {
-    warn("packet plus source header too long\n");
-    return 1;
-  }
-
-  sh = (struct source_header *)malloc(sizeof(struct source_header) + (path->length + path_second->length)*sizeof(uint16_t));
-  if (sh == NULL || g_hdr == NULL) return 1;
-
-  sh->nxt_hdr = orig->hdr.nxt_hdr;
-  sh->len = sizeof(struct source_header) + ((path->length + path_second->length) * sizeof(uint16_t));
-  sh->dispatch = IP_EXT_SOURCE_DISPATCH;
-  sh->current = 0;
-  orig->hdr.nxt_hdr = NXTHDR_SOURCE;
-
-  fprintf(stderr, "to 0x%x [%i]: ", noths(orig->hdr.ip6_dst.s6_addr16[7]), path->length + path_second->length);
-  for (i = path; i != NULL; i = i->next) {
-    fprintf(stderr, "0x%x ", i->node);
-    sh->hops[offset++] = hton16(i->node);
-  }
-  for (i = path_second; i != NULL; i = i->next) {
-    fprintf(stderr, "0x%x ", i->node);
-    sh->hops[offset++] = hton16(i->node);
-  }
-
-  fprintf(stderr, "\n");
-
-  orig->hdr.plen = hton16(ntoh16(orig->hdr.plen) + sh->len);
-
-  g_hdr->payload_malloced = 1;
-  g_hdr->len = sh->len;
-  g_hdr->hdr.sh = sh;
-  g_hdr->next = orig->headers;
-  orig->headers = g_hdr;
-
-  nw_free_path(path);
-  nw_free_path(path_second);
-
-  return 0;
-}
-*/
-
-/*
  */
 uint8_t routing_insert_route(struct split_ip_msg *orig) {
@@ -418 +308 @@
   FILE *fd;
   ++current_seqno;
-  if ((fd = fopen("/var/run/ip-driver.seq", "w")) != NULL) {
+  if ((fd = fopen(PATH_BLIP_SEQFILE, "w")) != NULL) {
     fprintf(fd, "%hi\n", current_seqno);
     fclose(fd);

code/b6lowpan/branches/devel/support/sdk/c/blip/driver/routing.h

@@ -26 +26 @@
 #include <string.h>
 #include "nwstate.h"
-#include "config.h"
+#include "router-config.h"
+
+#if ! HAVE_SIOCADDRT
+#define SIOCADDRT 1
+#define SIOCDELRT 2
+#endif
 
 enum {
@@ -49 +54 @@
 };
 
+/* 
+ * These two are platform-specific
+ *
+ * They should be in a file named routing-{arch}.c, which is linked to
+ * routing-platform.c by configure.
+ */
 int routing_init(struct config *c, char *tun_dev);
+int route_cmd(int cmd, struct in6_addr *dest, char *dev);
 
 /* 

code/b6lowpan/branches/devel/support/sdk/c/blip/driver/serial_tun.c

@@ -167 +167 @@
   printf("  nxthdr: 0x%x hlim: 0x%x plen: %i\n", msg->hdr.nxt_hdr, msg->hdr.hlim, ntohs(msg->hdr.plen));
   printf("  src: ");
-  for (i = 0; i < 16; i++) printf("0x%x ", msg->hdr.ip6_src.s6_addr[i]);
+  for (i = 0; i < 16; i++) printf("0x%hhx ", msg->hdr.ip6_src.s6_addr[i]);
   printf("\n");
   printf("  dst: ");
-  for (i = 0; i < 16; i++) printf("0x%x ", msg->hdr.ip6_dst.s6_addr[i]);
+  for (i = 0; i < 16; i++) printf("0x%hhx ", msg->hdr.ip6_dst.s6_addr[i]);
   printf("\n");
 
@@ -472 +472 @@
   debug("next hop: 0x%x\n", dest);
   flow_insert_label(msg);
-  print_ip_packet(msg);
 
   fifo_report(msg, dest, nxt_hdr);
@@ -926 +925 @@
   }
   debug("tun_read: read 0x%x bytes\n", len);
+  log_dump_serial_packet(&msg->pi, len);
 
   if ((msg->hdr.vlfc[0] >> 4) != IPV6_VERSION) {
@@ -1217 +1217 @@
     } else if (strcmp(argv[1], "lpl") == 0) {
       if (val < 0 || val > 4096) {
-        VTY_printf("diallowing lpl interval of %i\r\n");
+        VTY_printf("diallowing lpl interval of %i\r\n", val);
       } else {
         driver_config.lpl_interval = val;
@@ -1382 +1382 @@
     
     if (!opt_listenonly) {
-      int more_data;
+      int more_data = 0;
       /* check for data */
-      do {
-        more_data = tun_input();
-        more_data = serial_input() || more_data ;
-      } while (more_data);
+      if (FD_ISSET(tun_fd, &fs)) tun_input();
+      if (FD_ISSET(pan_fd, &fs)) serial_input();
+/*       do { */
+/*         more_data = serial_input() || more_data ; */
+/*       } while (more_data); */
     }
 
@@ -1466 +1467 @@
   dev[0] = 0;
   if (opt_listenonly) {
-    tun_fd = -1;
 #ifndef SF_SRC
     ser_src = NULL;
@@ -1485 +1485 @@
     }
     
-    
     for (i = 0; i < N_RECONSTRUCTIONS; i++) {
       reconstructions[i].timeout = T_UNUSED;
@@ -1495 +1494 @@
                                  1, stderr_msg);
     if (!ser_src) {
-      fatal("Couldn't open serial port at %s:%s\n", argv[optind], argv[optind + 1]);
+      log_fatal_perror("Couldn't open serial port");// at %s:%s\n", argv[optind], argv[optind + 1]);
       exit(1);
     }

code/b6lowpan/branches/devel/support/sdk/c/blip/lib6lowpan/6lowpan.h

@@ -32 +32 @@
 #define __6LOWPAN_H__
 
-#include <stdint.h>
+#include "lib6lowpan-includes.h"
+
 /*
  * Typedefs and static library data.
@@ -38 +39 @@
 typedef uint8_t ip6_addr_t [16];
 typedef uint16_t cmpr_ip6_addr_t;
-#ifdef PC
-#include "../config.h"
-typedef uint16_t ieee154_saddr_t;
-typedef uint16_t hw_pan_t;
-enum {
-  HW_BROADCAST_ADDR = 0xffff,
-};
-#else
-#include <Ieee154.h>
-#endif
+
 
 /*

code/b6lowpan/branches/devel/support/sdk/c/blip/lib6lowpan/Makefile.am

@@ -5 +5 @@
 noinst_lib6lowpandir = $(includedir)/lib6lowpan-2.1.1
 noinst_lib6lowpan_HEADERS = 6lowpan.h  devconf.h  IEEE154Packet.h  in_cksum.h  \
-        ip.h  ip_malloc.h  lib6lowpan.h  TrackFlows.h
+        ip.h  ip_malloc.h  lib6lowpan.h  TrackFlows.h nwbyte.h
 lib6lowpan_a_SOURCES = lib6lowpan.c lib6lowpanIP.c lib6lowpanFrag.c $(lib6lowpan_HEADERS)
 

code/b6lowpan/branches/devel/support/sdk/c/blip/lib6lowpan/ip.h

@@ -23 +23 @@
 #define _IP_H_
 
+#include "lib6lowpan-includes.h"
+#include "6lowpan.h"
+
 /*
  * define message structures for internet communication
  *
  */
-
-#ifdef PC
-#include <linux/if_tun.h>
-#include <netinet/in.h>
-#endif
-
-#include "6lowpan.h"
 
 enum {

code/b6lowpan/branches/devel/support/sdk/c/blip/lib6lowpan/lib6lowpan.c

@@ -20 +20 @@
  *
  */
-#include "6lowpan.h"
-#include "ip.h"
 #include "lib6lowpan.h"
 

code/b6lowpan/branches/devel/support/sdk/c/blip/lib6lowpan/lib6lowpan.h

@@ -22 +22 @@
 #ifndef _LIB6LOWPAN_H_
 #define _LIB6LOWPAN_H_
-#include <stdint.h>
-#include <stddef.h>
-
+
+#include "lib6lowpan-includes.h"
 #include "6lowpan.h"
 #include "ip.h"
-#include "nwbyte.h"
 
 

code/b6lowpan/branches/devel/support/sdk/c/blip/lib6lowpan/lib6lowpanFrag.c

@@ -29 +29 @@
 #include <stdio.h>
 
-#include "ip.h"
 #include "ip_malloc.h"
-#include "6lowpan.h"
 #include "lib6lowpan.h"
 

code/b6lowpan/branches/devel/support/sdk/c/blip/lib6lowpan/nwbyte.h

@@ -11 +11 @@
 #if defined(PC) 
 // use library versions if on linux
-#include <netinet/in.h>
-#include <endian.h>
-
 #define ntoh16(X)   ntohs(X)
 #define hton16(X)   htons(X)

code/b6lowpan/branches/devel/support/sdk/c/blip/serial_tun.conf

@@ -7 +7 @@
 # set the debug level of the output
 # choices are DEBUG, INFO, WARN, ERROR, and FATAL
-# log DEBUG
+log DEBUG
 
 # set the address of the router's 802.15.4 interface.  The interface