shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-09 01:18:19 +03:00
Code

network-generator: use network_acquire() at more places

Browse Source
This commit is contained in:
Yu Watanabe 2024-08-09 14:37:59 +09:00
parent b8a57ea56b
commit 15642d2f38
1 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/network/generator/network-generator.c
View File

@ -438,13 +438,14 @@ static int network_set_dhcp_type(Context *context, const char *ifname, const cha
static int network_set_hostname(Context *context, const char *ifname, const char *hostname) { static int network_set_hostname(Context *context, const char *ifname, const char *hostname) {
Network *network; Network *network;
int r;
assert(context); assert(context);
assert(ifname); assert(ifname);
network = network_get(context, ifname); r = network_acquire(context, ifname, &network);
if (!network) if (r < 0)
return log_debug_errno(SYNTHETIC_ERRNO(ENODEV), "No network found for '%s'", ifname); return log_debug_errno(r, "Failed to acquire network for '%s': %m", ifname);
return free_and_strdup(&network->hostname, hostname); return free_and_strdup(&network->hostname, hostname);
} }
@ -459,9 +460,9 @@ static int network_set_mtu(Context *context, const char *ifname, const char *mtu
if (isempty(mtu)) if (isempty(mtu))
return 0; return 0;
network = network_get(context, ifname); r = network_acquire(context, ifname, &network);
if (!network) if (r < 0)
return log_debug_errno(SYNTHETIC_ERRNO(ENODEV), "No network found for '%s'", ifname); return log_debug_errno(r, "Failed to acquire network for '%s': %m", ifname);
r = parse_mtu(AF_UNSPEC, mtu, &network->mtu); r = parse_mtu(AF_UNSPEC, mtu, &network->mtu);
if (r < 0) if (r < 0)
@ -478,20 +479,27 @@ static int network_set_mac_address(Context *context, const char *ifname, const c
assert(ifname); assert(ifname);
assert(mac); assert(mac);
network = network_get(context, ifname); r = network_acquire(context, ifname, &network);
if (!network) if (r < 0)
return log_debug_errno(SYNTHETIC_ERRNO(ENODEV), "No network found for '%s'", ifname); return log_debug_errno(r, "Failed to acquire network for '%s': %m", ifname);
r = parse_ether_addr(mac, &network->mac); r = parse_ether_addr(mac, &network->mac);
if (r < 0) if (r < 0)
return log_debug_errno(r, "Invalid MAC address '%s' for '%s'", mac, ifname); return log_debug_errno(r, "Invalid MAC address '%s' for '%s'", mac, ifname);
return r; return 0;
} }
static int network_set_address(Context *context, const char *ifname, int family, unsigned char prefixlen, static int network_set_address(
union in_addr_union *addr, union in_addr_union *peer) { Context *context,
const char *ifname,
int family,
unsigned char prefixlen,
union in_addr_union *addr,
union in_addr_union *peer) {
Network *network; Network *network;
int r;
assert(context); assert(context);
assert(ifname); assert(ifname);
@ -501,15 +509,21 @@ static int network_set_address(Context *context, const char *ifname, int family,
if (!in_addr_is_set(family, addr)) if (!in_addr_is_set(family, addr))
return 0; return 0;
network = network_get(context, ifname); r = network_acquire(context, ifname, &network);
if (!network) if (r < 0)
return log_debug_errno(SYNTHETIC_ERRNO(ENODEV), "No network found for '%s'", ifname); return log_debug_errno(r, "Failed to acquire network for '%s': %m", ifname);
return address_new(network, family, prefixlen, addr, peer, NULL); return address_new(network, family, prefixlen, addr, peer, NULL);
} }
static int network_set_route(Context *context, const char *ifname, int family, unsigned char prefixlen, static int network_set_route(
union in_addr_union *dest, union in_addr_union *gateway) { Context *context,
const char *ifname,
int family,
unsigned char prefixlen,
union in_addr_union *dest,
union in_addr_union *gateway) {
Network *network; Network *network;
int r; int r;