Changeset 4a207b8 for lib/protocols.c

Timestamp:

03/23/07 16:41:03 (14 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:

dbdc23f

Parents:

83f2cbf

Message:

Endace POS traces are in fact PPP traces. Deal with this correctly, even when
converting between trace formats

File:

• lib/protocols.c (modified) (2 diffs)

lib/protocols.c

@@ -206 +206 @@
 }
 
-void *trace_get_payload_from_pos(void *link, 
+void *trace_get_payload_from_ppp(void *link, 
                 uint16_t *type, uint32_t *remaining)
 {
         /* 64 byte capture. */
-        libtrace_pos_t *pos = (libtrace_pos_t*)link;
-
-        if (remaining) {
-                if (*remaining < sizeof(libtrace_pos_t))
-                        return NULL;
-                *remaining-=sizeof(libtrace_pos_t);
-        }
-
-        /* This is documented by endace to be an ethertype.  The ethertype
-         * however is always ntohs(0x0021), which endace in their own tools
-         * ignore and assume IP, so...
-         */
-        /*if (type) *type = ntohs(pos->ether_type); */
-        if (type) *type = ntohs(0x0800);
-
-        return (void*)((char *)pos+sizeof(*pos));
+        libtrace_ppp_t *ppp = (libtrace_ppp_t*)link;
+
+        if (remaining) {
+                if (*remaining < sizeof(libtrace_ppp_t))
+                        return NULL;
+                *remaining-=sizeof(libtrace_ppp_t);
+        }
+
+        if (type) {
+                switch(ppp->protocol) {
+                        case 0x0021: *type = ntohs(0x0800);
+                }
+        }
+
+        return (void*)((char *)ppp+sizeof(*ppp));
 }
 
@@ -313 +312 @@
                 case TRACE_TYPE_PFLOG:
                         return trace_get_payload_from_pflog(link,type,remaining);
-                case TRACE_TYPE_POS:
-                        return trace_get_payload_from_pos(link,type,remaining);
+                case TRACE_TYPE_PPP:
+                        return trace_get_payload_from_ppp(link,type,remaining);
                 case TRACE_TYPE_ATM:
                         l=trace_get_payload_from_atm(link,NULL,remaining);