Changeset 4a5678c for tools

Timestamp:

06/02/15 14:49:11 (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:

8b12caf

Parents:

94725ea

Message:

Fixed a couple of annoying things about traceanon

Added a -f option to filter packets received from the input source.
Unfortunately, we already had an option using '-f' so I have changed that
option to use -F so that all of our tools can be consistent. Apologies in
advance to anyone whose scripts break because of this change.

traceanon will now handle keyboard interrupts nicely when reading from a live
source -- any buffered output will now be written nicely to disk rather than
being lost forever.

Updated manpage for traceanon to match new options.

Location:

tools/traceanon

Files:

• traceanon.1 (modified) (3 diffs)
• traceanon.c (modified) (10 diffs)

tools/traceanon/traceanon.1

@@ -8 +8 @@
 [ \-p prefix | \-\^\-prefix=prefix ]
 [ \-c key | \-\^\-cryptopan=key ]
-[ \-f key-file | \-\^\-keyfile=file ]
+[ \-F key-file | \-\^\-keyfile=file ]
+[ \-f expr | \-\^\-filter=expr ]
 [ \-z level | \-\^\-compress-level=level ]
 [ \-Z method | \-\^\-compress-type=method ]
@@ -59 +60 @@
 .TP
 .PD 0
-.BI \-f
+.BI \-F
 .TP
 .PD
@@ -67 +68 @@
 long. A suitable method of generating a key is by using the command dd to read
 from /dev/urandom.
+
+.TP
+.PD 0
+.BI \-f
+.TP
+.PD
+.BI \-\^\-filter=expr
+Discard all packets that do not match the BPF expression specified in 'expr'.
 
 

tools/traceanon/traceanon.c

@@ -9 +9 @@
 #include <string.h>
 #include <time.h>
+#include <signal.h>
 #include "ipenc.h"
-
 
 static void usage(char *argv0)
@@ -20 +20 @@
         "-c --cryptopan=key     Encrypt the addresses with the cryptopan\n"
         "                       prefix preserving\n"
-        "-f --keyfile=file      A file containing the cryptopan key\n"
+        "-F --keyfile=file      A file containing the cryptopan key\n"
+        "-f --filter=expr       Discard all packets that do not match the\n"
+        "                       provided BPF expression\n"
         "-p --prefix=C.I.D.R/bits Substitute the prefix of the address\n"
         "-H --libtrace-help     Print libtrace runtime documentation\n"
         "-z --compress-level    Compress the output trace at the specified level\n"
-        "-Z --compress-type     Compress the output trace using the specified"
+        "-Z --compress-type     Compress the output trace using the specified\n"
         "                       compression algorithm\n"
         ,argv0);
         exit(1);
+}
+
+volatile int done=0;
+
+static void cleanup_signal(int sig)
+{
+        (void)sig;
+        done=1;
+        trace_interrupt();
 }
 
@@ -116 +127 @@
         struct libtrace_packet_t *packet = trace_create_packet();
         struct libtrace_out_t *writer = 0;
+        struct libtrace_filter_t *filter = NULL;
         bool enc_source = false;
         bool enc_dest   = false;
         char *output = 0;
         int level = -1;
+        char *filterstring = NULL;
         char *compress_type_str=NULL;
         trace_option_compresstype_t compress_type = TRACE_OPTION_COMPRESSTYPE_NONE;
-
+        struct sigaction sigact;
 
         if (argc<2)
                 usage(argv[0]);
+
+        sigact.sa_handler = cleanup_signal;
+        sigemptyset(&sigact.sa_mask);
+        sigact.sa_flags = SA_RESTART;
+
+        signal(SIGINT,&cleanup_signal);
+        signal(SIGTERM,&cleanup_signal);
 
         while (1) {
@@ -133 +153 @@
                         { "encrypt-dest",       0, 0, 'd' },
                         { "cryptopan",          1, 0, 'c' },
-                        { "cryptopan-file",     1, 0, 'f' },
+                        { "cryptopan-file",     1, 0, 'F' },
+                        { "filter",             1, 0, 'f' },
                         { "prefix",             1, 0, 'p' },
                         { "compress-level",     1, 0, 'z' },
@@ -152 +173 @@
                         case 's': enc_source=true; break;
                         case 'd': enc_dest  =true; break;
+                        case 'f': filterstring = optarg; break;
                         case 'c': 
                                   if (key!=NULL) {
@@ -160 +182 @@
                                   enc_type = ENC_CRYPTOPAN;
                                   break;
-                        case 'f':
+                        case 'F':
                                   if(key != NULL) {
                                     fprintf(stderr,"You can only have one encryption type and one key\n");
@@ -230 +252 @@
         
 
+        if (filterstring) {
+            filter = trace_create_filter(filterstring);
+        }
+
         enc_init(enc_type,key);
 
@@ -279 +305 @@
         }
 
+        if (filter && trace_config(trace, TRACE_OPTION_FILTER, filter) == -1) {
+                trace_perror(trace, "Configuring input filter");
+                trace_destroy_output(writer);
+                trace_destroy(trace);
+                return 1;
+        }
+
         if (trace_start(trace)==-1) {
                 trace_perror(trace,"trace_start");
@@ -298 +331 @@
                 int psize;
                 psize = trace_read_packet(trace, packet);
-                if (psize == 0) {
-                        break;
-                }
-                if (psize < 0) {
-                        trace_perror(trace,"read_packet");
+                if (psize <= 0) {
                         break;
                 }
@@ -334 +363 @@
                         break;
                 }
-        }
+
+                if (done)
+                    break;
+        }
+        if (trace_is_err(trace)) {
+            trace_perror(trace,"read_packet");
+        }
+
+        if (filter)
+            trace_destroy_filter(filter);
+        
         trace_destroy_packet(packet);
         trace_destroy(trace);