Changeset d242ea8

Timestamp:

02/07/07 16:46:43 (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:

43ab7b3

Parents:

205809b

Message:

Some of tracesummary's bpf filters were incorrect - however the new correct filters don't work so well with the output format so that will need fixing at some point
Improved error reporting for bpf filters
tracestats will now ignore a filter that fails and print a single warning. It also no longer increments the counter for filters that fail.

Files:

• lib/trace.c (modified) (3 diffs)
• tools/tracestats/tracestats.c (modified) (3 diffs)
• tools/tracestats/tracesummary (modified) (1 diff)

lib/trace.c

@@ -975 +975 @@
         
         if (filter->filterstring && ! filter->flag) {
-                pcap_t *pcap;
+                pcap_t *pcap = NULL;
                 libtrace_linktype_t linktype=trace_get_link_type(packet);
                 if (linktype==(libtrace_linktype_t)-1) {
@@ -985 +985 @@
                 if (libtrace_to_pcap_dlt(linktype) == ~1U) {
                         trace_set_err(packet->trace,TRACE_ERR_BAD_PACKET,
-                                        "Unknown pcap equivilent linktype");
+                                        "Unknown pcap equivalent linktype");
                         return -1;
                 }
@@ -992 +992 @@
                                 1500U);
                 /* build filter */
+                assert(pcap);
                 if (pcap_compile( pcap, &filter->filter, filter->filterstring, 
                                         1, 0)) {
+                        trace_set_err(packet->trace,TRACE_ERR_BAD_PACKET,
+                                        "Unable to compile the filter \"%s\": %s", 
+                                        filter->filterstring,
+                                        pcap_geterr(pcap));
                         pcap_close(pcap);
-                        trace_set_err(packet->trace,TRACE_ERR_BAD_PACKET,
-                                        "Packet has no payload");
                         return -1;
                 }

tools/tracestats/tracestats.c

@@ -100 +100 @@
 
                 for(i=0;i<filter_count;++i) {
-                        if(trace_apply_filter(filters[i].filter,packet)) {
+                        if (filters[i].filter == NULL)
+                                continue;
+                        if(trace_apply_filter(filters[i].filter,packet) > 0) {
                                 ++filters[i].count;
                                 filters[i].bytes+=trace_get_wire_length(packet);
+                        }
+                        if (trace_is_err(trace)) {
+                                trace_perror(trace, "trace_apply_filter");
+                                fprintf(stderr, "Removing filter from filterlist\n");
+                                filters[i].filter = NULL;
                         }
                 }
@@ -110 +117 @@
         }
 
+        printf("%-30s\t%12s\t%12s\t%7s\n","filter","count","bytes","%");
         for(i=0;i<filter_count;++i) {
                 printf("%30s:\t%12"PRIu64"\t%12"PRIu64"\t%7.03f\n",filters[i].expr,filters[i].count,filters[i].bytes,filters[i].count*100.0/count);
@@ -165 +173 @@
         }
 
-        printf("%-30s\t%12s\t%12s\t%7s\n","filter","count","bytes","%");
         for(i=optind;i<argc;++i) {
                 run_trace(argv[i]);

tools/tracestats/tracesummary

@@ -5 +5 @@
 fi
 
-exec tracestats --filter 'not ip and not ip6' \
-                --filter 'ip6' \
-                --filter 'ip' \
+exec tracestats 
+                # XXX: Fix the formatting for these filters
+                --filter 'not ether proto \ip and not ether proto 0x86dd' \
+                --filter 'ether proto 0x86dd' \
+                --filter 'ether proto \ip' \
                 --filter tcp \
                 --filter udp \