git.samba.org
/
metze
/
wireshark
/
wip.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
List the disappearance of the ADDRESS macros as an API change.
[metze/wireshark/wip.git]
/
summary.c
diff --git
a/summary.c
b/summary.c
index d7f77a4ff6742a8a0dcce9a2d1bc7214b9b46129..4bcfe16d147d81af17b0e1d159acff9b55212f77 100644
(file)
--- a/
summary.c
+++ b/
summary.c
@@
-105,7
+105,7
@@
summary_fill_in(capture_file *cf, summary_tally *st)
{
frame_data *first_frame, *cur_frame;
guint32 framenum;
{
frame_data *first_frame, *cur_frame;
guint32 framenum;
- wtapng_section_t* shb_inf;
+
const
wtapng_section_t* shb_inf;
iface_options iface;
guint i;
wtapng_iface_descriptions_t* idb_info;
iface_options iface;
guint i;
wtapng_iface_descriptions_t* idb_info;
@@
-156,7
+156,7
@@
summary_fill_in(capture_file *cf, summary_tally *st)
st->dfilter = cf->dfilter;
/* Get info from SHB */
st->dfilter = cf->dfilter;
/* Get info from SHB */
- shb_inf = wtap_file_get_shb
_info
(cf->wth);
+ shb_inf = wtap_file_get_shb(cf->wth);
if(shb_inf == NULL){
st->opt_comment = NULL;
st->shb_hardware = NULL;
if(shb_inf == NULL){
st->opt_comment = NULL;
st->shb_hardware = NULL;
@@
-167,7
+167,6
@@
summary_fill_in(capture_file *cf, summary_tally *st)
st->shb_hardware = shb_inf->shb_hardware;
st->shb_os = shb_inf->shb_os;
st->shb_user_appl = shb_inf->shb_user_appl;
st->shb_hardware = shb_inf->shb_hardware;
st->shb_os = shb_inf->shb_os;
st->shb_user_appl = shb_inf->shb_user_appl;
- g_free(shb_inf);
}
st->ifaces = g_array_new(FALSE, FALSE, sizeof(iface_options));
}
st->ifaces = g_array_new(FALSE, FALSE, sizeof(iface_options));
@@
-182,11
+181,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.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);
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);
iface.isb_comment = if_stats->opt_comment;
}
g_array_append_val(st->ifaces, iface);
@@
-224,3
+227,16
@@
summary_fill_in_capture(capture_file *cf,capture_options *capture_opts, summary_
}
}
#endif
}
}
#endif
+
+/*
+ * Editor modelines - http://www.wireshark.org/tools/modelines.html
+ *
+ * Local Variables:
+ * c-basic-offset: 2
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
+ * :indentSize=2:tabSize=8:noTabs=true:
+ */