Changeset 1734 for trunk/src/tcpreplay.c

Timestamp:

03/20/07 22:20:18 (22 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

Files:

• trunk/src/tcpreplay.c (modified) (6 diffs)

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);
     }