External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-16 09:35:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

net: Move creation of dnsmasq hosts file to function starting dnsmasq

Browse Source 
The hosts file was created in the network definition function. This
patch moves the place the file is being created to the point where
dnsmasq is being started.
(cherry picked from commit 23ae3fe4256ba634babc6818b8cb7bbd3664a95a)
This commit is contained in:
Peter Krempa 2012-10-25 14:41:28 +02:00 committed by Cole Robinson
parent 2d49ed5d18
commit b16a4ca98b
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/network/bridge_driver.c
View File

@ -888,6 +888,8 @@ networkStartDhcpDaemon(struct network_driver *driver,
char *pidfile = NULL;
int ret = -1;
dnsmasqContext *dctx = NULL;
virNetworkIpDefPtr ipdef;
int i;
if (!virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, 0)) {
/* no IPv6 addresses, so we don't need to run radvd */
@ -931,6 +933,18 @@ networkStartDhcpDaemon(struct network_driver *driver,
if (ret < 0)
goto cleanup;
/* populate dnsmasq hosts file */
for (i = 0; (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, i)); i++) {
if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET) &&
(ipdef->nranges || ipdef->nhosts)) {
if (networkBuildDnsmasqHostsfile(dctx, ipdef,
network->def->dns) < 0)
goto cleanup;
break;
}
}
ret = dnsmasqSave(dctx);
if (ret < 0)
goto cleanup;
@ -2792,7 +2806,6 @@ static virNetworkPtr networkDefine(virConnectPtr conn, const char *xml) {
virNetworkObjPtr network = NULL;
virNetworkPtr ret = NULL;
int ii;
dnsmasqContext* dctx = NULL;
networkDriverLock(driver);
@ -2849,21 +2862,12 @@ static virNetworkPtr networkDefine(virConnectPtr conn, const char *xml) {
goto cleanup;
}
if (ipv4def) {
dctx = dnsmasqContextNew(def->name, DNSMASQ_STATE_DIR);
if (dctx == NULL ||
networkBuildDnsmasqHostsfile(dctx, ipv4def, def->dns) < 0 ||
dnsmasqSave(dctx) < 0)
goto cleanup;
}
VIR_INFO("Defining network '%s'", def->name);
ret = virGetNetwork(conn, def->name, def->uuid);
cleanup:
if (freeDef)
virNetworkDefFree(def);
dnsmasqContextFree(dctx);
if (network)
virNetworkObjUnlock(network);
networkDriverUnlock(driver);