Changeset 1314 for trunk/lib/protocols_transport.c

Timestamp:

12/19/07 11:17:58 (5 years ago)

Author:

spa1

Message:

• Fixed get_payload_from_X functions not returning NULL in cases where they have a full X header but no subsequent payload (i.e. remaining would be exactly 0 upon return)
• trace_get_layer3 should not be a SIMPLE_FUNCTION anymore
• trace_get_ip now checks that at least a full IPv4 header is present
• Calls to payload_from_ethernet functions inside trace_get_layer3 will now update remaining correctly

File:

• trunk/lib/protocols_transport.c (modified) (4 diffs)

trunk/lib/protocols_transport.c

@@ -19 +19 @@
         transport = trace_get_layer3(packet,&ethertype,remaining);
 
-        if (!transport)
+        if (!transport || *remaining == 0)
                 return NULL;
 
@@ -118 +118 @@
 {
         if (remaining) {
-                if (*remaining < sizeof(libtrace_udp_t))
+                if (*remaining <= sizeof(libtrace_udp_t))
                         return NULL;
                 *remaining-=sizeof(libtrace_udp_t);
@@ -129 +129 @@
         unsigned int dlen = tcp->doff*4;
         if (remaining) {
-                if (*remaining < dlen)
+                if (*remaining <= dlen)
                         return NULL;
                 *remaining-=dlen;
@@ -139 +139 @@
 {
         if (remaining) {
-                if (*remaining < sizeof(libtrace_icmp_t))
+                if (*remaining <= sizeof(libtrace_icmp_t))
                         return NULL;
                 *remaining-=sizeof(libtrace_icmp_t);