SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

netlink: move resolve_ifname() or friends to netlink-util.[ch]

Browse Source
This commit is contained in:
Yu Watanabe
2021-06-12 03:19:08 +09:00
parent f0ad7aedd9
commit f6e491547d
7 changed files with 56 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nspawn/nspawn-network.c
+6 -6
View File
@@ -272,7 +272,7 @@ int setup_veth(const char *machine_name,
if (r < 0)
return r;
u = if_nametoindex(n); /* We don't need to use resolve_ifname() here because the
u = if_nametoindex(n); /* We don't need to use rtnl_resolve_ifname() here because the
* name we assigned is always the main name. */
if (u == 0)
return log_error_errno(errno, "Failed to resolve interface %s: %m", n);
@@ -330,7 +330,7 @@ static int join_bridge(sd_netlink *rtnl, const char *veth_name, const char *brid
assert(veth_name);
assert(bridge_name);
bridge_ifi = resolve_interface(&rtnl, bridge_name);
bridge_ifi = rtnl_resolve_interface(&rtnl, bridge_name);
if (bridge_ifi < 0)
return bridge_ifi;
@@ -475,7 +475,7 @@ int test_network_interface_initialized(const char *name) {
/* udev should be around. */
ifi = resolve_interface_or_warn(NULL, name);
ifi = rtnl_resolve_interface_or_warn(NULL, name);
if (ifi < 0)
return ifi;
@@ -515,7 +515,7 @@ int move_network_interfaces(int netns_fd, char **ifaces) {
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
int ifi;
ifi = resolve_interface_or_warn(&rtnl, *i);
ifi = rtnl_resolve_interface_or_warn(&rtnl, *i);
if (ifi < 0)
return ifi;
@@ -554,7 +554,7 @@ int setup_macvlan(const char *machine_name, pid_t pid, char **ifaces) {
struct ether_addr mac;
int ifi;
ifi = resolve_interface_or_warn(&rtnl, *i);
ifi = rtnl_resolve_interface_or_warn(&rtnl, *i);
if (ifi < 0)
return ifi;
@@ -640,7 +640,7 @@ int setup_ipvlan(const char *machine_name, pid_t pid, char **ifaces) {
_cleanup_free_ char *n = NULL, *a = NULL;
int ifi;
ifi = resolve_interface_or_warn(&rtnl, *i);
ifi = rtnl_resolve_interface_or_warn(&rtnl, *i);
if (ifi < 0)
return ifi;