shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

network/netdev: use hashmap_remove_value() on detaching NetDev from manager

Browse Source 
Then, it is not necessary to free NetDev.ifname when a conflicting
.netdev file is already loaded.

This also split out netdev_detach_name() and netdev_detach_impl().

No functional change, just refactoring.
This commit is contained in:
Yu Watanabe 2024-09-09 15:17:54 +09:00
parent bc0d3f3842
commit 0dc71b9584
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/network/netdev/netdev.c
View File

@ -191,12 +191,31 @@ static bool netdev_is_stacked(NetDev *netdev) {
return true; return true;
} }
static void netdev_detach_from_manager(NetDev *netdev) { NetDev* netdev_detach_name(NetDev *netdev, const char *name) {
if (netdev->ifname && netdev->manager) assert(netdev);
hashmap_remove(netdev->manager->netdevs, netdev->ifname);
if (!netdev->manager || !name)
return NULL; /* Already detached or not attached yet. */
return hashmap_remove_value(netdev->manager->netdevs, name, netdev);
} }
static NetDev *netdev_free(NetDev *netdev) { static NetDev* netdev_detach_impl(NetDev *netdev) {
assert(netdev);
NetDev *n = netdev_detach_name(netdev, netdev->ifname);
netdev->manager = NULL;
return n; /* Return NULL when it is not attached yet, or already detached. */
}
void netdev_detach(NetDev *netdev) {
assert(netdev);
netdev_unref(netdev_detach_impl(netdev));
}
static NetDev* netdev_free(NetDev *netdev) {
assert(netdev); assert(netdev);
/* Invoke the per-kind done() destructor, but only if the state field is initialized. We conditionalize that /* Invoke the per-kind done() destructor, but only if the state field is initialized. We conditionalize that
@ -211,7 +230,7 @@ static NetDev *netdev_free(NetDev *netdev) {
NETDEV_VTABLE(netdev)->done) NETDEV_VTABLE(netdev)->done)
NETDEV_VTABLE(netdev)->done(netdev); NETDEV_VTABLE(netdev)->done(netdev);
netdev_detach_from_manager(netdev); netdev_detach_impl(netdev);
condition_free_list(netdev->conditions); condition_free_list(netdev->conditions);
free(netdev->filename); free(netdev->filename);
@ -245,9 +264,7 @@ void netdev_drop(NetDev *netdev) {
log_netdev_debug(netdev, "netdev removed"); log_netdev_debug(netdev, "netdev removed");
netdev_detach_from_manager(netdev); netdev_detach(netdev);
netdev_unref(netdev);
return;
} }
int netdev_get(Manager *manager, const char *name, NetDev **ret) { int netdev_get(Manager *manager, const char *name, NetDev **ret) {
@ -891,9 +908,6 @@ int netdev_load_one(Manager *manager, const char *filename) {
"Device was already configured by \"%s\", ignoring %s.", "Device was already configured by \"%s\", ignoring %s.",
n->filename, netdev->filename); n->filename, netdev->filename);
/* Clear ifname before netdev_free() is called. Otherwise, the NetDev object 'n' is
* removed from the hashmap 'manager->netdevs'. */
netdev->ifname = mfree(netdev->ifname);
return -EEXIST; return -EEXIST;
} }
assert(r > 0); assert(r > 0);

3
src/network/netdev/netdev.h
View File

@ -195,6 +195,9 @@ extern const NetDevVTable * const netdev_vtable[_NETDEV_KIND_MAX];
/* For casting the various netdev kinds into a netdev */ /* For casting the various netdev kinds into a netdev */
#define NETDEV(n) (&(n)->meta) #define NETDEV(n) (&(n)->meta)
NetDev* netdev_detach_name(NetDev *netdev, const char *name);
void netdev_detach(NetDev *netdev);
int netdev_load(Manager *manager, bool reload); int netdev_load(Manager *manager, bool reload);
int netdev_load_one(Manager *manager, const char *filename); int netdev_load_one(Manager *manager, const char *filename);
void netdev_drop(NetDev *netdev); void netdev_drop(NetDev *netdev);