Changeset b86f8d3

Timestamp:

03/30/05 17:36:39 (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:

e92d11f

Parents:

461a518

Message:

fixes calls to get_link to catch a NULL return and pass it up the chain, instead of dying.

Location:

lib

Files:

• Makefile.am (modified) (1 diff)
• trace.c (modified) (6 diffs)

lib/Makefile.am

@@ -8 +8 @@
 libtrace_la_CFLAGS = @ADD_INCLS@
 libtrace_la_LIBADD = @ADD_LIBS@ $(top_builddir)/replace/libreplace.a
-libtrace_la_LDFLAGS=-version-info 2:15:0 @ADD_LDFLAGS@
+libtrace_la_LDFLAGS=-version-info 2:15a:0 @ADD_LDFLAGS@
 
 dagapi.c:

lib/trace.c

@@ -903 +903 @@
                                 
                                 struct ieee_802_11_header *wifi = trace_get_link(packet);       
+                                if (!wifi) {
+                                        ipptr = NULL;
+                                        break;
+                                }
 
                                 // Data packet?
@@ -922 +926 @@
                                 struct ether_header *eth = 
                                         trace_get_link(packet);
+                                if (!eth) {
+                                        ipptr = NULL;
+                                        break;
+                                }
                                 if (ntohs(eth->ether_type)!=0x0800) {
                                         ipptr = NULL;
@@ -938 +946 @@
 
                                 sll = trace_get_link(packet);
+                                if (!sll) {
+                                        ipptr = NULL;
+                                        break;
+                                }
                                 if (ntohs(sll->protocol)!=0x0800) {
                                         ipptr = NULL;
@@ -953 +965 @@
                                 //       NULL for non IP data
                                 //       Presumably it uses the normal stuff
+                                if (!acm) {
+                                        ipptr = NULL;
+                                        break;
+                                }
                                 ipptr =  (void*)&atm->pload;
                                 break;
@@ -1553 +1569 @@
         assert(filter);
         assert(packet);
-        linkptr = trace_get_link(packet);       
-        assert(linkptr);
+        linkptr = trace_get_link(packet);
+        if (!linkptr) {
+                return 0;
+        }
+        
         clen = trace_get_capture_length(packet);
         
@@ -1649 +1668 @@
                                                 struct trace_sll_header_t *sll;
                                                 sll = trace_get_link(packet);
+                                                if (!sll) {
+                                                        return -1;
+                                                }
                                                 /* 0 == LINUX_SLL_HOST */
                                                 /* the Waikato Capture point defines "packets