diff options
| author | Guy Harris <guy@alum.mit.edu> | 2010-07-23 10:11:44 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2010-07-23 10:11:44 +0000 |
| commit | 99a086051bd318b811886754ea9db594b2b3904a (patch) | |
| tree | b67be7e38741db22abdca078a6e0e67fa01cd4f0 /wiretap | |
| parent | 7330e631281b4810f7cfb850189cc4ff2874916d (diff) | |
| download | wireshark-99a086051bd318b811886754ea9db594b2b3904a.tar.gz wireshark-99a086051bd318b811886754ea9db594b2b3904a.tar.bz2 wireshark-99a086051bd318b811886754ea9db594b2b3904a.zip | |
At least in some NetMon 3.4 VPN captures, the per-packet link-layer type
is 0, but the packets have Ethernet headers. We handle this by mapping
0 to WTAP_ENCAP_ETHERNET.
(XXX - should we, instead, use the per-file link-layer type?)
svn path=/trunk/; revision=33620
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/netmon.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/wiretap/netmon.c b/wiretap/netmon.c index 7bf00f7eae..e515ab7fc5 100644 --- a/wiretap/netmon.c +++ b/wiretap/netmon.c @@ -139,8 +139,14 @@ typedef struct { guint current_frame; } netmon_t; +/* + * XXX - at least in some NetMon 3.4 VPN captures, the per-packet + * link-layer type is 0, but the packets have Ethernet headers. + * We handle this by mapping 0 to WTAP_ENCAP_ETHERNET; should we, + * instead, use the per-file link-layer type? + */ static const int netmon_encap[] = { - WTAP_ENCAP_UNKNOWN, + WTAP_ENCAP_ETHERNET, WTAP_ENCAP_ETHERNET, WTAP_ENCAP_TOKEN_RING, WTAP_ENCAP_FDDI_BITSWAPPED, |