Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-04 15:48:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed RadioTap support (still "Works for Me")

Browse source
This commit is contained in:
Seth Hall 2015-10-17 03:09:12 -04:00
parent d6c89ae022
commit 1d94eadd36
1 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/iosource/Packet.cc
View file

@ -256,21 +256,34 @@ void Packet::ProcessLayer2()
case DLT_IEEE802_11_RADIO:
{
protocol = (data[57] << 8) + data[58];
if ( (data[54] == 0 && data[55] == 0 && data[56] == 0) &&
(protocol == 0x0800 || protocol == 0x86DD) )
//if ( ! (pdata[73] == 0 && pdata[74] == 0 && pdata[75] == 0) )
// {
// Weird("unknown_radiotap_packet");
// return;
// }
// Skip over the RadioTap header, the IEEE QoS header,
// and logical link control header.
//printf("link header size: %d\n", GetLinkHeaderSize(link_type));
// skip Radio Tap header.
pdata += (pdata[3] << 8) + pdata[2];
// skip QoS data header
pdata += 26;
int protocol = (pdata[6] << 8) + pdata[7];
if ( protocol == 0x0800 )
l3_proto = L3_IPV4;
else if ( protocol == 0x86DD )
l3_proto = L3_IPV6;
else
{
// Found an IPv4 or IPv6 packet.
// Skip over the RadioTap header, the IEEE QoS header,
// and logical link control header.
data += GetLinkHeaderSize(props.link_type);
pkt_hdr_size = 0;
}
else
{
Weird("non_ip_packet_in_ieee802_11_radio_encapsulation", &current_packet);
goto done;
Weird("non_ip_packet_in_ieee802_11_radio_encapsulation");
return;
}
// skip logical link control header
pdata += 8;
break;
}