1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 04:31:29 +00:00

Improve flow in nmap_mass_dns_core()

This commit is contained in:
dmiller
2025-05-09 22:47:05 +00:00
parent 84cf8b5840
commit cec0cc6f99

View File

@@ -1201,11 +1201,13 @@ static void nmap_mass_dns_core(DNS::Request *requests, int num_requests) {
// If necessary, set up the dns server list
init_servs();
if (servs.size() == 0 && firstrun) error("mass_dns: warning: Unable to "
"determine any DNS servers. Reverse"
" DNS is disabled. Try using "
"--system-dns or specify valid "
"servers with --dns-servers");
if (servs.size() == 0) {
if (firstrun)
error("mass_dns: warning: Unable to determine any DNS servers. "
"Reverse DNS is disabled. Try using --system-dns or "
"specify valid servers with --dns-servers");
return;
}
// If necessary, read /etc/hosts and put entries into the hashtable
@@ -1235,7 +1237,6 @@ static void nmap_mass_dns_core(DNS::Request *requests, int num_requests) {
tpreq->id = DNS::Factory::progressiveId++;
new_reqs.push_back(tpreq);
total_reqs++;
if (reqt.type == DNS::ANY) {
DNS::Request *req_aaaa = new DNS::Request;
@@ -1248,13 +1249,13 @@ static void nmap_mass_dns_core(DNS::Request *requests, int num_requests) {
tpreq_alt->alt_req = true;
tpreq_alt->id = DNS::Factory::progressiveId++;
new_reqs.push_back(tpreq_alt);
total_reqs++;
}
stat_actual++;
}
if (total_reqs == 0 || servs.size() == 0) return;
total_reqs = new_reqs.size();
if (total_reqs > 0) {
// And finally, do it!
@@ -1306,11 +1307,12 @@ static void nmap_mass_dns_core(DNS::Request *requests, int num_requests) {
close_dns_servers();
nsock_pool_delete(dnspool);
if (deferred_reqs.size() && o.debugging)
log_write(LOG_STDOUT, "Performing system-dns for %d domain names that were deferred\n", (int) deferred_reqs.size());
}
if (deferred_reqs.size()) {
if (o.debugging)
log_write(LOG_STDOUT, "Performing system-dns for %d domain names that were deferred\n", (int) deferred_reqs.size());
Snprintf(spmobuf, sizeof(spmobuf), "System DNS resolution of %u host%s.", (unsigned) deferred_reqs.size(), deferred_reqs.size()-1 ? "s" : "");
SPM = new ScanProgressMeter(spmobuf);