External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

lxc: Initializing IPv6 and IPv4 gateway to overwrite old settings.

Browse Source 
This commit fixes a bug when you have multiple network settings defined.
Basically, if you set an IPv6 or IPv4 gateway, it carries on next
network settings. It is happening because the data is not being
initialized when a new network type is defined. So, the old data still
persists into the pointer. Another way to initialized the data was
introduced using memset() to avoid missing attributes from the struct.

Signed-off-by: Julio Faracco <jcfaracco@gmail.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Julio Faracco 2018-11-30 20:43:36 +08:00 committed by John Ferlan
parent 34eca98522
commit 53762677a8
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/lxc/lxc_native.c
View File

@ -561,27 +561,26 @@ lxcNetworkWalkCallback(const char *name, virConfValuePtr value, void *data)
int status; int status;
if (STREQ(name, "lxc.network.type")) { if (STREQ(name, "lxc.network.type")) {
virDomainDefPtr def = parseData->def;
size_t networks = parseData->networks;
bool privnet = parseData->privnet;
/* Store the previous NIC */ /* Store the previous NIC */
status = lxcAddNetworkDefinition(parseData); status = lxcAddNetworkDefinition(parseData);
if (status < 0) if (status < 0)
return -1; return -1;
else if (status > 0) else if (status > 0)
parseData->networks++; networks++;
else if (parseData->type != NULL && STREQ(parseData->type, "none")) else if (parseData->type != NULL && STREQ(parseData->type, "none"))
parseData->privnet = false; privnet = false;
/* Start a new network interface config */ /* clean NIC to store a new one */
parseData->type = NULL; memset(parseData, 0, sizeof(*parseData));
parseData->link = NULL;
parseData->mac = NULL;
parseData->flag = NULL;
parseData->macvlanmode = NULL;
parseData->vlanid = NULL;
parseData->name = NULL;
parseData->ips = NULL; parseData->def = def;
parseData->nips = 0; parseData->networks = networks;
parseData->privnet = privnet;
/* Keep the new value */ /* Keep the new value */
parseData->type = value->str; parseData->type = value->str;