From 53762677a84c7bf124714d9e607da8c115084775 Mon Sep 17 00:00:00 2001 From: Julio Faracco Date: Fri, 30 Nov 2018 20:43:36 +0800 Subject: [PATCH] lxc: Initializing IPv6 and IPv4 gateway to overwrite old settings. 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 Reviewed-by: John Ferlan --- src/lxc/lxc_native.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 9f6d4b3de8..0d21d9fb2b 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -561,27 +561,26 @@ lxcNetworkWalkCallback(const char *name, virConfValuePtr value, void *data) int status; if (STREQ(name, "lxc.network.type")) { + virDomainDefPtr def = parseData->def; + size_t networks = parseData->networks; + bool privnet = parseData->privnet; + /* Store the previous NIC */ status = lxcAddNetworkDefinition(parseData); if (status < 0) return -1; else if (status > 0) - parseData->networks++; + networks++; else if (parseData->type != NULL && STREQ(parseData->type, "none")) - parseData->privnet = false; - - /* Start a new network interface config */ - parseData->type = NULL; - parseData->link = NULL; - parseData->mac = NULL; - parseData->flag = NULL; - parseData->macvlanmode = NULL; - parseData->vlanid = NULL; - parseData->name = NULL; - - parseData->ips = NULL; - parseData->nips = 0; + privnet = false; + + /* clean NIC to store a new one */ + memset(parseData, 0, sizeof(*parseData)); + + parseData->def = def; + parseData->networks = networks; + parseData->privnet = privnet; /* Keep the new value */ parseData->type = value->str; -- 2.47.2