Changeset 39c3ce7 for libpacketdump

Timestamp:

08/31/15 14:30:45 (5 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, 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:

206109f, 87cba74

Parents:

7aa2a21

Message:

Dump ICMP checksum with rest of ICMP header

Previously, we were decoding and printing the embedded IP header in TTL
Exceeded and Destination Unreachable messages before printing the Checksum
for the preceding ICMP header.

File:

• libpacketdump/ip_1.c (modified) (4 diffs)

libpacketdump/ip_1.c

@@ -26 +26 @@
 {
         libtrace_icmp_t *icmp = (libtrace_icmp_t*)packet;
+        int ippresent = 0;
         if (len<1)
                 return;
@@ -48 +49 @@
                                 printf(" ICMP: Code: %i (Unknown)\n",icmp->code);
                         }
-                        // Pretend that this was just passed up from ethernet
-                        decode_next(packet+8,len-8,
-                                        "eth",0x0800);
-
+                        ippresent = 1;
                         break;
                 case 8:
@@ -62 +60 @@
                 case 11:
                         printf(" Type: 11 (ICMP TTL Exceeded)\n");
-                        decode_next(packet+8,len-8,
-                                        "eth",0x0800);
+                        ippresent = 1;
                         break;
                 default:
@@ -76 +73 @@
                 printf("%u\n", ntohs(icmp->checksum));
 
+        if (ippresent) {
+                decode_next(packet+8,len-8,
+                                "eth",0x0800);
+        }
+
 
         return;