Changeset 813

Timestamp:

05/23/06 13:23:06 (7 years ago)

Author:

perry

Message:

Support filtering (but no command line for it yet)
Support libtrace3

File:

• trunk/tools/tracereport/tracereport.c (modified) (4 diffs)

trunk/tools/tracereport/tracereport.c

@@ -29 +29 @@
  */
 
-// 
-// This program takes a series of traces and bpf filters and outputs how many
-// bytes/packets
+/* This program takes a series of traces and bpf filters and outputs how many
+ * bytes/packets
+ */
 
 #include <stdio.h>
@@ -59 +59 @@
 
 /* Process a trace, counting packets that match filter(s) */
-void run_trace(char *uri) 
+void run_trace(char *uri, libtrace_filter_t *filter, int count) 
 {
         struct libtrace_packet_t *packet = trace_create_packet();
@@ -68 +68 @@
         if (trace_is_err(trace)) {
                 trace_perror(trace,"trace_create");
-                return 1;
+                return;
+        }
+
+        if (filter) {
+                trace_config(trace,TRACE_OPTION_FILTER,filter);
         }
 
         if (trace_start(trace)==-1) {
                 trace_perror(trace,"trace_start");
-                return 1;
+                return;
         }
 
         for (;;) {
                 int psize;
+                if (count--<1)
+                        break;
                 if ((psize = trace_read_packet(trace, packet)) <1) {
                         break;
@@ -104 +110 @@
         int i;
 
+        /*char *filterstring="host 130.197.127.210"; */
+
+        libtrace_filter_t *filter = NULL;/*trace_bpf_setfilter(filterstring); */
 
         for(i=1;i<argc;++i) {
-                run_trace(argv[i]);
+                run_trace(argv[i],filter,1000);
         }