Changeset 1839

Timestamp:

04/22/07 15:22:54 (19 months ago)

Author:

aturner

Message:

don't use pcap_findalldevs() on OS X. refs #167

Location:

trunk

Files:

• configure.in (modified) (6 diffs)
• src/common/interface.c (modified) (1 diff)
• src/config.h.in (modified) (1 diff)
• src/tcpbridge.c (modified) (1 diff)
• src/tcpreplay.c (modified) (1 diff)
• src/tcpreplay_opts.def (modified) (1 diff)

trunk/configure.in

@@ -11 +11 @@
 dnl Set version info here!
 MAJOR_VERSION=3
-MINOR_VERSION=0
+MINOR_VERSION=1
 MICRO_VERSION=0
 TCPREPLAY_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
@@ -983 +983 @@
 dnl No 'make test' when cross compile
 
-AC_MSG_CHECKING( for 'make test' profile)
+AC_MSG_CHECKING(for 'make test' profile)
 if test "$host" != "$build" ; then
         AC_MSG_WARN(Unable to do tests when cross-compiling)
@@ -995 +995 @@
       AC_MSG_RESULT([Using --with-testnic=$withval])],
     [
+
+dnl There's a bug in OS X which causes pcap_findalldevs() to make the wifi NIC to disassociate
+dnl so under OSX we disable the interface list feature
+disable_pcap_findalldevs=no
+
+
 dnl these need to be dynamic based on OS
 case $host in
@@ -1018 +1024 @@
         nic1=en0
         nic2=en0
+        disable_pcap_findalldevs=yes
         AC_MSG_RESULT(Apple OS X)
         ;;
@@ -1049 +1056 @@
 AC_SUBST(nic1)
 AC_SUBST(nic2)
+
+
+AC_MSG_CHECKING([if it's ok to use pcap_findalldevs()])
+if test x$disable_pcap_findalldevs = xno ; then
+        AC_DEFINE([ENABLE_PCAP_FINDALLDEVS], [1], [Enable use of pcap_findalldevs()])
+        AC_MSG_RESULT(yes)
+else
+        AC_MSG_RESULT(no)
+fi
 
 LIBOPTS_CHECK
@@ -1070 +1086 @@
         AC_MSG_WARN([OS X <= 10.4.9 has a serious problem.  Please see: http://tcpreplay.synfin.net/trac/ticket/142])
         ;;
+        
+        *-*-cygwin)
+        AC_MSG_WARN([Windows/Cygwin support is still somewhat experimental.  Please report any bugs!])
+        ;;
 esac

trunk/src/common/interface.c

@@ -55 +55 @@
     
     assert(alias);
-    assert(list);
     
-    ptr = list;
+    if (list != NULL) {        
+        ptr = list;
     
-    do {
-        /* check both the alias & name fields */
-        if (strcmp(alias, ptr->alias) == 0)
-            return(ptr->name);
+        do {
+            /* check both the alias & name fields */
+            if (strcmp(alias, ptr->alias) == 0)
+                return(ptr->name);
         
-        if (strcmp(alias, ptr->name) == 0)
-            return(ptr->name);
+            if (strcmp(alias, ptr->name) == 0)
+                return(ptr->name);
             
-        ptr = ptr->next;
-    } while (ptr != NULL);
+            ptr = ptr->next;
+        } while (ptr != NULL);
+    } else {
+        return(alias);
+    }
     
     return(NULL);

trunk/src/config.h.in

@@ -15 +15 @@
 /* Enable building flowreplay (alpha) */
 #undef ENABLE_FLOWREPLAY
+
+/* Enable use of pcap_findalldevs() */
+#undef ENABLE_PCAP_FINDALLDEVS
 
 /* Do we have tcpdump and pcap_dump_fopen()? */

trunk/src/tcpbridge.c

@@ -159 +159 @@
     char ebuf[SENDPACKET_ERRBUF_SIZE];
     char *intname;
+#ifdef ENABLE_PCAP_FINDALLDEVS
     interface_list_t *intlist = get_interface_list();
-
+#else
+    interface_list_t *intlist = NULL;
+#endif
     
 #ifdef DEBUG

trunk/src/tcpreplay.c

@@ -272 +272 @@
     char ebuf[SENDPACKET_ERRBUF_SIZE];
     int int1dlt, int2dlt;
+    
+#ifdef ENABLE_PCAP_FINDALLDEVS
     interface_list_t *intlist = get_interface_list();
-
+#else
+    interface_list_t *intlist = NULL;
+#endif
 
 #ifdef DEBUG

trunk/src/tcpreplay_opts.def

@@ -206 +206 @@
 
 flag = {
+        ifdef           = ENABLE_PCAP_FINDALLDEVS;
         name            = listnics;
         value           = N;