External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 20:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

net: Re-use checks when creating transient networks

Browse Source 
When a transient network was created some of the checks weren't run on
the definition allowing to start invalid networks.

This patch splits out code to the network validation function and
re-uses that code when creating transient networks.
This commit is contained in:
Peter Krempa 2012-10-25 16:27:07 +02:00
parent e87af617fc
commit b6dbbae128
1 changed files with 40 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/network/bridge_driver.c
View File

@ -2681,11 +2681,48 @@ cleanup:
static int static int
networkValidate(virNetworkDefPtr def) networkValidate(struct network_driver *driver,
virNetworkDefPtr def,
bool check_active)
{ {
int ii; int ii;
bool vlanUsed, vlanAllowed, badVlanUse = false; bool vlanUsed, vlanAllowed, badVlanUse = false;
virPortGroupDefPtr defaultPortGroup = NULL; virPortGroupDefPtr defaultPortGroup = NULL;
virNetworkIpDefPtr ipdef;
bool ipv4def = false;
int i;
/* check for duplicate networks */
if (virNetworkObjIsDuplicate(&driver->networks, def, check_active) < 0)
return -1;
/* Only the three L3 network types that are configured by libvirt
* need to have a bridge device name / mac address provided
*/
if (def->forwardType == VIR_NETWORK_FORWARD_NONE ||
def->forwardType == VIR_NETWORK_FORWARD_NAT ||
def->forwardType == VIR_NETWORK_FORWARD_ROUTE) {
if (virNetworkSetBridgeName(&driver->networks, def, 1))
return -1;
virNetworkSetBridgeMacAddr(def);
}
/* We only support dhcp on one IPv4 address per defined network */
for (i = 0; (ipdef = virNetworkDefGetIpByIndex(def, AF_INET, i)); i++) {
if (ipdef->nranges || ipdef->nhosts) {
if (ipv4def) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Multiple dhcp sections found. "
"dhcp is supported only for a "
"single IPv4 address on each network"));
return -1;
} else {
ipv4def = true;
}
}
}
/* The only type of networks that currently support transparent /* The only type of networks that currently support transparent
* vlan configuration are those using hostdev sr-iov devices from * vlan configuration are those using hostdev sr-iov devices from
@ -2755,23 +2792,7 @@ static virNetworkPtr networkCreate(virConnectPtr conn, const char *xml) {
if (!(def = virNetworkDefParseString(xml))) if (!(def = virNetworkDefParseString(xml)))
goto cleanup; goto cleanup;
if (virNetworkObjIsDuplicate(&driver->networks, def, true) < 0) if (networkValidate(driver, def, true) < 0)
goto cleanup;
/* Only the three L3 network types that are configured by libvirt
* need to have a bridge device name / mac address provided
*/
if (def->forwardType == VIR_NETWORK_FORWARD_NONE ||
def->forwardType == VIR_NETWORK_FORWARD_NAT ||
def->forwardType == VIR_NETWORK_FORWARD_ROUTE) {
if (virNetworkSetBridgeName(&driver->networks, def, 1))
goto cleanup;
virNetworkSetBridgeMacAddr(def);
}
if (networkValidate(def) < 0)
goto cleanup; goto cleanup;
/* NB: "live" is false because this transient network hasn't yet /* NB: "live" is false because this transient network hasn't yet
@ -2801,54 +2822,17 @@ cleanup:
static virNetworkPtr networkDefine(virConnectPtr conn, const char *xml) { static virNetworkPtr networkDefine(virConnectPtr conn, const char *xml) {
struct network_driver *driver = conn->networkPrivateData; struct network_driver *driver = conn->networkPrivateData;
virNetworkIpDefPtr ipdef, ipv4def = NULL;
virNetworkDefPtr def; virNetworkDefPtr def;
bool freeDef = true; bool freeDef = true;
virNetworkObjPtr network = NULL; virNetworkObjPtr network = NULL;
virNetworkPtr ret = NULL; virNetworkPtr ret = NULL;
int ii;
networkDriverLock(driver); networkDriverLock(driver);
if (!(def = virNetworkDefParseString(xml))) if (!(def = virNetworkDefParseString(xml)))
goto cleanup; goto cleanup;
if (virNetworkObjIsDuplicate(&driver->networks, def, false) < 0) if (networkValidate(driver, def, false) < 0)
goto cleanup;
/* Only the three L3 network types that are configured by libvirt
* need to have a bridge device name / mac address provided
*/
if (def->forwardType == VIR_NETWORK_FORWARD_NONE ||
def->forwardType == VIR_NETWORK_FORWARD_NAT ||
def->forwardType == VIR_NETWORK_FORWARD_ROUTE) {
if (virNetworkSetBridgeName(&driver->networks, def, 1))
goto cleanup;
virNetworkSetBridgeMacAddr(def);
}
/* We only support dhcp on one IPv4 address per defined network */
for (ii = 0;
(ipdef = virNetworkDefGetIpByIndex(def, AF_UNSPEC, ii));
ii++) {
if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) {
if (ipdef->nranges || ipdef->nhosts) {
if (ipv4def) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Multiple dhcp sections found. "
"dhcp is supported only for a "
"single IPv4 address on each network"));
goto cleanup;
} else {
ipv4def = ipdef;
}
}
}
}
if (networkValidate(def) < 0)
goto cleanup; goto cleanup;
if (!(network = virNetworkAssignDef(&driver->networks, def, false))) if (!(network = virNetworkAssignDef(&driver->networks, def, false)))