X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fresolve%2Fresolved-link.c;h=f94e4bb6f058252fbbbef8489bdc5e12871d7861;hb=d2df88ffbac8858214adb9daaf7a93122fe26a50;hp=e1cdd6091d071c1f9f71ae71d155a2d14d8d5ae0;hpb=19b50b5ba7ee8c1bfb330377309e4bab7a7531d8;p=elogind.git diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c index e1cdd6091..f94e4bb6f 100644 --- a/src/resolve/resolved-link.c +++ b/src/resolve/resolved-link.c @@ -33,7 +33,7 @@ int link_new(Manager *m, Link **ret, int ifindex) { assert(m); assert(ifindex > 0); - r = hashmap_ensure_allocated(&m->links, NULL, NULL); + r = hashmap_ensure_allocated(&m->links, NULL); if (r < 0) return r; @@ -88,25 +88,30 @@ static void link_allocate_scopes(Link *l) { if (!l->unicast_scope) { r = dns_scope_new(l->manager, &l->unicast_scope, l, DNS_PROTOCOL_DNS, AF_UNSPEC); if (r < 0) - log_warning("Failed to allocate DNS scope: %s", strerror(-r)); + log_warning_errno(r, "Failed to allocate DNS scope: %m"); } } else l->unicast_scope = dns_scope_free(l->unicast_scope); - if (link_relevant(l, AF_INET) && l->llmnr_support != SUPPORT_NO && l->manager->llmnr_support != SUPPORT_NO) { + if (link_relevant(l, AF_INET) && + l->llmnr_support != SUPPORT_NO && + l->manager->llmnr_support != SUPPORT_NO) { if (!l->llmnr_ipv4_scope) { r = dns_scope_new(l->manager, &l->llmnr_ipv4_scope, l, DNS_PROTOCOL_LLMNR, AF_INET); if (r < 0) - log_warning("Failed to allocate LLMNR IPv4 scope: %s", strerror(-r)); + log_warning_errno(r, "Failed to allocate LLMNR IPv4 scope: %m"); } } else l->llmnr_ipv4_scope = dns_scope_free(l->llmnr_ipv4_scope); - if (link_relevant(l, AF_INET6) && l->llmnr_support != SUPPORT_NO && l->manager->llmnr_support != SUPPORT_NO) { + if (link_relevant(l, AF_INET6) && + l->llmnr_support != SUPPORT_NO && + l->manager->llmnr_support != SUPPORT_NO && + socket_ipv6_is_supported()) { if (!l->llmnr_ipv6_scope) { r = dns_scope_new(l->manager, &l->llmnr_ipv6_scope, l, DNS_PROTOCOL_LLMNR, AF_INET6); if (r < 0) - log_warning("Failed to allocate LLMNR IPv6 scope: %s", strerror(-r)); + log_warning_errno(r, "Failed to allocate LLMNR IPv6 scope: %m"); } } else l->llmnr_ipv6_scope = dns_scope_free(l->llmnr_ipv6_scope); @@ -133,7 +138,7 @@ int link_update_rtnl(Link *l, sd_rtnl_message *m) { sd_rtnl_message_read_u32(m, IFLA_MTU, &l->mtu); if (sd_rtnl_message_read_string(m, IFLA_IFNAME, &n) >= 0) { - strncpy(l->name, n, sizeof(l->name)); + strncpy(l->name, n, sizeof(l->name)-1); char_array_0(l->name); } @@ -151,7 +156,7 @@ static int link_update_dns_servers(Link *l) { assert(l); - r = sd_network_get_dns(l->ifindex, &nameservers); + r = sd_network_link_get_dns(l->ifindex, &nameservers); if (r < 0) goto clear; @@ -195,7 +200,7 @@ static int link_update_llmnr_support(Link *l) { assert(l); - r = sd_network_get_llmnr(l->ifindex, &b); + r = sd_network_link_get_llmnr(l->ifindex, &b); if (r < 0) goto clear; @@ -218,12 +223,30 @@ clear: return r; } +static int link_update_domains(Link *l) { + int r; + + if (!l->unicast_scope) + return 0; + + strv_free(l->unicast_scope->domains); + l->unicast_scope->domains = NULL; + + r = sd_network_link_get_domains(l->ifindex, + &l->unicast_scope->domains); + if (r < 0) + return r; + + return 0; +} + int link_update_monitor(Link *l) { assert(l); link_update_dns_servers(l); link_update_llmnr_support(l); link_allocate_scopes(l); + link_update_domains(l); link_add_rrs(l, false); return 0; @@ -245,7 +268,7 @@ bool link_relevant(Link *l, int family) { if ((l->flags & (IFF_UP|IFF_LOWER_UP|IFF_MULTICAST)) != (IFF_UP|IFF_LOWER_UP|IFF_MULTICAST)) return false; - sd_network_get_link_operational_state(l->ifindex, &state); + sd_network_link_get_operational_state(l->ifindex, &state); if (state && !STR_IN_SET(state, "unknown", "degraded", "routable")) return false; @@ -416,11 +439,11 @@ void link_address_add_rrs(LinkAddress *a, bool force_remove) { r = dns_zone_put(&a->link->llmnr_ipv4_scope->zone, a->link->llmnr_ipv4_scope, a->llmnr_address_rr, true); if (r < 0) - log_warning("Failed tp add A record to LLMNR zone: %s", strerror(-r)); + log_warning_errno(r, "Failed to add A record to LLMNR zone: %m"); r = dns_zone_put(&a->link->llmnr_ipv4_scope->zone, a->link->llmnr_ipv4_scope, a->llmnr_ptr_rr, false); if (r < 0) - log_warning("Failed tp add IPv6 PTR record to LLMNR zone: %s", strerror(-r)); + log_warning_errno(r, "Failed to add IPv6 PTR record to LLMNR zone: %m"); } else { if (a->llmnr_address_rr) { if (a->link->llmnr_ipv4_scope) @@ -473,11 +496,11 @@ void link_address_add_rrs(LinkAddress *a, bool force_remove) { r = dns_zone_put(&a->link->llmnr_ipv6_scope->zone, a->link->llmnr_ipv6_scope, a->llmnr_address_rr, true); if (r < 0) - log_warning("Failed to add AAAA record to LLMNR zone: %s", strerror(-r)); + log_warning_errno(r, "Failed to add AAAA record to LLMNR zone: %m"); r = dns_zone_put(&a->link->llmnr_ipv6_scope->zone, a->link->llmnr_ipv6_scope, a->llmnr_ptr_rr, false); if (r < 0) - log_warning("Failed to add IPv6 PTR record to LLMNR zone: %s", strerror(-r)); + log_warning_errno(r, "Failed to add IPv6 PTR record to LLMNR zone: %m"); } else { if (a->llmnr_address_rr) { if (a->link->llmnr_ipv6_scope) @@ -496,7 +519,7 @@ void link_address_add_rrs(LinkAddress *a, bool force_remove) { return; fail: - log_debug("Failed to update address RRs: %s", strerror(-r)); + log_debug_errno(r, "Failed to update address RRs: %m"); } int link_address_update_rtnl(LinkAddress *a, sd_rtnl_message *m) { @@ -519,7 +542,7 @@ int link_address_update_rtnl(LinkAddress *a, sd_rtnl_message *m) { bool link_address_relevant(LinkAddress *a) { assert(a); - if (a->flags & IFA_F_DEPRECATED) + if (a->flags & (IFA_F_DEPRECATED|IFA_F_TENTATIVE)) return false; if (IN_SET(a->scope, RT_SCOPE_HOST, RT_SCOPE_NOWHERE))