Changeset 195a044 for lib/trace.c

Timestamp:

03/25/05 16:44:08 (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:

6a4997b

Parents:

d86b8d7

Message:

comments on pcap_next etc

File:

• lib/trace.c (modified) (2 diffs)

lib/trace.c

@@ -670 +670 @@
                 /* pcap_next doesn't return enough information for us
                  * newer libpcap has pcap_next_ex, which does, but we'd
-                 * really rather have it all the time. Also, pcap_next
-                 * works differently under freebsd! */
+                 * really rather have it all the time. */
+                
                 //if ((pcappkt = pcap_next(libtrace->input.pcap, &pcaphdr)) == NULL) {
                 /*
@@ -677 +677 @@
                                                 &pcaphdr,
                                                 &pcappkt)) < 0 ) {
-                                                */
+                */
+                /* Instead of pcap_next/pcap_next_ex, we do this ourselves
+                 * with a trivial callback function. This lets us 
+                 * catch the same errors as pcap_next_ex, but removes
+                 * the requirement for libpcap >= 0.8.x
+                 */
                 while ((pcapbytes = pcap_dispatch(libtrace->input.pcap,
                                                 1, /* number of packets */