From 7a12328735af2bca53dbbb1c85a14ba5cf1e084c Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 14 Dec 2022 23:50:08 +0900 Subject: timesync: downgrade log message about unsupported address family As this is mostly not user's fault. --- src/timesync/timesyncd-manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/timesync') diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c index 5b076157aa..15a18217f7 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/timesync/timesyncd-manager.c @@ -752,7 +752,7 @@ static int manager_resolve_handler(sd_resolve_query *q, int ret, const struct ad assert(ai->ai_addrlen >= offsetof(struct sockaddr, sa_data)); if (!IN_SET(ai->ai_addr->sa_family, AF_INET, AF_INET6)) { - log_warning("Unsuitable address protocol for %s", m->current_server_name->string); + log_debug("Ignoring unsuitable address protocol for %s.", m->current_server_name->string); continue; } -- cgit v1.2.1 From 713e6e631d4071c7d9287d5d343bebb69a58b29c Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 14 Dec 2022 23:54:11 +0900 Subject: timesync: ignore IPv6 addresses when the kernel does not support IPv6 Fixes #25728. --- src/timesync/timesyncd-manager.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/timesync') diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c index 15a18217f7..c05a832316 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/timesync/timesyncd-manager.c @@ -806,11 +806,6 @@ int manager_connect(Manager *m) { if (m->current_server_address && m->current_server_address->addresses_next) manager_set_server_address(m, m->current_server_address->addresses_next); else { - static const struct addrinfo hints = { - .ai_flags = AI_NUMERICSERV|AI_ADDRCONFIG, - .ai_socktype = SOCK_DGRAM, - }; - /* Hmm, we are through all addresses, let's look for the next host instead */ if (m->current_server_name && m->current_server_name->names_next) manager_set_server_name(m, m->current_server_name->names_next); @@ -878,6 +873,12 @@ int manager_connect(Manager *m) { log_debug("Resolving %s...", m->current_server_name->string); + struct addrinfo hints = { + .ai_flags = AI_NUMERICSERV|AI_ADDRCONFIG, + .ai_socktype = SOCK_DGRAM, + .ai_family = socket_ipv6_is_supported() ? AF_UNSPEC : AF_INET, + }; + r = resolve_getaddrinfo(m->resolve, &m->resolve_query, m->current_server_name->string, "123", &hints, manager_resolve_handler, NULL, m); if (r < 0) return log_error_errno(r, "Failed to create resolver: %m"); -- cgit v1.2.1