Changeset 1697

Timestamp:

02/24/07 13:24:34 (23 months ago)

Author:

aturner

Message:

basic tweaks for winpcap/win32. Need to improve though. refs #110

Location:

trunk

Files:

• configure.in (modified) (6 diffs)
• src/common/Makefile.am (modified) (1 diff)
• src/common/sendpacket.c (modified) (1 diff)

trunk/configure.in

@@ -418 +418 @@
 
     for testdir in $trypcapdir /usr/local /usr ; do 
- 
      if test -f "${testdir}/include/pcap.h" -a $foundpcap = no ; then
          LPCAPINC="${testdir}/include/pcap.h"
@@ -426 +425 @@
          elif test -f "${testdir}/lib64/libpcap.a" ; then
              LPCAPLIB="${testdir}/lib64/libpcap.a"
+         elif test -f "${testdir}/lib/libpcap.a" ; then
+             LPCAPLIB="${testdir}/lib/libpcap.a"
          else
-             LPCAPLIB="${testdir}/lib/libpcap.a"
-         fi
+             LPCAPLIB="${testdir}/lib/libwpcap.a"
+         fi 
         foundpcap=$testdir
      fi
@@ -445 +446 @@
 dnl Checks to see what version of libpcap we've got
 OLDLIBS="$LIBS"
-OLDCFLAGS="$CFLAGS"
+OLDCFLAGS="$CFLAGS -I$LPCAPINCDIR"
 LIBS="$LPCAPLIB"
 CFLAGS="$CFLAGS -I$LPCAPINCDIR"
@@ -468 +469 @@
  * or one otherwise
  */
-    if (strncmp(pcap_lib_version, PCAP_TEST, 3) >= 0)
+    if (strncmp(pcap_lib_version(), PCAP_TEST, 3) >= 0)
             exit(0);
+
+    /* winpcap? */
+    if (strncmp(pcap_lib_version(), "WinPcap", 7) == 0)
+            exit(0);
+
     exit(1);
 ]]), [
@@ -490 +496 @@
  * or one otherwise
  */
+
     if (strncmp(pcap_version, PCAP_TEST, 3) >= 0)
             exit(0);
+    
     exit(1);
 ]]), [
@@ -876 +884 @@
 fi
 
+
+AM_CONDITIONAL(HAVE_TCPDUMP, test $td = yes)
 dnl No 'make test' when cross compile
 

trunk/src/common/Makefile.am

@@ -14 +14 @@
 libcommon_a_SOURCES = cidr.c err.c list.c cache.c services.c get.c \
                       fakepcap.c fakepcapnav.c fakepoll.c xX.c utils.c \
-                      tcpdump.c timer.c svn_version.c abort.c sendpacket.c \
+                      timer.c svn_version.c abort.c sendpacket.c \
                           dlt_names.c mac.c
+
+if HAVE_TCPDUMP
+        libcommon_a_SOURCES += tcpdump.c
+endif
 
 AM_CFLAGS = -I.. -I../.. $(LNAV_CFLAGS)

trunk/src/common/sendpacket.c

@@ -81 +81 @@
 #include <sys/ioctl.h>
 #include <sys/file.h>
-#include <sys/sysctl.h>
-#include <net/route.h>
+//#include <sys/sysctl.h>
+//#include <net/route.h>
 #include <stdlib.h>
 #include <unistd.h>