Changeset 1716

Timestamp:

02/27/07 21:14:28 (23 months ago)

Author:

aturner

Message:

improve Win32 support. mostly fix printing libpcap/winpcap version. refs #110

Location:

trunk

Files:

• configure.in (modified) (1 diff)
• src/config.h.in (modified) (1 diff)
• src/flowreplay_opts.def (modified) (2 diffs)
• src/tcpprep_opts.def (modified) (2 diffs)
• src/tcpreplay_opts.def (modified) (3 diffs)
• src/tcprewrite_opts.def (modified) (1 diff)

trunk/configure.in

@@ -897 +897 @@
     ;;
 
+        *-*-cygwin)
+        AC_MSG_RESULT(Win32/Cygwin)
+        AC_DEFINE([WIN32],[1], [Platform is Win32/Cygwin])
+        nic1=%0
+        nic1=%0
+        ;;
+        
         *)
         AC_MSG_RESULT([$host is unknown!  

trunk/src/config.h.in

@@ -158 +158 @@
 /* Does libpcap have pcap_sendpacket? */
 #undef HAVE_PCAP_SENDPACKET
+
+/* Does libpcap have pcap_version[] */
+#undef HAVE_PCAP_VERSION
 
 /* Do we have Linux PF_PACKET socket support? */

trunk/src/flowreplay_opts.def

@@ -269 +269 @@
 #endif
     fprintf(stderr, "\n");
-    fprintf(stderr, "Copyright 2001-2006 by Aaron Turner <aturner at synfin dot net>\n");
+    fprintf(stderr, "Copyright 2001-2007 by Aaron Turner <aturner at synfin dot net>\n");
 #ifdef HAVE_LIBNET
     fprintf(stderr, "Compiled against libnet: %s\n", LIBNET_VERSION);
@@ -275 +275 @@
         fprintf(stderr, "Not compiled with libnet.\n");
 #endif
+#ifdef HAVE_WINPCAP
+        fprintf(stderr, "Compiled against winpcap: %s\n", pcap_lib_version());
+#else
     fprintf(stderr, "Compiled against libpcap: %s\n", pcap_version);
+#endif
 #ifdef ENABLE_64BITS
     fprintf(stderr, "64 bit packet counters: enabled\n");

trunk/src/tcpprep_opts.def

@@ -537 +537 @@
 #endif
     fprintf(stderr, "\n");
-    fprintf(stderr, "Copyright 2001-2006 by Aaron Turner <aturner at synfin dot net>\n");
+    fprintf(stderr, "Copyright 2001-2007 by Aaron Turner <aturner at synfin dot net>\n");
     fprintf(stderr, "Cache file supported: %s\n", CACHEVERSION);
 #ifdef HAVE_LIBNET
@@ -544 +544 @@
         fprintf(stderr, "Not compiled with libnet.\n");
 #endif
+#ifdef HAVE_WINPCAP
+        fprintf(stderr, "Compiled against winpcap: %s\n", pcap_lib_version());
+#else
     fprintf(stderr, "Compiled against libpcap: %s\n", pcap_version);
+#endif
 #ifdef ENABLE_64BITS
     fprintf(stderr, "64 bit packet counters: enabled\n");

trunk/src/tcpreplay_opts.def

@@ -205 +205 @@
     pcap_if_ptr = pcap_if;
     printf("%s", "Available network interfaces:\n");
-#ifdef HAVE_WINPCAP
-        printf("Short Name\tName\tDescription\n");
-#endif
+#ifdef WIN32  /* Win32 has alias/name/description */
+        printf("Alias\tName\n");
+#else
+        /* Unix just has a warning about being root */
         if (geteuid() != 0)
                 printf("Warning!  Need to run as root to get complete list.\n");
+#endif
 
     while (pcap_if_ptr != NULL) {
         if (! pcap_if_ptr->flags & PCAP_IF_LOOPBACK) {
-#ifdef HAVE_WINPCAP
-            printf("%%%d\t%s\t%s\n", i, pcap_if_ptr->name, pcap_if_ptr->description);
+#ifdef WIN32
+            printf("%%%d\t%s\n\t%s\n", i, pcap_if_ptr->name, pcap_if_ptr->description);
 #else
                         printf("%s\n", pcap_if_ptr->name);
@@ -373 +375 @@
 #endif
     fprintf(stderr, "\n");
-    fprintf(stderr, "Copyright 2001-2006 by Aaron Turner <aturner at synfin dot net>\n");
+    fprintf(stderr, "Copyright 2001-2007 by Aaron Turner <aturner at synfin dot net>\n");
     fprintf(stderr, "Cache file supported: %s\n", CACHEVERSION);
 #ifdef HAVE_LIBNET
@@ -380 +382 @@
         fprintf(stderr, "Not compiled with libnet.\n");
 #endif
+#ifdef HAVE_WINPCAP
+        fprintf(stderr, "Compiled against winpcap: %s\n", pcap_lib_version());
+#else
     fprintf(stderr, "Compiled against libpcap: %s\n", pcap_version);
+#endif
 #ifdef ENABLE_64BITS
     fprintf(stderr, "64 bit packet counters: enabled\n");

trunk/src/tcprewrite_opts.def

@@ -185 +185 @@
         fprintf(stderr, "Not compiled with libnet.\n");
 #endif
+#ifdef HAVE_WINPCAP
+        fprintf(stderr, "Compiled against winpcap: %s\n", pcap_lib_version());
+#else
     fprintf(stderr, "Compiled against libpcap: %s\n", pcap_version);
+#endif
 #ifdef ENABLE_64BITS
     fprintf(stderr, "64 bit packet counters: enabled\n");