diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-08-01 09:43:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-01 09:43:41 +0200 |
| commit | f19ca6105e9f74b01e799d02c280eec67696c228 (patch) | |
| tree | a2b530b2c214dd24a022c175474aca4251cea952 /src/resolve | |
| parent | core: check which MACs to use before a new mount ns is created (#6498) (diff) | |
| parent | resolved: add debug message about stub listener (diff) | |
| download | systemd-f19ca6105e9f74b01e799d02c280eec67696c228.tar.xz systemd-f19ca6105e9f74b01e799d02c280eec67696c228.zip | |
Merge pull request #6420 from keszybz/gateway-name
Rename "gateway" to "_gateway" and other resolved changes
Diffstat (limited to 'src/resolve')
| -rw-r--r-- | src/resolve/resolved-dns-stub.c | 8 | ||||
| -rw-r--r-- | src/resolve/resolved-dns-synthesize.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/resolve/resolved-dns-stub.c b/src/resolve/resolved-dns-stub.c index 7afbfedfb0..6f7b5ab9e8 100644 --- a/src/resolve/resolved-dns-stub.c +++ b/src/resolve/resolved-dns-stub.c @@ -543,6 +543,14 @@ int manager_dns_stub_start(Manager *m) { assert(m); + if (m->dns_stub_listener_mode == DNS_STUB_LISTENER_NO) + log_debug("Not creating stub listener."); + else + log_debug("Creating stub listener using %s.", + m->dns_stub_listener_mode == DNS_STUB_LISTENER_UDP ? "UDP" : + m->dns_stub_listener_mode == DNS_STUB_LISTENER_TCP ? "TCP" : + "UDP/TCP"); + if (IN_SET(m->dns_stub_listener_mode, DNS_STUB_LISTENER_YES, DNS_STUB_LISTENER_UDP)) r = manager_dns_stub_udp_fd(m); diff --git a/src/resolve/resolved-dns-synthesize.c b/src/resolve/resolved-dns-synthesize.c index e3003411f7..c454f64049 100644 --- a/src/resolve/resolved-dns-synthesize.c +++ b/src/resolve/resolved-dns-synthesize.c @@ -334,7 +334,7 @@ static int synthesize_gateway_ptr(Manager *m, int af, const union in_addr_union if (n < 0) return n; - return answer_add_addresses_ptr(answer, "gateway", addresses, n, af, address); + return answer_add_addresses_ptr(answer, "_gateway", addresses, n, af, address); } int dns_synthesize_answer( |