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

Reuse DNS query ID for retransmissions

Browse Source
This commit is contained in:
dmiller
2024-05-13 14:31:33 +00:00
parent 5c46b3b9f7
commit e1a2577ffd
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
nmap_dns.cc
View File

@@ -493,7 +493,6 @@ static void put_dns_packet_on_wire(request *req) {
struct timeval now, timeout; struct timeval now, timeout;
req->id = DNS::Factory::progressiveId;
req->curr_server->write_busy = 1; req->curr_server->write_busy = 1;
req->curr_server->reqs_on_wire++; req->curr_server->reqs_on_wire++;
DNS::Request &reqt = *req->targ; DNS::Request &reqt = *req->targ;
@@ -502,11 +501,11 @@ static void put_dns_packet_on_wire(request *req) {
case DNS::ANY: case DNS::ANY:
case DNS::A: case DNS::A:
case DNS::AAAA: case DNS::AAAA:
plen = DNS::Factory::buildSimpleRequest(reqt.name, wire_type(reqt.type), packet, maxlen); plen = DNS::Factory::buildSimpleRequest(req->id, reqt.name, wire_type(reqt.type), packet, maxlen);
break; break;
case DNS::PTR: case DNS::PTR:
assert(reqt.ssv.size() > 0); assert(reqt.ssv.size() > 0);
plen = DNS::Factory::buildReverseRequest(reqt.ssv.front(), packet, maxlen); plen = DNS::Factory::buildReverseRequest(req->id, reqt.ssv.front(), packet, maxlen);
break; break;
default: default:
break; break;
@@ -1185,6 +1184,7 @@ static void nmap_mass_dns_core(DNS::Request *requests, int num_requests) {
tpreq->tries = 0; tpreq->tries = 0;
tpreq->servers_tried = 0; tpreq->servers_tried = 0;
tpreq->alt_req = false; tpreq->alt_req = false;
tpreq->id = DNS::Factory::progressiveId++;
new_reqs.push_back(tpreq); new_reqs.push_back(tpreq);
total_reqs++; total_reqs++;
@@ -1198,6 +1198,7 @@ static void nmap_mass_dns_core(DNS::Request *requests, int num_requests) {
*tpreq_alt = *tpreq; *tpreq_alt = *tpreq;
tpreq_alt->targ = req_aaaa; tpreq_alt->targ = req_aaaa;
tpreq_alt->alt_req = true; tpreq_alt->alt_req = true;
tpreq_alt->id = DNS::Factory::progressiveId++;
new_reqs.push_back(tpreq_alt); new_reqs.push_back(tpreq_alt);
total_reqs++; total_reqs++;
} }
@@ -1513,10 +1514,10 @@ bool DNS::Factory::ptrToIp(const std::string &ptr, sockaddr_storage &ip)
return true; return true;
} }
size_t DNS::Factory::buildSimpleRequest(const std::string &name, RECORD_TYPE rt, u8 *buf, size_t maxlen) size_t DNS::Factory::buildSimpleRequest(u16 id, const std::string &name, RECORD_TYPE rt, u8 *buf, size_t maxlen)
{ {
size_t ret=0 , tmp=0; size_t ret=0 , tmp=0;
DNS_CHECK_ACCUMLATE(ret, tmp, putUnsignedShort(progressiveId++, buf, ID, maxlen)); // Postincrement inmportant here DNS_CHECK_ACCUMLATE(ret, tmp, putUnsignedShort(id, buf, ID, maxlen));
DNS_CHECK_ACCUMLATE(ret, tmp, putUnsignedShort(OP_STANDARD_QUERY | RECURSION_DESIRED, buf, FLAGS_OFFSET, maxlen)); DNS_CHECK_ACCUMLATE(ret, tmp, putUnsignedShort(OP_STANDARD_QUERY | RECURSION_DESIRED, buf, FLAGS_OFFSET, maxlen));
DNS_CHECK_ACCUMLATE(ret, tmp, putUnsignedShort(1, buf, QDCOUNT, maxlen)); DNS_CHECK_ACCUMLATE(ret, tmp, putUnsignedShort(1, buf, QDCOUNT, maxlen));
DNS_CHECK_ACCUMLATE(ret, tmp, putUnsignedShort(0, buf, ANCOUNT, maxlen)); DNS_CHECK_ACCUMLATE(ret, tmp, putUnsignedShort(0, buf, ANCOUNT, maxlen));
@@ -1529,11 +1530,11 @@ size_t DNS::Factory::buildSimpleRequest(const std::string &name, RECORD_TYPE rt,
return ret; return ret;
} }
size_t DNS::Factory::buildReverseRequest(const sockaddr_storage &ip, u8 *buf, size_t maxlen) size_t DNS::Factory::buildReverseRequest(u16 id, const sockaddr_storage &ip, u8 *buf, size_t maxlen)
{ {
std::string name; std::string name;
if(ipToPtr(ip,name)) if(ipToPtr(ip,name))
return buildSimpleRequest(name, PTR, buf, maxlen); return buildSimpleRequest(id, name, PTR, buf, maxlen);
return 0; return 0;
} }

4
nmap_dns.h
View File

@@ -148,8 +148,8 @@ public:
static u16 progressiveId; static u16 progressiveId;
static bool ipToPtr(const sockaddr_storage &ip, std::string &ptr); static bool ipToPtr(const sockaddr_storage &ip, std::string &ptr);
static bool ptrToIp(const std::string &ptr, sockaddr_storage &ip); static bool ptrToIp(const std::string &ptr, sockaddr_storage &ip);
static size_t buildSimpleRequest(const std::string &name, RECORD_TYPE rt, u8 *buf, size_t maxlen); static size_t buildSimpleRequest(u16 id, const std::string &name, RECORD_TYPE rt, u8 *buf, size_t maxlen);
static size_t buildReverseRequest(const sockaddr_storage &ip, u8 *buf, size_t maxlen); static size_t buildReverseRequest(u16 id, const sockaddr_storage &ip, u8 *buf, size_t maxlen);
static size_t putUnsignedShort(u16 num, u8 *buf, size_t offset, size_t maxlen); static size_t putUnsignedShort(u16 num, u8 *buf, size_t offset, size_t maxlen);
static size_t putDomainName(const std::string &name, u8 *buf, size_t offset, size_t maxlen); static size_t putDomainName(const std::string &name, u8 *buf, size_t offset, size_t maxlen);
static size_t parseUnsignedShort(u16 &num, const u8 *buf, size_t offset, size_t maxlen); static size_t parseUnsignedShort(u16 &num, const u8 *buf, size_t offset, size_t maxlen);