diff options
| author | Vadim Kochan <vadim4j@gmail.com> | 2015-04-10 11:43:57 +0300 |
|---|---|---|
| committer | Tobias Klauser <tklauser@distanz.ch> | 2015-04-13 10:32:25 +0200 |
| commit | 47a7037955bfa7405a0a676f214c26d136b8ca9a (patch) | |
| tree | 7d442b8d8131e6d3dfcfc47a462a732278331a2c /pcap_io.h | |
| parent | 06200b94b91cdf80d23a15de00145147ffd1174e (diff) | |
netsniff-ng: Consider radiotap header of monitor dev
netsniff-ng does not check if monitor device includes radiotap
header which leads to the wrong 802.11 frame parsing.
Tested if the .pcap file is understandable by wireshark and if
dump info is basically correct, but did not test the case when xmit
packets from .pcap file to the output device and from the input device
to the output device.
Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
[tklauser: whitespace changes]
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'pcap_io.h')
| -rw-r--r-- | pcap_io.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -161,8 +161,8 @@ static inline int pcap_devtype_to_linktype(const char *ifname) case ARPHRD_IPGRE: case ARPHRD_IP6GRE: case ARPHRD_ETHER: return LINKTYPE_EN10MB; + case ARPHRD_IEEE80211_RADIOTAP: return LINKTYPE_IEEE802_11_RADIOTAP; case ARPHRD_IEEE80211_PRISM: - case ARPHRD_IEEE80211_RADIOTAP: case ARPHRD_IEEE80211: return LINKTYPE_IEEE802_11; case ARPHRD_NETLINK: return LINKTYPE_NETLINK; case ARPHRD_EETHER: return LINKTYPE_EN3MB; @@ -650,6 +650,7 @@ static const bool pcap_supported_linktypes[LINKTYPE_MAX] __maybe_unused = { [LINKTYPE_ATM_CLIP] = true, [LINKTYPE_C_HDLC] = true, [LINKTYPE_IEEE802_11] = true, + [LINKTYPE_IEEE802_11_RADIOTAP] = true, [LINKTYPE_FRELAY] = true, [LINKTYPE_ECONET] = true, [LINKTYPE_ARCNET_LINUX] = true, |