From f0ad7aedd93b9f0b4214ba000d96911aba061683 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 10 Jun 2021 06:00:44 +0900
Subject: [PATCH] network: use link_get_by_name()

---
 src/network/networkd-manager-bus.c | 10 ++--------
 src/network/networkd-route.c       |  8 ++------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/network/networkd-manager-bus.c b/src/network/networkd-manager-bus.c
index 1c6230b3932..4be09d98d84 100644
--- a/src/network/networkd-manager-bus.c
+++ b/src/network/networkd-manager-bus.c
@@ -14,7 +14,6 @@
 #include "networkd-manager-bus.h"
 #include "networkd-manager.h"
 #include "path-util.h"
-#include "socket-netlink.h"
 #include "strv.h"
 #include "user-util.h"
 
@@ -60,19 +59,14 @@ static int method_get_link_by_name(sd_bus_message *message, void *userdata, sd_b
         _cleanup_free_ char *path = NULL;
         Manager *manager = userdata;
         const char *name;
-        int index, r;
         Link *link;
+        int r;
 
         r = sd_bus_message_read(message, "s", &name);
         if (r < 0)
                 return r;
 
-        index = resolve_ifname(&manager->rtnl, name);
-        if (index < 0)
-                return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_LINK, "Link %s cannot be resolved", name);
-
-        link = hashmap_get(manager->links, INT_TO_PTR(index));
-        if (!link)
+        if (link_get_by_name(manager, name, &link) < 0)
                 return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_LINK, "Link %s not known", name);
 
         r = sd_bus_message_new_method_return(message, &reply);
diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index 721d49af752..c68382433c6 100644
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -13,7 +13,6 @@
 #include "networkd-queue.h"
 #include "networkd-route.h"
 #include "parse-util.h"
-#include "socket-netlink.h"
 #include "string-table.h"
 #include "string-util.h"
 #include "strv.h"
@@ -708,13 +707,10 @@ int link_has_route(Link *link, const Route *route) {
                 Link *l;
 
                 if (m->ifname) {
-                        r = resolve_interface(&link->manager->rtnl, m->ifname);
-                        if (r < 0)
+                        if (link_get_by_name(link->manager, m->ifname, &l) < 0)
                                 return false;
-                        m->ifindex = r;
 
-                        if (link_get(link->manager, m->ifindex, &l) < 0)
-                                return false;
+                        m->ifindex = l->ifindex;
                 } else
                         l = link;
 
-- 
2.47.3