Changeset 05e83dc for lib/trace.c

Timestamp:

03/24/05 16:56:06 (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:

1b67314

Parents:

23c13e8

Message:

some assorted fixes in the examples tree, to support building under freebsd. Isn't quite there yet.

Changed trace_read_packet to use pcap_next_ex, and to set a timeout of 1ms on pcap_open. This fixes the blocking under freebsd, it seems

File:

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

lib/trace.c

@@ -464 +464 @@
                                                 4096,
                                                 1,
-                                                0,
+                                                1,
                                                 errbuf);
                                         break;
@@ -632 +632 @@
         char buf[RP_BUFSIZE];
 #if HAVE_PCAP
-        struct pcap_pkthdr pcaphdr;
+        struct pcap_pkthdr *pcaphdr = malloc(sizeof(struct pcap_pkthdr));
         const u_char *pcappkt;
+        int pcapbytes = 0;
 #endif
         dag_record_t *erfptr;
@@ -653 +654 @@
         /* PCAP gives us it's own per-packet interface. Let's use it */
         if (libtrace->format == PCAP || libtrace->format == PCAPINT) {
-                if ((pcappkt = pcap_next(libtrace->input.pcap, &pcaphdr)) == NULL) {
-                        return 0;
+                /* 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! */
+                //if ((pcappkt = pcap_next(libtrace->input.pcap, &pcaphdr)) == NULL) {
+                if ((pcapbytes = pcap_next_ex(libtrace->input.pcap, 
+                                                &pcaphdr,
+                                                &pcappkt)) < 0 ) {
+                        return -1;
                 }
+                if (pcapbytes == 0) {
+                        return 0;
+                }
                 memcpy(buffer,&pcaphdr,sizeof(struct pcap_pkthdr));
-                memcpy(buffer + sizeof(struct pcap_pkthdr),pcappkt,pcaphdr.len);
-                numbytes = pcaphdr.len;
+                numbytes = pcaphdr->len;
+                memcpy(buffer + sizeof(struct pcap_pkthdr),pcappkt,numbytes);
         
                 packet->size = numbytes + sizeof(struct pcap_pkthdr);
@@ -1635 +1646 @@
                                 default:
                                         /* pass */
+                                        break;
                         }
                 default:
                         /* pass */
+                        break;
         }