Changeset 3b8a5ef for lib/trace.c

Timestamp:

11/30/05 15:43:30 (16 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:

2adf051

Parents:

08594b8

Message:

I hate shane

File:

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

lib/trace.c

@@ -567 +567 @@
 void *trace_get_link(const struct libtrace_packet_t *packet) {
         return (void *)packet->payload;
+}
+
 /*
-        const void *ethptr = 0;
-
-        assert(packet->size>0 && packet->size<65536);
-        
-        if (packet->trace->format->get_link) {
-                ethptr = packet->trace->format->get_link(packet);
-        }
-        return (void *)ethptr;
-*/
-}
-
 typedef struct legacy_framing {
         uint64_t        ts;
         uint32_t        crc;
         uint32_t        header;
-        uint32_t        data[12]; /* pad to 64 bytes */
+        uint32_t        data[12]; // pad to 64 bytes 
 } legacy_framing_t;
+*/
 
 /* get a pointer to the IP header (if any)
@@ -612 +604 @@
                                         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;
-                                                }
+                                        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);
+                                            }
                                         }
                                 }
@@ -634 +629 @@
                                 ipptr = NULL;
                                 
-                                if (eth->ether_type==0x0008) {
-                                        ipptr = ((void *)eth) + 14;
-                                } else if (eth->ether_type == 0x0081) {
+                                if (ntohs(eth->ether_type)==0x0800) {
+                                        ipptr = ((void *)eth) + sizeof(*eth);
+                                } else if (ntohs(eth->ether_type) == 0x8100) {
                                         struct libtrace_8021q *vlanhdr = 
                                                 (struct libtrace_8021q *)eth;
-                                        if (vlanhdr->vlan_ether_type == 0x0008) {
-                                                ipptr = ((void *)eth) + 18;
+                                        if (ntohs(vlanhdr->vlan_ether_type) 
+                                                        == 0x0800) {
+                                                ipptr = ((void *)eth) + 
+                                                        sizeof(*vlanhdr);
                                         }
                                 }
@@ -697 +694 @@
                         {
                                 // 64 byte capture.
-                                struct libtrace_atm_cell *cell =
+                                struct libtrace_llcsnap *llc = 
                                         trace_get_link(packet);
-                                if (ntohs(cell->ether_type) == 0x0800) {
-                                        ipptr = ((void *)cell) + sizeof(*cell);
+
+                                // advance the llc ptr +4 into the link layer.
+                                // need to check what is in these 4 bytes.
+                                // don't have time!
+                                llc = (void *)llc + 4;
+                                if (ntohs(llc->type) == 0x0800) {
+                                        ipptr = ((void *)llc) + sizeof(*llc);
                                 } else {
                                         ipptr = NULL;