Changeset b13caea for lib

Timestamp:

08/06/15 17:41:06 (6 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, 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:

c24de65

Parents:

fc0325e

Message:

Add support for ERF extension headers

At the moment, we don't actually look at them but we need to:

• recognise that they are present so we can skip past them
• not use the MSB of the type field when evaluating the type packet as this has now been re-purposed for indicating the presence of extension headers.

File:

• lib/format_erf.c (modified) (7 diffs)

lib/format_erf.c

@@ -49 +49 @@
 #include <string.h>
 #include <stdlib.h>
+
 
 #ifdef WIN32
@@ -135 +136 @@
         if (packet->trace->format->type==TRACE_FORMAT_ERF) {
                 dag_record_t *erfptr = (dag_record_t *)packet->header;
-                switch(erfptr->type) {
+                switch((erfptr->type & 0x7f)) {
                         case TYPE_ETH:          
                         case TYPE_DSM_COLOR_ETH:
@@ -152 +153 @@
 int erf_get_framing_length(const libtrace_packet_t *packet)
 {
-        return dag_record_size + erf_get_padding(packet);
+        uint16_t extsize = 0;
+        dag_record_t *erfptr = NULL;
+        uint64_t *exthdr = NULL;
+        
+        erfptr = (dag_record_t *)packet->header;
+        if ((erfptr->type & 0x80) == 0x80) {
+                /* Extension headers are present */
+                exthdr = (uint64_t *)((char *)packet->header + dag_record_size);
+                extsize += 8;
+
+                while (*exthdr < (1UL << 31)) {
+                        extsize += 8;
+                        exthdr ++;
+                        assert(extsize <= ntohs(erfptr->rlen));
+                }
+        }
+        
+
+        return dag_record_size + extsize + erf_get_padding(packet);
 }
 
@@ -186 +205 @@
         }
         /* Is this a proper typed packet */
-        if (erf->type > TYPE_AAL2) {
+        if ((erf->type & 0x7f) > TYPE_AAL2) {
                 return 0;
         }
@@ -448 +467 @@
 
         /* Check for loss */
-        if (erfptr->type == TYPE_DSM_COLOR_ETH) {
+        if ((erfptr->type & 0x7f) == TYPE_DSM_COLOR_ETH) {
                 /* No idea how we get this yet */
 
@@ -505 +524 @@
 
         /* Unknown/corrupt */
-        if (((dag_record_t *)packet->buffer)->type >= TYPE_RAW_LINK) {
+        if ((((dag_record_t *)packet->buffer)->type & 0x7f) >= TYPE_RAW_LINK) {
                 trace_set_err(libtrace, TRACE_ERR_BAD_PACKET, 
                                 "Corrupt or Unknown ERF type");
@@ -684 +703 @@
         dag_record_t *erfptr = 0;
         erfptr = (dag_record_t *)packet->header;
-        if (erfptr->type != TYPE_LEGACY)
-                return erf_type_to_libtrace(erfptr->type);
+        uint8_t type = (erfptr->type & 0x7f);
+        if (type != TYPE_LEGACY) {
+                /* The top-most bit is now used to indicate the presence of
+                 * extension headers :/ */
+                return erf_type_to_libtrace(type);
+        }
         else {
                 /* Sigh, lets start wildly guessing */