Changeset 819

Timestamp:

05/23/06 14:56:06 (7 years ago)

Author:

perry

Message:

Don't wander off the end of the packet when the packet was prematurely snapped
when looking at packets that were snapped before the end of the IPv6 header
when looking for the source/dest port.

File:

• trunk/lib/protocols.c (modified) (2 diffs)

trunk/lib/protocols.c

@@ -337 +337 @@
 {
         void *transport;
-        uint8_t dummy;
+        uint8_t dummy_proto;
         uint16_t ethertype;
         void *link;
-
-        if (!proto) proto=&dummy;
-
-        if (remaining)
-                *remaining = trace_get_capture_length(packet);
+        uint32_t dummy_remaining;
+
+        if (!proto) proto=&dummy_proto;
+
+        if (!remaining) remaining=&dummy_remaining;
+
+        *remaining = trace_get_capture_length(packet);
 
         link=trace_get_link(packet);
@@ -500 +502 @@
 DLLEXPORT uint16_t trace_get_source_port(const libtrace_packet_t *packet)
 {
+        uint32_t remaining;
         struct ports_t *port = 
                 (struct ports_t*)trace_get_transport((libtrace_packet_t*)packet,
-                        NULL, NULL);
+                        NULL, &remaining);
+
+        /* snapped too early */
+        if (remaining<2)
+                return 0;
 
         if (port)