Changeset 38c00dd for tools

Timestamp:

04/06/16 13:08:30 (5 years ago)

Author:

Richard Sanger <rsanger@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, master, ndag_format, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

bb0a1f4

Parents:

13bcf9e (diff), fd4482d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into develop

Conflicts:

lib/trace.c

Location:

tools/tracesplit

Files:

• tracesplit.1 (modified) (2 diffs)
• tracesplit.c (modified) (17 diffs)

tools/tracesplit/tracesplit.1

@@ -5 +5 @@
 .B tracesplit
 [ \fB-f \fRbpf | \fB--filter=\fRbpf]
+[ \fB-j \fRnumhdrs | \fB--jump=\fRnumhdrs]
 [ \fB-c \fRcount | \fB--count=\fRcount]
 [ \fB-b \fRbytes | \fB--bytes=\fRbytes]
@@ -20 +21 @@
 \fB\-f\fR bpf filter
 output only packets that match tcpdump style bpf filter
+
+.TP
+\fB\-j\fR numhdrs
+Strip headers before the numhdrs layer 3 header.  For example, \-j1 will strip
+off all the layer 2 headers, \-j2 will strip off all the l2 headers, the first
+l3 header, any transport headers, and return a trace that starts at the next
+l3 header.
 
 .TP

tools/tracesplit/tracesplit.c

@@ -25 +25 @@
 uint64_t filescreated = 0;
 uint16_t snaplen = 0;
+int jump=0;
 int verbose=0;
 int compress_level=-1;
@@ -56 +57 @@
         "-e --endtime=time      End at time\n"
         "-m --maxfiles=n        Create a maximum of n trace files\n"
+        "-j --jump=n            Jump to the nth IP header\n"
         "-H --libtrace-help     Print libtrace runtime documentation\n"
         "-S --snaplen           Snap packets at the specified length\n"
@@ -75 +77 @@
 
 
+static libtrace_packet_t *perform_jump(libtrace_packet_t *packet, int jump)
+{
+    uint16_t ethertype;
+    uint32_t remaining;
+    uint8_t ipproto;
+    void *offset = trace_get_layer3(packet, &ethertype, &remaining);
+    while(jump > 0 && offset) {
+        --jump;
+        switch (ethertype) {
+            case TRACE_ETHERTYPE_IP:
+                if (jump <= 0) {
+                    void *newpacket = trace_create_packet();
+                    trace_construct_packet(newpacket,
+                            TRACE_TYPE_NONE,
+                            offset,
+                            remaining);
+                    return newpacket;
+                }
+                offset = trace_get_payload_from_ip(offset,
+                        &ipproto,
+                        &remaining);
+                if (!offset)
+                    return NULL;
+                break;
+            case TRACE_ETHERTYPE_IPV6:
+                if (jump <= 0) {
+                    void *newpacket = trace_create_packet();
+                    trace_construct_packet(newpacket,
+                            TRACE_TYPE_NONE,
+                            offset,
+                            remaining);
+                    return newpacket;
+                }
+                offset = trace_get_payload_from_ip6(offset,
+                        &ipproto,
+                        &remaining);
+                if (!offset)
+                    return NULL;
+                break;
+            /* TODO: vlan, etc */
+            default:
+                return NULL;
+        }
+        if (!offset)
+            return false;
+        switch (ipproto) {
+            case TRACE_IPPROTO_IPV6:
+                ethertype = TRACE_ETHERTYPE_IPV6;
+                continue;
+            case TRACE_IPPROTO_IPIP:
+                ethertype = TRACE_ETHERTYPE_IP;
+                continue;
+            case TRACE_IPPROTO_GRE:
+                if (remaining < sizeof(libtrace_gre_t)) {
+                    return NULL;
+                }
+                ethertype = ((libtrace_gre_t *)offset)->ethertype;
+                offset = trace_get_payload_from_gre(offset, &remaining);
+                continue;
+            case TRACE_IPPROTO_UDP:
+                offset = trace_get_vxlan_from_udp(offset, &remaining);
+                if (!offset)
+                    return NULL;
+                offset = trace_get_payload_from_vxlan(offset, &remaining);
+                if (!offset)
+                    return NULL;
+                offset = trace_get_payload_from_layer2(offset,
+                        TRACE_TYPE_ETH,
+                        &ethertype,
+                        &remaining);
+                if (!offset)
+                    return NULL;
+                continue;
+        }
+        return NULL;
+    }
+    return NULL;
+}
+
+
 /* Return values:
  *  1 = continue reading packets
@@ -80 +162 @@
  *  -1 = stop reading packets, we've got an error
  */
