CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-05-13 08:46:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Consolidate cases: arpping is used for both IPv4 and IPv6

Browse source
This commit is contained in:
dmiller 2024-09-27 19:20:40 +00:00
parent f43fdaa1d7
commit 2184f98858
1 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
targets.cc
View file

@ -117,8 +117,10 @@ static void arpping(Target *hostbatch[], int num_hosts) {
if (!targets.empty()) {
if (targets[0]->af() == AF_INET)
ultra_scan(targets, NULL, PING_SCAN_ARP);
else
else {
assert(targets[0]->af() == AF_INET6);
ultra_scan(targets, NULL, PING_SCAN_ND);
}
}
return;
}
@ -518,19 +520,9 @@ static void refresh_hostbatch(HostGroupState *hs, struct addrset *exclude_group,
/* First I'll do the ARP ping if all of the machines in the group are
directly connected over ethernet. I may need the MAC addresses
later anyway. */
if (hs->hostbatch[0]->ifType() == devt_ethernet &&
hs->hostbatch[0]->af() == AF_INET &&
hs->hostbatch[0]->directlyConnected() &&
o.sendpref != PACKET_SEND_IP_STRONG &&
o.implicitARPPing) {
arpping(hs->hostbatch, hs->current_batch_sz);
arpping_done = true;
}
/* No other interface types are supported by ND ping except devt_ethernet
at the moment. */
if (hs->hostbatch[0]->ifType() == devt_ethernet &&
hs->hostbatch[0]->af() == AF_INET6 &&
hs->hostbatch[0]->directlyConnected() &&
o.sendpref != PACKET_SEND_IP_STRONG &&
o.implicitARPPing) {