Changeset 1276

Timestamp:

09/13/07 16:51:57 (6 years ago)

Author:

perry

Message:

Add support for cisco hdlc over pos

Location:

trunk/lib

Files:

• format_legacy.c (modified) (1 diff)
• linktypes.c (modified) (2 diffs)
• protocols.c (modified) (4 diffs)

trunk/lib/format_legacy.c

@@ -270 +270 @@
                 
 
-static libtrace_linktype_t legacypos_get_link_type(const libtrace_packet_t *packet UNUSED) {
+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;
 }
 
-static libtrace_linktype_t legacyatm_get_link_type(const libtrace_packet_t *packet UNUSED) {
+static libtrace_linktype_t legacyatm_get_link_type(
+                const libtrace_packet_t *packet UNUSED) {
         return TRACE_TYPE_ATM;
 }

trunk/lib/linktypes.c

@@ -69 +69 @@
                 case TRACE_TYPE_LLCSNAP: return TRACE_DLT_ATM_RFC1483;
                 case TRACE_TYPE_PPP:    return TRACE_DLT_PPP;
+                case TRACE_TYPE_HDLC_POS: return TRACE_DLT_C_HDLC;
                 /* Below here are unsupported conversions */
                 /* Dispite hints to the contrary, there is no DLT
@@ -86 +87 @@
                 /* TODO: We haven't researched these yet */
                 case TRACE_TYPE_AAL5:
-                case TRACE_TYPE_HDLC_POS:
                 case TRACE_TYPE_METADATA:
                         break;

trunk/lib/protocols.c

@@ -233 +233 @@
 
         return (void*)((char *)ppp+sizeof(*ppp));
+}
+
+typedef struct libtrace_chdlc_t {
+        uint8_t address;        /** 0xF0 for unicast, 0xF8 for multicast */
+        uint8_t control;
+        uint16_t ethertype;
+} libtrace_chdlc_t;
+
+static void *trace_get_payload_from_chdlc(void *link, 
+                uint16_t *type, uint32_t *remaining)
+{
+        libtrace_chdlc_t *chdlc = (libtrace_chdlc_t*)link;
+
+        if (remaining) {
+                if (*remaining < sizeof(libtrace_chdlc_t))
+                        return NULL;
+                *remaining-=sizeof(libtrace_chdlc_t);
+        }
+
+        if (type) {
+                *type=ntohs(chdlc->ethertype);
+        }
+
+
+        return (void*)((char *)chdlc+sizeof(*chdlc));
 }
 
@@ -381 +406 @@
         void *trans_ptr = 0;
 
-        if ((ipptr->ip_off & SW_IP_OFFMASK) != 0) {
+        if ((ntohs(ipptr->ip_off) & SW_IP_OFFMASK) != 0) {
                 return NULL;
         }
@@ -460 +485 @@
                 case TRACE_TYPE_80211_PRISM:
                         return pktbuf;
+                /* Non metadata packets */
                 case TRACE_TYPE_HDLC_POS:
                 case TRACE_TYPE_ETH:
@@ -605 +631 @@
                         return trace_get_payload_from_llcsnap(link,ethertype,remaining);
 
+                case TRACE_TYPE_HDLC_POS:
+                        return trace_get_payload_from_chdlc(link,ethertype,
+                                        remaining);
                 /* TODO: Unsupported */
-                case TRACE_TYPE_HDLC_POS:
                 case TRACE_TYPE_POS:
                 case TRACE_TYPE_AAL5: