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: do not assign invalid ID

Browse Source 
This also reduces the scope of the iterator.
This commit is contained in:
Yu Watanabe
2023-12-12 01:59:34 +09:00
parent 58830ef5eb
commit c624143b59
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -309,7 +309,6 @@ static int nexthop_add(Manager *manager, Link *link, NextHop *nexthop) {
static int nexthop_acquire_id(Manager *manager, NextHop *nexthop) {
_cleanup_set_free_ Set *ids = NULL;
Network *network;
uint32_t id;
int r;
assert(manager);
@@ -337,16 +336,17 @@ static int nexthop_acquire_id(Manager *manager, NextHop *nexthop) {
}
}
for (id = 1; id < UINT32_MAX; id++) {
for (uint32_t id = 1; id < UINT32_MAX; id++) {
if (manager_get_nexthop_by_id(manager, id, NULL) >= 0)
continue;
if (set_contains(ids, UINT32_TO_PTR(id)))
continue;
break;
nexthop->id = id;
return 0;
}
nexthop->id = id;
return 0;
return -EBUSY;
}
static void log_nexthop_debug(const NextHop *nexthop, const char *str, const Link *link) {