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;
return -ENOMEM;
l->ifindex = ifindex;
+ l->llmnr_support = SUPPORT_YES;
r = hashmap_put(m->links, INT_TO_PTR(ifindex), l);
if (r < 0)
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->manager->use_llmnr) {
+ 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->manager->use_llmnr) {
+ 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);
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);
}
assert(l);
- LIST_FOREACH(servers, s, l->dns_servers)
- s->marked = true;
-
- r = sd_network_get_dns(l->ifindex, &nameservers);
+ r = sd_network_link_get_dns(l->ifindex, &nameservers);
if (r < 0)
goto clear;
+ LIST_FOREACH(servers, s, l->dns_servers)
+ s->marked = true;
+
STRV_FOREACH(nameserver, nameservers) {
union in_addr_union a;
int family;
if (s)
s->marked = false;
else {
- r = dns_server_new(l->manager, NULL, l, family, &a);
+ r = dns_server_new(l->manager, NULL, DNS_SERVER_LINK, l, family, &a);
if (r < 0)
goto clear;
}
return r;
}
+static int link_update_llmnr_support(Link *l) {
+ _cleanup_free_ char *b = NULL;
+ int r;
+
+ assert(l);
+
+ r = sd_network_link_get_llmnr(l->ifindex, &b);
+ if (r < 0)
+ goto clear;
+
+ r = parse_boolean(b);
+ if (r < 0) {
+ if (streq(b, "resolve"))
+ l->llmnr_support = SUPPORT_RESOLVE;
+ else
+ goto clear;
+
+ } else if (r > 0)
+ l->llmnr_support = SUPPORT_YES;
+ else
+ l->llmnr_support = SUPPORT_NO;
+
+ return 0;
+
+clear:
+ l->llmnr_support = SUPPORT_YES;
+ 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;
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;
return NULL;
}
+DnsServer* link_set_dns_server(Link *l, DnsServer *s) {
+ assert(l);
+
+ if (l->current_dns_server == s)
+ return s;
+
+ if (s) {
+ _cleanup_free_ char *ip = NULL;
+
+ in_addr_to_string(s->family, &s->address, &ip);
+ log_info("Switching to DNS server %s for interface %s.", strna(ip), l->name);
+ }
+
+ l->current_dns_server = s;
+
+ if (l->unicast_scope)
+ dns_cache_flush(&l->unicast_scope->cache);
+
+ return s;
+}
+
DnsServer *link_get_dns_server(Link *l) {
assert(l);
if (!l->current_dns_server)
- l->current_dns_server = l->dns_servers;
+ link_set_dns_server(l, l->dns_servers);
return l->current_dns_server;
}
void link_next_dns_server(Link *l) {
assert(l);
- /* Switch to the next DNS server */
-
- if (!l->current_dns_server) {
- l->current_dns_server = l->dns_servers;
- if (l->current_dns_server)
- return;
- }
-
if (!l->current_dns_server)
return;
if (l->current_dns_server->servers_next) {
- l->current_dns_server = l->current_dns_server->servers_next;
+ link_set_dns_server(l, l->current_dns_server->servers_next);
return;
}
- l->current_dns_server = l->dns_servers;
+ link_set_dns_server(l, l->dns_servers);
}
int link_address_new(Link *l, LinkAddress **ret, int family, const union in_addr_union *in_addr) {
if (a->family == AF_INET) {
- if (!force_remove && link_address_relevant(a) && a->link->llmnr_ipv4_scope) {
+ if (!force_remove &&
+ link_address_relevant(a) &&
+ a->link->llmnr_ipv4_scope &&
+ a->link->llmnr_support == SUPPORT_YES &&
+ a->link->manager->llmnr_support == SUPPORT_YES) {
+
if (!a->link->manager->host_ipv4_key) {
a->link->manager->host_ipv4_key = dns_resource_key_new(DNS_CLASS_IN, DNS_TYPE_A, a->link->manager->hostname);
if (!a->link->manager->host_ipv4_key) {
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)
if (a->family == AF_INET6) {
- if (!force_remove && link_address_relevant(a) && a->link->llmnr_ipv6_scope) {
+ if (!force_remove &&
+ link_address_relevant(a) &&
+ a->link->llmnr_ipv6_scope &&
+ a->link->llmnr_support == SUPPORT_YES &&
+ a->link->manager->llmnr_support == SUPPORT_YES) {
+
if (!a->link->manager->host_ipv6_key) {
a->link->manager->host_ipv6_key = dns_resource_key_new(DNS_CLASS_IN, DNS_TYPE_AAAA, a->link->manager->hostname);
if (!a->link->manager->host_ipv6_key) {
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)
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) {
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))
~ianmdlvl / elogind.git / blobdiff