aboutgitcodebugslistschat
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf.c49
-rw-r--r--dhcp.c4
-rw-r--r--dhcpv6.c5
-rw-r--r--ndp.c6
-rw-r--r--passt.h8
5 files changed, 49 insertions, 23 deletions
diff --git a/conf.c b/conf.c
index b51effc..bfecdff 100644
--- a/conf.c
+++ b/conf.c
@@ -355,10 +355,12 @@ overlap:
*/
static void get_dns(struct ctx *c)
{
+ struct in6_addr *dns6_send = &c->ip6.dns_send[0];
+ struct in_addr *dns4_send = &c->ip4.dns_send[0];
int dns4_set, dns6_set, dnss_set, dns_set, fd;
struct in6_addr *dns6 = &c->ip6.dns[0];
- struct fqdn *s = c->dns_search;
struct in_addr *dns4 = &c->ip4.dns[0];
+ struct fqdn *s = c->dns_search;
struct lineread resolvconf;
int line_len;
char *line, *p, *end;
@@ -388,31 +390,47 @@ static void get_dns(struct ctx *c)
if (!dns4_set &&
dns4 - &c->ip4.dns[0] < ARRAY_SIZE(c->ip4.dns) - 1 &&
inet_pton(AF_INET, p + 1, dns4)) {
- /* We can only access local addresses via the gw redirect */
+ /* Guest or container can only access local
+ * addresses via local redirect
+ */
if (IN4_IS_ADDR_LOOPBACK(dns4)) {
- if (c->no_map_gw) {
- dns4->s_addr = htonl(INADDR_ANY);
- continue;
+ if (!c->no_map_gw) {
+ *dns4_send = c->ip4.gw;
+ dns4_send++;
}
- *dns4 = c->ip4.gw;
+ } else {
+ *dns4_send = *dns4;
+ dns4_send++;
}
+
dns4++;
+
dns4->s_addr = htonl(INADDR_ANY);
+ dns4_send->s_addr = htonl(INADDR_ANY);
}
if (!dns6_set &&
dns6 - &c->ip6.dns[0] < ARRAY_SIZE(c->ip6.dns) - 1 &&
inet_pton(AF_INET6, p + 1, dns6)) {
- /* We can only access local addresses via the gw redirect */
+ /* Guest or container can only access local
+ * addresses via local redirect
+ */
if (IN6_IS_ADDR_LOOPBACK(dns6)) {
- if (c->no_map_gw) {
- memset(dns6, 0, sizeof(*dns6));
- continue;
+ if (!c->no_map_gw) {
+ memcpy(dns6_send, &c->ip6.gw,
+ sizeof(*dns6_send));
+ dns6_send++;
}
- memcpy(dns6, &c->ip6.gw, sizeof(*dns6));
+ } else {
+ memcpy(dns6_send, dns6,
+ sizeof(*dns6_send));
+ dns6_send++;
}
+
dns6++;
+
memset(dns6, 0, sizeof(*dns6));
+ memset(dns6_send, 0, sizeof(*dns6_send));
}
} else if (!dnss_set && strstr(line, "search ") == line &&
s == c->dns_search) {
@@ -876,10 +894,12 @@ static void conf_print(const struct ctx *c)
inet_ntop(AF_INET, &c->ip4.gw, buf4, sizeof(buf4)));
}
- for (i = 0; !IN4_IS_ADDR_UNSPECIFIED(&c->ip4.dns[i]); i++) {
+ for (i = 0; !IN4_IS_ADDR_UNSPECIFIED(&c->ip4.dns_send[i]);
+ i++) {
if (!i)
info("DNS:");
- inet_ntop(AF_INET, &c->ip4.dns[i], buf4, sizeof(buf4));
+ inet_ntop(AF_INET, &c->ip4.dns_send[i], buf4,
+ sizeof(buf4));
info(" %s", buf4);
}
@@ -910,7 +930,8 @@ static void conf_print(const struct ctx *c)
inet_ntop(AF_INET6, &c->ip6.addr_ll, buf6, sizeof(buf6)));
dns6:
- for (i = 0; !IN6_IS_ADDR_UNSPECIFIED(&c->ip6.dns[i]); i++) {
+ for (i = 0; !IN6_IS_ADDR_UNSPECIFIED(&c->ip6.dns_send[i]);
+ i++) {
if (!i)
info("DNS:");
inet_ntop(AF_INET6, &c->ip6.dns[i], buf6, sizeof(buf6));
diff --git a/dhcp.c b/dhcp.c
index 0c6f712..12da47a 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -359,9 +359,9 @@ int dhcp(const struct ctx *c, const struct pool *p)
}
for (i = 0, opts[6].slen = 0;
- !c->no_dhcp_dns && !IN4_IS_ADDR_UNSPECIFIED(&c->ip4.dns[i]);
+ !c->no_dhcp_dns && !IN4_IS_ADDR_UNSPECIFIED(&c->ip4.dns_send[i]);
i++) {
- ((struct in_addr *)opts[6].s)[i] = c->ip4.dns[i];
+ ((struct in_addr *)opts[6].s)[i] = c->ip4.dns_send[i];
opts[6].slen += sizeof(uint32_t);
}
diff --git a/dhcpv6.c b/dhcpv6.c
index e763aed..67262e6 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[i]); i++) {
+ for (i = 0; !IN6_IS_ADDR_UNSPECIFIED(&c->ip6.dns_send[i]); i++) {
if (!i) {
srv = (struct opt_dns_servers *)(buf + offset);
offset += sizeof(struct opt_hdr);
@@ -387,7 +387,8 @@ 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[i], sizeof(srv->addr[i]));
+ memcpy(&srv->addr[i], &c->ip6.dns_send[i],
+ sizeof(srv->addr[i]));
srv->hdr.l += sizeof(srv->addr[i]);
offset += sizeof(srv->addr[i]);
}
diff --git a/ndp.c b/ndp.c
index 80e1f19..6d79477 100644
--- a/ndp.c
+++ b/ndp.c
@@ -121,7 +121,7 @@ int ndp(struct ctx *c, const struct icmp6hdr *ih, const struct in6_addr *saddr)
if (c->no_dhcp_dns)
goto dns_done;
- for (n = 0; !IN6_IS_ADDR_UNSPECIFIED(&c->ip6.dns[n]); n++);
+ for (n = 0; !IN6_IS_ADDR_UNSPECIFIED(&c->ip6.dns_send[n]); n++);
if (n) {
*p++ = 25; /* RDNSS */
*p++ = 1 + 2 * n; /* length */
@@ -130,8 +130,8 @@ int ndp(struct ctx *c, const struct icmp6hdr *ih, const struct in6_addr *saddr)
p += 4;
for (i = 0; i < n; i++) {
- memcpy(p, &c->ip6.dns[i], 16); /* address */
- p += 16;
+ memcpy(p, &c->ip6.dns_send[i], 16);
+ p += 16; /* address */
}
for (n = 0; *c->dns_search[n].n; n++)
diff --git a/passt.h b/passt.h
index 1a8d74b..e93eea8 100644
--- a/passt.h
+++ b/passt.h
@@ -101,7 +101,8 @@ enum passt_modes {
* @addr_seen: Latest IPv4 address seen as source from tap
* @prefixlen: IPv4 prefix length (netmask)
* @gw: Default IPv4 gateway, network order
- * @dns: IPv4 DNS addresses, zero-terminated, network order
+ * @dns: Host IPv4 DNS addresses, zero-terminated, network order
+ * @dns_send: Offered IPv4 DNS, zero-terminated, network order
* @dns_fwd: Address forwarded (UDP) to first IPv4 DNS, network order
*/
struct ip4_ctx {
@@ -110,6 +111,7 @@ struct ip4_ctx {
int prefix_len;
struct in_addr gw;
struct in_addr dns[MAXNS + 1];
+ struct in_addr dns_send[MAXNS + 1];
struct in_addr dns_fwd;
};
@@ -120,7 +122,8 @@ struct ip4_ctx {
* @addr_seen: Latest IPv6 global/site address seen as source from tap
* @addr_ll_seen: Latest IPv6 link-local address seen as source from tap
* @gw: Default IPv6 gateway
- * @dns: IPv6 DNS addresses, zero-terminated
+ * @dns: Host IPv6 DNS addresses, zero-terminated
+ * @dns_send: Offered IPv6 DNS addresses, zero-terminated
* @dns_fwd: Address forwarded (UDP) to first IPv6 DNS, network order
*/
struct ip6_ctx {
@@ -130,6 +133,7 @@ struct ip6_ctx {
struct in6_addr addr_ll_seen;
struct in6_addr gw;
struct in6_addr dns[MAXNS + 1];
+ struct in6_addr dns_send[MAXNS + 1];
struct in6_addr dns_fwd;
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 07:18:35 +0000