network/nexthop: rename manager_get_nexthop_by_id() -> nexthop_get_by_id()

diff --git a/src/network/networkd-nexthop.c b/src/network/networkd-nexthop.c
index bcb114094ef38114d98bb2e9dd6ea763326fcb18..dc0e93e587461d2fbe651a5b8a82cb9c4ecd5423 100644 (file)
--- a/src/network/networkd-nexthop.c
+++ b/src/network/networkd-nexthop.c
@@ -208,7 +208,7 @@ static bool nexthop_bound_to_link(const NextHop *nexthop) {
         return !nexthop->blackhole && hashmap_isempty(nexthop->group);
 }
 
-int manager_get_nexthop_by_id(Manager *manager, uint32_t id, NextHop **ret) {
+int nexthop_get_by_id(Manager *manager, uint32_t id, NextHop **ret) {
         NextHop *nh;
 
         assert(manager);
@@ -338,7 +338,7 @@ static int nexthop_acquire_id(Manager *manager, NextHop *nexthop) {
         }
 
         for (uint32_t id = 1; id < UINT32_MAX; id++) {
-                if (manager_get_nexthop_by_id(manager, id, NULL) >= 0)
+                if (nexthop_get_by_id(manager, id, NULL) >= 0)
                         continue;
                 if (set_contains(ids, UINT32_TO_PTR(id)))
                         continue;
@@ -538,7 +538,7 @@ static bool nexthop_is_ready_to_configure(Link *link, const NextHop *nexthop) {
         HASHMAP_FOREACH(nhg, nexthop->group) {
                 NextHop *g;
 
-                if (manager_get_nexthop_by_id(link->manager, nhg->id, &g) < 0)
+                if (nexthop_get_by_id(link->manager, nhg->id, &g) < 0)
                         return false;
 
                 if (!nexthop_exists(g))

diff --git a/src/network/networkd-nexthop.h b/src/network/networkd-nexthop.h
index 6f2aa6f6dc3f44a8e7b44f478d623649ebbba601..6e5643015b4b2381067f48f399ebcf02cfac6dd8 100644 (file)
--- a/src/network/networkd-nexthop.h
+++ b/src/network/networkd-nexthop.h
@@ -46,7 +46,7 @@ void link_foreignize_nexthops(Link *link);
 
 int link_request_static_nexthops(Link *link, bool only_ipv4);
 
-int manager_get_nexthop_by_id(Manager *manager, uint32_t id, NextHop **ret);
+int nexthop_get_by_id(Manager *manager, uint32_t id, NextHop **ret);
 int manager_rtnl_process_nexthop(sd_netlink *rtnl, sd_netlink_message *message, Manager *m);
 
 DEFINE_NETWORK_CONFIG_STATE_FUNCTIONS(NextHop, nexthop);

diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index 7218d799fc842098e9b19499a3ce7e4344e02676..3cb1f80e5f00b7a096fd5a0dd544460c19e35d1b 100644 (file)
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -461,7 +461,7 @@ static int route_convert(Manager *manager, const Route *route, ConvertedRoutes *
                 struct nexthop_grp *nhg;
                 NextHop *nh;
 
-                r = manager_get_nexthop_by_id(manager, route->nexthop_id, &nh);
+                r = nexthop_get_by_id(manager, route->nexthop_id, &nh);
                 if (r < 0)
                         return r;
 
@@ -489,7 +489,7 @@ static int route_convert(Manager *manager, const Route *route, ConvertedRoutes *
                 HASHMAP_FOREACH(nhg, nh->group) {
                         NextHop *h;
 
-                        r = manager_get_nexthop_by_id(manager, nhg->id, &h);
+                        r = nexthop_get_by_id(manager, nhg->id, &h);
                         if (r < 0)
                                 return r;
 
@@ -1284,7 +1284,7 @@ static int route_is_ready_to_configure(const Route *route, Link *link) {
                 struct nexthop_grp *nhg;
                 NextHop *nh;
 
-                if (manager_get_nexthop_by_id(link->manager, route->nexthop_id, &nh) < 0)
+                if (nexthop_get_by_id(link->manager, route->nexthop_id, &nh) < 0)
                         return false;
 
                 if (!nexthop_exists(nh))
@@ -1293,7 +1293,7 @@ static int route_is_ready_to_configure(const Route *route, Link *link) {
                 HASHMAP_FOREACH(nhg, nh->group) {
                         NextHop *g;
 
-                        if (manager_get_nexthop_by_id(link->manager, nhg->id, &g) < 0)
+                        if (nexthop_get_by_id(link->manager, nhg->id, &g) < 0)
                                 return false;
 
                         if (!nexthop_exists(g))