Changeset 66ad025 for libpacketdump

Timestamp:

07/15/10 16:45:16 (11 years ago)

Author:

Shane Alcock <salcock@…>

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:

7af80ba

Parents:

148338c

Message:

• Fixed bug where libpacketdump doesn't skip past IP options correctly before parsing the next header
• Added a trace_hexdump_packet() which will dump the entire packet as hex, which can be useful for debugging libpacketdump
• Use results of trace_get_capture_length() as the length when dumping packets, to avoid issues with an upcoming change

Location:

libpacketdump

Files:

• Makefile.am (modified) (1 diff)
• eth_2048.c (modified) (1 diff)
• libpacketdump.cc (modified) (3 diffs)
• libpacketdump.h (modified) (1 diff)

libpacketdump/Makefile.am

@@ -105 +105 @@
 link_2_la_LDFLAGS=-module
 link_4_la_LDFLAGS=-module
-link_6_la_LDFLAGS=-module
+link_6_la_LDFLAGS=-module 
 link_9_la_LDFLAGS=-module
 link_10_la_LDFLAGS=-module

libpacketdump/eth_2048.c

@@ -58 +58 @@
         DISPLAYIP(ip_src," IP: Source %s ");
         DISPLAYIP(ip_dst,"Destination %s\n");
-        decode_next(packet+sizeof(*ip),len-sizeof(*ip),"ip",ip->ip_p);
+        decode_next(packet+ip->ip_hl*4,len-ip->ip_hl*4,"ip",ip->ip_p);
         return;
 }

libpacketdump/libpacketdump.cc

@@ -79 +79 @@
 #endif
 
+static void formatted_hexdump(const char *packet, int len) {
+        int i;
+
+        for(i=0;i<len; /* Nothing */ ) {
+                int j;
+                printf("\n ");
+                for(j=0;j<WIDTH;j++) {
+                        if (i+j<len)
+                                printf(" %02x",(unsigned char)packet[i+j]);
+                        else
+                                printf("   ");
+                }
+                printf("    ");
+                for(j=0;j<WIDTH;j++) {
+                        if (i+j<len)
+                                if (isprint((unsigned char)packet[i+j]))
+                                        printf("%c",(unsigned char)packet[i+j]);
+                                else
+                                        printf(".");
+                        else
+                                printf("   ");
+                }
+                if (i+WIDTH>len)
+                        break;
+                else
+                        i+=WIDTH;
+        }
+        printf("\n");
+}
+
+void trace_hexdump_packet(struct libtrace_packet_t *packet) {
+
+        libtrace_linktype_t linktype;
+        uint32_t length;
+        const char *pkt_ptr = (char *)trace_get_packet_buffer(packet, &linktype, NULL);
+
+        time_t sec = (time_t)trace_get_seconds(packet);
+        
+        length = trace_get_capture_length(packet);
+
+        if (pkt_ptr == NULL || length == 0) {
+                printf(" [No packet payload]\n");
+                return;
+        }
+
+        printf("\n%s",ctime(&sec));
+        printf(" Capture: Packet Length: %i/%i Direction Value: %i\n",
+                        (int)length,
+                        (int)trace_get_wire_length(packet),
+                        (int)trace_get_direction(packet));
+        
+
+        formatted_hexdump(pkt_ptr, (int)length);
+        return;
+}
+
 void trace_dump_packet(struct libtrace_packet_t *packet)
 {
@@ -84 +140 @@
         libtrace_linktype_t linktype;
         uint32_t length;
-        const char *link=(char *)trace_get_packet_buffer(packet,&linktype,&length);
+        const char *link=(char *)trace_get_packet_buffer(packet,&linktype,NULL);
+        
+        length = trace_get_capture_length(packet);
 
         printf("\n%s",ctime(&sec));
@@ -99 +157 @@
 
 static void generic_decode(uint16_t type,const char *packet, int len) {
-        int i;
         printf(" Unknown Protocol: %i",type);
-        for(i=0;i<len; /* Nothing */ ) {
-                int j;
-                printf("\n ");
-                for(j=0;j<WIDTH;j++) {
-                        if (i+j<len)
-                                printf(" %02x",(unsigned char)packet[i+j]);
-                        else
-                                printf("   ");
-                }
-                printf("    ");
-                for(j=0;j<WIDTH;j++) {
-                        if (i+j<len)
-                                if (isprint((unsigned char)packet[i+j]))
-                                        printf("%c",(unsigned char)packet[i+j]);
-                                else
-                                        printf(".");
-                        else
-                                printf("   ");
-                }
-                if (i+WIDTH>len)
-                        break;
-                else
-                        i+=WIDTH;
-        }
-        printf("\n");
+
+        formatted_hexdump(packet, len);
 }
 

libpacketdump/libpacketdump.h

@@ -7 +7 @@
 #endif
 
+void trace_hexdump_packet(libtrace_packet_t *packet);
 void trace_dump_packet(libtrace_packet_t *packet);
 void decode_next(const char *packet,int len,const char *proto_name,int type);