git.samba.org
/
obnox
/
wireshark
/
wip.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set focus to packet list when a row is selected.
[obnox/wireshark/wip.git]
/
capture_info.c
diff --git
a/capture_info.c
b/capture_info.c
index 7e0cf2d80d3454959904df2d0e5629b329f672f7..1e0c7cae4a5912f630a82a9294958980ffc1500b 100644
(file)
--- a/
capture_info.c
+++ b/
capture_info.c
@@
-54,11
+54,10
@@
#include <epan/dissectors/packet-ieee80211.h>
#include <epan/dissectors/packet-radiotap.h>
#include <epan/dissectors/packet-chdlc.h>
#include <epan/dissectors/packet-ieee80211.h>
#include <epan/dissectors/packet-radiotap.h>
#include <epan/dissectors/packet-chdlc.h>
-#include <epan/dissectors/packet-prism.h>
#include <epan/dissectors/packet-ipfc.h>
#include <epan/dissectors/packet-arcnet.h>
#include <epan/dissectors/packet-enc.h>
#include <epan/dissectors/packet-ipfc.h>
#include <epan/dissectors/packet-arcnet.h>
#include <epan/dissectors/packet-enc.h>
-#include <epan/dissectors/packet-
wlancap
.h>
+#include <epan/dissectors/packet-
i2c
.h>
static void capture_info_packet(
packet_counts *counts, gint wtap_linktype, const guchar *pd, guint32 caplen, union wtap_pseudo_header *pseudo_header);
static void capture_info_packet(
packet_counts *counts, gint wtap_linktype, const guchar *pd, guint32 caplen, union wtap_pseudo_header *pseudo_header);
@@
-76,7
+75,7
@@
info_data_t info_data;
/* open the info */
/* open the info */
-void capture_info_open(c
onst char *iface
)
+void capture_info_open(c
apture_options *capture_opts
)
{
info_data.counts.total = 0;
info_data.counts.sctp = 0;
{
info_data.counts.total = 0;
info_data.counts.sctp = 0;
@@
-90,11
+89,13
@@
void capture_info_open(const char *iface)
info_data.counts.vines = 0;
info_data.counts.other = 0;
info_data.counts.arp = 0;
info_data.counts.vines = 0;
info_data.counts.other = 0;
info_data.counts.arp = 0;
+ info_data.counts.i2c_event = 0;
+ info_data.counts.i2c_data = 0;
info_data.wtap = NULL;
info_data.ui.counts = &info_data.counts;
info_data.wtap = NULL;
info_data.ui.counts = &info_data.counts;
- capture_info_ui_create(&info_data.ui,
iface
);
+ capture_info_ui_create(&info_data.ui,
capture_opts
);
}
}
@@
-214,7
+215,7
@@
gboolean capture_info_new_file(const char *new_filename)
g_snprintf(err_msg, sizeof err_msg,
cf_open_error_message(err, err_info, FALSE, WTAP_FILE_PCAP),
new_filename);
g_snprintf(err_msg, sizeof err_msg,
cf_open_error_message(err, err_info, FALSE, WTAP_FILE_PCAP),
new_filename);
- g_warning("capture_info_new_file: %
s"
, err_msg);
+ g_warning("capture_info_new_file: %
d (%s)", err
, err_msg);
return FALSE;
} else
return TRUE;
return FALSE;
} else
return TRUE;
@@
-336,6
+337,9
@@
capture_info_packet(packet_counts *counts, gint wtap_linktype, const guchar *pd,
case WTAP_ENCAP_PPI:
capture_ppi(pd, caplen, counts);
break;
case WTAP_ENCAP_PPI:
capture_ppi(pd, caplen, counts);
break;
+ case WTAP_ENCAP_I2C:
+ capture_i2c(pseudo_header, counts);
+ break;
/* XXX - some ATM drivers on FreeBSD might prepend a 4-byte ATM
pseudo-header to DLT_ATM_RFC1483, with LLC header following;
we might have to implement that at some point. */
/* XXX - some ATM drivers on FreeBSD might prepend a 4-byte ATM
pseudo-header to DLT_ATM_RFC1483, with LLC header following;
we might have to implement that at some point. */