Changeset 1b67314

Timestamp:

03/25/05 16:17:26 (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:

d86b8d7

Parents:

05e83dc

Message:

updated trace_read_packet to use a local pcap handler, to get better information out. We do this because we can't rely on pcap_next_ex() existing!

File:

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

lib/trace.c

@@ -620 +620 @@
 }
 
+#if HAVE_PCAP
+void trace_pcap_handler(u_char *user, const struct pcap_pkthdr *pcaphdr, const u_char *pcappkt) {
+        struct libtrace_packet_t *packet = (struct libtrace_packet_t *)user;    
+        void *buffer = packet->buffer;
+        int numbytes = 0;
+        
+        memcpy(buffer,pcaphdr,sizeof(struct pcap_pkthdr));
+        numbytes = pcaphdr->len;
+        memcpy(buffer + sizeof(struct pcap_pkthdr),pcappkt,numbytes);
+
+        packet->size = numbytes + sizeof(struct pcap_pkthdr);
+
+}
+#endif
 /** Read one packet from the trace into buffer
  *
@@ -659 +673 @@
                  * works differently under freebsd! */
                 //if ((pcappkt = pcap_next(libtrace->input.pcap, &pcaphdr)) == NULL) {
+                /*
                 if ((pcapbytes = pcap_next_ex(libtrace->input.pcap, 
                                                 &pcaphdr,
                                                 &pcappkt)) < 0 ) {
+                                                */
+                while ((pcapbytes = pcap_dispatch(libtrace->input.pcap,
+                                                1, /* number of packets */
+                                                &trace_pcap_handler,
+                                                (u_char *)packet)) == 0);
+                        
+                if (pcapbytes < 0 ) {                   
                         return -1;
                 }
-                if (pcapbytes == 0) {
-                        return 0;
-                }
-                memcpy(buffer,&pcaphdr,sizeof(struct pcap_pkthdr));
-                numbytes = pcaphdr->len;
-                memcpy(buffer + sizeof(struct pcap_pkthdr),pcappkt,numbytes);
+                return (packet->size - sizeof(struct pcap_pkthdr));
+                //memcpy(buffer,&pcaphdr,sizeof(struct pcap_pkthdr));
+                //numbytes = pcaphdr->len;
+                //memcpy(buffer + sizeof(struct pcap_pkthdr),pcappkt,numbytes);
         
-                packet->size = numbytes + sizeof(struct pcap_pkthdr);
-                return numbytes;
+                //packet->size = numbytes + sizeof(struct pcap_pkthdr);
+                //return numbytes;
         } 
 #endif