Changeset 8e11beb for tools/traceends

Timestamp:

07/03/17 16:37:48 (4 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

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

Children:

568a341

Parents:

ed5b2ce

Message:

Update tools to properly ignore meta records and missing timestamps

pcapng introduces a lot of meta records that we should preserve as
long as possible. Since we aren't automatically discarding them,
we need to make sure that our tools do not try to treat them as
"real" packets, i.e. try to get a timestamp or capture length from
them.

Similarly, simple pcapng packet records do not have a timestamp
so we need to make sure the tools do the right thing when
trace_get_seconds() returns a timestamp of zero on a packet. For
starters, we don't want to set our "first" packet time to zero
in that case!

File:

• tools/traceends/traceends.cc (modified) (3 diffs)

tools/traceends/traceends.cc

@@ -309 +309 @@
         c->src_pbytes += plen;
         c->src_bytes += ip->ip_len;
-        c->last_active = ts;
+        if (ts != 0)
+                c->last_active = ts;
         
         key = ip->ip_dst.s_addr;
@@ -324 +325 @@
         c->dst_pbytes += plen;
         c->dst_bytes += ip_len;
-        c->last_active = ts;
+        if (ts != 0)
+                c->last_active = ts;
 }
 
@@ -455 +457 @@
 
                 while (trace_read_packet(input,packet)>0) {
+                        if (IS_LIBTRACE_META_PACKET(packet))
+                                continue;
                         if (per_packet(packet) < 1)
                                 done = 1;