SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #23582 from bnf/dns-proxy-stub-ifindex

Browse Source 
resolved: define source address for proxy-only stub replies
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2022-06-02 16:34:55 +02:00
committed by GitHub
parent 39a742888b de777ffae8
commit d7cf4ba6f3
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resolve/resolved-dns-stub.c
+12 -4
View File
@@ -528,18 +528,26 @@ static int dns_stub_send(
if (s)
r = dns_stream_write_packet(s, reply);
else {
int fd;
int fd, ifindex;
fd = find_socket_fd(m, l, p->family, &p->sender, SOCK_DGRAM);
fd = find_socket_fd(m, l, p->family, &p->destination, SOCK_DGRAM);
if (fd < 0)
return fd;
if (address_is_proxy(p->family, &p->destination))
/* Force loopback iface if this is the loopback proxy stub
* and ifindex was normalized to 0 by manager_recv(). */
ifindex = p->ifindex ?: LOOPBACK_IFINDEX;
else
/* Force loopback iface if this is the main listener stub. */
ifindex = l ? p->ifindex : LOOPBACK_IFINDEX;
/* Note that it is essential here that we explicitly choose the source IP address for this
* packet. This is because otherwise the kernel will choose it automatically based on the
* routing table and will thus pick 127.0.0.1 rather than 127.0.0.53. */
* routing table and will thus pick 127.0.0.1 rather than 127.0.0.53/54. */
r = manager_send(m,
fd,
l || address_is_proxy(p->family, &p->destination) ? p->ifindex : LOOPBACK_IFINDEX, /* force loopback iface if this is the main listener stub */
ifindex,
p->family, &p->sender, p->sender_port, &p->destination,
reply);
}