aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2011-06-16 08:04:31 +0000
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2011-06-16 08:04:31 +0000
commit3384fdecc4e61fde6205a17a914f5ed13567ecf3 (patch)
treec5071dbc175865f4ffa93b9c581320b3fc3077c3 /wiretap
parentbd2e37c8799e530e7bef024c62243cb8658a165c (diff)
From Kevin Kayes via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6026
Enhance Snoop file reader to include 10Gbit datalink value svn path=/trunk/; revision=37683
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;