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

Support 802.11 monitor mode

Browse source
This commit is contained in:
Pierre LALET 2018-05-15 10:14:57 +02:00
parent 057c982b9d
commit 30c28da046
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/iosource/Packet.cc
View file

@ -86,6 +86,9 @@ int Packet::GetLinkHeaderSize(int link_type)
case DLT_PPP_SERIAL: // PPP_SERIAL case DLT_PPP_SERIAL: // PPP_SERIAL
return 4; return 4;
case DLT_IEEE802_11: // 802.11 monitor
return 34;
case DLT_IEEE802_11_RADIO: // 802.11 plus RadioTap case DLT_IEEE802_11_RADIO: // 802.11 plus RadioTap
return 59; return 59;
@ -279,12 +282,15 @@ void Packet::ProcessLayer2()
} }
pdata += rtheader_len; pdata += rtheader_len;
}
case DLT_IEEE802_11:
{
u_char len_80211 = 24; // minimal length of data frames u_char len_80211 = 24; // minimal length of data frames
if ( pdata + len_80211 >= end_of_data ) if ( pdata + len_80211 >= end_of_data )
{ {
Weird("truncated_radiotap_header"); Weird("truncated_802_11_header");
return; return;
} }
@ -316,7 +322,7 @@ void Packet::ProcessLayer2()
if ( pdata + len_80211 >= end_of_data ) if ( pdata + len_80211 >= end_of_data )
{ {
Weird("truncated_radiotap_header"); Weird("truncated_802_11_header");
return; return;
} }
@ -349,7 +355,7 @@ void Packet::ProcessLayer2()
if ( pdata + 8 >= end_of_data ) if ( pdata + 8 >= end_of_data )
{ {
Weird("truncated_radiotap_header"); Weird("truncated_802_11_header");
return; return;
} }
// Check that the DSAP and SSAP are both SNAP and that the control // Check that the DSAP and SSAP are both SNAP and that the control
@ -374,9 +380,11 @@ void Packet::ProcessLayer2()
l3_proto = L3_IPV4; l3_proto = L3_IPV4;
else if ( protocol == 0x86DD ) else if ( protocol == 0x86DD )
l3_proto = L3_IPV6; l3_proto = L3_IPV6;
else if ( protocol == 0x0806 || protocol == 0x8035 )
l3_proto = L3_ARP;
else else
{ {
Weird("non_ip_packet_in_ieee802_11_radio_encapsulation"); Weird("non_ip_packet_in_ieee802_11");
return; return;
} }
pdata += 2; pdata += 2;