Changeset 1734

Timestamp:

03/20/07 22:20:18 (20 months ago)

Author:

aturner

Message:

tag things as rc1 refs #108
add support for pcap_snapshot_override() refs #130
check that dual nic mode both interfaces have the same dlt refs #125

Location:

trunk

Files:

• configure.in (modified) (2 diffs)
• src/tcpprep.c (modified) (3 diffs)
• src/tcpreplay.c (modified) (6 diffs)
• src/tcprewrite.c (modified) (1 diff)

trunk/configure.in

@@ -13 +13 @@
 MAJOR_VERSION=3
 MINOR_VERSION=0
-MICRO_VERSION=beta13
+MICRO_VERSION=RC1
 TCPREPLAY_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
 
@@ -495 +495 @@
               [Does libpcap have dlt_val_to_desc?])
 fi
+
+
+dnl Check to see if we've got pcap_snapshot_override()
+AC_MSG_CHECKING(for pcap_snapshot_override)
+AC_LINK_IFELSE(AC_LANG_PROGRAM([[
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "$LPCAPINC"
+]],[[
+        pcap_t *pcap;
+        pcap_snapshot_override(pcap, 1);
+        exit(0);
+]]),[
+    have_pcap_snapshot_override=yes
+    AC_MSG_RESULT(yes)
+], [
+    have_pcap_snapshot_override=no
+    AC_MSG_RESULT(no)
+])
+
+if test $have_pcap_snapshot_override = yes ; then
+    AC_DEFINE([HAVE_PCAP_SNAPSHOT_OVERRIDE], [1], 
+              [Does libpcap have pcap_snapshot_override()?])
+fi
+
 
 dnl This message is placed here for continuity purposes

trunk/src/tcpprep.c

@@ -122 +122 @@
         errx(1, "Error opening file: %s", errbuf);
 
+#ifdef HAVE_PCAP_SNAPSHOT_OVERRIDE
+    /* libpcap >= 0.9.6 have this which handles broken RedHat libpcap files */
+    pcap_snapshot_override(pin, 65535);
+#endif
+
     /* make sure we support the DLT type */
     switch(pcap_datalink(options.pcap)) {
@@ -307 +312 @@
 #endif
     
+    assert(pcap);
+    
     while ((pktdata = pcap_next(pcap, &pkthdr)) != NULL) {
         packetnum++;
@@ -316 +323 @@
             if (options.xX.mode < xXExclude) {
                 if (!check_list(options.xX.list, packetnum)) {
-                    add_cache(&options.cachedata, DONT_SEND, 0);
+                    add_cache(&(options.cachedata), DONT_SEND, 0);
                     continue;
                 }
             }
             else if (check_list(options.xX.list, packetnum)) {
-                add_cache(&options.cachedata, DONT_SEND, 0);
+                add_cache(&(options.cachedata), DONT_SEND, 0);
                 continue;
             }

trunk/src/tcpreplay.c

@@ -118 +118 @@
     if (bytes_sent > 0)
         packet_stats(&begin, &end, bytes_sent, pkts_sent, failed);
-
     return 0;
 }                               /* main() */
@@ -131 +130 @@
     pcap_t *pcap = NULL;
     char ebuf[PCAP_ERRBUF_SIZE];
+    int dlt;
 
 #ifdef HAVE_TCPDUMP
@@ -150 +150 @@
         errx(1, "Error opening pcap file: %s", ebuf);
 
+#ifdef HAVE_PCAP_SNAPSHOT_OVERRIDE
+    /* libpcap >= 0.9.6 have this which handles broken RedHat libpcap files */
+    pcap_snapshot_override(pcap, 65535);
+#endif
+
+    dlt = sendpacket_get_dlt(options.intf1);
+    if ((dlt > 0) && (dlt != pcap_datalink(pcap)))
+        warnx("%s DLT does not match that of the outbound interface: %s", path, options.intf1->device);
+        
     send_packets(pcap);
     pcap_close(pcap);
@@ -198 +207 @@
     char *temp;
     char ebuf[SENDPACKET_ERRBUF_SIZE];
+    int int1dlt, int2dlt;
     
 
@@ -252 +262 @@
         errx(1, "Can't open %s: %s", options.intf1_name, ebuf);
            
+    int1dlt = sendpacket_get_dlt(options.intf1);
+    
     if (HAVE_OPT(INTF2)) {
         options.intf2_name = (char *)safe_malloc(strlen(OPT_ARG(INTF2)) + 1);
@@ -259 +271 @@
         if ((options.intf2 = sendpacket_open(options.intf2_name, ebuf)) == NULL)
             errx(1, "Can't open %s: %s", options.intf2_name, ebuf);
+            
+        int2dlt = sendpacket_get_dlt(options.intf2);
+        if (int2dlt != int1dlt)
+            errx(1, "DLT type missmatch for %s and %s", options.intf1_name, options.intf2_name);
     }
 

trunk/src/tcprewrite.c

@@ -199 +199 @@
     pkthdr_ptr = &pkthdr;
 
+#ifdef HAVE_PCAP_SNAPSHOT_OVERRIDE
+    /* libpcap >= 0.9.6 have this which handles broken RedHat libpcap files */
+    pcap_snapshot_override(pin, 65535);
+#endif
+
     /* MAIN LOOP 
      * Keep sending while we have packets or until