aboutgitcodebugslistschat
path: root/dhcpv6.c
diff options
context:
space:
mode:
authorStefano Brivio <sbrivio@redhat.com>2022-11-10 20:30:03 +0100
committerStefano Brivio <sbrivio@redhat.com>2022-11-16 15:09:31 +0100
commit3a2afde87dd15e9e9716cadaedce37de47a05d91 (patch)
tree340619abfaea041e3c0c91975615f2a996d92f22 /dhcpv6.c
parent4129764ecaebf05a33e22d8d95bb3d8deaa14c14 (diff)
downloadpasst-3a2afde87dd15e9e9716cadaedce37de47a05d91.tar
passt-3a2afde87dd15e9e9716cadaedce37de47a05d91.tar.gz
passt-3a2afde87dd15e9e9716cadaedce37de47a05d91.tar.bz2
passt-3a2afde87dd15e9e9716cadaedce37de47a05d91.tar.lz
passt-3a2afde87dd15e9e9716cadaedce37de47a05d91.tar.xz
passt-3a2afde87dd15e9e9716cadaedce37de47a05d91.tar.zst
passt-3a2afde87dd15e9e9716cadaedce37de47a05d91.zip
conf, udp: Drop mostly duplicated dns_send arrays, rename related fields
Given that we use just the first valid DNS resolver address configured, or read from resolv.conf(5) on the host, to forward DNS queries to, in case --dns-forward is used, we don't need to duplicate dns[] to dns_send[]: - rename dns_send[] back to dns[]: those are the resolvers we advertise to the guest/container - for forwarding purposes, instead of dns[], use a single field (for each protocol version): dns_host - and rename dns_fwd to dns_match, so that it's clear this is the address we are matching DNS queries against, to decide if they need to be forwarded Suggested-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Stefano Brivio <sbrivio@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'dhcpv6.c')
-rw-r--r--dhcpv6.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/dhcpv6.c b/dhcpv6.c
index 67262e6..e763aed 100644
--- a/dhcpv6.c
+++ b/dhcpv6.c
@@ -379,7 +379,7 @@ static size_t dhcpv6_dns_fill(const struct ctx *c, char *buf, int offset)
if (c->no_dhcp_dns)
goto search;
- for (i = 0; !IN6_IS_ADDR_UNSPECIFIED(&c->ip6.dns_send[i]); i++) {
+ for (i = 0; !IN6_IS_ADDR_UNSPECIFIED(&c->ip6.dns[i]); i++) {
if (!i) {
srv = (struct opt_dns_servers *)(buf + offset);
offset += sizeof(struct opt_hdr);
@@ -387,8 +387,7 @@ static size_t dhcpv6_dns_fill(const struct ctx *c, char *buf, int offset)
srv->hdr.l = 0;
}
- memcpy(&srv->addr[i], &c->ip6.dns_send[i],
- sizeof(srv->addr[i]));
+ memcpy(&srv->addr[i], &c->ip6.dns[i], sizeof(srv->addr[i]));
srv->hdr.l += sizeof(srv->addr[i]);
offset += sizeof(srv->addr[i]);
}