proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-27 12:37:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

network: restore ability to move nl80211 devices

Browse Source 
Closes #3105.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2019-07-26 08:20:02 +02:00
parent d0b950440a
commit 3dd7829433
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/lxc/network.c
View File

@ -1248,22 +1248,21 @@ static int lxc_netdev_rename_by_name_in_netns(pid_t pid, const char *old,
static int lxc_netdev_move_wlan(char *physname, const char *ifname, pid_t pid, static int lxc_netdev_move_wlan(char *physname, const char *ifname, pid_t pid,
const char *newname) const char *newname)
{ {
char *cmd; __do_free char *cmd = NULL;
pid_t fpid; pid_t fpid;
int err = -1;
/* Move phyN into the container. TODO - do this using netlink. /* Move phyN into the container. TODO - do this using netlink.
* However, IIUC this involves a bit more complicated work to talk to * However, IIUC this involves a bit more complicated work to talk to
* the 80211 module, so for now just call out to iw. * the 80211 module, so for now just call out to iw.
*/ */
cmd = on_path("iw", NULL); cmd = on_path("iw", NULL);
if (!cmd) if (!cmd) {
goto out1; return -1;
free(cmd); }
fpid = fork(); fpid = fork();
if (fpid < 0) if (fpid < 0)
goto out1; return -1;
if (fpid == 0) { if (fpid == 0) {
char pidstr[30]; char pidstr[30];
@ -1274,21 +1273,18 @@ static int lxc_netdev_move_wlan(char *physname, const char *ifname, pid_t pid,
} }
if (wait_for_pid(fpid)) if (wait_for_pid(fpid))
goto out1; return -1;
err = 0;
if (newname) if (newname)
err = lxc_netdev_rename_by_name_in_netns(pid, ifname, newname); return lxc_netdev_rename_by_name_in_netns(pid, ifname, newname);
out1: return 0;
free(physname);
return err;
} }
int lxc_netdev_move_by_name(const char *ifname, pid_t pid, const char* newname) int lxc_netdev_move_by_name(const char *ifname, pid_t pid, const char* newname)
{ {
__do_free char *physname = NULL;
int index; int index;
char *physname;
if (!ifname) if (!ifname)
return -EINVAL; return -EINVAL;
@ -3279,13 +3275,20 @@ int lxc_network_move_created_netdev_priv(struct lxc_handler *handler)
return 0; return 0;
lxc_list_for_each(iterator, network) { lxc_list_for_each(iterator, network) {
__do_free char *physname = NULL;
int ret; int ret;
struct lxc_netdev *netdev = iterator->elem; struct lxc_netdev *netdev = iterator->elem;
if (!netdev->ifindex) if (!netdev->ifindex)
continue; continue;
ret = lxc_netdev_move_by_index(netdev->ifindex, pid, NULL); if (netdev->type == LXC_NET_PHYS)
physname = is_wlan(netdev->link);
if (physname)
ret = lxc_netdev_move_wlan(physname, netdev->link, pid, NULL);
else
ret = lxc_netdev_move_by_index(netdev->ifindex, pid, NULL);
if (ret) { if (ret) {
errno = -ret; errno = -ret;
SYSERROR("Failed to move network device \"%s\" with ifindex %d to network namespace %d", SYSERROR("Failed to move network device \"%s\" with ifindex %d to network namespace %d",