Changeset 1439466

Timestamp:

04/24/13 11:01:44 (8 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

c73f536

Parents:

ec56195

Message:

• Fixed pointer arithmetic bug in traceanon that was not anonymising IP headers embedded inside of ICMP messages correctly
• Also, fixed traceanon to wipe ICMP checksums just like we do with TCP and UDP

File:

• tools/traceanon/traceanon.c (modified) (2 diffs)

tools/traceanon/traceanon.c

@@ -92 +92 @@
                  * internally 
                  */
+                
                 if (icmp->type == 3 
                                 || icmp->type == 5 
                                 || icmp->type == 11) {
+                        char *ptr = (char *)icmp;
                         encrypt_ips(
-                                (struct libtrace_ip*)icmp+
-                                        sizeof(struct libtrace_icmp),
+                                (struct libtrace_ip*)(ptr+
+                                        sizeof(struct libtrace_icmp)),
                                 enc_dest,
                                 enc_source);
                 }
+
+                if (enc_source || enc_dest)
+                        icmp->checksum = 0;
         }
 }
@@ -314 +319 @@
                         tcp->check = 0;
                 }
-
+        
                 /* TODO: Encrypt IP's in ARP packets */