dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-09 09:32:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

machined: refresh resolve hook addresses per machine

Browse Source 
Track which machine the cached address list belongs to and refresh it
when ResolveRecord() advances to another machine. This keeps A/AAAA
reuse for the same machine while avoiding mixed name/address records.

Reproducer: register two machines with private addresses 10.88.1.1
and 10.88.2.1, then call io.systemd.Resolve.Hook.ResolveRecord
with both A questions in one request.

Before: the answer for the second machine used its own name but
reused the first machine's address, e.g. resolve-bug-m2 returned
10.88.1.1 instead of 10.88.2.1.

Follow-up: 3cd929f837
This commit is contained in:
dongshengyuan
2026-07-17 15:55:57 +08:00
committed by Yu Watanabe
parent 48b1109b0c
commit 8a5c8b751b
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/machine/machined-resolve-hook.c
View File

@@ -125,6 +125,7 @@ int vl_method_resolve_record(
_cleanup_(dns_answer_unrefp) DnsAnswer *answer = NULL;
_cleanup_free_ struct local_address *addresses = NULL;
Machine *addresses_machine = NULL;
bool found = false, nxdomain = false;
int n_addresses = -1;
@@ -138,10 +139,13 @@ int vl_method_resolve_record(
if (!dns_resource_key_is_address(key))
continue;
if (n_addresses < 0) {
if (addresses_machine != machine) {
addresses = mfree(addresses);
n_addresses = machine_get_addresses(machine, &addresses);
if (n_addresses < 0)
return n_addresses;
addresses_machine = machine;
}
int family = dns_type_to_af(key->type);

6
test/units/TEST-13-NSPAWN.nss-mymachines.sh
View File

@@ -148,4 +148,10 @@ for i in {100..120}; do
run_and_grep "10\.2\.0\.$i" resolvectl query nss-mymachines-manyips
done
hook_question='{"question":[{"key":{"class":1,"type":1,"name":"nss-mymachines-singleip"}},{"key":{"class":1,"type":1,"name":"nss-mymachines-manyips"}}]}'
hook_answer="$(varlinkctl --json=short call /run/systemd/resolve.hook/io.systemd.Machine io.systemd.Resolve.Hook.ResolveRecord "$hook_question")"
jq -e '.answer[] | select(.rr.key.name == "nss-mymachines-singleip" and .rr.address == [10, 1, 0, 2])' <<<"$hook_answer"
jq -e '.answer[] | select(.rr.key.name == "nss-mymachines-manyips" and .rr.address == [10, 2, 0, 2])' <<<"$hook_answer"
(! jq -e '.answer[] | select(.rr.key.name == "nss-mymachines-manyips" and .rr.address == [10, 1, 0, 2])' <<<"$hook_answer")
machinectl stop nss-mymachines-{noip,singleip,manyips}