External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-11-08 14:29:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

LXC: use the new net devices routes definition

Browse Source 
Actually set routes in lxc containers if there are defined ones.
This commit is contained in:
Cédric Bosdonnat 2014-07-24 15:20:27 +02:00
parent 430e939127
commit cef6eb77b8
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/lxc/lxc_container.c
View File

@ -497,6 +497,8 @@ static int lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef,
int rc = 0; int rc = 0;
size_t i, j; size_t i, j;
char *newname = NULL; char *newname = NULL;
char *toStr = NULL;
char *viaStr = NULL;
virDomainNetDefPtr netDef; virDomainNetDefPtr netDef;
bool privNet = vmDef->features[VIR_DOMAIN_FEATURE_PRIVNET] == bool privNet = vmDef->features[VIR_DOMAIN_FEATURE_PRIVNET] ==
VIR_TRISTATE_SWITCH_ON; VIR_TRISTATE_SWITCH_ON;
@ -539,6 +541,28 @@ static int lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef,
if (rc < 0) if (rc < 0)
goto error_out; goto error_out;
/* Set the routes */
for (j = 0; j < netDef->nroutes; j++) {
virDomainNetRouteDefPtr route = netDef->routes[j];
if (VIR_SOCKET_ADDR_VALID(&route->to))
toStr = virSocketAddrFormat(&route->to);
else
if (VIR_STRDUP(toStr, "default") < 0)
goto error_out;
viaStr = virSocketAddrFormat(&route->via);
VIR_DEBUG("Adding route %s/%d via %s", toStr, route->prefix, viaStr);
if (virNetDevAddRoute(newname, &route->to, route->prefix,
&route->via, 0) < 0) {
virReportError(VIR_ERR_SYSTEM_ERROR,
_("Failed to add route %s/%d via %s"),
toStr, route->prefix, viaStr);
goto error_out;
}
VIR_FREE(toStr);
VIR_FREE(viaStr);
}
VIR_FREE(newname); VIR_FREE(newname);
} }
@ -547,6 +571,8 @@ static int lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef,
rc = virNetDevSetOnline("lo", true); rc = virNetDevSetOnline("lo", true);
error_out: error_out:
VIR_FREE(toStr);
VIR_FREE(viaStr);
VIR_FREE(newname); VIR_FREE(newname);
return rc; return rc;
} }