-static int per_packet(libtrace_packet_t *packet) {
-
-        if (trace_get_link_type(packet) == ~0U) {
+static int per_packet(libtrace_packet_t **packet) {
+
+        if (trace_get_link_type(*packet) == -1) {
                 fprintf(stderr, "Halted due to being unable to determine linktype - input trace may be corrupt.\n");
                 return -1;
@@ -88 +170 @@
 
         if (snaplen>0) {
-                trace_set_capture_length(packet,snaplen);
-        }
-
-        if (trace_get_seconds(packet)<starttime) {
+                trace_set_capture_length(*packet,snaplen);
+        }
+
+        if (trace_get_seconds(*packet)<starttime) {
                 return 1;
         }
 
-        if (trace_get_seconds(packet)>endtime) {
+        if (trace_get_seconds(*packet)>endtime) {
                 return 0;
         }
 
         if (firsttime==0) {
-                time_t now = trace_get_seconds(packet);
+                time_t now = trace_get_seconds(*packet);
                 if (starttime != 0) {
                         firsttime=now-((now - starttime)%interval);
@@ -109 +191 @@
         }
 
-        if (output && trace_get_seconds(packet)>firsttime+interval) {
+        if (output && trace_get_seconds(*packet)>firsttime+interval) {
                 trace_destroy_output(output);
                 output=NULL;
@@ -121 +203 @@
 
         pktcount++;
-        totbytes+=trace_get_capture_length(packet);
+        totbytes+=trace_get_capture_length(*packet);
         if (output && totbytes-totbyteslast>=bytes) {
                 trace_destroy_output(output);
@@ -198 +280 @@
         }
 
-        /* Some traces we have are padded (usually with 0x00), so 
+        /* Some traces we have are padded (usually with 0x00), so
          * lets sort that out now and truncate them properly
          */
 
-        if (trace_get_capture_length(packet) 
-                        > trace_get_wire_length(packet)) {
-                trace_set_capture_length(packet,trace_get_wire_length(packet));
-        }
-
-        if (trace_write_packet(output,packet)==-1) {
+        if (trace_get_capture_length(*packet)
+                        > trace_get_wire_length(*packet)) {
+                trace_set_capture_length(*packet,
+                        trace_get_wire_length(*packet));
+        }
+
+        /* Support "jump"ping to the nth IP header. */
+        if (jump) {
+            /* Skip headers */
+            void *newpacket = perform_jump(*packet, jump);
+            if (newpacket) {
+                trace_destroy_packet(*packet);
+                *packet = newpacket;
+            }
+            else /* Skip packet */
+                return 1;
+        }
+
+        if (trace_write_packet(output, *packet)==-1) {
                 trace_perror_output(output,"write_packet");
                 return -1;
@@ -223 +318 @@
         struct libtrace_packet_t *packet = trace_create_packet();
         struct sigaction sigact;
-        int i;  
-        
+        int i;
+
         if (argc<2) {
                 usage(argv[0]);
@@ -240 +335 @@
                         { "endtime",       1, 0, 'e' },
                         { "interval",      1, 0, 'i' },
+                        { "jump",          1, 0, 'j' },
                         { "libtrace-help", 0, 0, 'H' },
                         { "maxfiles",      1, 0, 'm' },
@@ -249 +345 @@
                 };
 
-                int c=getopt_long(argc, argv, "f:c:b:s:e:i:m:S:Hvz:Z:",
+                int c=getopt_long(argc, argv, "j:f:c:b:s:e:i:m:S:Hvz:Z:",
                                 long_options, &option_index);
 
@@ -268 +364 @@
                         case 'i': interval=atoi(optarg);
                                   break;
+                        case 'j': jump=atoi(optarg);
+                                  break;
                         case 'm': maxfiles=atoi(optarg);
                                   break;
@@ -283 +381 @@
                                   if (compress_level<0 || compress_level>9) {
                                         usage(argv[0]);
-                                        exit(1);
+                                        exit(1);
                                   }
                                   break;
                         case 'Z':
                                   compress_type_str=optarg;
-                                  break;        
+                                  break;
                         default:
                                 fprintf(stderr,"Unknown option: %c\n",c);
@@ -321 +419 @@
                 compress_type = TRACE_OPTION_COMPRESSTYPE_NONE;
         } else {
-                fprintf(stderr, "Unknown compression type: %s\n", 
+                fprintf(stderr, "Unknown compression type: %s\n",
                         compress_type_str);
                 return 1;
@@ -348 +446 @@
 
 
-                input = trace_create(argv[i]);  
-                
+                input = trace_create(argv[i]);
+
                 if (trace_is_err(input)) {
                         trace_perror(input,"%s",argv[i]);
@@ -356 +454 @@
 
                 if (filter && trace_config(input, TRACE_OPTION_FILTER, filter) == 1) {
-                        trace_perror(input, "Configuring filter for %s", 
+                        trace_perror(input, "Configuring filter for %s",
                                         argv[i]);
                         return 1;
@@ -367 +465 @@
 
                 while (trace_read_packet(input,packet)>0) {
-                        if (per_packet(packet) < 1)
+                        if (per_packet(&packet) < 1)
                                 done = 1;
                         if (done)