summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHadriel Kaplan <hadrielk@yahoo.com>2015-08-29 19:14:13 -0400
committerHadriel Kaplan <hadrielk@yahoo.com>2015-08-30 00:01:35 +0000
commit55ccc2489bac808bec2d298e9fef16a194e96279 (patch)
treed52c524784cf645482e54ac98164a98246bd530a
parent723f119653123a430baf0b2e78e7298393695477 (diff)
downloadwireshark-55ccc2489bac808bec2d298e9fef16a194e96279.tar.gz
pcapng: drop count is unknown for ISB without isb_if_drop option
Bug: 11489 Change-Id: I38bcc2570c2efc461e4eb0edbff8ac2a7371c725 Reviewed-on: https://code.wireshark.org/review/10311 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> (cherry picked from commit 7791c6f4ebc63850914abc692226cbeb1ffcbbc9) Reviewed-on: https://code.wireshark.org/review/10312
-rw-r--r--summary.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/summary.c b/summary.c
index ec9999896e..8a8ff96337 100644
--- a/summary.c
+++ b/summary.c
@@ -182,11 +182,15 @@ summary_fill_in(capture_file *cf, summary_tally *st)
iface.snap = wtapng_if_descr.snap_len;
iface.has_snap = (iface.snap != 65535);
iface.encap_type = wtapng_if_descr.wtap_encap;
+ iface.isb_comment = NULL;
if(wtapng_if_descr.num_stat_entries == 1){
/* dumpcap only writes one ISB, only handle that for now */
if_stats = &g_array_index(wtapng_if_descr.interface_statistics, wtapng_if_stats_t, 0);
- iface.drops_known = TRUE;
- iface.drops = if_stats->isb_ifdrop;
+ if (if_stats->isb_ifdrop != G_GUINT64_CONSTANT(0xFFFFFFFFFFFFFFFF)) {
+ iface.drops_known = TRUE;
+ iface.drops = if_stats->isb_ifdrop;
+ }
+ /* XXX: this doesn't get used, and might need to be g_strdup'ed when it does */
iface.isb_comment = if_stats->opt_comment;
}
g_array_append_val(st->ifaces, iface);