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

Merge branch 'p-l--topic/support-wlan-monitor'

Browse source 
# Conflicts:
#	testing/btest/Traces/arp-who-has-radiotap.pcap
#	testing/btest/Traces/arp-who-has-wlanmon.pcap
This commit is contained in:
Seth Hall 2018-05-18 09:52:28 -04:00
commit d5797d8bde
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/analyzer/protocol/arp/ARP.cc
View file

@ -140,7 +140,7 @@ void ARP_Analyzer::NextPacket(double t, const Packet* pkt)
// Check MAC src address = ARP sender MAC address.
if ( memcmp((const char*) (data+6), ar_sha(ah), ah->ar_hln) )
if ( memcmp(pkt->l2_src, ar_sha(ah), ah->ar_hln) )
{
BadARP(ah, "weird-arp-sha");
return;
@ -149,12 +149,12 @@ void ARP_Analyzer::NextPacket(double t, const Packet* pkt)
// Check the code is supported.
switch ( ntohs(ah->ar_op) ) {
case ARPOP_REQUEST:
RREvent(arp_request, data+6, data,
RREvent(arp_request, pkt->l2_src, pkt->l2_dst,
ar_spa(ah), ar_sha(ah), ar_tpa(ah), ar_tha(ah));
break;
case ARPOP_REPLY:
RREvent(arp_reply, data+6, data,
RREvent(arp_reply, pkt->l2_src, pkt->l2_dst,
ar_spa(ah), ar_sha(ah), ar_tpa(ah), ar_tha(ah));
break;