Changeset 8babb98 for lib/format_legacy.c

Timestamp:

10/14/08 16:07:22 (13 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:

530cef6

Parents:

5c4e0c0

Message:

Change detection of lagacypos traces to HDLC.

File:

• lib/format_legacy.c (modified) (1 diff)

lib/format_legacy.c

@@ -311 +311 @@
 static libtrace_linktype_t legacypos_get_link_type(
                 const libtrace_packet_t *packet) {
-        /* Is this a cisco hdlc frame? */
-        if ((((uint8_t*)packet->payload)[0] == 0x0F /* Unicast */
-                || ((uint8_t*)packet->payload)[0] == 0x8F /* Multicast */)
-                && ((uint8_t*)packet->payload)[1] == 0x00 /* control == 0x00 */
-           )
-                return TRACE_TYPE_HDLC_POS;
-        return TRACE_TYPE_PPP;
+        /* This code used to look for (0x0F|0x8F 0x00) frames
+         * and return TRACE_TYPE_HDLC_POS, otherwise return PPP.
+         * However the PPP frames were being decoded using HDLC_POS semantics
+         * so when we fixed PPP, this all broke.  I've changed this to always
+         * assume HDLC_POS.  If we ever find a trace that does raw PPP over
+         * HDLC_POS then this should be changed to detect that it's PPP and 
+         * do the right thing.  I suspect this is due to an original confusion
+         * as to how exactly POS works.
+         *  -- Perry Lorier (2008-10-14)
+         */
+        return TRACE_TYPE_HDLC_POS;
 }