Changeset f04e489 for examples

Timestamp:

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

Location:

examples/tracedump

Files:

• link_10.cc (modified) (1 diff)
• link_11.cc (modified) (1 diff)
• link_9.cc (modified) (1 diff)

examples/tracedump/link_10.cc

@@ -11 +11 @@
 {
         printf(" Legacy ATM:");
-        /*
-        if (len>=6)
-                printf(" %s",ether_ntoa((struct ether_addr*)packet));
-        else {
-                printf("[|Truncated]\n");
-                return;
-        }
-        if (len>=12) 
-                printf(" %s",ether_ntoa((struct ether_addr*)(packet+6)));
-        else {
-                printf("[|Truncated]\n");
-                return;
-        }
-        */
-        if (len>=24) {
-                uint16_t type = htons(*(uint16_t*)(packet+22));
+        if (len>=12) {
+                uint16_t type = htons(*(uint16_t*)(packet+10));
                 printf(" %04x\n",type);
-                decode_next(packet+24,len-24,"eth",type);
+                decode_next(packet+12,len-12,"eth",type);
         }
         else {

examples/tracedump/link_11.cc

@@ -12 +12 @@
 {
         printf(" Legacy Framing: ");
-        if (len>=10) {
-                decode_next(packet+10,len-10,"link",2);
-        }
-        else {
-                printf("[|Truncated]\n");
-                return;
-        }
+        decode_next(packet,len,"link",2);
         return;
 }

examples/tracedump/link_9.cc

@@ -11 +11 @@
 {
         printf(" Legacy POS:");
-        /*
-        if (len>=6)
-                printf(" %s",ether_ntoa((struct ether_addr*)packet));
-        else {
-                printf("[|Truncated]\n");
-                return;
-        }
-        if (len>=12) 
-                printf(" %s",ether_ntoa((struct ether_addr*)(packet+6)));
-        else {
-                printf("[|Truncated]\n");
-                return;
-        }
-        */
-        if (len>=20) {
-                uint16_t type = htons(*(uint16_t*)(packet+18));
+        if (len>=4) {
+                uint16_t type = htons(*(uint16_t*)(packet+2));
                 printf(" %04x\n",type);
-                decode_next(packet+20,len-20,"eth",type);
+                decode_next(packet+4,len-4,"eth",type);
         }
         else {