shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-06 17:17:56 +03:00
Code Releases Activity

network: use g_auto wherever appropriate

Browse Source 
This includes standard g_autofree() as well as other objects that have
a cleanup function defined to use via g_autoptr (virCommand,
virJSONValue)

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Laine Stump 2020-07-03 23:43:21 -04:00
parent 9f51c3d6c0
commit b32b2746ad
3 changed files with 73 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

199
src/network/bridge_driver.c
View File

@ -160,6 +160,7 @@ networkDnsmasqDefNamespaceFree(void *nsdata)
VIR_FREE(def); VIR_FREE(def);
} }
G_DEFINE_AUTOPTR_CLEANUP_FUNC(networkDnsmasqXmlNsDef, networkDnsmasqDefNamespaceFree);
static int static int
@ -195,7 +196,7 @@ static int
networkDnsmasqDefNamespaceParse(xmlXPathContextPtr ctxt, networkDnsmasqDefNamespaceParse(xmlXPathContextPtr ctxt,
void **data) void **data)
{ {
networkDnsmasqXmlNsDefPtr nsdata = g_new0(networkDnsmasqXmlNsDef, 1); g_autoptr(networkDnsmasqXmlNsDef) nsdata = g_new0(networkDnsmasqXmlNsDef, 1);
int ret = -1; int ret = -1;
if (networkDnsmasqDefNamespaceParseOptions(nsdata, ctxt)) if (networkDnsmasqDefNamespaceParseOptions(nsdata, ctxt))
@ -207,7 +208,6 @@ networkDnsmasqDefNamespaceParse(xmlXPathContextPtr ctxt,
ret = 0; ret = 0;
cleanup: cleanup:
networkDnsmasqDefNamespaceFree(nsdata);
return ret; return ret;
} }
@ -329,7 +329,7 @@ networkRunHook(virNetworkObjPtr obj,
{ {
virNetworkDefPtr def; virNetworkDefPtr def;
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
char *xml = NULL; g_autofree char *xml = NULL;
int hookret; int hookret;
int ret = -1; int ret = -1;
@ -366,7 +366,6 @@ networkRunHook(virNetworkObjPtr obj,
ret = 0; ret = 0;
cleanup: cleanup:
VIR_FREE(xml);
return ret; return ret;
} }
@ -431,14 +430,14 @@ static int
networkRemoveInactive(virNetworkDriverStatePtr driver, networkRemoveInactive(virNetworkDriverStatePtr driver,
virNetworkObjPtr obj) virNetworkObjPtr obj)
{ {
char *leasefile = NULL; g_autofree char *leasefile = NULL;
char *customleasefile = NULL; g_autofree char *customleasefile = NULL;
char *radvdconfigfile = NULL; g_autofree char *radvdconfigfile = NULL;
char *configfile = NULL; g_autofree char *configfile = NULL;
char *radvdpidbase = NULL; g_autofree char *radvdpidbase = NULL;
char *statusfile = NULL; g_autofree char *statusfile = NULL;
char *macMapFile = NULL; g_autofree char *macMapFile = NULL;
dnsmasqContext *dctx = NULL; g_autoptr(dnsmasqContext) dctx = NULL;
virNetworkDefPtr def = virNetworkObjGetPersistentDef(obj); virNetworkDefPtr def = virNetworkObjGetPersistentDef(obj);
int ret = -1; int ret = -1;
@ -492,14 +491,6 @@ networkRemoveInactive(virNetworkDriverStatePtr driver,
ret = 0; ret = 0;
cleanup: cleanup:
VIR_FREE(leasefile);
VIR_FREE(configfile);
VIR_FREE(customleasefile);
VIR_FREE(radvdconfigfile);
VIR_FREE(radvdpidbase);
VIR_FREE(statusfile);
VIR_FREE(macMapFile);
dnsmasqContextFree(dctx);
return ret; return ret;
} }
@ -550,9 +541,9 @@ networkUpdateState(virNetworkObjPtr obj,
{ {
virNetworkDefPtr def; virNetworkDefPtr def;
virNetworkDriverStatePtr driver = opaque; virNetworkDriverStatePtr driver = opaque;
dnsmasqCapsPtr dnsmasq_caps = networkGetDnsmasqCaps(driver); g_autoptr(dnsmasqCaps) dnsmasq_caps = networkGetDnsmasqCaps(driver);
virMacMapPtr macmap; virMacMapPtr macmap;
char *macMapFile = NULL; g_autofree char *macMapFile = NULL;
int ret = -1; int ret = -1;
virObjectLock(obj); virObjectLock(obj);
@ -614,7 +605,7 @@ networkUpdateState(virNetworkObjPtr obj,
if (virNetworkObjIsActive(obj) && def->ips && (def->nips > 0)) { if (virNetworkObjIsActive(obj) && def->ips && (def->nips > 0)) {
pid_t radvdPid; pid_t radvdPid;
pid_t dnsmasqPid; pid_t dnsmasqPid;
char *radvdpidbase; g_autofree char *radvdpidbase = NULL;
ignore_value(virPidFileReadIfAlive(driver->pidDir, ignore_value(virPidFileReadIfAlive(driver->pidDir,
def->name, def->name,
@ -630,14 +621,11 @@ networkUpdateState(virNetworkObjPtr obj,
radvdpidbase, radvdpidbase,
&radvdPid, RADVD)); &radvdPid, RADVD));
virNetworkObjSetRadvdPid(obj, radvdPid); virNetworkObjSetRadvdPid(obj, radvdPid);
VIR_FREE(radvdpidbase);
} }
ret = 0; ret = 0;
cleanup: cleanup:
virObjectUnlock(obj); virObjectUnlock(obj);
virObjectUnref(dnsmasq_caps);
VIR_FREE(macMapFile);
return ret; return ret;
} }
@ -716,8 +704,8 @@ networkStateInitialize(bool privileged,
void *opaque G_GNUC_UNUSED) void *opaque G_GNUC_UNUSED)
{ {
int ret = VIR_DRV_STATE_INIT_ERROR; int ret = VIR_DRV_STATE_INIT_ERROR;
char *configdir = NULL; g_autofree char *configdir = NULL;
char *rundir = NULL; g_autofree char *rundir = NULL;
bool autostart = true; bool autostart = true;
#ifdef WITH_FIREWALLD #ifdef WITH_FIREWALLD
DBusConnection *sysbus = NULL; DBusConnection *sysbus = NULL;
@ -845,8 +833,6 @@ networkStateInitialize(bool privileged,
ret = VIR_DRV_STATE_INIT_COMPLETE; ret = VIR_DRV_STATE_INIT_COMPLETE;
cleanup: cleanup:
VIR_FREE(configdir);
VIR_FREE(rundir);
return ret; return ret;
error: error:
@ -1047,10 +1033,11 @@ networkDnsmasqConfLocalPTRs(virBufferPtr buf,
{ {
virNetworkIPDefPtr ip; virNetworkIPDefPtr ip;
size_t i; size_t i;
char *ptr = NULL;
int rc; int rc;
for (i = 0; i < def->nips; i++) { for (i = 0; i < def->nips; i++) {
g_autofree char *ptr = NULL;
ip = def->ips + i; ip = def->ips + i;
if (ip->localPTR != VIR_TRISTATE_BOOL_YES) if (ip->localPTR != VIR_TRISTATE_BOOL_YES)
@ -1071,7 +1058,6 @@ networkDnsmasqConfLocalPTRs(virBufferPtr buf,
} }
virBufferAsprintf(buf, "local=/%s/\n", ptr); virBufferAsprintf(buf, "local=/%s/\n", ptr);
VIR_FREE(ptr);
} }
return 0; return 0;
@ -1095,7 +1081,6 @@ networkDnsmasqConfContents(virNetworkObjPtr obj,
bool wantDNS = dns->enable != VIR_TRISTATE_BOOL_NO; bool wantDNS = dns->enable != VIR_TRISTATE_BOOL_NO;
virNetworkIPDefPtr tmpipdef, ipdef, ipv4def, ipv6def; virNetworkIPDefPtr tmpipdef, ipdef, ipv4def, ipv6def;
bool ipv6SLAAC; bool ipv6SLAAC;
char *saddr = NULL, *eaddr = NULL;
*configstr = NULL; *configstr = NULL;
@ -1150,12 +1135,11 @@ networkDnsmasqConfContents(virNetworkObjPtr obj,
if (fwd->domain) if (fwd->domain)
virBufferAsprintf(&configbuf, "/%s/", fwd->domain); virBufferAsprintf(&configbuf, "/%s/", fwd->domain);
if (VIR_SOCKET_ADDR_VALID(&fwd->addr)) { if (VIR_SOCKET_ADDR_VALID(&fwd->addr)) {
char *addr = virSocketAddrFormat(&fwd->addr); g_autofree char *addr = virSocketAddrFormat(&fwd->addr);
if (!addr) if (!addr)
goto cleanup; goto cleanup;
virBufferAsprintf(&configbuf, "%s\n", addr); virBufferAsprintf(&configbuf, "%s\n", addr);
VIR_FREE(addr);
if (!fwd->domain) if (!fwd->domain)
addNoResolv = true; addNoResolv = true;
} else { } else {
@ -1228,7 +1212,7 @@ networkDnsmasqConfContents(virNetworkObjPtr obj,
for (i = 0; for (i = 0;
(tmpipdef = virNetworkDefGetIPByIndex(def, AF_UNSPEC, i)); (tmpipdef = virNetworkDefGetIPByIndex(def, AF_UNSPEC, i));
i++) { i++) {
char *ipaddr = virSocketAddrFormat(&tmpipdef->address); g_autofree char *ipaddr = virSocketAddrFormat(&tmpipdef->address);
if (!ipaddr) if (!ipaddr)
goto cleanup; goto cleanup;
@ -1254,11 +1238,9 @@ networkDnsmasqConfContents(virNetworkObjPtr obj,
"(as described in RFC1918/RFC3484/RFC4193)."), "(as described in RFC1918/RFC3484/RFC4193)."),
ipaddr, (int)version / 1000000, ipaddr, (int)version / 1000000,
(int)(version % 1000000) / 1000); (int)(version % 1000000) / 1000);
VIR_FREE(ipaddr);
goto cleanup; goto cleanup;
} }
virBufferAsprintf(&configbuf, "listen-address=%s\n", ipaddr); virBufferAsprintf(&configbuf, "listen-address=%s\n", ipaddr);
VIR_FREE(ipaddr);
} }
} }
@ -1414,6 +1396,8 @@ networkDnsmasqConfContents(virNetworkObjPtr obj,
int thisRange; int thisRange;
virNetworkDHCPRangeDef range = ipdef->ranges[r]; virNetworkDHCPRangeDef range = ipdef->ranges[r];
g_autofree char *leasetime = NULL; g_autofree char *leasetime = NULL;
g_autofree char *saddr = NULL;
g_autofree char *eaddr = NULL;
if (!(saddr = virSocketAddrFormat(&range.addr.start)) || if (!(saddr = virSocketAddrFormat(&range.addr.start)) ||
!(eaddr = virSocketAddrFormat(&range.addr.end))) !(eaddr = virSocketAddrFormat(&range.addr.end)))
@ -1446,8 +1430,6 @@ networkDnsmasqConfContents(virNetworkObjPtr obj,
virBufferAddLit(&configbuf, "\n"); virBufferAddLit(&configbuf, "\n");
VIR_FREE(saddr);
VIR_FREE(eaddr);
thisRange = virSocketAddrGetRange(&range.addr.start, thisRange = virSocketAddrGetRange(&range.addr.start,
&range.addr.end, &range.addr.end,
&ipdef->address, &ipdef->address,
@ -1464,7 +1446,7 @@ networkDnsmasqConfContents(virNetworkObjPtr obj,
* support) * support)
*/ */
if (!ipdef->nranges && ipdef->nhosts) { if (!ipdef->nranges && ipdef->nhosts) {
char *bridgeaddr = virSocketAddrFormat(&ipdef->address); g_autofree char *bridgeaddr = virSocketAddrFormat(&ipdef->address);
if (!bridgeaddr) if (!bridgeaddr)
goto cleanup; goto cleanup;
virBufferAsprintf(&configbuf, "dhcp-range=%s,static", virBufferAsprintf(&configbuf, "dhcp-range=%s,static",
@ -1472,7 +1454,6 @@ networkDnsmasqConfContents(virNetworkObjPtr obj,
if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET6)) if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET6))
virBufferAsprintf(&configbuf, ",%d", prefix); virBufferAsprintf(&configbuf, ",%d", prefix);
virBufferAddLit(&configbuf, "\n"); virBufferAddLit(&configbuf, "\n");
VIR_FREE(bridgeaddr);
} }
if (networkBuildDnsmasqDhcpHostsList(dctx, ipdef) < 0) if (networkBuildDnsmasqDhcpHostsList(dctx, ipdef) < 0)
@ -1492,13 +1473,12 @@ networkDnsmasqConfContents(virNetworkObjPtr obj,
if (ipdef->bootfile) { if (ipdef->bootfile) {
if (VIR_SOCKET_ADDR_VALID(&ipdef->bootserver)) { if (VIR_SOCKET_ADDR_VALID(&ipdef->bootserver)) {
char *bootserver = virSocketAddrFormat(&ipdef->bootserver); g_autofree char *bootserver = virSocketAddrFormat(&ipdef->bootserver);
if (!bootserver) if (!bootserver)
goto cleanup; goto cleanup;
virBufferAsprintf(&configbuf, "dhcp-boot=%s%s%s\n", virBufferAsprintf(&configbuf, "dhcp-boot=%s%s%s\n",
ipdef->bootfile, ",,", bootserver); ipdef->bootfile, ",,", bootserver);
VIR_FREE(bootserver);
} else { } else {
virBufferAsprintf(&configbuf, "dhcp-boot=%s\n", ipdef->bootfile); virBufferAsprintf(&configbuf, "dhcp-boot=%s\n", ipdef->bootfile);
} }
@ -1543,12 +1523,11 @@ networkDnsmasqConfContents(virNetworkObjPtr obj,
(ipdef = virNetworkDefGetIPByIndex(def, AF_INET6, i)); (ipdef = virNetworkDefGetIPByIndex(def, AF_INET6, i));
i++) { i++) {
if (!(ipdef->nranges || ipdef->nhosts)) { if (!(ipdef->nranges || ipdef->nhosts)) {
char *bridgeaddr = virSocketAddrFormat(&ipdef->address); g_autofree char *bridgeaddr = virSocketAddrFormat(&ipdef->address);
if (!bridgeaddr) if (!bridgeaddr)
goto cleanup; goto cleanup;
virBufferAsprintf(&configbuf, virBufferAsprintf(&configbuf,
"dhcp-range=%s,ra-only\n", bridgeaddr); "dhcp-range=%s,ra-only\n", bridgeaddr);
VIR_FREE(bridgeaddr);
} }
} }
} }
@ -1569,8 +1548,6 @@ networkDnsmasqConfContents(virNetworkObjPtr obj,
ret = 0; ret = 0;
cleanup: cleanup:
VIR_FREE(saddr);
VIR_FREE(eaddr);
return ret; return ret;
} }
@ -1584,13 +1561,13 @@ networkBuildDhcpDaemonCommandLine(virNetworkDriverStatePtr driver,
dnsmasqContext *dctx) dnsmasqContext *dctx)
{ {
virNetworkDefPtr def = virNetworkObjGetDef(obj); virNetworkDefPtr def = virNetworkObjGetDef(obj);
dnsmasqCapsPtr dnsmasq_caps = networkGetDnsmasqCaps(driver); g_autoptr(dnsmasqCaps) dnsmasq_caps = networkGetDnsmasqCaps(driver);
virCommandPtr cmd = NULL; g_autoptr(virCommand) cmd = NULL;
int ret = -1; int ret = -1;
char *configfile = NULL; g_autofree char *configfile = NULL;
char *configstr = NULL; g_autofree char *configstr = NULL;
char *hostsfilestr = NULL; g_autofree char *hostsfilestr = NULL;
char *leaseshelper_path = NULL; g_autofree char *leaseshelper_path = NULL;
virNetworkObjSetDnsmasqPid(obj, -1); virNetworkObjSetDnsmasqPid(obj, -1);
@ -1625,14 +1602,9 @@ networkBuildDhcpDaemonCommandLine(virNetworkDriverStatePtr driver,
virCommandAddArgFormat(cmd, "--dhcp-script=%s", leaseshelper_path); virCommandAddArgFormat(cmd, "--dhcp-script=%s", leaseshelper_path);
virCommandAddEnvPair(cmd, "VIR_BRIDGE_NAME", def->bridge); virCommandAddEnvPair(cmd, "VIR_BRIDGE_NAME", def->bridge);
*cmdout = cmd; *cmdout = g_steal_pointer(&cmd);
ret = 0; ret = 0;
cleanup: cleanup:
virObjectUnref(dnsmasq_caps);
VIR_FREE(configfile);
VIR_FREE(configstr);
VIR_FREE(hostsfilestr);
VIR_FREE(leaseshelper_path);
return ret; return ret;
} }
@ -1645,11 +1617,11 @@ networkStartDhcpDaemon(virNetworkDriverStatePtr driver,
virNetworkIPDefPtr ipdef; virNetworkIPDefPtr ipdef;
size_t i; size_t i;
bool needDnsmasq = false; bool needDnsmasq = false;
virCommandPtr cmd = NULL; g_autoptr(virCommand) cmd = NULL;
char *pidfile = NULL; g_autofree char *pidfile = NULL;
pid_t dnsmasqPid; pid_t dnsmasqPid;
int ret = -1; int ret = -1;
dnsmasqContext *dctx = NULL; g_autoptr(dnsmasqContext) dctx = NULL;
/* see if there are any IP addresses that need a dhcp server */ /* see if there are any IP addresses that need a dhcp server */
i = 0; i = 0;
@ -1722,9 +1694,6 @@ networkStartDhcpDaemon(virNetworkDriverStatePtr driver,
ret = 0; ret = 0;
cleanup: cleanup:
VIR_FREE(pidfile);
virCommandFree(cmd);
dnsmasqContextFree(dctx);
return ret; return ret;
} }
@ -1745,7 +1714,7 @@ networkRefreshDhcpDaemon(virNetworkDriverStatePtr driver,
size_t i; size_t i;
pid_t dnsmasqPid; pid_t dnsmasqPid;
virNetworkIPDefPtr ipdef, ipv4def, ipv6def; virNetworkIPDefPtr ipdef, ipv4def, ipv6def;
dnsmasqContext *dctx = NULL; g_autoptr(dnsmasqContext) dctx = NULL;
/* if no IP addresses specified, nothing to do */ /* if no IP addresses specified, nothing to do */
if (!virNetworkDefGetIPByIndex(def, AF_UNSPEC, 0)) if (!virNetworkDefGetIPByIndex(def, AF_UNSPEC, 0))
@ -1797,7 +1766,6 @@ networkRefreshDhcpDaemon(virNetworkDriverStatePtr driver,
dnsmasqPid = virNetworkObjGetDnsmasqPid(obj); dnsmasqPid = virNetworkObjGetDnsmasqPid(obj);
ret = kill(dnsmasqPid, SIGHUP); ret = kill(dnsmasqPid, SIGHUP);
cleanup: cleanup:
dnsmasqContextFree(dctx);
return ret; return ret;
} }
@ -1872,7 +1840,7 @@ networkRadvdConfContents(virNetworkObjPtr obj,
/* add a section for each IPv6 address in the config */ /* add a section for each IPv6 address in the config */
for (i = 0; (ipdef = virNetworkDefGetIPByIndex(def, AF_INET6, i)); i++) { for (i = 0; (ipdef = virNetworkDefGetIPByIndex(def, AF_INET6, i)); i++) {
int prefix; int prefix;
char *netaddr; g_autofree char *netaddr = NULL;
prefix = virNetworkIPDefPrefix(ipdef); prefix = virNetworkIPDefPrefix(ipdef);
if (prefix < 0) { if (prefix < 0) {
@ -1889,7 +1857,6 @@ networkRadvdConfContents(virNetworkObjPtr obj,
" {\n%s };\n", " {\n%s };\n",
netaddr, prefix, netaddr, prefix,
dhcp6 ? radvd2 : radvd3); dhcp6 ? radvd2 : radvd3);
VIR_FREE(netaddr);
} }
virBufferAddLit(&configbuf, "};\n"); virBufferAddLit(&configbuf, "};\n");
@ -1908,8 +1875,8 @@ networkRadvdConfWrite(virNetworkDriverStatePtr driver,
{ {
virNetworkDefPtr def = virNetworkObjGetDef(obj); virNetworkDefPtr def = virNetworkObjGetDef(obj);
int ret = -1; int ret = -1;
char *configStr = NULL; g_autofree char *configStr = NULL;
char *myConfigFile = NULL; g_autofree char *myConfigFile = NULL;
if (!configFile) if (!configFile)
configFile = &myConfigFile; configFile = &myConfigFile;
@ -1937,8 +1904,6 @@ networkRadvdConfWrite(virNetworkDriverStatePtr driver,
ret = 0; ret = 0;
cleanup: cleanup:
VIR_FREE(configStr);
VIR_FREE(myConfigFile);
return ret; return ret;
} }
@ -1948,12 +1913,12 @@ networkStartRadvd(virNetworkDriverStatePtr driver,
virNetworkObjPtr obj) virNetworkObjPtr obj)
{ {
virNetworkDefPtr def = virNetworkObjGetDef(obj); virNetworkDefPtr def = virNetworkObjGetDef(obj);
dnsmasqCapsPtr dnsmasq_caps = networkGetDnsmasqCaps(driver); g_autoptr(dnsmasqCaps) dnsmasq_caps = networkGetDnsmasqCaps(driver);
pid_t radvdPid; pid_t radvdPid;
char *pidfile = NULL; g_autofree char *pidfile = NULL;
char *radvdpidbase = NULL; g_autofree char *radvdpidbase = NULL;
char *configfile = NULL; g_autofree char *configfile = NULL;
virCommandPtr cmd = NULL; g_autoptr(virCommand) cmd = NULL;
int ret = -1; int ret = -1;
virNetworkObjSetRadvdPid(obj, -1); virNetworkObjSetRadvdPid(obj, -1);
@ -2026,11 +1991,6 @@ networkStartRadvd(virNetworkDriverStatePtr driver,
ret = 0; ret = 0;
cleanup: cleanup:
virObjectUnref(dnsmasq_caps);
virCommandFree(cmd);
VIR_FREE(configfile);
VIR_FREE(radvdpidbase);
VIR_FREE(pidfile);
return ret; return ret;
} }
@ -2040,14 +2000,13 @@ networkRefreshRadvd(virNetworkDriverStatePtr driver,
virNetworkObjPtr obj) virNetworkObjPtr obj)
{ {
virNetworkDefPtr def = virNetworkObjGetDef(obj); virNetworkDefPtr def = virNetworkObjGetDef(obj);
dnsmasqCapsPtr dnsmasq_caps = networkGetDnsmasqCaps(driver); g_autoptr(dnsmasqCaps) dnsmasq_caps = networkGetDnsmasqCaps(driver);
g_autofree char *radvdpidbase = NULL; g_autofree char *radvdpidbase = NULL;
g_autofree char *pidfile = NULL; g_autofree char *pidfile = NULL;
pid_t radvdPid; pid_t radvdPid;
/* Is dnsmasq handling RA? */ /* Is dnsmasq handling RA? */
if (DNSMASQ_RA_SUPPORT(dnsmasq_caps)) { if (DNSMASQ_RA_SUPPORT(dnsmasq_caps)) {
virObjectUnref(dnsmasq_caps);
if ((radvdpidbase = networkRadvdPidfileBasename(def->name)) && if ((radvdpidbase = networkRadvdPidfileBasename(def->name)) &&
(pidfile = virPidFileBuildPath(driver->pidDir, radvdpidbase))) { (pidfile = virPidFileBuildPath(driver->pidDir, radvdpidbase))) {
/* radvd should not be running but in case it is */ /* radvd should not be running but in case it is */
@ -2056,7 +2015,6 @@ networkRefreshRadvd(virNetworkDriverStatePtr driver,
} }
return 0; return 0;
} }
virObjectUnref(dnsmasq_caps);
/* if there's no running radvd, just start it */ /* if there's no running radvd, just start it */
radvdPid = virNetworkObjGetRadvdPid(obj); radvdPid = virNetworkObjGetRadvdPid(obj);
@ -2384,7 +2342,8 @@ networkWaitDadFinish(virNetworkObjPtr obj)
{ {
virNetworkDefPtr def = virNetworkObjGetDef(obj); virNetworkDefPtr def = virNetworkObjGetDef(obj);
virNetworkIPDefPtr ipdef; virNetworkIPDefPtr ipdef;
virSocketAddrPtr *addrs = NULL, addr = NULL; g_autofree virSocketAddrPtr *addrs = NULL;
virSocketAddrPtr addr = NULL;
size_t naddrs = 0; size_t naddrs = 0;
int ret = -1; int ret = -1;
@ -2399,7 +2358,6 @@ networkWaitDadFinish(virNetworkObjPtr obj)
ret = (naddrs == 0) ? 0 : virNetDevIPWaitDadFinish(addrs, naddrs); ret = (naddrs == 0) ? 0 : virNetDevIPWaitDadFinish(addrs, naddrs);
cleanup: cleanup:
VIR_FREE(addrs);
VIR_DEBUG("Finished waiting for IPv6 DAD on network %s with status %d", VIR_DEBUG("Finished waiting for IPv6 DAD on network %s with status %d",
def->name, ret); def->name, ret);
return ret; return ret;
@ -2416,9 +2374,9 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver,
virErrorPtr save_err = NULL; virErrorPtr save_err = NULL;
virNetworkIPDefPtr ipdef; virNetworkIPDefPtr ipdef;
virNetDevIPRoutePtr routedef; virNetDevIPRoutePtr routedef;
char *macTapIfName = NULL; g_autofree char *macTapIfName = NULL;
virMacMapPtr macmap; virMacMapPtr macmap;
char *macMapFile = NULL; g_autofree char *macMapFile = NULL;
int tapfd = -1; int tapfd = -1;
bool dnsmasqStarted = false; bool dnsmasqStarted = false;
bool devOnline = false; bool devOnline = false;
@ -2465,7 +2423,6 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver,
VIR_NETDEV_TAP_CREATE_USE_MAC_FOR_BRIDGE | VIR_NETDEV_TAP_CREATE_USE_MAC_FOR_BRIDGE |
VIR_NETDEV_TAP_CREATE_IFUP | VIR_NETDEV_TAP_CREATE_IFUP |
VIR_NETDEV_TAP_CREATE_PERSIST) < 0) { VIR_NETDEV_TAP_CREATE_PERSIST) < 0) {
VIR_FREE(macTapIfName);
goto error; goto error;
} }
} }
@ -2581,9 +2538,6 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver,
if (virNetDevBandwidthSet(def->bridge, def->bandwidth, true, true) < 0) if (virNetDevBandwidthSet(def->bridge, def->bandwidth, true, true) < 0)
goto error; goto error;
VIR_FREE(macTapIfName);
VIR_FREE(macMapFile);
return 0; return 0;
error: error:
@ -2607,10 +2561,8 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver,
if (macTapIfName) { if (macTapIfName) {
VIR_FORCE_CLOSE(tapfd); VIR_FORCE_CLOSE(tapfd);
ignore_value(virNetDevTapDelete(macTapIfName, NULL)); ignore_value(virNetDevTapDelete(macTapIfName, NULL));
VIR_FREE(macTapIfName);
} }
virNetworkObjUnrefMacMap(obj); virNetworkObjUnrefMacMap(obj);
VIR_FREE(macMapFile);
ignore_value(virNetDevBridgeDelete(def->bridge)); ignore_value(virNetDevBridgeDelete(def->bridge));
@ -2635,14 +2587,12 @@ networkShutdownNetworkVirtual(virNetworkDriverStatePtr driver,
radvdPid = virNetworkObjGetRadvdPid(obj); radvdPid = virNetworkObjGetRadvdPid(obj);
if (radvdPid > 0) { if (radvdPid > 0) {
char *radvdpidbase; g_autofree char *radvdpidbase = NULL;
kill(radvdPid, SIGTERM); kill(radvdPid, SIGTERM);
/* attempt to delete the pidfile we created */ /* attempt to delete the pidfile we created */
if ((radvdpidbase = networkRadvdPidfileBasename(def->name))) { if ((radvdpidbase = networkRadvdPidfileBasename(def->name)))
virPidFileDelete(driver->pidDir, radvdpidbase); virPidFileDelete(driver->pidDir, radvdpidbase);
VIR_FREE(radvdpidbase);
}
} }
dnsmasqPid = virNetworkObjGetDnsmasqPid(obj); dnsmasqPid = virNetworkObjGetDnsmasqPid(obj);
@ -2650,11 +2600,9 @@ networkShutdownNetworkVirtual(virNetworkDriverStatePtr driver,
kill(dnsmasqPid, SIGTERM); kill(dnsmasqPid, SIGTERM);
if (def->mac_specified) { if (def->mac_specified) {
char *macTapIfName = networkBridgeDummyNicName(def->bridge); g_autofree char *macTapIfName = networkBridgeDummyNicName(def->bridge);
if (macTapIfName) { if (macTapIfName)
ignore_value(virNetDevTapDelete(macTapIfName, NULL)); ignore_value(virNetDevTapDelete(macTapIfName, NULL));
VIR_FREE(macTapIfName);
}
} }
ignore_value(virNetDevSetOnline(def->bridge, false)); ignore_value(virNetDevSetOnline(def->bridge, false));
@ -2960,7 +2908,7 @@ networkShutdownNetwork(virNetworkDriverStatePtr driver,
{ {
virNetworkDefPtr def = virNetworkObjGetDef(obj); virNetworkDefPtr def = virNetworkObjGetDef(obj);
int ret = 0; int ret = 0;
char *stateFile; g_autofree char *stateFile = NULL;
VIR_INFO("Shutting down network '%s'", def->name); VIR_INFO("Shutting down network '%s'", def->name);
@ -2972,7 +2920,6 @@ networkShutdownNetwork(virNetworkDriverStatePtr driver,
return -1; return -1;
unlink(stateFile); unlink(stateFile);
VIR_FREE(stateFile);
switch ((virNetworkForwardType) def->forward.type) { switch ((virNetworkForwardType) def->forward.type) {
@ -3245,7 +3192,6 @@ networkFindUnusedBridgeName(virNetworkObjListPtr nets,
virNetworkDefPtr def) virNetworkDefPtr def)
{ {
int ret = -1, id = 0; int ret = -1, id = 0;
char *newname = NULL;
const char *templ = "virbr%d"; const char *templ = "virbr%d";
const char *p; const char *p;
@ -3255,7 +3201,8 @@ networkFindUnusedBridgeName(virNetworkObjListPtr nets,
templ = def->bridge; templ = def->bridge;
do { do {
newname = g_strdup_printf(templ, id); g_autofree char *newname = g_strdup_printf(templ, id);
/* check if this name is used in another libvirt network or /* check if this name is used in another libvirt network or
* there is an existing device with that name. ignore errors * there is an existing device with that name. ignore errors
* from virNetDevExists(), just in case it isn't implemented * from virNetDevExists(), just in case it isn't implemented
@ -3264,11 +3211,10 @@ networkFindUnusedBridgeName(virNetworkObjListPtr nets,
if (!(virNetworkObjBridgeInUse(nets, newname, def->name) || if (!(virNetworkObjBridgeInUse(nets, newname, def->name) ||
virNetDevExists(newname) == 1)) { virNetDevExists(newname) == 1)) {
VIR_FREE(def->bridge); /*could contain template */ VIR_FREE(def->bridge); /*could contain template */
def->bridge = newname; def->bridge = g_steal_pointer(&newname);
ret = 0; ret = 0;
goto cleanup; goto cleanup;
} }
VIR_FREE(newname);
} while (++id <= MAX_BRIDGE_ID); } while (++id <= MAX_BRIDGE_ID);
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
@ -3276,8 +3222,6 @@ networkFindUnusedBridgeName(virNetworkObjListPtr nets,
MAX_BRIDGE_ID); MAX_BRIDGE_ID);
ret = 0; ret = 0;
cleanup: cleanup:
if (ret < 0)
VIR_FREE(newname);
return ret; return ret;
} }
@ -3421,7 +3365,7 @@ networkValidate(virNetworkDriverStatePtr driver,
*/ */
for (i = 0; i < def->forward.nifs; i++) { for (i = 0; i < def->forward.nifs; i++) {
virNetworkForwardIfDefPtr iface = &def->forward.ifs[i]; virNetworkForwardIfDefPtr iface = &def->forward.ifs[i];
char *sysfs_path = NULL; g_autofree char *sysfs_path = NULL;
switch ((virNetworkForwardHostdevDeviceType)iface->type) { switch ((virNetworkForwardHostdevDeviceType)iface->type) {
case VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NETDEV: case VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NETDEV:
@ -3462,10 +3406,8 @@ networkValidate(virNetworkDriverStatePtr driver,
_("device '%s' in network '%s' is not " _("device '%s' in network '%s' is not "
"an SR-IOV Virtual Function"), "an SR-IOV Virtual Function"),
sysfs_path, def->name); sysfs_path, def->name);
VIR_FREE(sysfs_path);
return -1; return -1;
} }
VIR_FREE(sysfs_path);
break; break;
} }
@ -4141,7 +4083,8 @@ networkSetAutostart(virNetworkPtr net,
virNetworkDriverStatePtr driver = networkGetDriver(); virNetworkDriverStatePtr driver = networkGetDriver();
virNetworkObjPtr obj; virNetworkObjPtr obj;
virNetworkDefPtr def; virNetworkDefPtr def;
char *configFile = NULL, *autostartLink = NULL; g_autofree char *configFile = NULL;
g_autofree char *autostartLink = NULL;
bool new_autostart; bool new_autostart;
bool cur_autostart; bool cur_autostart;
int ret = -1; int ret = -1;
@ -4198,8 +4141,6 @@ networkSetAutostart(virNetworkPtr net,
ret = 0; ret = 0;
cleanup: cleanup:
VIR_FREE(configFile);
VIR_FREE(autostartLink);
virNetworkObjEndAPI(&obj); virNetworkObjEndAPI(&obj);
return ret; return ret;
} }
@ -4221,14 +4162,13 @@ networkGetDHCPLeases(virNetworkPtr net,
long long currtime = 0; long long currtime = 0;
long long expirytime_tmp = -1; long long expirytime_tmp = -1;
bool ipv6 = false; bool ipv6 = false;
char *lease_entries = NULL; g_autofree char *lease_entries = NULL;
char *custom_lease_file = NULL; g_autofree char *custom_lease_file = NULL;
const char *ip_tmp = NULL; const char *ip_tmp = NULL;
const char *mac_tmp = NULL; const char *mac_tmp = NULL;
virJSONValuePtr lease_tmp = NULL; virJSONValuePtr lease_tmp = NULL;
virJSONValuePtr leases_array = NULL; g_autoptr(virJSONValue) leases_array = NULL;
virNetworkIPDefPtr ipdef_tmp = NULL; virNetworkIPDefPtr ipdef_tmp = NULL;
virNetworkDHCPLeasePtr lease = NULL;
virNetworkDHCPLeasePtr *leases_ret = NULL; virNetworkDHCPLeasePtr *leases_ret = NULL;
virNetworkObjPtr obj; virNetworkObjPtr obj;
virNetworkDefPtr def; virNetworkDefPtr def;
@ -4317,7 +4257,7 @@ networkGetDHCPLeases(virNetworkPtr net,
continue; continue;
if (need_results) { if (need_results) {
lease = g_new0(virNetworkDHCPLease, 1); g_autoptr(virNetworkDHCPLease) lease = g_new0(virNetworkDHCPLease, 1);
lease->expirytime = expirytime_tmp; lease->expirytime = expirytime_tmp;
@ -4365,8 +4305,6 @@ networkGetDHCPLeases(virNetworkPtr net,
} else { } else {
nleases++; nleases++;
} }
VIR_FREE(lease);
} }
if (leases_ret) { if (leases_ret) {
@ -4378,13 +4316,7 @@ networkGetDHCPLeases(virNetworkPtr net,
rv = nleases; rv = nleases;
cleanup: cleanup:
VIR_FREE(lease);
VIR_FREE(lease_entries);
VIR_FREE(custom_lease_file);
virJSONValueFree(leases_array);
virNetworkObjEndAPI(&obj); virNetworkObjEndAPI(&obj);
return rv; return rv;
error: error:
@ -5577,7 +5509,7 @@ networkPortSetParameters(virNetworkPortPtr port,
virNetworkDefPtr def; virNetworkDefPtr def;
virNetworkPortDefPtr portdef; virNetworkPortDefPtr portdef;
virNetDevBandwidthPtr bandwidth = NULL; virNetDevBandwidthPtr bandwidth = NULL;
char *dir = NULL; g_autofree char *dir = NULL;
int ret = -1; int ret = -1;
size_t i; size_t i;
@ -5654,7 +5586,6 @@ networkPortSetParameters(virNetworkPortPtr port,
cleanup: cleanup:
virNetDevBandwidthFree(bandwidth); virNetDevBandwidthFree(bandwidth);
virNetworkObjEndAPI(&obj); virNetworkObjEndAPI(&obj);
VIR_FREE(dir);
return ret; return ret;
} }

7
src/network/bridge_driver_linux.c
View File

@ -218,7 +218,8 @@ void networkPostReloadFirewallRules(bool startup G_GNUC_UNUSED)
int networkCheckRouteCollision(virNetworkDefPtr def) int networkCheckRouteCollision(virNetworkDefPtr def)
{ {
int ret = 0, len; int ret = 0, len;
char *cur, *buf = NULL; char *cur;
g_autofree char *buf = NULL;
/* allow for up to 100000 routes (each line is 128 bytes) */ /* allow for up to 100000 routes (each line is 128 bytes) */
enum {MAX_ROUTE_SIZE = 128*100000}; enum {MAX_ROUTE_SIZE = 128*100000};
@ -315,14 +316,13 @@ int networkCheckRouteCollision(virNetworkDefPtr def)
if ((r_addr.data.inet4.sin_addr.s_addr == addr_val) && if ((r_addr.data.inet4.sin_addr.s_addr == addr_val) &&
(r_mask.data.inet4.sin_addr.s_addr == mask_val)) { (r_mask.data.inet4.sin_addr.s_addr == mask_val)) {
char *addr_str = virSocketAddrFormat(&r_addr); g_autofree char *addr_str = virSocketAddrFormat(&r_addr);
if (!addr_str) if (!addr_str)
virResetLastError(); virResetLastError();
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Route address '%s' conflicts " _("Route address '%s' conflicts "
"with IP address for '%s'"), "with IP address for '%s'"),
NULLSTR(addr_str), iface); NULLSTR(addr_str), iface);
VIR_FREE(addr_str);
ret = -1; ret = -1;
goto out; goto out;
} }
@ -330,7 +330,6 @@ int networkCheckRouteCollision(virNetworkDefPtr def)
} }
out: out:
VIR_FREE(buf);
return ret; return ret;
} }

16
src/network/leaseshelper.c
View File

@ -82,8 +82,8 @@ VIR_ENUM_IMPL(virLeaseAction,
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
char *pid_file = NULL; g_autofree char *pid_file = NULL;
char *custom_lease_file = NULL; g_autofree char *custom_lease_file = NULL;
const char *ip = NULL; const char *ip = NULL;
const char *mac = NULL; const char *mac = NULL;
const char *leases_str = NULL; const char *leases_str = NULL;
@ -91,13 +91,13 @@ main(int argc, char **argv)
const char *clientid = getenv("DNSMASQ_CLIENT_ID"); const char *clientid = getenv("DNSMASQ_CLIENT_ID");
const char *interface = getenv("DNSMASQ_INTERFACE"); const char *interface = getenv("DNSMASQ_INTERFACE");
const char *hostname = getenv("DNSMASQ_SUPPLIED_HOSTNAME"); const char *hostname = getenv("DNSMASQ_SUPPLIED_HOSTNAME");
char *server_duid = NULL; g_autofree char *server_duid = NULL;
int action = -1; int action = -1;
int pid_file_fd = -1; int pid_file_fd = -1;
int rv = EXIT_FAILURE; int rv = EXIT_FAILURE;
bool delete = false; bool delete = false;
virJSONValuePtr lease_new = NULL; g_autoptr(virJSONValue) lease_new = NULL;
virJSONValuePtr leases_array_new = NULL; g_autoptr(virJSONValue) leases_array_new = NULL;
virSetErrorFunc(NULL, NULL); virSetErrorFunc(NULL, NULL);
virSetErrorLogPriorityFunc(NULL); virSetErrorLogPriorityFunc(NULL);
@ -256,11 +256,5 @@ main(int argc, char **argv)
if (pid_file_fd != -1) if (pid_file_fd != -1)
virPidFileReleasePath(pid_file, pid_file_fd); virPidFileReleasePath(pid_file, pid_file_fd);
VIR_FREE(pid_file);
VIR_FREE(server_duid);
VIR_FREE(custom_lease_file);
virJSONValueFree(lease_new);
virJSONValueFree(leases_array_new);
return rv; return rv;
} }