diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-06-10 06:01:44 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-06-12 03:19:08 +0900 |
| commit | f6e491547d92e86aa728a3851cc2007db57ea10e (patch) | |
| tree | 7ab8f697f659c021c414950afc688e6cb780651f /src/nspawn | |
| parent | f0ad7aedd93b9f0b4214ba000d96911aba061683 (diff) | |
| download | systemd-f6e491547d92e86aa728a3851cc2007db57ea10e.tar.gz | |
netlink: move resolve_ifname() or friends to netlink-util.[ch]
Diffstat (limited to 'src/nspawn')
| -rw-r--r-- | src/nspawn/nspawn-network.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c index 95e4b0213b..1f0d274757 100644 --- a/src/nspawn/nspawn-network.c +++ b/src/nspawn/nspawn-network.c @@ -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; |