Changeset 48d72f8

Timestamp:

01/04/12 15:35:18 (10 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:

29532e3

Parents:

31413f1

Message:

• Fixed stupid bug where the difference between remaining at the IP layer and remaining at the transport layer was over-inflated by 4 bytes on packets with a FCS.
• Fixed bug where promoted packets were not correctly updating their packet type to SLL and therefore could not be later demoted back to their original format.

Location:

lib

Files:

• linktypes.c (modified) (1 diff)
• protocols_l3.c (modified) (1 diff)

lib/linktypes.c

@@ -273 +273 @@
                 ((struct libtrace_pcapfile_pkt_hdr_t*) packet->header)->wirelen+=
                         sizeof(libtrace_sll_header_t);
+                trace_clear_cache(packet);
                 return;
         }

lib/protocols_l3.c

@@ -129 +129 @@
                  * don't want that counting as possible payload, e.g. for
                  * payload length calculations */
-                if (*remaining > ntohs(ipptr->ip_len))
-                        *remaining = ntohs(ipptr->ip_len);
+                //if (*remaining > ntohs(ipptr->ip_len))
+                //      *remaining = ntohs(ipptr->ip_len);
 
                 *remaining-=(ipptr->ip_hl * 4);