Changeset 3b8a5ef for libpacketdump

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

Location:

libpacketdump

Files:

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

libpacketdump/libpacketdump.cc

@@ -64 +64 @@
 
         printf("%s",ctime(&sec));
-        decode_next(link,packet->size - trace_get_framing_length(packet),"link",trace_get_link_type(packet));
+        decode_next(link,packet->size-trace_get_framing_length(packet),
+                        "link",
+                        trace_get_link_type(packet));
 }
 

libpacketdump/link_10.cc

@@ -6 +6 @@
 #include <map>
 #include "libpacketdump.h"
+#include "libtrace.h"
 
 extern "C"
 void decode(int link_type,char *packet,int len)
 {
-        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));
+        // ATM
+        printf(" Legacy Framing:");
+        if (len>=12) {
+                uint16_t type = htons(*(uint16_t*)(packet+sizeof(libtrace_atm_cell)+4));
                 printf(" %04x\n",type);
-                decode_next(packet+24,len-24,"eth",type);
+                decode_next(packet+sizeof(libtrace_atm_cell) + 4,
+                                len-sizeof(libtrace_atm_cell) -4, 
+                                "eth",type);
         }
         else {

libpacketdump/link_11.cc

@@ -11 +11 @@
 void decode(int link_type,char *packet,int len)
 {
-        printf(" Legacy Framing: ");
+        // Ethernet - just raw ethernet frames
+        printf(" Legacy: ");
         if (len>=10) {
-                decode_next(packet+10,len-10,"link",2);
+                decode_next(packet,len,"link",2);
         }
         else {

libpacketdump/link_9.cc

@@ -10 +10 @@
 void decode(int link_type,char *packet,int len)
 {
-        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));
+        // POS
+        printf(" Legacy Framing:");
+        // take into account llc
+        if (len>=4) {
+                uint16_t type = htons(
+                                ((libtrace_pos *)packet)->ether_type);
                 printf(" %04x\n",type);
-                decode_next(packet+20,len-20,"eth",type);
+                decode_next(packet+sizeof(libtrace_pos),
+                                len-sizeof(libtrace_pos),
+                                "eth",type);
         }
         else {