Changeset aa22b5b for lib/protocols_pktmeta.c

Timestamp:

10/31/08 13:51:59 (12 years ago)

Author:

Perry Lorier <perry@…>

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:

13fd6e1

Parents:

5d4e520

Message:

If we have a complete header, but truncated at the end of it, we shouldn't return NULL from
get_payload_from_* functions so we can distinguish it from a truncated header.

File:

• lib/protocols_pktmeta.c (modified) (4 diffs)

lib/protocols_pktmeta.c

@@ -26 +26 @@
 
         if (remaining) {
-                if (*remaining <= sizeof(*sll)) {
+                if (*remaining < sizeof(*sll)) {
                         *remaining = 0;
                         return NULL;
@@ -45 +45 @@
         libtrace_pflog_header_t *pflog = (libtrace_pflog_header_t*)link;
         if (remaining) {
-                if (*remaining<=sizeof(*pflog)) {
+                if (*remaining<sizeof(*pflog)) {
                         *remaining = 0;
                         return NULL;
@@ -62 +62 @@
 {
         if (remaining) {
-                if (*remaining<=144) {
+                /* Prism header is 144 bytes long */
+                if (*remaining<144) {
                         *remaining = 0;
                         return NULL;
@@ -81 +82 @@
         uint16_t rtaplen = bswap_le_to_host16(rtap->it_len);
         if (remaining) {
-                if (*remaining <= rtaplen) {
+                if (*remaining < rtaplen) {
                         *remaining = 0;
                         return NULL;