From 5650f35c6d094a6bf79c3c8ad8a36de73d0a8ef1 Mon Sep 17 00:00:00 2001 From: dmiller Date: Fri, 14 Aug 2026 19:04:39 +0000 Subject: [PATCH] Use random, not progressive TXID for DNS requests --- libnetutil/massdns.cc | 8 ++------ nbase/nbase.h | 1 + nbase/nbase_rnd.c | 47 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/libnetutil/massdns.cc b/libnetutil/massdns.cc index 58a35f95c..0f16cd942 100644 --- a/libnetutil/massdns.cc +++ b/libnetutil/massdns.cc @@ -622,10 +622,6 @@ DNS::Stats DNS::Resolver::getStats() const return impl->stat; } -//------------------- Globals --------------------- - -u16 DNS::Factory::progressiveId = get_random_u16(); - //------------------- Prototypes and macros --------------------- #define ACTION_FINISHED 0 @@ -693,7 +689,7 @@ void DNS::ResolverImpl::add_request(DNS::Request &reqt) tpreq->tries = 0; tpreq->servers_tried = 0; tpreq->alt_req = false; - tpreq->id = DNS::Factory::progressiveId++; + tpreq->id = get_random_unique_u16(); new_reqs.push_back(tpreq); stat.actual++; @@ -711,7 +707,7 @@ void DNS::ResolverImpl::add_request(DNS::Request &reqt) *tpreq_alt = *tpreq; tpreq_alt->targ = req_aaaa; tpreq_alt->alt_req = true; - tpreq_alt->id = DNS::Factory::progressiveId++; + tpreq_alt->id = get_random_unique_u16(); new_reqs.push_back(tpreq_alt); stat.actual++; } diff --git a/nbase/nbase.h b/nbase/nbase.h index ed0748f16..efb6b4fad 100644 --- a/nbase/nbase.h +++ b/nbase/nbase.h @@ -521,6 +521,7 @@ u32 get_random_u32(); u16 get_random_u16(); u8 get_random_u8(); u32 get_random_unique_u32(); +u16 get_random_unique_u16(); /* Create a new socket inheritable by subprocesses. On non-Windows systems it's just a normal socket. */ diff --git a/nbase/nbase_rnd.c b/nbase/nbase_rnd.c index 0d25a0563..bb3acf8ca 100644 --- a/nbase/nbase_rnd.c +++ b/nbase/nbase_rnd.c @@ -359,3 +359,50 @@ u32 get_random_unique_u32() { return output; } + +/* The same, but for 16-bit numbers */ +u16 get_random_unique_u16() { + static u16 state, tweak1, tweak2, tweak3; + static int state_init = 0; + u16 output; + + /* Initialize if we need to */ + if (!state_init) { + get_random_bytes(&state, sizeof(state)); + get_random_bytes(&tweak1, sizeof(tweak1)); + get_random_bytes(&tweak2, sizeof(tweak2)); + get_random_bytes(&tweak3, sizeof(tweak3)); + + state_init = 1; + } + + /* https://oeis.org/A383940 + */ + state = (((state * 25173) & 0xFFFF) + 13849) & 0xFFFF; + + output = state; + + /* Then rotate and XOR */ + output = ((output << 7) | (output >> (16 - 7))); + output = output ^ tweak1; /* This is the round key */ + + /* End round 1, start round 2 */ + + /* Then put it through an affine transform */ + output = (((output * 4321) & 0xFFFF) + 12345) & 0xFFFF; + + /* Then rotate and XOR some more */ + output = ((output << 11) | (output >> (16 - 11))); + output = output ^ tweak2; + + /* End round 2, start round 3 */ + + /* Then put it through another affine transform (Quick C/C++ constants) */ + output = (((output * 31337) & 0xFFFF) + 1997) & 0xFFFF; + + /* Then rotate and XOR some more */ + output = ((output << 5) | (output >> (16 - 5))); + output = output ^ tweak3; + + return output; +}