aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
authoralagoutte <alagoutte@f5534014-38df-0310-8fa8-9805f1628bb7>2011-06-16 08:04:31 +0000
committeralagoutte <alagoutte@f5534014-38df-0310-8fa8-9805f1628bb7>2011-06-16 08:04:31 +0000
commit5527eecbe0ca56ee3669176892bcd6efbe02e764 (patch)
treec5071dbc175865f4ffa93b9c581320b3fc3077c3 /wiretap
parent3f7c51b37e71d3595dee0e6ac99769f3146b83fe (diff)
From Kevin Kayes via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6026
Enhance Snoop file reader to include 10Gbit datalink value git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37683 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/snoop.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/wiretap/snoop.c b/wiretap/snoop.c
index 552cdbe37e..b5446e442e 100644
--- a/wiretap/snoop.c
+++ b/wiretap/snoop.c
@@ -244,7 +244,8 @@ int snoop_open(wtap *wth, int *err, gchar **err_info)
WTAP_ENCAP_UNKNOWN, /* Other */
WTAP_ENCAP_UNKNOWN, /* Other */
WTAP_ENCAP_UNKNOWN, /* Other */
- WTAP_ENCAP_IEEE_802_11_WITH_RADIO,
+ WTAP_ENCAP_IEEE_802_11_WITH_RADIO, /* IEEE 802.11 with Radio Header */
+ WTAP_ENCAP_ETHERNET, /* 10 Gigabit Ethernet */
};
#define NUM_SHOMITI_ENCAPS (sizeof shomiti_encap / sizeof shomiti_encap[0])
int file_encap;