Changeset aafdc55 for tools

Timestamp:

09/15/15 11:24:14 (6 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, 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:

5765044

Parents:

ebb54a5

Message:

Add BPF filtering back into traceanon

File:

• tools/traceanon/traceanon.cc (modified) (6 diffs)

tools/traceanon/traceanon.cc

@@ -48 +48 @@
         "                       compression algorithm\n"
         "-t --threads=max       Use this number of threads for packet processing\n"
+        "-f --filter=expr       Discard all packets that do not match the\n"
+        "                       provided BPF expression\n"
         ,argv0);
         exit(1);
@@ -286 +288 @@
         libtrace_callback_set_t *repcbs = NULL;
         int exitcode = 0;
+        char *filterstring = NULL;
+        libtrace_filter_t *filter = NULL;
 
         if (argc<2)
@@ -299 +303 @@
                         { "prefix",             1, 0, 'p' },
                         { "threads",            1, 0, 't' },
+                        { "filter",             1, 0, 'f' },
                         { "compress-level",     1, 0, 'z' },
                         { "compress-type",      1, 0, 'Z' },
@@ -305 +310 @@
                 };
 
-                int c=getopt_long(argc, argv, "Z:z:sc:f:dp:ht:",
+                int c=getopt_long(argc, argv, "Z:z:sc:f:dp:ht:f:",
                                 long_options, &option_index);
 
@@ -344 +349 @@
                                   break;
                         }
+                        case 'f':
+                                  filterstring = optarg;
+                                  break;
                         case 'p':
                                   if (key!=NULL) {
@@ -431 +439 @@
         trace_set_perpkt_threads(trace, maxthreads);
 
+        if (filterstring) {
+                filter = trace_create_filter(filterstring);
+        }
+
+        if (filter && trace_config(trace, TRACE_OPTION_FILTER, filter) == -1)
+        {
+                trace_perror(trace, "Configuring input filter");
+                exitcode = 1;
+                goto exitanon;
+        }
+
         if (trace_pstart(trace, output, pktcbs, repcbs)==-1) {
                 trace_perror(trace,"trace_start");