diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2020-04-14 12:51:47 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2020-04-14 12:57:17 +0100 |
| commit | cfccdc22ca6d8f28d70a2546a495c9ead4bbb765 (patch) | |
| tree | 645cd82dc16395007b6993a0537801f654fb9611 /interface.c | |
| parent | dbf97b47a53809a6ff812d4466d2082aa4d3efb6 (diff) | |
interface, system: clean up netns functionality
Use struct device pointer as parameter instead of bare ifname allows
for some simplication and again removing system_ifname_resolve()
function introduced in commit d93126d.
Fixes: d93126d ("interface: allow renaming interface when moving to jail netns")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'interface.c')
| -rw-r--r-- | interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/interface.c b/interface.c index 24d90aa..782174f 100644 --- a/interface.c +++ b/interface.c @@ -1171,7 +1171,7 @@ interface_start_jail(const char *jail, const pid_t netns_pid) if (!iface->jail || strcmp(iface->jail, jail)) continue; - system_link_netns_move(iface->ifname, netns_fd, iface->jail_ifname); + system_link_netns_move(iface->main_dev.dev, netns_fd, iface->jail_ifname); } close(netns_fd); @@ -1248,7 +1248,7 @@ interface_stop_jail(const char *jail, const pid_t netns_pid) interface_do_reload(iface); interface_set_down(iface); - system_link_netns_move(iface->ifname, root_netns, orig_ifname); + system_link_netns_move(iface->main_dev.dev, root_netns, orig_ifname); } close(root_netns); |