PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 04:31:29 +00:00
Code Issues Projects Releases Wiki Activity

Generalize nmap_mass_rdns to support more than just Targets and PTR requests

Browse Source
This commit is contained in:
dmiller
2024-04-18 19:16:23 +00:00
parent 22ee545f7e
commit e8c7e7ba01
3 changed files with 170 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
traceroute.cc
View File

@@ -1333,7 +1333,6 @@ void TracerouteState::resolve_hops() {
std::set<sockaddr_storage, lt_sockaddr_storage>::iterator addr_iter;
std::vector<HostState *>::iterator host_iter;
std::map<sockaddr_storage, const char *, lt_sockaddr_storage> name_map;
Target **targets;
Hop *hop;
int i, n;
@@ -1347,43 +1346,32 @@ void TracerouteState::resolve_hops() {
}
}
n = addrs.size();
/* Second, make an array of pointer to Target to suit the interface of
nmap_mass_rdns. */
targets = (Target **) safe_malloc(sizeof(*targets) * n);
i = 0;
addr_iter = addrs.begin();
while (i < n) {
targets[i] = new Target();
targets[i]->setTargetSockAddr(&*addr_iter, sizeof(*addr_iter));
targets[i]->flags = HOST_UP;
i++;
addr_iter++;
/* Second, make an array of pointer to DNS::Request to suit the interface of
nmap_mass_dns. */
DNS::Request *requests = new DNS::Request[n];
for (i = 0, addr_iter = addrs.begin(); i < n; i++, addr_iter++) {
memcpy(&requests[i].ss, &*addr_iter, sizeof(*addr_iter));
requests[i].type = DNS::PTR;
}
nmap_mass_rdns(targets, n);
nmap_mass_dns(requests, n);
/* Third, make a map from addresses to names for easy lookup. */
for (i = 0; i < n; i++) {
struct sockaddr_storage ss;
size_t ss_len;
const char *hostname = targets[i]->HostName();
if (*hostname == '\0')
hostname = NULL;
ss_len = sizeof(ss);
targets[i]->TargetSockAddr(&ss, &ss_len);
name_map[ss] = hostname;
std::string &hostname = requests[i].name;
if (!hostname.empty())
name_map[requests[i].ss] = hostname.c_str();
}
/* Finally, copy the names into the hops. */
for (host_iter = hosts.begin(); host_iter != hosts.end(); host_iter++) {
for (hop = (*host_iter)->hops; hop != NULL; hop = hop->parent) {
if (hop->addr.ss_family != AF_UNSPEC) {
const char *hostname = name_map[hop->addr];
if (hostname != NULL)
hop->hostname = hostname;
std::map<sockaddr_storage, const char *, lt_sockaddr_storage>::const_iterator it;
it = name_map.find(hop->addr);
if (it != name_map.end())
hop->hostname = it->second;
}
}
}
for (i = 0; i < n; i++)
delete targets[i];
free(targets);
delete [] requests;
}
void TracerouteState::transfer_hops() {