Changeset f7f7015

Timestamp:

11/22/16 11:26:41 (4 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:

571e2f9

Parents:

78fe0d2 (diff), d0a067f (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

Location:

lib

Files:

• format_pcap.c (modified) (1 diff)
• libtrace.h.in (modified) (1 diff)
• linktypes.c (modified) (1 diff)
• trace.c (modified) (1 diff)

lib/format_pcap.c

@@ -765 +765 @@
         }
 
+        stat->received_valid = 1;
+        stat->received = pcapstats.ps_recv;
         stat->dropped_valid = 1;
         stat->dropped = pcapstats.ps_drop;

lib/libtrace.h.in

@@ -1662 +1662 @@
 
 /**
+ * Clear all fields of given statistic.
+ * This api doesn't verify the magic field unlike other stat apis.
+ *
+ * @param s The statistic structure to clear
+ */
+DLLEXPORT
+void trace_clear_statistics(libtrace_stat_t *s);
+
+/**
  * Performs the operation c=a-b accounting for valid fields.
  * c is allowed to be a or b.

lib/linktypes.c

@@ -212 +212 @@
                 case LIBTRACE_ARPHRD_PPP: return TRACE_TYPE_NONE;
                 case LIBTRACE_ARPHRD_LOOPBACK: return TRACE_TYPE_ETH;
+                case LIBTRACE_ARPHRD_SIT: return TRACE_TYPE_ETH;
                 case LIBTRACE_ARPHRD_NONE: return TRACE_TYPE_NONE;
         }

lib/trace.c

@@ -2214 +2214 @@
 }
 
+void trace_clear_statistics(libtrace_stat_t *s) {
+        memset(s, 0, sizeof(libtrace_stat_t));
+        s->magic = LIBTRACE_STAT_MAGIC;
+}
+
 void trace_subtract_statistics(const libtrace_stat_t *a, const libtrace_stat_t *b,
                          libtrace_stat_t *c) {