Changeset 53de8c0

Timestamp:

09/06/04 11:43: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:

3fb49bc

Parents:

36f563c

Message:

2.0.3 testing release

Files:

• ChangeLog (modified) (1 diff)
• config.h (modified) (1 diff)
• examples/sample/sample.c (modified) (2 diffs)
• lib/Makefile.am (modified) (1 diff)

ChangeLog

@@ -29 +29 @@
 ##
 
+- Version 2.0.3 (unreleased)
+        * Fixed packet->size bug for pcap
+
 - Version 2.0.2
         * Port to AMD64. Should also work on IA64

config.h

@@ -18 +18 @@
 
 /* Define to 1 if you have the <pcap-bpf.h> header file. */
-#define HAVE_PCAP_BPF_H 1
+/* #undef HAVE_PCAP_BPF_H */
 
 /* Define to 1 if you have the <pcap.h> header file. */

examples/sample/sample.c

@@ -59 +59 @@
 
         char *uri = 0;
+        char *filterstring = 0;
         int psize = 0;
-        int status = 0;
         struct libtrace_ip *ipptr = 0;
         struct libtrace_packet_t packet;
+        struct libtrace_filter_t *filter = 0;
 
         if (argc == 2) {
                 uri = strdup(argv[1]);
-        }
+        } else if (argc == 3) {
+                uri = strdup(argv[1]);
+                filterstring = strdup(argv[2]);
+        }
+
+        if (filterstring) 
+                filter = trace_bpf_setfilter(filterstring);
 
         // open a trace
@@ -78 +85 @@
                         break;
                 }
+
+                if(filter && !trace_bpf_filter(filter,&packet)) {
+                        continue;
+                }
 
                 printf("TS %f: ",trace_get_seconds(&packet));

lib/Makefile.am

@@ -3 +3 @@
 include_HEADERS = libtrace.h dagformat.h wag.h
 libtrace_la_LIBADD = @LIBPCAP@ @LIBZ@
-libtrace_la_LDFLAGS=-version-info 2:2:0 @LIBPCAP_PATH@ @LIBZ_PATH@
+libtrace_la_LDFLAGS=-version-info 2:3:0 @LIBPCAP_PATH@ @LIBZ_PATH@