Changeset 5bbe424 for lib/trace.c

Timestamp:

09/08/05 18:17:36 (17 years ago)

Author:

Daniel Lawson <dlawson@…>

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:

12290e6

Parents:

de8c420b

Message:

added vlan support

File:

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

lib/trace.c

@@ -527 +527 @@
                                 else {
                                         struct ieee_802_11_payload *eth = (void*)wifi->data;
-                                        if (eth->type != 0x0008) {
-                                                ipptr=NULL;
-                                        } else {
+                                        ipptr = NULL;
+
+                                        if (eth->type == 0x0008) {
                                                 ipptr=(void*)eth->data;
+                                        } else if (eth->type = 0x0081) {
+                                                // VLAN
+                                                if ((*(uint16_t *)(eth + 16)) == 0x0008) {
+                                                        ipptr = (void*)eth->data + 4;
+                                                }
                                         }
                                 }
@@ -543 +548 @@
                                         break;
                                 }
-                                if (ntohs(eth->ether_type)!=0x0800) {
-                                        ipptr = NULL;
-                                }
-                                else {
+                                ipptr = NULL;
+                                
+                                if (eth->ether_type==0x0008) {
                                         ipptr = ((void *)eth) + 14;
+                                } else if (eth->ether_type == 0x0081) {
+                                        struct libtrace_8021q *vlanhdr = 
+                                                (struct libtrace_8021q *)eth;
+                                        if (vlanhdr->vlan_ether_type == 0x0008) {
+                                                ipptr = ((void *)eth) + 18;
+                                        }
                                 }
                                 break;