Changeset f04e489 for lib/trace.c

Timestamp:

10/28/05 16:57:37 (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:

950d54a

Parents:

b190686

Message:

fixed the legacyatm legacypos and legacyeth formats to correctly calculate the framing offset then use that to step into the link layer properly.
Added headers to deal with the link layers.

updated tracedump to be correct now.

File:

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

lib/trace.c

@@ -598 +598 @@
                         break;
                 case TRACE_TYPE_ETH:
+                case TRACE_TYPE_LEGACY_ETH:
                         {
                                 struct libtrace_ether *eth = 
@@ -653 +654 @@
                         }
                         break;
-                case TRACE_TYPE_ATM:
-                        {
-                                struct atm_rec *atm = 
-                                        trace_get_link(packet);
-                                // TODO: Find out what ATM does, and return
-                                //       NULL for non IP data
-                                //       Presumably it uses the normal stuff
-                                if (!atm) {
-                                        ipptr = NULL;
-                                        break;
-                                }
-                                ipptr =  (void*)&atm->pload;
-                                break;
-                        }
                 case TRACE_TYPE_LEGACY_POS:
                         {
                                 // 64 byte capture. 
-                                legacy_framing_t *cell = 
+                                struct libtrace_pos *pos = 
                                         trace_get_link(packet);
-                                // check ethertype
-                                uint16_t *etype = (uint16_t *)cell->data + 1;
-                                if (*etype == 0x0008) {
-                                        ipptr = (void *)&cell->data[1];
+                                if (ntohs(pos->ether_type) == 0x0800) {
+                                        ipptr = ((void *)pos) + sizeof(*pos);
                                 } else {
                                         ipptr = NULL;
@@ -683 +668 @@
                         }
                 case TRACE_TYPE_LEGACY_ATM:
-                case TRACE_TYPE_LEGACY_ETH:
-                case TRACE_TYPE_LEGACY:
+                case TRACE_TYPE_ATM:
                         {
                                 // 64 byte capture.
-                                legacy_framing_t *cell =
+                                struct libtrace_atm_cell *cell =
                                         trace_get_link(packet);
-                                uint16_t *etype = (uint16_t *)cell->data + 3;
-                                if (*etype == 0x0008) {
-                                        ipptr = (void *)&cell->data[2];
+                                if (ntohs(cell->ether_type) == 0x0800) {
+                                        ipptr = ((void *)cell) + sizeof(*cell);
                                 } else {
                                         ipptr = NULL;