add --nofixcsum to disable all checksumming refs appneta#449

will consider per-protocol configuration in 4.x
baigubulu · Nov 24, 2010 · 0804ccf · 0804ccf
1 parent 42722b8
commit 0804ccf
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 7 deletions.
diff --git a/configure.ac b/configure.ac
@@ -17,7 +17,7 @@ AC_CONFIG_MACRO_DIR([m4])
 dnl Set version info here!
 MAJOR_VERSION=3
 MINOR_VERSION=4
-MICRO_VERSION=5beta2
+MICRO_VERSION=5beta3
 TCPREPLAY_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
 PACKAGE_URL=http://tcpreplay.synfin.net/
 

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
@@ -1,5 +1,10 @@
 $Id$
 
+??/??/2010 Version 3.4.5
+    - Update URL's to point to new tcpreplay website (#430)
+    - Fix statistics to be more industry standard (#443)
+    - Add --nofixcsum (#449)
+
 08/15/2010 Version 3.4.5beta1
     - First pass at fixing 'make test' on many little-endian systems (#429)
     - Warn users when processing LINUX_SLL frames w/o an Ethernet source MAC (#434)

diff --git a/src/tcpedit/parse_args.c b/src/tcpedit/parse_args.c
@@ -113,8 +113,11 @@ tcpedit_post_args(tcpedit_t **tcpedit_ex) {
         tcpedit->cidrmap2 = tcpedit->cidrmap1;
 
     /* --fixcsum */
-    if (HAVE_OPT(FIXCSUM))
-        tcpedit->fixcsum = 1;
+    if (HAVE_OPT(FIXCSUM)) {
+        tcpedit->fixcsum = TCPEDIT_FIXCSUM_ON;
+    } else if (HAVE_OPT(NOFIXCSUM)) {
+        tcpedit->fixcsum = TCPEDIT_FIXCSUM_DISABLE;
+    }
 
     /* --efcs */
     if (HAVE_OPT(EFCS)) 

diff --git a/src/tcpedit/tcpedit-int.h b/src/tcpedit/tcpedit-int.h
@@ -95,10 +95,11 @@ struct tcpedit_s {
 #define TCPEDIT_REWRITE_IP_OFF 0x0
 #define TCPEDIT_REWRITE_IP_ON  0x1
 
-    /* fix IP/TCP/UDP checksums */
+    /* fix IP/TCP/UDP/ICMP checksums */
     u_int8_t fixcsum;
 #define TCPEDIT_FIXCSUM_OFF 0x0
 #define TCPEDIT_FIXCSUM_ON  0x1
+#define TCPEDIT_FIXCSUM_DISABLE  0xFF /* never fix via --nofixcsum */
 
     /* remove ethernet FCS */
     u_int8_t efcs;

diff --git a/src/tcpedit/tcpedit.c b/src/tcpedit/tcpedit.c
@@ -270,8 +270,13 @@ tcpedit_packet(tcpedit_t *tcpedit, struct pcap_pkthdr **pkthdr,
         }
     }
 
-    /* do we need to fix checksums? -- must always do this last! */
-    if ((tcpedit->fixcsum || needtorecalc)) {
+    /* do we need to fix checksums? -- must always do this last! 
+     * We recalc if:
+     * user specified --fixcsum
+     * packet was edited AND user did NOT specify --nofixcsum
+     */
+    if ((tcpedit->fixcsum == TCPEDIT_FIXCSUM_ON || 
+            (needtorecalc && tcpedit->fixcsum != TCPEDIT_FIXCSUM_DISABLE))) {
         if (ip_hdr != NULL) {
             retval = fix_ipv4_checksums(tcpedit, *pkthdr, ip_hdr);
         } else if (ip6_hdr != NULL) {

diff --git a/src/tcpedit/tcpedit_opts.def b/src/tcpedit/tcpedit_opts.def
@@ -131,14 +131,26 @@ EOText;
 flag = {
     name        = fixcsum;
     value       = C;
-    descrip     = "Force recalculation of IPv4/TCP/UDP header checksums";
+    descrip     = "Force recalculation of IP/TCP/UDP/ICMP header checksums";
+    flags-cant  = nofixcsum;
     doc         = <<- EOText
 Causes each IPv4/v6 packet to have their checksums recalcualted and
 fixed.  Automatically enabled for packets modified with @samp{--seed}, 
 @samp{--pnat}, @samp{--endpoints} or @samp{--fixlen}.
 EOText;
 };
 
+flag = {
+    name        = nofixcsum;
+    descrip     = "Disable recalcuation of IP/TCP/UDP/ICMP header checksums";
+    flags-cant  = fixcsum;
+    doc         = <<- EOText
+Normally, checksums will be automatically re-calcuated and fixed as necessary
+when editing packets.  However, if you wish to disable fixing of checksums
+then specify this option.
+EOText;
+};
+
 flag = {
     name        = mtu;
     value       = m;