shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-02 09:47:03 +03:00
Code

wait-online: split out link_update_name()

Browse Source 
No functional changes, just refactoring and preparation for later
commits.
This commit is contained in:
Yu Watanabe 2022-10-31 10:14:30 +09:00
parent e53f43fee8
commit 2401f920f3
1 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/network/wait-online/link.c
View File

@ -3,6 +3,7 @@
#include "sd-network.h"
#include "alloc-util.h"
#include "format-util.h"
#include "hashmap.h"
#include "link.h"
#include "manager.h"
@ -62,7 +63,7 @@ Link *link_free(Link *l) {
return mfree(l);
}
int link_update_rtnl(Link *l, sd_netlink_message *m) {
static int link_update_name(Link *l, sd_netlink_message *m) {
const char *ifname;
int r;
@ -70,29 +71,44 @@ int link_update_rtnl(Link *l, sd_netlink_message *m) {
assert(l->manager);
assert(m);
r = sd_netlink_message_read_string(m, IFLA_IFNAME, &ifname);
if (r == -ENODATA)
/* Hmm? But ok. */
return 0;
if (r < 0)
return r;
if (streq(ifname, l->ifname))
return 0;
hashmap_remove(l->manager->links_by_name, l->ifname);
r = free_and_strdup(&l->ifname, ifname);
if (r < 0)
return r;
r = hashmap_ensure_put(&l->manager->links_by_name, &string_hash_ops, l->ifname, l);
if (r < 0)
return r;
return 0;
}
int link_update_rtnl(Link *l, sd_netlink_message *m) {
int r;
assert(l);
assert(l->manager);
assert(m);
r = sd_rtnl_message_link_get_flags(m, &l->flags);
if (r < 0)
return r;
r = sd_netlink_message_read_string(m, IFLA_IFNAME, &ifname);
r = link_update_name(l, m);
if (r < 0)
return r;
if (!streq(l->ifname, ifname)) {
char *new_ifname;
new_ifname = strdup(ifname);
if (!new_ifname)
return -ENOMEM;
assert_se(hashmap_remove(l->manager->links_by_name, l->ifname) == l);
free_and_replace(l->ifname, new_ifname);
r = hashmap_put(l->manager->links_by_name, l->ifname, l);
if (r < 0)
return r;
}
return 0;
}