Changeset 8ccb7897

Timestamp:

03/10/11 16:24:22 (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:

4c90362

Parents:

361d283

Message:

• Fixed bug where the packet buffer can be freed twice following a trace termination event
• Fixed bug with processing SLL traces that have actually retained the Ethernet header

Location:

lib

Files:

• format_helper.c (modified) (1 diff)
• protocols_pktmeta.c (modified) (3 diffs)

lib/format_helper.c

@@ -166 +166 @@
                         trace_destroy_packet(trace->event.packet);
                         trace->event.packet = NULL;
+                        packet->buffer = NULL;
+                        packet->header = NULL;
+                        packet->payload = NULL;
+                        packet->buf_control = TRACE_CTRL_EXTERNAL;
                         return event;
                 }

lib/protocols_pktmeta.c

@@ -37 +37 @@
 #include <assert.h>
 
-#ifndef WIN32
-#include <net/if_arp.h>
-#endif
-
-#ifndef ARPHRD_ETHER
-#define ARPHRD_ETHER    1               /* Ethernet 10/100Mbps.  */
-#endif
-
-#ifndef ARPHRD_PPP
-#define ARPHRD_PPP      512
-#endif
+#include "arphrd.h"
 
 /* This file contains all the protocol decoding functions for the meta-data
@@ -186 +176 @@
         void *nexthdr; 
         uint16_t arphrd;
+        uint16_t next;
         
         assert(meta != NULL);
@@ -194 +185 @@
                 case TRACE_TYPE_LINUX_SLL:
                         nexthdr = trace_get_payload_from_linux_sll(meta,
-                                        &arphrd, NULL, remaining);
+                                        &arphrd, &next, remaining);
 
                         /* Ethernet header is usually absent in SLL captures,
                          * so we don't want to skip it just yet */
-                        if (arphrd_type_to_libtrace(arphrd) == TRACE_TYPE_ETH) 
+                        if (arphrd_type_to_libtrace(arphrd) == TRACE_TYPE_ETH && next != 0x0060) 
                                 *linktype = TRACE_TYPE_NONE; 
                         else