Changeset 8ea5b38

Timestamp:

02/23/06 13:45:51 (16 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:

82dc7d8

Parents:

52f8fc2

Message:

Added a couple of asserts to format_helper
Fixed bugs in pcapint_start_input

Location:

lib

Files:

• format_helper.c (modified) (1 diff)
• format_pcap.c (modified) (1 diff)

lib/format_helper.c

@@ -52 +52 @@
         int data;
 
+        assert(trace);
+        assert(packet);
+        
         if (trace->format->get_fd) {
                 event.fd = trace->format->get_fd(packet);

lib/format_pcap.c

@@ -210 +210 @@
                         errbuf)) == NULL) {
                 trace_set_err(TRACE_ERR_INIT_FAILED,"%s",errbuf);
-                /* Set a filter if one is defined */
-                if (DATA(libtrace)->filter)
-                        if (pcap_setfilter(INPUT.pcap,&DATA(libtrace)->filter->filter)
-                                == -1) {
-                                trace_set_err(TRACE_ERR_INIT_FAILED,"%s",
-                                                pcap_geterr(INPUT.pcap));
-                                return -1;
-                        }
+                return -1;
+        }
+        /* Set a filter if one is defined */
+        if (DATA(libtrace)->filter) {
+                if (pcap_setfilter(INPUT.pcap,&DATA(libtrace)->filter->filter)
+                        == -1) {
+                        trace_set_err(TRACE_ERR_INIT_FAILED,"%s",
+                                        pcap_geterr(INPUT.pcap));
+                        return -1;
+                }
                 return 0;
         }