External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-25 22:15:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

virNetworkForwardNatDefParseXML: Use virXMLProp*

Browse Source 
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Tim Wiederhake 2021-04-16 11:41:50 +02:00 committed by Peter Krempa
parent ab5d2776c9
commit 593140dabd
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/conf/network_conf.c
View File

@ -1321,7 +1321,6 @@ virNetworkForwardNatDefParseXML(const char *networkName,
g_autofree xmlNodePtr *natPortNodes = NULL; g_autofree xmlNodePtr *natPortNodes = NULL;
g_autofree char *addrStart = NULL; g_autofree char *addrStart = NULL;
g_autofree char *addrEnd = NULL; g_autofree char *addrEnd = NULL;
g_autofree char *ipv6 = NULL;
VIR_XPATH_NODE_AUTORESTORE(ctxt) VIR_XPATH_NODE_AUTORESTORE(ctxt)
ctxt->node = node; ctxt->node = node;
@ -1333,18 +1332,9 @@ virNetworkForwardNatDefParseXML(const char *networkName,
return -1; return -1;
} }
ipv6 = virXMLPropString(node, "ipv6"); if (virXMLPropTristateBool(node, "ipv6", VIR_XML_PROP_OPTIONAL,
if (ipv6) { &def->natIPv6) < 0)
int natIPv6;
if ((natIPv6 = virTristateBoolTypeFromString(ipv6)) <= 0) {
virReportError(VIR_ERR_XML_ERROR,
_("Invalid ipv6 setting '%s' "
"in network '%s' NAT"),
ipv6, networkName);
return -1; return -1;
}
def->natIPv6 = natIPv6;
}
/* addresses for SNAT */ /* addresses for SNAT */
nNatAddrs = virXPathNodeSet("./address", ctxt, &natAddrNodes); nNatAddrs = virXPathNodeSet("./address", ctxt, &natAddrNodes);