Changeset dc6072d for lib

Timestamp:

02/18/13 13:31:17 (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:

0801187

Parents:

c0a5a50

Message:

• Added libtrace structure for the ICMPv6 header
• Updated trace_get_payload_length to calculate correct payload length for ICMP6 packets

Location:

lib

Files:

• libtrace.h.in (modified) (1 diff)
• protocols_transport.c (modified) (1 diff)

lib/libtrace.h.in

@@ -625 +625 @@
 } PACKED libtrace_icmp_t;
 
+typedef struct libtrace_icmp6 {
+  uint8_t type;         /**< Message Type */
+  uint8_t code;         /**< Type Sub-code */
+  uint16_t checksum;    /**< Checksum */
+
+  union {
+    struct {
+        uint8_t length;   /**< Length of original datagram content in 64 bit words */
+        uint8_t unused;   /**< Unused */        
+        uint8_t unused1;  /**< Unused */
+    } extend;   /**< Extensions added in RFC 4884 for Time Exceeded and Destination Unreachable Messages */
+
+    uint32_t mtu;       /**< MTU from Packet Too Big Message */
+    uint32_t pointer;   /**< Pointer from Parameter Problem Message */
+    struct {
+        uint16_t id;    /**< Echo Identifier */
+        uint16_t sequence; /**< Echo Sequence Number */
+    } echo; /**< Data required for Echo Request and Reply messages */
+  } un;
+} PACKED libtrace_icmp6_t;
+
 /** Generic LLC/SNAP header structure */
 typedef struct libtrace_llcsnap

lib/protocols_transport.c

@@ -129 +129 @@
                         len -= sizeof(libtrace_icmp_t);
                         break;
-                
+                case TRACE_IPPROTO_ICMPV6:
+                        if (rem < sizeof(libtrace_icmp6_t))
+                                return 0;
+                        if (len < sizeof(libtrace_icmp6_t))
+                                return 0;
+                        len -= sizeof(libtrace_icmp6_t);
+                        break;
+                        
                 default:
                         return 0;