condition: unify condition logic in one file

[elogind.git] / src / resolve / resolved-link.c

diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c
index fea52d94b64ee966dbb2c264c9296c893f5f43dc..4def672214b9cda84acc53da255feff75620f8f0 100644 (file)
--- 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;
 
@@ -95,8 +95,7 @@ static void link_allocate_scopes(Link *l) {
 
         if (link_relevant(l, AF_INET) &&
             l->llmnr_support != SUPPORT_NO &&
-            l->manager->llmnr_support != SUPPORT_NO &&
-            l->manager->llmnr_ipv4_udp_fd >= 0) {
+            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)
@@ -108,7 +107,7 @@ static void link_allocate_scopes(Link *l) {
         if (link_relevant(l, AF_INET6) &&
             l->llmnr_support != SUPPORT_NO &&
             l->manager->llmnr_support != SUPPORT_NO &&
-            l->manager->llmnr_ipv6_udp_fd >= 0) {
+            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)
@@ -224,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;