Changeset 9d6b5cd

Timestamp:

08/25/06 15:48:53 (16 years ago)

Author:

Perry Lorier <perry@…>

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:

d0fd73c

Parents:

e283596

Message:

Deal with trace_packet_dump() being passed a packet without a link layer

Location:

libpacketdump

Files:

• libpacketdump.cc (modified) (1 diff)
• parser/parser.h (modified) (1 diff)

libpacketdump/libpacketdump.cc

@@ -85 +85 @@
 
         printf("%s",ctime(&sec));
-        decode_next(link,packet->size-trace_get_framing_length(packet),
-                        "link",
+        if (!link) 
+                printf(" [No link layer available]\n");
+        else
+                decode_next(link,trace_get_capture_length(packet), "link",
                         trace_get_link_type(packet));
 }

libpacketdump/parser/parser.h

@@ -59 +59 @@
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 28 "parser.y"
+#line 27 "parser.y"
 typedef union YYSTYPE {
     int intval;