PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-02-02 03:29:02 +00:00
Code Issues Projects Releases Wiki Activity

Send up to current capacity of requests at once. Fixes #3280

Browse Source
This commit is contained in:
dmiller
2026-01-22 19:47:54 +00:00
parent 31af4f24e1
commit f5c06c948b
2 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@@ -1,5 +1,8 @@
#Nmap Changelog ($Id$); -*-text-*-
o [GH#3280] Fix a performance regression in reverse-DNS in Nmap 7.98. The fix
for #3130 had caused Nmap to send requests too slowly. [Daniel Miller]
o [GH#3214] Improve compatibility of build process on various platforms and add
multiplatform autobuilds in Github workflow. [Jordan Ritter]

64
nmap_dns.cc
View File

@@ -463,10 +463,41 @@ static void close_dns_servers() {
nsock_loop_quit(dnspool);
}
// Attempts to send a request for this server
static bool server_send(dns_server &serv) {
if (serv.write_busy || serv.reqs_on_wire >= serv.capacity) {
return false;
}
request *tpreq = NULL;
if (!new_reqs.empty()) {
tpreq = new_reqs.front();
assert(tpreq != NULL);
assert(tpreq->targ != NULL);
tpreq->first_server = tpreq->curr_server = &serv;
new_reqs.pop_front();
} else if (!serv.to_process.empty()) {
tpreq = serv.to_process.front();
serv.to_process.pop_front();
} else {
return false;
}
assert(tpreq != NULL);
assert(tpreq->targ != NULL);
assert(tpreq->curr_server == &serv);
if (o.debugging >= TRACE_DEBUG_LEVEL)
log_write(LOG_STDOUT, "mass_dns: TRANSMITTING for <%s> (server <%s>)\n", tpreq->targ->repr(), serv.hostname.c_str());
stat_trans++;
serv.write_busy = 1;
put_dns_packet_on_wire(tpreq);
serv.write_busy = 0;
return true;
}
// Puts as many packets on the line as capacity will allow
static void do_possible_writes() {
std::list<dns_server>::iterator servI;
request *tpreq;
bool all_servs_disconnected = true;
for(servI = servs.begin(); servI != servs.end(); servI++) {
@@ -480,27 +511,9 @@ static void do_possible_writes() {
continue;
break;
}
if (servI->write_busy == 0 && servI->reqs_on_wire < servI->capacity) {
tpreq = NULL;
if (!new_reqs.empty()) {
tpreq = new_reqs.front();
assert(tpreq != NULL);
assert(tpreq->targ != NULL);
tpreq->first_server = tpreq->curr_server = &*servI;
new_reqs.pop_front();
} else if (!servI->to_process.empty()) {
tpreq = servI->to_process.front();
servI->to_process.pop_front();
assert(tpreq != NULL);
assert(tpreq->targ != NULL);
assert(tpreq->curr_server == &*servI);
}
if (tpreq) {
if (o.debugging >= TRACE_DEBUG_LEVEL)
log_write(LOG_STDOUT, "mass_dns: TRANSMITTING for <%s> (server <%s>)\n", tpreq->targ->repr(), servI->hostname.c_str());
stat_trans++;
put_dns_packet_on_wire(tpreq);
for (int i=servI->capacity - servI->reqs_on_wire; i > 0; i--) {
if (!server_send(*servI)) {
break;
}
}
}
@@ -515,7 +528,7 @@ static void write_evt_handler(nsock_pool nsp, nsock_event evt, void *req_v) {
request *req = (request *) req_v;
if (nse_status(evt) == NSE_STATUS_SUCCESS) {
do_possible_writes();
server_send(*req->curr_server);
}
else {
if (o.debugging) {
@@ -526,10 +539,6 @@ static void write_evt_handler(nsock_pool nsp, nsock_event evt, void *req_v) {
req->curr_server->to_process.push_front(req);
}
// Avoid runaway recursion: when we call do_possible_writes above,
// make sure we still are "busy"
req->curr_server->write_busy = 0;
if (req->status == request::DONE) {
delete req;
}
@@ -556,7 +565,6 @@ static void put_dns_packet_on_wire(request *req) {
dns_server *srv = req->curr_server;
info record;
srv->write_busy = 1;
srv->reqs_on_wire++;
DNS::Request &reqt = *req->targ;