Changeset 7fc0eaa2 for lib/format_legacy.c

Timestamp:

03/15/10 16:58:28 (11 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:

4811b1e

Parents:

91c38f8

Message:

• Correctly deal with the differences between PPP over HDLC and CHDLC - we can now decode both link headers correctly (tested against IPLS and Leipzig traces)

File:

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

lib/format_legacy.c

@@ -349 +349 @@
          *      - Perry Lorier (2008-11-04)
          */
+        
+        /* It can also be CHDLC, which is different again */
+        
+        /* This check matchs PPP over HDLC, a la RFC 1662 */
         if (((char *)packet->payload)[0] == '\xFF'
                 && ((char*)packet->payload)[1] == '\x03')
                 return TRACE_TYPE_POS;
+        
+        /* This check matches unicast CHDLC */
+        else if (((char *)packet->payload)[0] == '\x0F' &&
+                ((char*)packet->payload)[1] == '\x00')
+                return TRACE_TYPE_HDLC_POS;
+        
+        /* This check matches broadcast CHDLC */
+        else if (((char *)packet->payload)[0] == '\x8F' &&
+                ((char*)packet->payload)[1] == '\x00')
+                return TRACE_TYPE_HDLC_POS;
+
+        /* Otherwise just assume raw PPP (?) */
         else 
                 return TRACE_TYPE_PPP;