Changeset 9dc77f3 for lib/protocols_transport.c

Timestamp:

02/02/10 15:52:06 (12 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:

6dc74e1

Parents:

226c08b

Message:

• Ensure get_*_port functions always return 0 for ICMP

File:

• lib/protocols_transport.c (modified) (2 diffs)

lib/protocols_transport.c

@@ -184 +184 @@
 {
         uint32_t remaining;
+        uint8_t proto;
         const struct ports_t *port = 
                 (const struct ports_t*)trace_get_transport((libtrace_packet_t*)packet,
-                        NULL, &remaining);
+                        &proto, &remaining);
 
         /* snapped too early */
         if (remaining<2)
+                return 0;
+
+        /* ICMP *technically* doesn't have ports */
+        if (proto == TRACE_IPPROTO_ICMP)
                 return 0;
 
@@ -202 +207 @@
 {
         uint32_t remaining;
+        uint8_t proto;
         struct ports_t *port = 
                 (struct ports_t*)trace_get_transport((libtrace_packet_t*)packet,
-                        NULL, &remaining);
+                        &proto, &remaining);
         /* snapped to early */
         if (remaining<4)
+                return 0;
+        
+        /* ICMP *technically* doesn't have ports */
+        if (proto == TRACE_IPPROTO_ICMP)
                 return 0;