Changeset bb09ce4

Timestamp:

02/09/06 10:47:14 (15 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:

9e3902e

Parents:

5baec88

Message:

More wifi support

File:

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

lib/trace.c

@@ -587 +587 @@
 
         switch(trace_get_link_type(packet)) {
+                case TRACE_TYPE_80211_PRISM:
+                        {
+                                struct ieee_802_11_header *wifi = trace_get_link(packet)+144;
+                                if (!wifi) {
+                                        ipptr = NULL;
+                                        break;
+                                }
+
+                                // Data packet?
+                                if (wifi->type != 2) {
+                                        ipptr = NULL;
+                                }
+                                else {
+                                        struct ieee_802_11_payload *eth = (void*)wifi->data;
+                                        ipptr = NULL;
+
+                                        if (ntohs(eth->type) == 0x0800) {
+                                            ipptr=((void*)eth) + sizeof(*eth);
+                                        } else if (ntohs(eth->type) == 0x8100) {
+                                            struct libtrace_8021q *vlanhdr =
+                                                (struct libtrace_8021q *)eth;
+                                            if (ntohs(vlanhdr->vlan_ether_type)
+                                                            == 0x0800) {
+                                                ipptr=((void*)eth) + 
+                                                        sizeof(*vlanhdr);
+                                            }
+                                        }
+                                }
+                        }
+                        break;
                 case TRACE_TYPE_80211:
                         {