From b6c5d46b23a28b5b03601ee1e8162b1bc7c7be25 Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Tue, 19 Jan 2016 13:58:55 +0100 Subject: resolved: fix mDNS IPv6 multicast address Fixes #2366 --- src/resolve/resolved-dns-packet.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/resolve/resolved-dns-packet.h b/src/resolve/resolved-dns-packet.h index 6821be73e4..c53431576b 100644 --- a/src/resolve/resolved-dns-packet.h +++ b/src/resolve/resolved-dns-packet.h @@ -247,7 +247,7 @@ DnsProtocol dns_protocol_from_string(const char *s) _pure_; #define LLMNR_MULTICAST_IPV6_ADDRESS ((struct in6_addr) { .s6_addr = { 0xFF, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03 } }) #define MDNS_MULTICAST_IPV4_ADDRESS ((struct in_addr) { .s_addr = htobe32(224U << 24 | 251U) }) -#define MDNS_MULTICAST_IPV6_ADDRESS ((struct in6_addr) { .s6_addr = { 0xFF, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xfb } }) +#define MDNS_MULTICAST_IPV6_ADDRESS ((struct in6_addr) { .s6_addr = { 0xFF, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb } }) static inline uint64_t SD_RESOLVED_FLAGS_MAKE(DnsProtocol protocol, int family, bool authenticated) { uint64_t f; -- cgit v1.2.3-54-g00ecf From 60402bdc52a7569f9f6fd00486e34796c4f6f55d Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Tue, 19 Jan 2016 14:05:01 +0100 Subject: resolved: remove configuration knobs for mDNS until it's ready These bits were intenionally left out while mDNS is under development. Remove the exposed knobs and man page entries again until this is settled. --- man/resolved.conf.xml | 16 ---------------- src/resolve/resolved-gperf.gperf | 1 - src/resolve/resolved.conf.in | 1 - 3 files changed, 18 deletions(-) (limited to 'src') diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml index 5da2d5488e..3ab7fc4a11 100644 --- a/man/resolved.conf.xml +++ b/man/resolved.conf.xml @@ -124,22 +124,6 @@ global setting is on. - - MulticastDNS= - Takes a boolean argument or - resolve. Controls Multicast DNS support - (RFC - 6762) on the local host. If true, enables full - Multicast DNS responder and resolver support. If false, - disables both. If set to resolve, only - resolution support is enabled, but responding is - disabled. Note that - systemd-networkd.service8 - also maintains per-interface Multicast DNS settings. Multicast - DNS will be enabled on an interface only if the per-interface - and the global setting is on. - - DNSSEC= Takes a boolean argument or diff --git a/src/resolve/resolved-gperf.gperf b/src/resolve/resolved-gperf.gperf index c5ad04afd7..82f26215df 100644 --- a/src/resolve/resolved-gperf.gperf +++ b/src/resolve/resolved-gperf.gperf @@ -18,5 +18,4 @@ Resolve.DNS, config_parse_dns_servers, DNS_SERVER_SYSTEM, 0 Resolve.FallbackDNS, config_parse_dns_servers, DNS_SERVER_FALLBACK, 0 Resolve.Domains, config_parse_search_domains, 0, 0 Resolve.LLMNR, config_parse_resolve_support, 0, offsetof(Manager, llmnr_support) -Resolve.MulticastDNS, config_parse_resolve_support, 0, offsetof(Manager, mdns_support) Resolve.DNSSEC, config_parse_dnssec_mode, 0, offsetof(Manager, dnssec_mode) diff --git a/src/resolve/resolved.conf.in b/src/resolve/resolved.conf.in index 0ba572d113..efc9c6733a 100644 --- a/src/resolve/resolved.conf.in +++ b/src/resolve/resolved.conf.in @@ -16,5 +16,4 @@ #FallbackDNS=@DNS_SERVERS@ #Domains= #LLMNR=yes -#MulticastDNS=no #DNSSEC=no -- cgit v1.2.3-54-g00ecf