Changeset 7ca2c7d

Timestamp:

11/01/06 13:09:03 (14 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:

a31b4c7

Parents:

2f3a25e

Message:

Fixed trace_apply_filter to operate on a copy of the packet, which should eliminate the problem where the packet is corrupted

File:

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

lib/trace.c

@@ -998 +998 @@
         assert(filter);
         assert(packet);
-
+        libtrace_packet_t *packet_copy = packet;
+
+        
         if (libtrace_to_pcap_dlt(trace_get_link_type(packet))==~0) {
                 /* Copy the packet, as we don't want to trash the one we
                  * were passed in
                  */
-                packet=trace_copy_packet(packet);
+                packet_copy=trace_copy_packet(packet);
                 free_packet_needed=true;
-                while (libtrace_to_pcap_dlt(trace_get_link_type(packet))==~0) {
-                        if (!demote_packet(packet)) {
+                while (libtrace_to_pcap_dlt(trace_get_link_type(packet_copy))==
+                                ~0) {
+                        if (!demote_packet(packet_copy)) {
                                 trace_set_err_out(packet->trace, 
                                                 TRACE_ERR_NO_CONVERSION,
                                                 "pcap does not support this format");
                                 if (free_packet_needed) {
-                                        trace_destroy_packet(packet);
+                                        trace_destroy_packet(packet_copy);
                                 }
                                 return -1;
@@ -1018 +1021 @@
         }
         
-        linkptr = trace_get_link(packet);
+        linkptr = trace_get_link(packet_copy);
         if (!linkptr) {
                 if (free_packet_needed) {
-                        trace_destroy_packet(packet);
+                        trace_destroy_packet(packet_copy);
                 }
                 return 0;
@@ -1029 +1032 @@
          * link type was
          */
-        if (trace_bpf_compile(filter,packet)==-1) {
+        if (trace_bpf_compile(filter,packet_copy)==-1) {
                 if (free_packet_needed) {
-                        trace_destroy_packet(packet);
+                        trace_destroy_packet(packet_copy);
                 }
                 return -1;
         }
 
-        clen = trace_get_capture_length(packet);
+        clen = trace_get_capture_length(packet_copy);
 
         assert(filter->flag);
         ret=bpf_filter(filter->filter.bf_insns,(u_char*)linkptr,clen,clen);
         if (free_packet_needed) {
-                trace_destroy_packet(packet);
+                trace_destroy_packet(packet_copy);
         }
         return ret;