shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-26 03:21:44 +03:00
Code Releases Activity

virNetworkIPDefParseXML: Use virXMLPropUInt instead of virXPathULong

Browse Source 
Parse the 'prefix' field directly and adjust the the error message
format strings.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-10-05 14:43:44 +02:00
parent fa6ba9b8c7
commit 367fdfbff8
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/conf/network_conf.c
View File

@ -1057,8 +1057,6 @@ virNetworkIPDefParseXML(const char *networkName,
xmlNodePtr dhcp; xmlNodePtr dhcp;
g_autofree char *address = NULL; g_autofree char *address = NULL;
g_autofree char *netmask = NULL; g_autofree char *netmask = NULL;
unsigned long prefix = 0;
int prefixRc;
int ret = -1; int ret = -1;
ctxt->node = node; ctxt->node = node;
@ -1089,17 +1087,8 @@ virNetworkIPDefParseXML(const char *networkName,
goto cleanup; goto cleanup;
} }
prefixRc = virXPathULong("string(./@prefix)", ctxt, &prefix); if (virXMLPropUInt(node, "prefix", 10, VIR_XML_PROP_NONE, &def->prefix) < 0)
if (prefixRc == -2) {
virReportError(VIR_ERR_XML_ERROR,
_("Invalid ULong value specified for prefix in definition of network '%s'"),
networkName);
goto cleanup; goto cleanup;
}
if (prefixRc < 0)
def->prefix = 0;
else
def->prefix = prefix;
if (virXMLPropTristateBool(node, "localPtr", if (virXMLPropTristateBool(node, "localPtr",
VIR_XML_PROP_NONE, VIR_XML_PROP_NONE,
@ -1131,8 +1120,8 @@ virNetworkIPDefParseXML(const char *networkName,
} }
} else if (def->prefix > 32) { } else if (def->prefix > 32) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Invalid IPv4 prefix '%lu' in network '%s'"), _("Invalid IPv4 prefix '%u' in network '%s'"),
prefix, networkName); def->prefix, networkName);
goto cleanup; goto cleanup;
} }
} else if (STREQ(def->family, "ipv6")) { } else if (STREQ(def->family, "ipv6")) {
@ -1150,8 +1139,8 @@ virNetworkIPDefParseXML(const char *networkName,
} }
if (def->prefix > 128) { if (def->prefix > 128) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Invalid IPv6 prefix '%lu' in network '%s'"), _("Invalid IPv6 prefix '%u' in network '%s'"),
prefix, networkName); def->prefix, networkName);
goto cleanup; goto cleanup;
} }
} else { } else {