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

network: remove obsolete logic

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2017-06-16 17:53:53 +02:00
parent e5d2fd7c2a
commit b45e32f972
No known key found for this signature in database
GPG Key ID: 7B3C391EFEA93624
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/lxc/confile.c
View File

@ -943,7 +943,8 @@ static int set_network_link(const char *key, const char *value,
return network_ifname(&netdev->link, value); return network_ifname(&netdev->link, value);
} }
static int create_matched_ifnames(const char *value, struct lxc_conf *lxc_conf) static int create_matched_ifnames(const char *value, struct lxc_conf *lxc_conf,
struct lxc_netdev *netdev)
{ {
struct ifaddrs *ifaddr, *ifa; struct ifaddrs *ifaddr, *ifa;
int n; int n;
@ -965,10 +966,10 @@ static int create_matched_ifnames(const char *value, struct lxc_conf *lxc_conf)
if (!strncmp(value, ifa->ifa_name, strlen(value) - 1)) { if (!strncmp(value, ifa->ifa_name, strlen(value) - 1)) {
ret = set_config_network_type(type_key, tmpvalue, ret = set_config_network_type(type_key, tmpvalue,
lxc_conf, NULL); lxc_conf, netdev);
if (!ret) { if (!ret) {
ret = set_network_link(link_key, ifa->ifa_name, ret = set_network_link(link_key, ifa->ifa_name,
lxc_conf, NULL); lxc_conf, netdev);
if (ret) { if (ret) {
ERROR("failed to create matched ifnames"); ERROR("failed to create matched ifnames");
break; break;
@ -990,7 +991,6 @@ static int set_config_network_link(const char *key, const char *value,
struct lxc_conf *lxc_conf, void *data) struct lxc_conf *lxc_conf, void *data)
{ {
struct lxc_netdev *netdev; struct lxc_netdev *netdev;
struct lxc_list *it;
int ret = 0; int ret = 0;
if (lxc_config_value_empty(value)) if (lxc_config_value_empty(value))
@ -1004,21 +1004,10 @@ static int set_config_network_link(const char *key, const char *value,
if (!netdev) if (!netdev)
return -1; return -1;
if (value[strlen(value) - 1] == '+' && netdev->type == LXC_NET_PHYS) { if (value[strlen(value) - 1] == '+' && netdev->type == LXC_NET_PHYS)
/* Get the last network list and remove it. */ ret = create_matched_ifnames(value, lxc_conf, netdev);
it = lxc_conf->network.prev; else
if (((struct lxc_netdev *)(it->elem))->type != LXC_NET_PHYS) {
ERROR("lxc config cannot support string pattern "
"matching for this link type");
return -1;
}
lxc_list_del(it);
free(it);
ret = create_matched_ifnames(value, lxc_conf);
} else {
ret = network_ifname(&netdev->link, value); ret = network_ifname(&netdev->link, value);
}
return ret; return ret;
} }