sd-network: rename the per-ifindex calls to sd_network_get_link_xxx()

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

diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c
index e1cdd6091d071c1f9f71ae71d155a2d14d8d5ae0..ed176ab417574c6b17f1da4348adddcc422e7a57 100644 (file)
--- a/src/resolve/resolved-link.c
+++ b/src/resolve/resolved-link.c
@@ -133,7 +133,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 +151,7 @@ static int link_update_dns_servers(Link *l) {
 
         assert(l);
 
-        r = sd_network_get_dns(l->ifindex, &nameservers);
+        r = sd_network_get_link_dns(l->ifindex, &nameservers);
         if (r < 0)
                 goto clear;
 
@@ -195,7 +195,7 @@ static int link_update_llmnr_support(Link *l) {
 
         assert(l);
 
-        r = sd_network_get_llmnr(l->ifindex, &b);
+        r = sd_network_get_link_llmnr(l->ifindex, &b);
         if (r < 0)
                 goto clear;
 
@@ -416,11 +416,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("Failed to add A record to LLMNR zone: %s", strerror(-r));
 
                         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("Failed to add IPv6 PTR record to LLMNR zone: %s", strerror(-r));
                 } else {
                         if (a->llmnr_address_rr) {
                                 if (a->link->llmnr_ipv4_scope)
@@ -519,7 +519,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))