Changeset 1950

Timestamp:

01/14/08 10:09:59 (12 months ago)

Author:

aturner

Message:

link libfragroute to tcprewrite and parse args. refs #42

Location:

trunk/src

Files:

• Makefile.am (modified) (2 diffs)
• tcprewrite.c (modified) (6 diffs)
• tcprewrite.h (modified) (2 diffs)

trunk/src/Makefile.am

@@ -1 +1 @@
 # $Id: Makefile.am 1632 2007-02-03 18:46:16Z aturner $
 if COMPILE_FRAGROUTE
-    LIBFRAGROUTE = ./fragroute/libfragroute.a
+    LIBFRAGROUTE = ./fragroute/libfragroute.a @LDNETLIB@
     FRAGROUTE_DIR = fragroute
 else
@@ -54 +54 @@
         @AUTOGEN@ $(opts_list) tcpreplay_opts.def
 
-tcprewrite_CFLAGS = $(LIBOPTS_CFLAGS) -I.. $(LNAV_CFLAGS) -DTCPREWRITE -DHAVE_CACHEFILE_SUPPORT
+tcprewrite_CFLAGS = $(LIBOPTS_CFLAGS) -I.. @LDNETINC@ $(LNAV_CFLAGS) -DTCPREWRITE -DHAVE_CACHEFILE_SUPPORT
 tcprewrite_LDADD = ./tcpedit/libtcpedit.a ./common/libcommon.a \
         $(LIBSTRL) @LNETLIB@ @LPCAPLIB@ $(LIBOPTS_LDADD) @DMALLOC_LIB@ \

trunk/src/tcprewrite.c

@@ -78 +78 @@
     int optct, rcode;
     pcap_t *dlt_pcap;
-    
+    char ebuf[FRAGROUTE_ERRBUF_LEN];
     tcprewrite_init();
 
@@ -117 +117 @@
     dbgx(1, "DLT of dlt_pcap is %s",
         pcap_datalink_val_to_name(pcap_datalink(dlt_pcap)));
+
+    if (options.fragroute_args) {
+        if ((options.frag_ctx = fragroute_init(65535, options.fragroute_args, ebuf)) == NULL)
+            errx(1, "%s", ebuf);
+    }
 
 #ifdef ENABLE_VERBOSE
@@ -187 +192 @@
 #endif
 
+
+#ifdef ENABLE_FRAGROUTE
+    if (HAVE_OPT(FRAGROUTE))
+        options.fragroute_args = safe_strdup(OPT_ARG(FRAGROUTE));
+    
+    options.fragroute_dir = FRAGROUTE_DIR_BOTH;
+    if (HAVE_OPT(FRAGDIR)) {
+        if (strcmp(OPT_ARG(FRAGDIR), "c2s") == 0) {
+            options.fragroute_dir = FRAGROUTE_DIR_C2S;
+        } else if (strcmp(OPT_ARG(FRAGDIR), "s2c") == 0) {
+            options.fragroute_dir = FRAGROUTE_DIR_S2C;
+        } else if (strcmp(OPT_ARG(FRAGDIR), "both") == 0) {
+            options.fragroute_dir = FRAGROUTE_DIR_BOTH;
+        } else {
+            errx(1, "Unknown --fragdir value: %s", OPT_ARG(FRAGDIR));
+        }
+    }
+#endif
+
     /* open up the input file */
     options.infile = safe_strdup(OPT_ARG(INFILE));
@@ -203 +227 @@
     const u_char *pktdata = NULL;               /* packet from libpcap */
     u_char **packet = NULL;                     /* packet from tcpedit */
+    char *frag = NULL;
     COUNTER packetnum = 0;
-    int rcode;
+    int rcode, frag_len;
 
     pkthdr_ptr = &pkthdr;
@@ -235 +260 @@
             goto WRITE_PACKET; /* still need to write it so cache stays in sync */
 
-        packet = &pktdata;
+        packet = (u_char **)&pktdata;
         if ((rcode = tcpedit_packet(tcpedit, &pkthdr_ptr, packet, cache_result)) == TCPEDIT_ERROR) {
             return -1;
@@ -246 +271 @@
 
 WRITE_PACKET:
-        /* write the packet */
-        pcap_dump((u_char *)pout, pkthdr_ptr, *packet);
+        if (options.frag_ctx == NULL) {
+            /* write the packet when there's no fragrouting to be done */
+            pcap_dump((u_char *)pout, pkthdr_ptr, *packet);
+        } else {
+            /* packet needs to be fragmented */
+            if ((options.fragroute_dir == FRAGROUTE_DIR_BOTH) ||
+                    (cache_result == TCPR_DIR_C2S && options.fragroute_dir == FRAGROUTE_DIR_C2S) ||
+                    (cache_result == TCPR_DIR_S2C && options.fragroute_dir == FRAGROUTE_DIR_S2C)) {
+                fragroute_process(options.frag_ctx, *packet, pkthdr_ptr->caplen);
+                while ((frag_len = fragroute_getfragment(options.frag_ctx, &frag)) > 0) {
+                    /* frags get the same timestamp as the original packet */
+                    pkthdr_ptr->caplen = frag_len;
+                    pkthdr_ptr->len = frag_len;
+                    pcap_dump((u_char *)pout, pkthdr_ptr, (u_char *)frag);
+                }
+            } else {
+                /* write the packet without fragroute */
+                pcap_dump((u_char *)pout, pkthdr_ptr, *packet);
+            }
+        }
 
     } /* while() */

trunk/src/tcprewrite.h

@@ -43 +43 @@
 #endif
 
+#ifdef ENABLE_FRAGROUTE
+#include "fragroute/fragroute.h"
+#endif
 
 /* runtime options */
@@ -64 +67 @@
     char *tcpdump_args;
 #endif
+
+#ifdef ENABLE_FRAGROUTE
+    char *fragroute_args;
+    fragroute_t *frag_ctx;
+#define FRAGROUTE_DIR_C2S  1
+#define FRAGROUTE_DIR_S2C  2
+#define FRAGROUTE_DIR_BOTH 4
+    int fragroute_dir;
+#endif
     tcpedit_t *tcpedit;
 };