dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-13 17:08:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yu Watanabe
2023-12-13 03:23:50 +09:00
parent 84faee4141
commit ac21790335
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/networkd-nexthop.c
View File

@@ -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))

2
src/network/networkd-nexthop.h
View File

@@ -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);

8
src/network/networkd-route.c
View File

@@ -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))