External/libvirt
1
0
Fork 0
Code

network: bridge: Store dnsmasq passthrough options in NULL-terminated string list

Browse Source 
We always process the full list so there's no value in storing the count
separately.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-06-21 14:54:24 +02:00
parent 93a42f8507
commit 1f2ceda397
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/network/bridge_driver.c
View File

@ -145,7 +145,6 @@ extern virXMLNamespace networkDnsmasqXMLNamespace;
typedef struct _networkDnsmasqXmlNsDef networkDnsmasqXmlNsDef; typedef struct _networkDnsmasqXmlNsDef networkDnsmasqXmlNsDef;
struct _networkDnsmasqXmlNsDef { struct _networkDnsmasqXmlNsDef {
size_t noptions;
char **options; char **options;
}; };
@ -157,7 +156,7 @@ networkDnsmasqDefNamespaceFree(void *nsdata)
if (!def) if (!def)
return; return;
virStringListFreeCount(def->options, def->noptions); g_strfreev(def->options);
g_free(def); g_free(def);
} }
@ -179,10 +178,10 @@ networkDnsmasqDefNamespaceParseOptions(networkDnsmasqXmlNsDef *nsdef,
if (nnodes == 0) if (nnodes == 0)
return 0; return 0;
nsdef->options = g_new0(char *, nnodes); nsdef->options = g_new0(char *, nnodes + 1);
for (i = 0; i < nnodes; i++) { for (i = 0; i < nnodes; i++) {
if (!(nsdef->options[nsdef->noptions++] = virXMLPropString(nodes[i], "value"))) { if (!(nsdef->options[i] = virXMLPropString(nodes[i], "value"))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("No dnsmasq options value specified")); _("No dnsmasq options value specified"));
return -1; return -1;
@ -202,7 +201,7 @@ networkDnsmasqDefNamespaceParse(xmlXPathContextPtr ctxt,
if (networkDnsmasqDefNamespaceParseOptions(nsdata, ctxt)) if (networkDnsmasqDefNamespaceParseOptions(nsdata, ctxt))
return -1; return -1;
if (nsdata->noptions > 0) if (nsdata->options)
*data = g_steal_pointer(&nsdata); *data = g_steal_pointer(&nsdata);
return 0; return 0;
@ -214,17 +213,16 @@ networkDnsmasqDefNamespaceFormatXML(virBuffer *buf,
void *nsdata) void *nsdata)
{ {
networkDnsmasqXmlNsDef *def = nsdata; networkDnsmasqXmlNsDef *def = nsdata;
size_t i; GStrv n;
if (!def->noptions) if (!def->options)
return 0; return 0;
virBufferAddLit(buf, "<dnsmasq:options>\n"); virBufferAddLit(buf, "<dnsmasq:options>\n");
virBufferAdjustIndent(buf, 2); virBufferAdjustIndent(buf, 2);
for (i = 0; i < def->noptions; i++) { for (n = def->options; *n; n++) {
virBufferEscapeString(buf, "<dnsmasq:option value='%s'/>\n", virBufferEscapeString(buf, "<dnsmasq:option value='%s'/>\n", *n);
def->options[i]);
} }
virBufferAdjustIndent(buf, -2); virBufferAdjustIndent(buf, -2);
@ -1554,8 +1552,9 @@ networkDnsmasqConfContents(virNetworkObj *obj,
if (def->namespaceData) { if (def->namespaceData) {
networkDnsmasqXmlNsDef *dnsmasqxmlns = def->namespaceData; networkDnsmasqXmlNsDef *dnsmasqxmlns = def->namespaceData;
for (i = 0; i < dnsmasqxmlns->noptions; i++) GStrv n;
virBufferAsprintf(&configbuf, "%s\n", dnsmasqxmlns->options[i]); for (n = dnsmasqxmlns->options; n && *n; n++)
virBufferAsprintf(&configbuf, "%s\n", *n);
} }
if (!(*configstr = virBufferContentAndReset(&configbuf))) if (!(*configstr = virBufferContentAndReset(&configbuf)))