vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-14 07:48:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

ARP fixes

Browse source
This commit is contained in:
Luca Deri 2018-03-22 23:31:24 +01:00
parent f0c936c368
commit caf83f1ad0
5 changed files with 65 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/NetworkInterface.cpp
View file

@ -2400,17 +2400,17 @@ decode_packet_eth:
if(srcMac && dstMac) {
setSeenMacAddresses();
if((eth_type == ETHERTYPE_ARP) && (h->caplen > (sizeof(arp_packet)+sizeof(struct ndpi_ethhdr)))) {
struct arp_packet *arpp = (struct arp_packet*)&packet[ip_offset];;
if((eth_type == ETHERTYPE_ARP) && (h->caplen >= (sizeof(arp_header)+sizeof(struct ndpi_ethhdr)))) {
struct arp_header *arpp = (struct arp_header*)&packet[ip_offset];
u_int16_t arp_opcode = ntohs(arpp->ar_op);
if(arp_opcode == 0x1 /* ARP request */) {
arp_requests++;
srcMac->incSentArpRequests();
srcMac->incSentArpRequests(), srcMac->setSourceMac();
dstMac->incRcvdArpRequests();
} else if(arp_opcode == 0x2 /* ARP reply */) {
arp_replies++;
srcMac->incSentArpReplies();
srcMac->incSentArpReplies(), srcMac->setSourceMac();
dstMac->incRcvdArpReplies();
checkMacIPAssociation(true, arpp->arp_sha, arpp->arp_spa);
@ -3596,7 +3596,7 @@ static bool mac_search_walker(GenericHashEntry *he, void *user_data, bool *match
if(!m
|| m->idle()
|| (r->sourceMacsOnly && !m->isSourceMac())
|| (r->hostMacsOnly && m->getNumHosts() == 0)
|| (r->hostMacsOnly && (m->getNumHosts() == 0))
|| ((r->devtypeFilter != (u_int8_t)-1) && (m->getDeviceType() != r->devtypeFilter))
|| ((r->locationFilter != (u_int8_t)-1) && (m->locate() != r->locationFilter))
|| (r->dhcpMacsOnly && (!m->isDhcpHost()))