External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 22:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

global: consistently use IP rather than Ip in identifiers

Browse Source 
I'm tired of mistyping this all the time, so let's do it the same all
the time (similar to how we changed all "Pci" to "PCI" awhile back).

(NB: I've left alone some things in the esx and vbox drivers because
I'm unable to compile them and they weren't obviously *not* a part of
some API. I also didn't change a couple of variables named,
e.g. "somethingIptables", because they were derived from the name of
the "iptables" command)
This commit is contained in:
Laine Stump 2016-06-08 12:48:50 -04:00
parent 638c6e5ba5
commit 22a6873a98
24 changed files with 225 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/conf/domain_conf.c
View File

@ -6119,11 +6119,11 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
return ret; return ret;
} }
static virDomainNetIpDefPtr static virDomainNetIPDefPtr
virDomainNetIpParseXML(xmlNodePtr node) virDomainNetIPParseXML(xmlNodePtr node)
{ {
/* Parse the prefix in every case */ /* Parse the prefix in every case */
virDomainNetIpDefPtr ip = NULL, ret = NULL; virDomainNetIPDefPtr ip = NULL, ret = NULL;
char *prefixStr = NULL; char *prefixStr = NULL;
unsigned int prefixValue = 0; unsigned int prefixValue = 0;
char *familyStr = NULL; char *familyStr = NULL;
@ -6245,7 +6245,7 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node ATTRIBUTE_UNUSED,
if (nipnodes) { if (nipnodes) {
size_t i; size_t i;
for (i = 0; i < nipnodes; i++) { for (i = 0; i < nipnodes; i++) {
virDomainNetIpDefPtr ip = virDomainNetIpParseXML(ipnodes[i]); virDomainNetIPDefPtr ip = virDomainNetIPParseXML(ipnodes[i]);
if (!ip) if (!ip)
goto error; goto error;
@ -8877,12 +8877,12 @@ virDomainActualNetDefParseXML(xmlNodePtr node,
int int
virDomainNetAppendIpAddress(virDomainNetDefPtr def, virDomainNetAppendIPAddress(virDomainNetDefPtr def,
const char *address, const char *address,
int family, int family,
unsigned int prefix) unsigned int prefix)
{ {
virDomainNetIpDefPtr ipDef = NULL; virDomainNetIPDefPtr ipDef = NULL;
if (VIR_ALLOC(ipDef) < 0) if (VIR_ALLOC(ipDef) < 0)
return -1; return -1;
@ -8954,7 +8954,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
int ret, val; int ret, val;
size_t i; size_t i;
size_t nips = 0; size_t nips = 0;
virDomainNetIpDefPtr *ips = NULL; virDomainNetIPDefPtr *ips = NULL;
size_t nroutes = 0; size_t nroutes = 0;
virNetworkRouteDefPtr *routes = NULL; virNetworkRouteDefPtr *routes = NULL;
@ -9054,9 +9054,9 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
ctxt->node = tmpnode; ctxt->node = tmpnode;
} }
} else if (xmlStrEqual(cur->name, BAD_CAST "ip")) { } else if (xmlStrEqual(cur->name, BAD_CAST "ip")) {
virDomainNetIpDefPtr ip = NULL; virDomainNetIPDefPtr ip = NULL;
if (!(ip = virDomainNetIpParseXML(cur))) if (!(ip = virDomainNetIPParseXML(cur)))
goto error; goto error;
if (VIR_APPEND_ELEMENT(ips, nips, ip) < 0) if (VIR_APPEND_ELEMENT(ips, nips, ip) < 0)
@ -20254,7 +20254,7 @@ virDomainFSDefFormat(virBufferPtr buf,
} }
static int static int
virDomainNetIpsFormat(virBufferPtr buf, virDomainNetIpDefPtr *ips, size_t nips) virDomainNetIPsFormat(virBufferPtr buf, virDomainNetIPDefPtr *ips, size_t nips)
{ {
size_t i; size_t i;
@ -20448,7 +20448,7 @@ virDomainHostdevDefFormatCaps(virBufferPtr buf,
virBufferAddLit(buf, "</source>\n"); virBufferAddLit(buf, "</source>\n");
if (def->source.caps.type == VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET) { if (def->source.caps.type == VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET) {
if (virDomainNetIpsFormat(buf, def->source.caps.u.net.ips, if (virDomainNetIPsFormat(buf, def->source.caps.u.net.ips,
def->source.caps.u.net.nips) < 0) def->source.caps.u.net.nips) < 0)
return -1; return -1;
if (virDomainNetRoutesFormat(buf, def->source.caps.u.net.routes, if (virDomainNetRoutesFormat(buf, def->source.caps.u.net.routes,
@ -20867,7 +20867,7 @@ virDomainNetDefFormat(virBufferPtr buf,
return -1; return -1;
} }
if (virDomainNetIpsFormat(buf, def->ips, def->nips) < 0) if (virDomainNetIPsFormat(buf, def->ips, def->nips) < 0)
return -1; return -1;
if (virDomainNetRoutesFormat(buf, def->routes, def->nroutes) < 0) if (virDomainNetRoutesFormat(buf, def->routes, def->nroutes) < 0)
return -1; return -1;

12
src/conf/domain_conf.h
View File

@ -382,9 +382,9 @@ typedef enum {
VIR_DOMAIN_HOSTDEV_CAPS_TYPE_LAST VIR_DOMAIN_HOSTDEV_CAPS_TYPE_LAST
} virDomainHostdevCapsType; } virDomainHostdevCapsType;
typedef struct _virDomainNetIpDef virDomainNetIpDef; typedef struct _virDomainNetIPDef virDomainNetIPDef;
typedef virDomainNetIpDef *virDomainNetIpDefPtr; typedef virDomainNetIPDef *virDomainNetIPDefPtr;
struct _virDomainNetIpDef { struct _virDomainNetIPDef {
virSocketAddr address; /* ipv4 or ipv6 address */ virSocketAddr address; /* ipv4 or ipv6 address */
unsigned int prefix; /* number of 1 bits in the net mask */ unsigned int prefix; /* number of 1 bits in the net mask */
}; };
@ -403,7 +403,7 @@ struct _virDomainHostdevCaps {
struct { struct {
char *iface; char *iface;
size_t nips; size_t nips;
virDomainNetIpDefPtr *ips; virDomainNetIPDefPtr *ips;
size_t nroutes; size_t nroutes;
virNetworkRouteDefPtr *routes; virNetworkRouteDefPtr *routes;
} net; } net;
@ -986,7 +986,7 @@ struct _virDomainNetDef {
int trustGuestRxFilters; /* enum virTristateBool */ int trustGuestRxFilters; /* enum virTristateBool */
int linkstate; int linkstate;
size_t nips; size_t nips;
virDomainNetIpDefPtr *ips; virDomainNetIPDefPtr *ips;
size_t nroutes; size_t nroutes;
virNetworkRouteDefPtr *routes; virNetworkRouteDefPtr *routes;
}; };
@ -2775,7 +2775,7 @@ virNetDevBandwidthPtr
virDomainNetGetActualBandwidth(virDomainNetDefPtr iface); virDomainNetGetActualBandwidth(virDomainNetDefPtr iface);
virNetDevVlanPtr virDomainNetGetActualVlan(virDomainNetDefPtr iface); virNetDevVlanPtr virDomainNetGetActualVlan(virDomainNetDefPtr iface);
bool virDomainNetGetActualTrustGuestRxFilters(virDomainNetDefPtr iface); bool virDomainNetGetActualTrustGuestRxFilters(virDomainNetDefPtr iface);
int virDomainNetAppendIpAddress(virDomainNetDefPtr def, int virDomainNetAppendIPAddress(virDomainNetDefPtr def,
const char *address, const char *address,
int family, int family,
unsigned int prefix); unsigned int prefix);

38
src/conf/interface_conf.c
View File

@ -45,7 +45,7 @@ virInterfaceDefDevFormat(virBufferPtr buf, const virInterfaceDef *def,
virInterfaceType parentIfType); virInterfaceType parentIfType);
static static
void virInterfaceIpDefFree(virInterfaceIpDefPtr def) void virInterfaceIPDefFree(virInterfaceIPDefPtr def)
{ {
if (def == NULL) if (def == NULL)
return; return;
@ -61,7 +61,7 @@ void virInterfaceProtocolDefFree(virInterfaceProtocolDefPtr def)
if (def == NULL) if (def == NULL)
return; return;
for (i = 0; i < def->nips; i++) for (i = 0; i < def->nips; i++)
virInterfaceIpDefFree(def->ips[i]); virInterfaceIPDefFree(def->ips[i]);
VIR_FREE(def->ips); VIR_FREE(def->ips);
VIR_FREE(def->family); VIR_FREE(def->family);
VIR_FREE(def->gateway); VIR_FREE(def->gateway);
@ -281,7 +281,7 @@ virInterfaceDefParseDhcp(virInterfaceProtocolDefPtr def,
} }
static int static int
virInterfaceDefParseIp(virInterfaceIpDefPtr def, virInterfaceDefParseIP(virInterfaceIPDefPtr def,
xmlXPathContextPtr ctxt) xmlXPathContextPtr ctxt)
{ {
int ret = 0; int ret = 0;
@ -310,7 +310,7 @@ virInterfaceDefParseProtoIPv4(virInterfaceProtocolDefPtr def,
{ {
xmlNodePtr dhcp; xmlNodePtr dhcp;
xmlNodePtr *ipNodes = NULL; xmlNodePtr *ipNodes = NULL;
int nIpNodes, ret = -1; int nipNodes, ret = -1;
size_t i; size_t i;
char *tmp; char *tmp;
@ -323,26 +323,26 @@ virInterfaceDefParseProtoIPv4(virInterfaceProtocolDefPtr def,
return -1; return -1;
} }
nIpNodes = virXPathNodeSet("./ip", ctxt, &ipNodes); nipNodes = virXPathNodeSet("./ip", ctxt, &ipNodes);
if (nIpNodes < 0) if (nipNodes < 0)
return -1; return -1;
if (ipNodes == NULL) if (ipNodes == NULL)
return 0; return 0;
if (VIR_ALLOC_N(def->ips, nIpNodes) < 0) if (VIR_ALLOC_N(def->ips, nipNodes) < 0)
goto error; goto error;
def->nips = 0; def->nips = 0;
for (i = 0; i < nIpNodes; i++) { for (i = 0; i < nipNodes; i++) {
virInterfaceIpDefPtr ip; virInterfaceIPDefPtr ip;
if (VIR_ALLOC(ip) < 0) if (VIR_ALLOC(ip) < 0)
goto error; goto error;
ctxt->node = ipNodes[i]; ctxt->node = ipNodes[i];
if (virInterfaceDefParseIp(ip, ctxt) < 0) { if (virInterfaceDefParseIP(ip, ctxt) < 0) {
virInterfaceIpDefFree(ip); virInterfaceIPDefFree(ip);
goto error; goto error;
} }
def->ips[def->nips++] = ip; def->ips[def->nips++] = ip;
@ -361,7 +361,7 @@ virInterfaceDefParseProtoIPv6(virInterfaceProtocolDefPtr def,
{ {
xmlNodePtr dhcp, autoconf; xmlNodePtr dhcp, autoconf;
xmlNodePtr *ipNodes = NULL; xmlNodePtr *ipNodes = NULL;
int nIpNodes, ret = -1; int nipNodes, ret = -1;
size_t i; size_t i;
char *tmp; char *tmp;
@ -378,26 +378,26 @@ virInterfaceDefParseProtoIPv6(virInterfaceProtocolDefPtr def,
return -1; return -1;
} }
nIpNodes = virXPathNodeSet("./ip", ctxt, &ipNodes); nipNodes = virXPathNodeSet("./ip", ctxt, &ipNodes);
if (nIpNodes < 0) if (nipNodes < 0)
return -1; return -1;
if (ipNodes == NULL) if (ipNodes == NULL)
return 0; return 0;
if (VIR_ALLOC_N(def->ips, nIpNodes) < 0) if (VIR_ALLOC_N(def->ips, nipNodes) < 0)
goto error; goto error;
def->nips = 0; def->nips = 0;
for (i = 0; i < nIpNodes; i++) { for (i = 0; i < nipNodes; i++) {
virInterfaceIpDefPtr ip; virInterfaceIPDefPtr ip;
if (VIR_ALLOC(ip) < 0) if (VIR_ALLOC(ip) < 0)
goto error; goto error;
ctxt->node = ipNodes[i]; ctxt->node = ipNodes[i];
if (virInterfaceDefParseIp(ip, ctxt) < 0) { if (virInterfaceDefParseIP(ip, ctxt) < 0) {
virInterfaceIpDefFree(ip); virInterfaceIPDefFree(ip);
goto error; goto error;
} }
def->ips[def->nips++] = ip; def->ips[def->nips++] = ip;

8
src/conf/interface_conf.h
View File

@ -119,9 +119,9 @@ struct _virInterfaceVlanDef {
char *dev_name; /* device name for vlan */ char *dev_name; /* device name for vlan */
}; };
typedef struct _virInterfaceIpDef virInterfaceIpDef; typedef struct _virInterfaceIPDef virInterfaceIPDef;
typedef virInterfaceIpDef *virInterfaceIpDefPtr; typedef virInterfaceIPDef *virInterfaceIPDefPtr;
struct _virInterfaceIpDef { struct _virInterfaceIPDef {
char *address; /* ip address */ char *address; /* ip address */
int prefix; /* ip prefix */ int prefix; /* ip prefix */
}; };
@ -135,7 +135,7 @@ struct _virInterfaceProtocolDef {
int peerdns; /* dhcp peerdns ? */ int peerdns; /* dhcp peerdns ? */
int autoconf; /* only useful if family is ipv6 */ int autoconf; /* only useful if family is ipv6 */
int nips; int nips;
virInterfaceIpDefPtr *ips; /* ptr to array of ips[nips] */ virInterfaceIPDefPtr *ips; /* ptr to array of ips[nips] */
char *gateway; /* route gateway */ char *gateway; /* route gateway */
}; };

80
src/conf/network_conf.c
View File

@ -310,7 +310,7 @@ virNetworkDHCPHostDefClear(virNetworkDHCPHostDefPtr def)
} }
static void static void
virNetworkIpDefClear(virNetworkIpDefPtr def) virNetworkIPDefClear(virNetworkIPDefPtr def)
{ {
VIR_FREE(def->family); VIR_FREE(def->family);
VIR_FREE(def->ranges); VIR_FREE(def->ranges);
@ -402,7 +402,7 @@ virNetworkDefFree(virNetworkDefPtr def)
virNetworkForwardDefClear(&def->forward); virNetworkForwardDefClear(&def->forward);
for (i = 0; i < def->nips && def->ips; i++) for (i = 0; i < def->nips && def->ips; i++)
virNetworkIpDefClear(&def->ips[i]); virNetworkIPDefClear(&def->ips[i]);
VIR_FREE(def->ips); VIR_FREE(def->ips);
for (i = 0; i < def->nroutes && def->routes; i++) for (i = 0; i < def->nroutes && def->routes; i++)
@ -780,8 +780,8 @@ void virNetworkRemoveInactive(virNetworkObjListPtr nets,
} }
/* return ips[index], or NULL if there aren't enough ips */ /* return ips[index], or NULL if there aren't enough ips */
virNetworkIpDefPtr virNetworkIPDefPtr
virNetworkDefGetIpByIndex(const virNetworkDef *def, virNetworkDefGetIPByIndex(const virNetworkDef *def,
int family, size_t n) int family, size_t n)
{ {
size_t i; size_t i;
@ -832,9 +832,9 @@ virNetworkDefGetRouteByIndex(const virNetworkDef *def,
/* return number of 1 bits in netmask for the network's ipAddress, /* return number of 1 bits in netmask for the network's ipAddress,
* or -1 on error * or -1 on error
*/ */
int virNetworkIpDefPrefix(const virNetworkIpDef *def) int virNetworkIPDefPrefix(const virNetworkIPDef *def)
{ {
return virSocketAddrGetIpPrefix(&def->address, return virSocketAddrGetIPPrefix(&def->address,
&def->netmask, &def->netmask,
def->prefix); def->prefix);
} }
@ -843,7 +843,7 @@ int virNetworkIpDefPrefix(const virNetworkIpDef *def)
* definition, based on either the definition's netmask, or its * definition, based on either the definition's netmask, or its
* prefix. Return -1 on error (and set the netmask family to AF_UNSPEC) * prefix. Return -1 on error (and set the netmask family to AF_UNSPEC)
*/ */
int virNetworkIpDefNetmask(const virNetworkIpDef *def, int virNetworkIPDefNetmask(const virNetworkIPDef *def,
virSocketAddrPtr netmask) virSocketAddrPtr netmask)
{ {
if (VIR_SOCKET_ADDR_IS_FAMILY(&def->netmask, AF_INET)) { if (VIR_SOCKET_ADDR_IS_FAMILY(&def->netmask, AF_INET)) {
@ -851,14 +851,14 @@ int virNetworkIpDefNetmask(const virNetworkIpDef *def,
return 0; return 0;
} }
return virSocketAddrPrefixToNetmask(virNetworkIpDefPrefix(def), netmask, return virSocketAddrPrefixToNetmask(virNetworkIPDefPrefix(def), netmask,
VIR_SOCKET_ADDR_FAMILY(&def->address)); VIR_SOCKET_ADDR_FAMILY(&def->address));
} }
static int static int
virSocketAddrRangeParseXML(const char *networkName, virSocketAddrRangeParseXML(const char *networkName,
virNetworkIpDefPtr ipdef, virNetworkIPDefPtr ipdef,
xmlNodePtr node, xmlNodePtr node,
virSocketAddrRangePtr range) virSocketAddrRangePtr range)
{ {
@ -887,7 +887,7 @@ virSocketAddrRangeParseXML(const char *networkName,
/* do a sanity check of the range */ /* do a sanity check of the range */
if (virSocketAddrGetRange(&range->start, &range->end, &ipdef->address, if (virSocketAddrGetRange(&range->start, &range->end, &ipdef->address,
virNetworkIpDefPrefix(ipdef)) < 0) virNetworkIPDefPrefix(ipdef)) < 0)
goto cleanup; goto cleanup;
ret = 0; ret = 0;
@ -900,7 +900,7 @@ virSocketAddrRangeParseXML(const char *networkName,
static int static int
virNetworkDHCPHostDefParseXML(const char *networkName, virNetworkDHCPHostDefParseXML(const char *networkName,
virNetworkIpDefPtr def, virNetworkIPDefPtr def,
xmlNodePtr node, xmlNodePtr node,
virNetworkDHCPHostDefPtr host, virNetworkDHCPHostDefPtr host,
bool partialOkay) bool partialOkay)
@ -1021,7 +1021,7 @@ virNetworkDHCPHostDefParseXML(const char *networkName,
static int static int
virNetworkDHCPDefParseXML(const char *networkName, virNetworkDHCPDefParseXML(const char *networkName,
xmlNodePtr node, xmlNodePtr node,
virNetworkIpDefPtr def) virNetworkIPDefPtr def)
{ {
int ret = -1; int ret = -1;
xmlNodePtr cur; xmlNodePtr cur;
@ -1448,10 +1448,10 @@ static int
virNetworkIPDefParseXML(const char *networkName, virNetworkIPDefParseXML(const char *networkName,
xmlNodePtr node, xmlNodePtr node,
xmlXPathContextPtr ctxt, xmlXPathContextPtr ctxt,
virNetworkIpDefPtr def) virNetworkIPDefPtr def)
{ {
/* /*
* virNetworkIpDef object is already allocated as part of an array. * virNetworkIPDef object is already allocated as part of an array.
* On failure clear it out, but don't free it. * On failure clear it out, but don't free it.
*/ */
@ -1586,7 +1586,7 @@ virNetworkIPDefParseXML(const char *networkName,
cleanup: cleanup:
if (result < 0) if (result < 0)
virNetworkIpDefClear(def); virNetworkIPDefClear(def);
VIR_FREE(address); VIR_FREE(address);
VIR_FREE(netmask); VIR_FREE(netmask);
@ -2050,7 +2050,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt)
xmlNodePtr *ipNodes = NULL; xmlNodePtr *ipNodes = NULL;
xmlNodePtr *routeNodes = NULL; xmlNodePtr *routeNodes = NULL;
xmlNodePtr *portGroupNodes = NULL; xmlNodePtr *portGroupNodes = NULL;
int nIps, nPortGroups, nRoutes; int nips, nPortGroups, nRoutes;
xmlNodePtr dnsNode = NULL; xmlNodePtr dnsNode = NULL;
xmlNodePtr virtPortNode = NULL; xmlNodePtr virtPortNode = NULL;
xmlNodePtr forwardNode = NULL; xmlNodePtr forwardNode = NULL;
@ -2227,18 +2227,18 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt)
} }
VIR_FREE(portGroupNodes); VIR_FREE(portGroupNodes);
nIps = virXPathNodeSet("./ip", ctxt, &ipNodes); nips = virXPathNodeSet("./ip", ctxt, &ipNodes);
if (nIps < 0) if (nips < 0)
goto error; goto error;
if (nIps > 0) { if (nips > 0) {
size_t i; size_t i;
/* allocate array to hold all the addrs */ /* allocate array to hold all the addrs */
if (VIR_ALLOC_N(def->ips, nIps) < 0) if (VIR_ALLOC_N(def->ips, nips) < 0)
goto error; goto error;
/* parse each addr */ /* parse each addr */
for (i = 0; i < nIps; i++) { for (i = 0; i < nips; i++) {
if (virNetworkIPDefParseXML(def->name, if (virNetworkIPDefParseXML(def->name,
ipNodes[i], ipNodes[i],
ctxt, ctxt,
@ -2278,7 +2278,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt)
* is directly reachable from this bridge. * is directly reachable from this bridge.
*/ */
nRoutes = def->nroutes; nRoutes = def->nroutes;
nIps = def->nips; nips = def->nips;
for (i = 0; i < nRoutes; i++) { for (i = 0; i < nRoutes; i++) {
size_t j; size_t j;
virSocketAddr testAddr, testGw; virSocketAddr testAddr, testGw;
@ -2286,13 +2286,13 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt)
virNetworkRouteDefPtr gwdef = def->routes[i]; virNetworkRouteDefPtr gwdef = def->routes[i];
virSocketAddrPtr gateway = virNetworkRouteDefGetGateway(gwdef); virSocketAddrPtr gateway = virNetworkRouteDefGetGateway(gwdef);
addrMatch = false; addrMatch = false;
for (j = 0; j < nIps; j++) { for (j = 0; j < nips; j++) {
virNetworkIpDefPtr def2 = &def->ips[j]; virNetworkIPDefPtr def2 = &def->ips[j];
if (VIR_SOCKET_ADDR_FAMILY(gateway) if (VIR_SOCKET_ADDR_FAMILY(gateway)
!= VIR_SOCKET_ADDR_FAMILY(&def2->address)) { != VIR_SOCKET_ADDR_FAMILY(&def2->address)) {
continue; continue;
} }
int prefix = virNetworkIpDefPrefix(def2); int prefix = virNetworkIPDefPrefix(def2);
virSocketAddrMaskByPrefix(&def2->address, prefix, &testAddr); virSocketAddrMaskByPrefix(&def2->address, prefix, &testAddr);
virSocketAddrMaskByPrefix(gateway, prefix, &testGw); virSocketAddrMaskByPrefix(gateway, prefix, &testGw);
if (VIR_SOCKET_ADDR_VALID(&testAddr) && if (VIR_SOCKET_ADDR_VALID(&testAddr) &&
@ -2544,8 +2544,8 @@ virNetworkDNSDefFormat(virBufferPtr buf,
} }
static int static int
virNetworkIpDefFormat(virBufferPtr buf, virNetworkIPDefFormat(virBufferPtr buf,
const virNetworkIpDef *def) const virNetworkIPDef *def)
{ {
int result = -1; int result = -1;
@ -2871,7 +2871,7 @@ virNetworkDefFormatBuf(virBufferPtr buf,
goto error; goto error;
for (i = 0; i < def->nips; i++) { for (i = 0; i < def->nips; i++) {
if (virNetworkIpDefFormat(buf, &def->ips[i]) < 0) if (virNetworkIPDefFormat(buf, &def->ips[i]) < 0)
goto error; goto error;
} }
@ -3452,15 +3452,15 @@ virNetworkDefUpdateIP(virNetworkDefPtr def,
return -1; return -1;
} }
static virNetworkIpDefPtr static virNetworkIPDefPtr
virNetworkIpDefByIndex(virNetworkDefPtr def, int parentIndex) virNetworkIPDefByIndex(virNetworkDefPtr def, int parentIndex)
{ {
virNetworkIpDefPtr ipdef = NULL; virNetworkIPDefPtr ipdef = NULL;
size_t i; size_t i;
/* first find which ip element's dhcp host list to work on */ /* first find which ip element's dhcp host list to work on */
if (parentIndex >= 0) { if (parentIndex >= 0) {
ipdef = virNetworkDefGetIpByIndex(def, AF_UNSPEC, parentIndex); ipdef = virNetworkDefGetIPByIndex(def, AF_UNSPEC, parentIndex);
if (!(ipdef)) { if (!(ipdef)) {
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
_("couldn't update dhcp host entry - no <ip> " _("couldn't update dhcp host entry - no <ip> "
@ -3474,15 +3474,15 @@ virNetworkIpDefByIndex(virNetworkDefPtr def, int parentIndex)
* means the one and only <ip> that has <dhcp> element * means the one and only <ip> that has <dhcp> element
*/ */
for (i = 0; for (i = 0;
(ipdef = virNetworkDefGetIpByIndex(def, AF_UNSPEC, i)); (ipdef = virNetworkDefGetIPByIndex(def, AF_UNSPEC, i));
i++) { i++) {
if (ipdef->nranges || ipdef->nhosts) if (ipdef->nranges || ipdef->nhosts)
break; break;
} }
if (!ipdef) { if (!ipdef) {
ipdef = virNetworkDefGetIpByIndex(def, AF_INET, 0); ipdef = virNetworkDefGetIPByIndex(def, AF_INET, 0);
if (!ipdef) if (!ipdef)
ipdef = virNetworkDefGetIpByIndex(def, AF_INET6, 0); ipdef = virNetworkDefGetIPByIndex(def, AF_INET6, 0);
} }
if (!ipdef) { if (!ipdef) {
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
@ -3495,13 +3495,13 @@ virNetworkIpDefByIndex(virNetworkDefPtr def, int parentIndex)
static int static int
virNetworkDefUpdateCheckMultiDHCP(virNetworkDefPtr def, virNetworkDefUpdateCheckMultiDHCP(virNetworkDefPtr def,
virNetworkIpDefPtr ipdef) virNetworkIPDefPtr ipdef)
{ {
int family = VIR_SOCKET_ADDR_FAMILY(&ipdef->address); int family = VIR_SOCKET_ADDR_FAMILY(&ipdef->address);
size_t i; size_t i;
virNetworkIpDefPtr ip; virNetworkIPDefPtr ip;
for (i = 0; (ip = virNetworkDefGetIpByIndex(def, family, i)); i++) { for (i = 0; (ip = virNetworkDefGetIPByIndex(def, family, i)); i++) {
if (ip != ipdef) { if (ip != ipdef) {
if (ip->nranges || ip->nhosts) { if (ip->nranges || ip->nhosts) {
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
@ -3526,7 +3526,7 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def,
{ {
size_t i; size_t i;
int ret = -1; int ret = -1;
virNetworkIpDefPtr ipdef = virNetworkIpDefByIndex(def, parentIndex); virNetworkIPDefPtr ipdef = virNetworkIPDefByIndex(def, parentIndex);
virNetworkDHCPHostDef host; virNetworkDHCPHostDef host;
bool partialOkay = (command == VIR_NETWORK_UPDATE_COMMAND_DELETE); bool partialOkay = (command == VIR_NETWORK_UPDATE_COMMAND_DELETE);
@ -3665,7 +3665,7 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def,
{ {
size_t i; size_t i;
int ret = -1; int ret = -1;
virNetworkIpDefPtr ipdef = virNetworkIpDefByIndex(def, parentIndex); virNetworkIPDefPtr ipdef = virNetworkIPDefByIndex(def, parentIndex);
virSocketAddrRange range; virSocketAddrRange range;
memset(&range, 0, sizeof(range)); memset(&range, 0, sizeof(range));

20
src/conf/network_conf.h
View File

@ -1,7 +1,7 @@
/* /*
* network_conf.h: network XML handling * network_conf.h: network XML handling
* *
* Copyright (C) 2006-2015 Red Hat, Inc. * Copyright (C) 2006-2016 Red Hat, Inc.
* Copyright (C) 2006-2008 Daniel P. Berrange * Copyright (C) 2006-2008 Daniel P. Berrange
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -138,15 +138,15 @@ struct _virNetworkDNSDef {
char **forwarders; char **forwarders;
}; };
typedef struct _virNetworkIpDef virNetworkIpDef; typedef struct _virNetworkIPDef virNetworkIPDef;
typedef virNetworkIpDef *virNetworkIpDefPtr; typedef virNetworkIPDef *virNetworkIPDefPtr;
struct _virNetworkIpDef { struct _virNetworkIPDef {
char *family; /* ipv4 or ipv6 - default is ipv4 */ char *family; /* ipv4 or ipv6 - default is ipv4 */
virSocketAddr address; /* Bridge IP address */ virSocketAddr address; /* Bridge IP address */
/* One or the other of the following two will be used for a given /* One or the other of the following two will be used for a given
* IP address, but never both. The parser guarantees this. * IP address, but never both. The parser guarantees this.
* Use virNetworkIpDefPrefix/virNetworkIpDefNetmask rather * Use virNetworkIPDefPrefix/virNetworkIPDefNetmask rather
* than accessing the data directly - these utility functions * than accessing the data directly - these utility functions
* will convert one into the other as necessary. * will convert one into the other as necessary.
*/ */
@ -240,7 +240,7 @@ struct _virNetworkDef {
virNetworkForwardDef forward; virNetworkForwardDef forward;
size_t nips; size_t nips;
virNetworkIpDefPtr ips; /* ptr to array of IP addresses on this network */ virNetworkIPDefPtr ips; /* ptr to array of IP addresses on this network */
size_t nroutes; size_t nroutes;
virNetworkRouteDefPtr *routes; /* ptr to array of static routes on this interface */ virNetworkRouteDefPtr *routes; /* ptr to array of static routes on this interface */
@ -351,14 +351,14 @@ const char * virNetworkDefForwardIf(const virNetworkDef *def, size_t n);
virPortGroupDefPtr virPortGroupFindByName(virNetworkDefPtr net, virPortGroupDefPtr virPortGroupFindByName(virNetworkDefPtr net,
const char *portgroup); const char *portgroup);
virNetworkIpDefPtr virNetworkIPDefPtr
virNetworkDefGetIpByIndex(const virNetworkDef *def, virNetworkDefGetIPByIndex(const virNetworkDef *def,
int family, size_t n); int family, size_t n);
virNetworkRouteDefPtr virNetworkRouteDefPtr
virNetworkDefGetRouteByIndex(const virNetworkDef *def, virNetworkDefGetRouteByIndex(const virNetworkDef *def,
int family, size_t n); int family, size_t n);
int virNetworkIpDefPrefix(const virNetworkIpDef *def); int virNetworkIPDefPrefix(const virNetworkIPDef *def);
int virNetworkIpDefNetmask(const virNetworkIpDef *def, int virNetworkIPDefNetmask(const virNetworkIPDef *def,
virSocketAddrPtr netmask); virSocketAddrPtr netmask);
int virNetworkSaveXML(const char *configDir, int virNetworkSaveXML(const char *configDir,

6
src/conf/networkcommon_conf.c
View File

@ -38,7 +38,7 @@ struct _virNetworkRouteDef {
/* One or the other of the following two will be used for a given /* One or the other of the following two will be used for a given
* Network address, but never both. The parser guarantees this. * Network address, but never both. The parser guarantees this.
* The virSocketAddrGetIpPrefix() can be used to get a * The virSocketAddrGetIPPrefix() can be used to get a
* valid prefix. * valid prefix.
*/ */
virSocketAddr netmask; /* ipv4 - either netmask or prefix specified */ virSocketAddr netmask; /* ipv4 - either netmask or prefix specified */
@ -387,10 +387,10 @@ virNetworkRouteDefGetPrefix(virNetworkRouteDefPtr def)
virSocketAddrEqual(&def->netmask, &zero))) virSocketAddrEqual(&def->netmask, &zero)))
prefix = 0; prefix = 0;
else else
prefix = virSocketAddrGetIpPrefix(&def->address, &def->netmask, prefix = virSocketAddrGetIPPrefix(&def->address, &def->netmask,
def->prefix); def->prefix);
} else { } else {
prefix = virSocketAddrGetIpPrefix(&def->address, &def->netmask, prefix = virSocketAddrGetIPPrefix(&def->address, &def->netmask,
def->prefix); def->prefix);
} }

44
src/esx/esx_driver.c
View File

@ -612,7 +612,7 @@ static int
esxConnectToHost(esxPrivate *priv, esxConnectToHost(esxPrivate *priv,
virConnectPtr conn, virConnectPtr conn,
virConnectAuthPtr auth, virConnectAuthPtr auth,
char **vCenterIpAddress) char **vCenterIPAddress)
{ {
int result = -1; int result = -1;
char ipAddress[NI_MAXHOST] = ""; char ipAddress[NI_MAXHOST] = "";
@ -626,7 +626,7 @@ esxConnectToHost(esxPrivate *priv,
? esxVI_ProductLine_ESX ? esxVI_ProductLine_ESX
: esxVI_ProductLine_GSX; : esxVI_ProductLine_GSX;
if (!vCenterIpAddress || *vCenterIpAddress) { if (!vCenterIPAddress || *vCenterIPAddress) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument"));
return -1; return -1;
} }
@ -683,7 +683,7 @@ esxConnectToHost(esxPrivate *priv,
&inMaintenanceMode, &inMaintenanceMode,
esxVI_Occurrence_RequiredItem) < 0 || esxVI_Occurrence_RequiredItem) < 0 ||
esxVI_GetStringValue(hostSystem, "summary.managementServerIp", esxVI_GetStringValue(hostSystem, "summary.managementServerIp",
vCenterIpAddress, vCenterIPAddress,
esxVI_Occurrence_OptionalItem) < 0) { esxVI_Occurrence_OptionalItem) < 0) {
goto cleanup; goto cleanup;
} }
@ -692,7 +692,7 @@ esxConnectToHost(esxPrivate *priv,
if (inMaintenanceMode == esxVI_Boolean_True) if (inMaintenanceMode == esxVI_Boolean_True)
VIR_WARN("The server is in maintenance mode"); VIR_WARN("The server is in maintenance mode");
if (VIR_STRDUP(*vCenterIpAddress, *vCenterIpAddress) < 0) if (VIR_STRDUP(*vCenterIPAddress, *vCenterIPAddress) < 0)
goto cleanup; goto cleanup;
result = 0; result = 0;
@ -714,7 +714,7 @@ esxConnectToVCenter(esxPrivate *priv,
virConnectPtr conn, virConnectPtr conn,
virConnectAuthPtr auth, virConnectAuthPtr auth,
const char *hostname, const char *hostname,
const char *hostSystemIpAddress) const char *hostSystemIPAddress)
{ {
int result = -1; int result = -1;
char ipAddress[NI_MAXHOST] = ""; char ipAddress[NI_MAXHOST] = "";
@ -722,7 +722,7 @@ esxConnectToVCenter(esxPrivate *priv,
char *password = NULL; char *password = NULL;
char *url = NULL; char *url = NULL;
if (!hostSystemIpAddress && if (!hostSystemIPAddress &&
(!priv->parsedUri->path || STREQ(priv->parsedUri->path, "/"))) { (!priv->parsedUri->path || STREQ(priv->parsedUri->path, "/"))) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("Path has to specify the datacenter and compute resource")); _("Path has to specify the datacenter and compute resource"));
@ -770,9 +770,9 @@ esxConnectToVCenter(esxPrivate *priv,
goto cleanup; goto cleanup;
} }
if (hostSystemIpAddress) { if (hostSystemIPAddress) {
if (esxVI_Context_LookupManagedObjectsByHostSystemIp if (esxVI_Context_LookupManagedObjectsByHostSystemIp
(priv->vCenter, hostSystemIpAddress) < 0) { (priv->vCenter, hostSystemIPAddress) < 0) {
goto cleanup; goto cleanup;
} }
} else { } else {
@ -847,8 +847,8 @@ esxConnectOpen(virConnectPtr conn, virConnectAuthPtr auth,
virDrvOpenStatus result = VIR_DRV_OPEN_ERROR; virDrvOpenStatus result = VIR_DRV_OPEN_ERROR;
char *plus; char *plus;
esxPrivate *priv = NULL; esxPrivate *priv = NULL;
char *potentialVCenterIpAddress = NULL; char *potentialVCenterIPAddress = NULL;
char vCenterIpAddress[NI_MAXHOST] = ""; char vCenterIPAddress[NI_MAXHOST] = "";
virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
@ -939,46 +939,46 @@ esxConnectOpen(virConnectPtr conn, virConnectAuthPtr auth,
STRCASEEQ(conn->uri->scheme, "gsx")) { STRCASEEQ(conn->uri->scheme, "gsx")) {
/* Connect to host */ /* Connect to host */
if (esxConnectToHost(priv, conn, auth, if (esxConnectToHost(priv, conn, auth,
&potentialVCenterIpAddress) < 0) { &potentialVCenterIPAddress) < 0) {
goto cleanup; goto cleanup;
} }
/* Connect to vCenter */ /* Connect to vCenter */
if (priv->parsedUri->vCenter) { if (priv->parsedUri->vCenter) {
if (STREQ(priv->parsedUri->vCenter, "*")) { if (STREQ(priv->parsedUri->vCenter, "*")) {
if (!potentialVCenterIpAddress) { if (!potentialVCenterIPAddress) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("This host is not managed by a vCenter")); _("This host is not managed by a vCenter"));
goto cleanup; goto cleanup;
} }
if (!virStrcpyStatic(vCenterIpAddress, if (!virStrcpyStatic(vCenterIPAddress,
potentialVCenterIpAddress)) { potentialVCenterIPAddress)) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("vCenter IP address %s too big for destination"), _("vCenter IP address %s too big for destination"),
potentialVCenterIpAddress); potentialVCenterIPAddress);
goto cleanup; goto cleanup;
} }
} else { } else {
if (esxUtil_ResolveHostname(priv->parsedUri->vCenter, if (esxUtil_ResolveHostname(priv->parsedUri->vCenter,
vCenterIpAddress, NI_MAXHOST) < 0) { vCenterIPAddress, NI_MAXHOST) < 0) {
goto cleanup; goto cleanup;
} }
if (potentialVCenterIpAddress && if (potentialVCenterIPAddress &&
STRNEQ(vCenterIpAddress, potentialVCenterIpAddress)) { STRNEQ(vCenterIPAddress, potentialVCenterIPAddress)) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("This host is managed by a vCenter with IP " _("This host is managed by a vCenter with IP "
"address %s, but a mismachting vCenter '%s' " "address %s, but a mismachting vCenter '%s' "
"(%s) has been specified"), "(%s) has been specified"),
potentialVCenterIpAddress, priv->parsedUri->vCenter, potentialVCenterIPAddress, priv->parsedUri->vCenter,
vCenterIpAddress); vCenterIPAddress);
goto cleanup; goto cleanup;
} }
} }
if (esxConnectToVCenter(priv, conn, auth, if (esxConnectToVCenter(priv, conn, auth,
vCenterIpAddress, vCenterIPAddress,
priv->host->ipAddress) < 0) { priv->host->ipAddress) < 0) {
goto cleanup; goto cleanup;
} }
@ -1011,7 +1011,7 @@ esxConnectOpen(virConnectPtr conn, virConnectAuthPtr auth,
cleanup: cleanup:
esxFreePrivate(&priv); esxFreePrivate(&priv);
VIR_FREE(potentialVCenterIpAddress); VIR_FREE(potentialVCenterIPAddress);
return result; return result;
} }

4
src/esx/esx_interface_driver.c
View File

@ -181,8 +181,8 @@ esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags)
virInterfaceProtocolDefPtr protocols; virInterfaceProtocolDefPtr protocols;
virInterfaceProtocolDef protocol; virInterfaceProtocolDef protocol;
virSocketAddr socketAddress; virSocketAddr socketAddress;
virInterfaceIpDefPtr ips; virInterfaceIPDefPtr ips;
virInterfaceIpDef ip; virInterfaceIPDef ip;
virCheckFlags(VIR_INTERFACE_XML_INACTIVE, NULL); virCheckFlags(VIR_INTERFACE_XML_INACTIVE, NULL);

4
src/esx/esx_vi.c
View File

@ -1367,13 +1367,13 @@ esxVI_Context_LookupManagedObjectsByPath(esxVI_Context *ctx, const char *path)
int int
esxVI_Context_LookupManagedObjectsByHostSystemIp(esxVI_Context *ctx, esxVI_Context_LookupManagedObjectsByHostSystemIp(esxVI_Context *ctx,
const char *hostSystemIpAddress) const char *hostSystemIPAddress)
{ {
int result = -1; int result = -1;
esxVI_ManagedObjectReference *managedObjectReference = NULL; esxVI_ManagedObjectReference *managedObjectReference = NULL;
/* Lookup HostSystem */ /* Lookup HostSystem */
if (esxVI_FindByIp(ctx, NULL, hostSystemIpAddress, esxVI_Boolean_False, if (esxVI_FindByIp(ctx, NULL, hostSystemIPAddress, esxVI_Boolean_False,
&managedObjectReference) < 0 || &managedObjectReference) < 0 ||
esxVI_LookupHostSystem(ctx, NULL, managedObjectReference, NULL, esxVI_LookupHostSystem(ctx, NULL, managedObjectReference, NULL,
&ctx->hostSystem, &ctx->hostSystem,

2
src/esx/esx_vi.h
View File

@ -220,7 +220,7 @@ int esxVI_Context_Connect(esxVI_Context *ctx, const char *ipAddress,
int esxVI_Context_LookupManagedObjects(esxVI_Context *ctx); int esxVI_Context_LookupManagedObjects(esxVI_Context *ctx);
int esxVI_Context_LookupManagedObjectsByPath(esxVI_Context *ctx, const char *path); int esxVI_Context_LookupManagedObjectsByPath(esxVI_Context *ctx, const char *path);
int esxVI_Context_LookupManagedObjectsByHostSystemIp(esxVI_Context *ctx, int esxVI_Context_LookupManagedObjectsByHostSystemIp(esxVI_Context *ctx,
const char *hostSystemIpAddress); const char *hostSystemIPAddress);
int esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, int esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName,
const char *request, esxVI_Response **response, const char *request, esxVI_Response **response,
esxVI_Occurrence occurrence); esxVI_Occurrence occurrence);

10
src/libvirt_private.syms
View File

@ -371,7 +371,7 @@ virDomainMemoryFindByDef;
virDomainMemoryFindInactiveByDef; virDomainMemoryFindInactiveByDef;
virDomainMemoryInsert; virDomainMemoryInsert;
virDomainMemoryRemove; virDomainMemoryRemove;
virDomainNetAppendIpAddress; virDomainNetAppendIPAddress;
virDomainNetDefFormat; virDomainNetDefFormat;
virDomainNetDefFree; virDomainNetDefFree;
virDomainNetFind; virDomainNetFind;
@ -597,7 +597,7 @@ virNetworkDefFormat;
virNetworkDefFormatBuf; virNetworkDefFormatBuf;
virNetworkDefForwardIf; virNetworkDefForwardIf;
virNetworkDefFree; virNetworkDefFree;
virNetworkDefGetIpByIndex; virNetworkDefGetIPByIndex;
virNetworkDefGetRouteByIndex; virNetworkDefGetRouteByIndex;
virNetworkDefParseFile; virNetworkDefParseFile;
virNetworkDefParseNode; virNetworkDefParseNode;
@ -605,8 +605,8 @@ virNetworkDefParseString;
virNetworkDefUpdateSection; virNetworkDefUpdateSection;
virNetworkDeleteConfig; virNetworkDeleteConfig;
virNetworkForwardTypeToString; virNetworkForwardTypeToString;
virNetworkIpDefNetmask; virNetworkIPDefNetmask;
virNetworkIpDefPrefix; virNetworkIPDefPrefix;
virNetworkLoadAllConfigs; virNetworkLoadAllConfigs;
virNetworkLoadAllState; virNetworkLoadAllState;
virNetworkObjAssignDef; virNetworkObjAssignDef;
@ -2258,7 +2258,7 @@ virSocketAddrCheckNetmask;
virSocketAddrEqual; virSocketAddrEqual;
virSocketAddrFormat; virSocketAddrFormat;
virSocketAddrFormatFull; virSocketAddrFormatFull;
virSocketAddrGetIpPrefix; virSocketAddrGetIPPrefix;
virSocketAddrGetNumNetmaskBits; virSocketAddrGetNumNetmaskBits;
virSocketAddrGetPort; virSocketAddrGetPort;
virSocketAddrGetRange; virSocketAddrGetRange;

2
src/lxc/lxc_container.c
View File

@ -513,7 +513,7 @@ static int lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef,
goto error_out; goto error_out;
for (j = 0; j < netDef->nips; j++) { for (j = 0; j < netDef->nips; j++) {
virDomainNetIpDefPtr ip = netDef->ips[j]; virDomainNetIPDefPtr ip = netDef->ips[j];
unsigned int prefix = (ip->prefix > 0) ? ip->prefix : unsigned int prefix = (ip->prefix > 0) ? ip->prefix :
VIR_SOCKET_ADDR_DEFAULT_PREFIX; VIR_SOCKET_ADDR_DEFAULT_PREFIX;
char *ipStr = virSocketAddrFormat(&ip->address); char *ipStr = virSocketAddrFormat(&ip->address);

4
src/lxc/lxc_native.c
View File

@ -419,7 +419,7 @@ typedef struct {
char *macvlanmode; char *macvlanmode;
char *vlanid; char *vlanid;
char *name; char *name;
virDomainNetIpDefPtr *ips; virDomainNetIPDefPtr *ips;
size_t nips; size_t nips;
char *gateway_ipv4; char *gateway_ipv4;
char *gateway_ipv6; char *gateway_ipv6;
@ -601,7 +601,7 @@ lxcNetworkWalkCallback(const char *name, virConfValuePtr value, void *data)
STREQ(name, "lxc.network.ipv6")) { STREQ(name, "lxc.network.ipv6")) {
int family = AF_INET; int family = AF_INET;
char **ipparts = NULL; char **ipparts = NULL;
virDomainNetIpDefPtr ip = NULL; virDomainNetIPDefPtr ip = NULL;
if (VIR_ALLOC(ip) < 0) if (VIR_ALLOC(ip) < 0)
return -1; return -1;

74
src/network/bridge_driver.c
View File

@ -863,7 +863,7 @@ networkKillDaemon(pid_t pid, const char *daemonName, const char *networkName)
static int static int
networkBuildDnsmasqDhcpHostsList(dnsmasqContext *dctx, networkBuildDnsmasqDhcpHostsList(dnsmasqContext *dctx,
virNetworkIpDefPtr ipdef) virNetworkIPDefPtr ipdef)
{ {
size_t i; size_t i;
bool ipv6 = false; bool ipv6 = false;
@ -914,7 +914,7 @@ networkDnsmasqConfContents(virNetworkObjPtr network,
int nbleases = 0; int nbleases = 0;
size_t i; size_t i;
virNetworkDNSDefPtr dns = &network->def->dns; virNetworkDNSDefPtr dns = &network->def->dns;
virNetworkIpDefPtr tmpipdef, ipdef, ipv4def, ipv6def; virNetworkIPDefPtr tmpipdef, ipdef, ipv4def, ipv6def;
bool ipv6SLAAC; bool ipv6SLAAC;
char *saddr = NULL, *eaddr = NULL; char *saddr = NULL, *eaddr = NULL;
@ -1004,7 +1004,7 @@ networkDnsmasqConfContents(virNetworkObjPtr network,
* So listen on all defined IPv[46] addresses * So listen on all defined IPv[46] addresses
*/ */
for (i = 0; for (i = 0;
(tmpipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, i)); (tmpipdef = virNetworkDefGetIPByIndex(network->def, AF_UNSPEC, i));
i++) { i++) {
char *ipaddr = virSocketAddrFormat(&tmpipdef->address); char *ipaddr = virSocketAddrFormat(&tmpipdef->address);
@ -1114,7 +1114,7 @@ networkDnsmasqConfContents(virNetworkObjPtr network,
/* Find the first dhcp for both IPv4 and IPv6 */ /* Find the first dhcp for both IPv4 and IPv6 */
for (i = 0, ipv4def = NULL, ipv6def = NULL, ipv6SLAAC = false; for (i = 0, ipv4def = NULL, ipv6def = NULL, ipv6SLAAC = false;
(ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, i)); (ipdef = virNetworkDefGetIPByIndex(network->def, AF_UNSPEC, i));
i++) { i++) {
if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) { if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) {
if (ipdef->nranges || ipdef->nhosts) { if (ipdef->nranges || ipdef->nhosts) {
@ -1172,7 +1172,7 @@ networkDnsmasqConfContents(virNetworkObjPtr network,
while (ipdef) { while (ipdef) {
int prefix; int prefix;
prefix = virNetworkIpDefPrefix(ipdef); prefix = virNetworkIPDefPrefix(ipdef);
if (prefix < 0) { if (prefix < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("bridge '%s' has an invalid prefix"), _("bridge '%s' has an invalid prefix"),
@ -1197,7 +1197,7 @@ networkDnsmasqConfContents(virNetworkObjPtr network,
thisRange = virSocketAddrGetRange(&ipdef->ranges[r].start, thisRange = virSocketAddrGetRange(&ipdef->ranges[r].start,
&ipdef->ranges[r].end, &ipdef->ranges[r].end,
&ipdef->address, &ipdef->address,
virNetworkIpDefPrefix(ipdef)); virNetworkIPDefPrefix(ipdef));
if (thisRange < 0) if (thisRange < 0)
goto cleanup; goto cleanup;
nbleases += thisRange; nbleases += thisRange;
@ -1278,7 +1278,7 @@ networkDnsmasqConfContents(virNetworkObjPtr network,
virBufferAddLit(&configbuf, "enable-ra\n"); virBufferAddLit(&configbuf, "enable-ra\n");
} else { } else {
for (i = 0; for (i = 0;
(ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET6, i)); (ipdef = virNetworkDefGetIPByIndex(network->def, AF_INET6, i));
i++) { i++) {
if (!(ipdef->nranges || ipdef->nhosts)) { if (!(ipdef->nranges || ipdef->nhosts)) {
char *bridgeaddr = virSocketAddrFormat(&ipdef->address); char *bridgeaddr = virSocketAddrFormat(&ipdef->address);
@ -1371,7 +1371,7 @@ networkStartDhcpDaemon(virNetworkDriverStatePtr driver,
int ret = -1; int ret = -1;
dnsmasqContext *dctx = NULL; dnsmasqContext *dctx = NULL;
if (!virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, 0)) { if (!virNetworkDefGetIPByIndex(network->def, AF_UNSPEC, 0)) {
/* no IP addresses, so we don't need to run */ /* no IP addresses, so we don't need to run */
ret = 0; ret = 0;
goto cleanup; goto cleanup;
@ -1448,11 +1448,11 @@ networkRefreshDhcpDaemon(virNetworkDriverStatePtr driver,
{ {
int ret = -1; int ret = -1;
size_t i; size_t i;
virNetworkIpDefPtr ipdef, ipv4def, ipv6def; virNetworkIPDefPtr ipdef, ipv4def, ipv6def;
dnsmasqContext *dctx = NULL; dnsmasqContext *dctx = NULL;
/* if no IP addresses specified, nothing to do */ /* if no IP addresses specified, nothing to do */
if (!virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, 0)) if (!virNetworkDefGetIPByIndex(network->def, AF_UNSPEC, 0))
return 0; return 0;
/* if there's no running dnsmasq, just start it */ /* if there's no running dnsmasq, just start it */
@ -1471,7 +1471,7 @@ networkRefreshDhcpDaemon(virNetworkDriverStatePtr driver,
*/ */
ipv4def = NULL; ipv4def = NULL;
for (i = 0; for (i = 0;
(ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET, i)); (ipdef = virNetworkDefGetIPByIndex(network->def, AF_INET, i));
i++) { i++) {
if (!ipv4def && (ipdef->nranges || ipdef->nhosts)) if (!ipv4def && (ipdef->nranges || ipdef->nhosts))
ipv4def = ipdef; ipv4def = ipdef;
@ -1479,7 +1479,7 @@ networkRefreshDhcpDaemon(virNetworkDriverStatePtr driver,
ipv6def = NULL; ipv6def = NULL;
for (i = 0; for (i = 0;
(ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET6, i)); (ipdef = virNetworkDefGetIPByIndex(network->def, AF_INET6, i));
i++) { i++) {
if (!ipv6def && (ipdef->nranges || ipdef->nhosts)) if (!ipv6def && (ipdef->nranges || ipdef->nhosts))
ipv6def = ipdef; ipv6def = ipdef;
@ -1536,14 +1536,14 @@ networkRadvdConfContents(virNetworkObjPtr network, char **configstr)
virBuffer configbuf = VIR_BUFFER_INITIALIZER; virBuffer configbuf = VIR_BUFFER_INITIALIZER;
int ret = -1; int ret = -1;
size_t i; size_t i;
virNetworkIpDefPtr ipdef; virNetworkIPDefPtr ipdef;
bool v6present = false, dhcp6 = false; bool v6present = false, dhcp6 = false;
*configstr = NULL; *configstr = NULL;
/* Check if DHCPv6 is needed */ /* Check if DHCPv6 is needed */
for (i = 0; for (i = 0;
(ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET6, i)); (ipdef = virNetworkDefGetIPByIndex(network->def, AF_INET6, i));
i++) { i++) {
v6present = true; v6present = true;
if (ipdef->nranges || ipdef->nhosts) { if (ipdef->nranges || ipdef->nhosts) {
@ -1573,12 +1573,12 @@ networkRadvdConfContents(virNetworkObjPtr network, char **configstr)
/* add a section for each IPv6 address in the config */ /* add a section for each IPv6 address in the config */
for (i = 0; for (i = 0;
(ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET6, i)); (ipdef = virNetworkDefGetIPByIndex(network->def, AF_INET6, i));
i++) { i++) {
int prefix; int prefix;
char *netaddr; char *netaddr;
prefix = virNetworkIpDefPrefix(ipdef); prefix = virNetworkIPDefPrefix(ipdef);
if (prefix < 0) { if (prefix < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("bridge '%s' has an invalid prefix"), _("bridge '%s' has an invalid prefix"),
@ -1668,7 +1668,7 @@ networkStartRadvd(virNetworkDriverStatePtr driver,
goto cleanup; goto cleanup;
} }
if (!virNetworkDefGetIpByIndex(network->def, AF_INET6, 0)) { if (!virNetworkDefGetIPByIndex(network->def, AF_INET6, 0)) {
/* no IPv6 addresses, so we don't need to run radvd */ /* no IPv6 addresses, so we don't need to run radvd */
ret = 0; ret = 0;
goto cleanup; goto cleanup;
@ -1766,7 +1766,7 @@ networkRefreshRadvd(virNetworkDriverStatePtr driver,
if (network->radvdPid <= 0 || (kill(network->radvdPid, 0) < 0)) if (network->radvdPid <= 0 || (kill(network->radvdPid, 0) < 0))
return networkStartRadvd(driver, network); return networkStartRadvd(driver, network);
if (!virNetworkDefGetIpByIndex(network->def, AF_INET6, 0)) { if (!virNetworkDefGetIPByIndex(network->def, AF_INET6, 0)) {
/* no IPv6 addresses, so we don't need to run radvd */ /* no IPv6 addresses, so we don't need to run radvd */
return 0; return 0;
} }
@ -1873,7 +1873,7 @@ networkReloadFirewallRules(virNetworkDriverStatePtr driver)
/* Enable IP Forwarding. Return 0 for success, -1 for failure. */ /* Enable IP Forwarding. Return 0 for success, -1 for failure. */
static int static int
networkEnableIpForwarding(bool enableIPv4, bool enableIPv6) networkEnableIPForwarding(bool enableIPv4, bool enableIPv6)
{ {
int ret = 0; int ret = 0;
#ifdef HAVE_SYSCTLBYNAME #ifdef HAVE_SYSCTLBYNAME
@ -1900,7 +1900,7 @@ networkSetIPv6Sysctls(virNetworkObjPtr network)
{ {
char *field = NULL; char *field = NULL;
int ret = -1; int ret = -1;
bool enableIPv6 = !!virNetworkDefGetIpByIndex(network->def, AF_INET6, 0); bool enableIPv6 = !!virNetworkDefGetIPByIndex(network->def, AF_INET6, 0);
/* set disable_ipv6 if there are no ipv6 addresses defined for the /* set disable_ipv6 if there are no ipv6 addresses defined for the
* network. But also unset it if there *are* ipv6 addresses, as we * network. But also unset it if there *are* ipv6 addresses, as we
@ -1966,9 +1966,9 @@ networkSetIPv6Sysctls(virNetworkObjPtr network)
/* add an IP address to a bridge */ /* add an IP address to a bridge */
static int static int
networkAddAddrToBridge(virNetworkObjPtr network, networkAddAddrToBridge(virNetworkObjPtr network,
virNetworkIpDefPtr ipdef) virNetworkIPDefPtr ipdef)
{ {
int prefix = virNetworkIpDefPrefix(ipdef); int prefix = virNetworkIPDefPrefix(ipdef);
if (prefix < 0) { if (prefix < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
@ -2035,14 +2035,14 @@ networkAddRouteToBridge(virNetworkObjPtr network,
static int static int
networkWaitDadFinish(virNetworkObjPtr network) networkWaitDadFinish(virNetworkObjPtr network)
{ {
virNetworkIpDefPtr ipdef; virNetworkIPDefPtr ipdef;
virSocketAddrPtr *addrs = NULL, addr = NULL; virSocketAddrPtr *addrs = NULL, addr = NULL;
size_t naddrs = 0; size_t naddrs = 0;
int ret = -1; int ret = -1;
VIR_DEBUG("Begin waiting for IPv6 DAD on network %s", network->def->name); VIR_DEBUG("Begin waiting for IPv6 DAD on network %s", network->def->name);
while ((ipdef = virNetworkDefGetIpByIndex(network->def, while ((ipdef = virNetworkDefGetIPByIndex(network->def,
AF_INET6, naddrs))) { AF_INET6, naddrs))) {
addr = &ipdef->address; addr = &ipdef->address;
if (VIR_APPEND_ELEMENT_COPY(addrs, naddrs, addr) < 0) if (VIR_APPEND_ELEMENT_COPY(addrs, naddrs, addr) < 0)
@ -2065,7 +2065,7 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver,
size_t i; size_t i;
bool v4present = false, v6present = false; bool v4present = false, v6present = false;
virErrorPtr save_err = NULL; virErrorPtr save_err = NULL;
virNetworkIpDefPtr ipdef; virNetworkIPDefPtr ipdef;
virNetworkRouteDefPtr routedef; virNetworkRouteDefPtr routedef;
char *macTapIfName = NULL; char *macTapIfName = NULL;
int tapfd = -1; int tapfd = -1;
@ -2138,7 +2138,7 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver,
goto err1; goto err1;
for (i = 0; for (i = 0;
(ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, i)); (ipdef = virNetworkDefGetIPByIndex(network->def, AF_UNSPEC, i));
i++) { i++) {
if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET))
v4present = true; v4present = true;
@ -2176,7 +2176,7 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver,
/* If forward.type != NONE, turn on global IP forwarding */ /* If forward.type != NONE, turn on global IP forwarding */
if (network->def->forward.type != VIR_NETWORK_FORWARD_NONE && if (network->def->forward.type != VIR_NETWORK_FORWARD_NONE &&
networkEnableIpForwarding(v4present, v6present) < 0) { networkEnableIPForwarding(v4present, v6present) < 0) {
virReportSystemError(errno, "%s", virReportSystemError(errno, "%s",
_("failed to enable IP forwarding")); _("failed to enable IP forwarding"));
goto err3; goto err3;
@ -2908,7 +2908,7 @@ networkValidate(virNetworkDriverStatePtr driver,
size_t i, j; size_t i, j;
bool vlanUsed, vlanAllowed, badVlanUse = false; bool vlanUsed, vlanAllowed, badVlanUse = false;
virPortGroupDefPtr defaultPortGroup = NULL; virPortGroupDefPtr defaultPortGroup = NULL;
virNetworkIpDefPtr ipdef; virNetworkIPDefPtr ipdef;
bool ipv4def = false, ipv6def = false; bool ipv4def = false, ipv6def = false;
bool bandwidthAllowed = true; bool bandwidthAllowed = true;
bool usesInterface = false, usesAddress = false; bool usesInterface = false, usesAddress = false;
@ -2940,7 +2940,7 @@ networkValidate(virNetworkDriverStatePtr driver,
virNetworkForwardTypeToString(def->forward.type)); virNetworkForwardTypeToString(def->forward.type));
return -1; return -1;
} }
if (virNetworkDefGetIpByIndex(def, AF_UNSPEC, 0)) { if (virNetworkDefGetIPByIndex(def, AF_UNSPEC, 0)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Unsupported <ip> element in network %s " _("Unsupported <ip> element in network %s "
"with forward mode='%s'"), "with forward mode='%s'"),
@ -3013,7 +3013,7 @@ networkValidate(virNetworkDriverStatePtr driver,
* on one IPv6 address per defined network * on one IPv6 address per defined network
*/ */
for (i = 0; for (i = 0;
(ipdef = virNetworkDefGetIpByIndex(def, AF_UNSPEC, i)); (ipdef = virNetworkDefGetIPByIndex(def, AF_UNSPEC, i));
i++) { i++) {
if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) { if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) {
if (ipdef->nranges || ipdef->nhosts) { if (ipdef->nranges || ipdef->nhosts) {
@ -3304,7 +3304,7 @@ networkUpdate(virNetworkPtr net,
virNetworkObjPtr network = NULL; virNetworkObjPtr network = NULL;
int isActive, ret = -1; int isActive, ret = -1;
size_t i; size_t i;
virNetworkIpDefPtr ipdef; virNetworkIPDefPtr ipdef;
bool oldDhcpActive = false; bool oldDhcpActive = false;
bool needFirewallRefresh = false; bool needFirewallRefresh = false;
@ -3321,7 +3321,7 @@ networkUpdate(virNetworkPtr net,
/* see if we are listening for dhcp pre-modification */ /* see if we are listening for dhcp pre-modification */
for (i = 0; for (i = 0;
(ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET, i)); (ipdef = virNetworkDefGetIPByIndex(network->def, AF_INET, i));
i++) { i++) {
if (ipdef->nranges || ipdef->nhosts) { if (ipdef->nranges || ipdef->nhosts) {
oldDhcpActive = true; oldDhcpActive = true;
@ -3416,7 +3416,7 @@ networkUpdate(virNetworkPtr net,
bool newDhcpActive = false; bool newDhcpActive = false;
for (i = 0; for (i = 0;
(ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET, i)); (ipdef = virNetworkDefGetIPByIndex(network->def, AF_INET, i));
i++) { i++) {
if (ipdef->nranges || ipdef->nhosts) { if (ipdef->nranges || ipdef->nhosts) {
newDhcpActive = true; newDhcpActive = true;
@ -3685,7 +3685,7 @@ networkGetDHCPLeases(virNetworkPtr network,
const char *mac_tmp = NULL; const char *mac_tmp = NULL;
virJSONValuePtr lease_tmp = NULL; virJSONValuePtr lease_tmp = NULL;
virJSONValuePtr leases_array = NULL; virJSONValuePtr leases_array = NULL;
virNetworkIpDefPtr ipdef_tmp = NULL; virNetworkIPDefPtr ipdef_tmp = NULL;
virNetworkDHCPLeasePtr lease = NULL; virNetworkDHCPLeasePtr lease = NULL;
virNetworkDHCPLeasePtr *leases_ret = NULL; virNetworkDHCPLeasePtr *leases_ret = NULL;
virNetworkObjPtr obj; virNetworkObjPtr obj;
@ -3792,7 +3792,7 @@ networkGetDHCPLeases(virNetworkPtr network,
} }
if (!ipv6 && VIR_SOCKET_ADDR_IS_FAMILY(&ipdef_tmp->address, if (!ipv6 && VIR_SOCKET_ADDR_IS_FAMILY(&ipdef_tmp->address,
AF_INET)) { AF_INET)) {
lease->prefix = virSocketAddrGetIpPrefix(&ipdef_tmp->address, lease->prefix = virSocketAddrGetIPPrefix(&ipdef_tmp->address,
&ipdef_tmp->netmask, &ipdef_tmp->netmask,
ipdef_tmp->prefix); ipdef_tmp->prefix);
break; break;
@ -4708,7 +4708,7 @@ networkGetNetworkAddress(const char *netname, char **netaddr)
int ret = -1; int ret = -1;
virNetworkObjPtr network; virNetworkObjPtr network;
virNetworkDefPtr netdef; virNetworkDefPtr netdef;
virNetworkIpDefPtr ipdef; virNetworkIPDefPtr ipdef;
virSocketAddr addr; virSocketAddr addr;
virSocketAddrPtr addrptr = NULL; virSocketAddrPtr addrptr = NULL;
char *dev_name = NULL; char *dev_name = NULL;
@ -4727,7 +4727,7 @@ networkGetNetworkAddress(const char *netname, char **netaddr)
case VIR_NETWORK_FORWARD_NONE: case VIR_NETWORK_FORWARD_NONE:
case VIR_NETWORK_FORWARD_NAT: case VIR_NETWORK_FORWARD_NAT:
case VIR_NETWORK_FORWARD_ROUTE: case VIR_NETWORK_FORWARD_ROUTE:
ipdef = virNetworkDefGetIpByIndex(netdef, AF_UNSPEC, 0); ipdef = virNetworkDefGetIPByIndex(netdef, AF_UNSPEC, 0);
if (!ipdef) { if (!ipdef) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("network '%s' doesn't have an IP address"), _("network '%s' doesn't have an IP address"),

70
src/network/bridge_driver_linux.c
View File

@ -68,7 +68,7 @@ int networkCheckRouteCollision(virNetworkDefPtr def)
while (cur) { while (cur) {
char iface[17], dest[128], mask[128]; char iface[17], dest[128], mask[128];
unsigned int addr_val, mask_val; unsigned int addr_val, mask_val;
virNetworkIpDefPtr ipdef; virNetworkIPDefPtr ipdef;
virNetworkRouteDefPtr routedef; virNetworkRouteDefPtr routedef;
int num; int num;
size_t i; size_t i;
@ -100,13 +100,13 @@ int networkCheckRouteCollision(virNetworkDefPtr def)
addr_val &= mask_val; addr_val &= mask_val;
for (i = 0; for (i = 0;
(ipdef = virNetworkDefGetIpByIndex(def, AF_INET, i)); (ipdef = virNetworkDefGetIPByIndex(def, AF_INET, i));
i++) { i++) {
unsigned int net_dest; unsigned int net_dest;
virSocketAddr netmask; virSocketAddr netmask;
if (virNetworkIpDefNetmask(ipdef, &netmask) < 0) { if (virNetworkIPDefNetmask(ipdef, &netmask) < 0) {
VIR_WARN("Failed to get netmask of '%s'", VIR_WARN("Failed to get netmask of '%s'",
def->bridge); def->bridge);
continue; continue;
@ -165,9 +165,9 @@ static const char networkLocalBroadcast[] = "255.255.255.255/32";
static int static int
networkAddMasqueradingFirewallRules(virFirewallPtr fw, networkAddMasqueradingFirewallRules(virFirewallPtr fw,
virNetworkDefPtr def, virNetworkDefPtr def,
virNetworkIpDefPtr ipdef) virNetworkIPDefPtr ipdef)
{ {
int prefix = virNetworkIpDefPrefix(ipdef); int prefix = virNetworkIPDefPrefix(ipdef);
const char *forwardIf = virNetworkDefForwardIf(def, 0); const char *forwardIf = virNetworkDefForwardIf(def, 0);
if (prefix < 0) { if (prefix < 0) {
@ -279,9 +279,9 @@ networkAddMasqueradingFirewallRules(virFirewallPtr fw,
static int static int
networkRemoveMasqueradingFirewallRules(virFirewallPtr fw, networkRemoveMasqueradingFirewallRules(virFirewallPtr fw,
virNetworkDefPtr def, virNetworkDefPtr def,
virNetworkIpDefPtr ipdef) virNetworkIPDefPtr ipdef)
{ {
int prefix = virNetworkIpDefPrefix(ipdef); int prefix = virNetworkIPDefPrefix(ipdef);
const char *forwardIf = virNetworkDefForwardIf(def, 0); const char *forwardIf = virNetworkDefForwardIf(def, 0);
if (prefix < 0) if (prefix < 0)
@ -349,9 +349,9 @@ networkRemoveMasqueradingFirewallRules(virFirewallPtr fw,
static int static int
networkAddRoutingFirewallRules(virFirewallPtr fw, networkAddRoutingFirewallRules(virFirewallPtr fw,
virNetworkDefPtr def, virNetworkDefPtr def,
virNetworkIpDefPtr ipdef) virNetworkIPDefPtr ipdef)
{ {
int prefix = virNetworkIpDefPrefix(ipdef); int prefix = virNetworkIPDefPrefix(ipdef);
const char *forwardIf = virNetworkDefForwardIf(def, 0); const char *forwardIf = virNetworkDefForwardIf(def, 0);
if (prefix < 0) { if (prefix < 0) {
@ -384,9 +384,9 @@ networkAddRoutingFirewallRules(virFirewallPtr fw,
static int static int
networkRemoveRoutingFirewallRules(virFirewallPtr fw, networkRemoveRoutingFirewallRules(virFirewallPtr fw,
virNetworkDefPtr def, virNetworkDefPtr def,
virNetworkIpDefPtr ipdef) virNetworkIPDefPtr ipdef)
{ {
int prefix = virNetworkIpDefPrefix(ipdef); int prefix = virNetworkIPDefPrefix(ipdef);
const char *forwardIf = virNetworkDefForwardIf(def, 0); const char *forwardIf = virNetworkDefForwardIf(def, 0);
if (prefix < 0) if (prefix < 0)
@ -415,12 +415,12 @@ networkAddGeneralIPv4FirewallRules(virFirewallPtr fw,
virNetworkDefPtr def) virNetworkDefPtr def)
{ {
size_t i; size_t i;
virNetworkIpDefPtr ipv4def; virNetworkIPDefPtr ipv4def;
/* First look for first IPv4 address that has dhcp or tftpboot defined. */ /* First look for first IPv4 address that has dhcp or tftpboot defined. */
/* We support dhcp config on 1 IPv4 interface only. */ /* We support dhcp config on 1 IPv4 interface only. */
for (i = 0; for (i = 0;
(ipv4def = virNetworkDefGetIpByIndex(def, AF_INET, i)); (ipv4def = virNetworkDefGetIPByIndex(def, AF_INET, i));
i++) { i++) {
if (ipv4def->nranges || ipv4def->nhosts || ipv4def->tftproot) if (ipv4def->nranges || ipv4def->nhosts || ipv4def->tftproot)
break; break;
@ -452,10 +452,10 @@ networkRemoveGeneralIPv4FirewallRules(virFirewallPtr fw,
virNetworkDefPtr def) virNetworkDefPtr def)
{ {
size_t i; size_t i;
virNetworkIpDefPtr ipv4def; virNetworkIPDefPtr ipv4def;
for (i = 0; for (i = 0;
(ipv4def = virNetworkDefGetIpByIndex(def, AF_INET, i)); (ipv4def = virNetworkDefGetIPByIndex(def, AF_INET, i));
i++) { i++) {
if (ipv4def->nranges || ipv4def->nhosts || ipv4def->tftproot) if (ipv4def->nranges || ipv4def->nhosts || ipv4def->tftproot)
break; break;
@ -487,7 +487,7 @@ networkAddGeneralIPv6FirewallRules(virFirewallPtr fw,
virNetworkDefPtr def) virNetworkDefPtr def)
{ {
if (!virNetworkDefGetIpByIndex(def, AF_INET6, 0) && if (!virNetworkDefGetIPByIndex(def, AF_INET6, 0) &&
!def->ipv6nogw) { !def->ipv6nogw) {
return; return;
} }
@ -499,7 +499,7 @@ networkAddGeneralIPv6FirewallRules(virFirewallPtr fw,
/* Allow traffic between guests on the same bridge */ /* Allow traffic between guests on the same bridge */
iptablesAddForwardAllowCross(fw, VIR_FIREWALL_LAYER_IPV6, def->bridge); iptablesAddForwardAllowCross(fw, VIR_FIREWALL_LAYER_IPV6, def->bridge);
if (virNetworkDefGetIpByIndex(def, AF_INET6, 0)) { if (virNetworkDefGetIPByIndex(def, AF_INET6, 0)) {
/* allow DNS over IPv6 */ /* allow DNS over IPv6 */
iptablesAddTcpInput(fw, VIR_FIREWALL_LAYER_IPV6, def->bridge, 53); iptablesAddTcpInput(fw, VIR_FIREWALL_LAYER_IPV6, def->bridge, 53);
iptablesAddUdpInput(fw, VIR_FIREWALL_LAYER_IPV6, def->bridge, 53); iptablesAddUdpInput(fw, VIR_FIREWALL_LAYER_IPV6, def->bridge, 53);
@ -511,12 +511,12 @@ static void
networkRemoveGeneralIPv6FirewallRules(virFirewallPtr fw, networkRemoveGeneralIPv6FirewallRules(virFirewallPtr fw,
virNetworkDefPtr def) virNetworkDefPtr def)
{ {
if (!virNetworkDefGetIpByIndex(def, AF_INET6, 0) && if (!virNetworkDefGetIPByIndex(def, AF_INET6, 0) &&
!def->ipv6nogw) { !def->ipv6nogw) {
return; return;
} }
if (virNetworkDefGetIpByIndex(def, AF_INET6, 0)) { if (virNetworkDefGetIPByIndex(def, AF_INET6, 0)) {
iptablesRemoveUdpInput(fw, VIR_FIREWALL_LAYER_IPV6, def->bridge, 547); iptablesRemoveUdpInput(fw, VIR_FIREWALL_LAYER_IPV6, def->bridge, 547);
iptablesRemoveUdpInput(fw, VIR_FIREWALL_LAYER_IPV6, def->bridge, 53); iptablesRemoveUdpInput(fw, VIR_FIREWALL_LAYER_IPV6, def->bridge, 53);
iptablesRemoveTcpInput(fw, VIR_FIREWALL_LAYER_IPV6, def->bridge, 53); iptablesRemoveTcpInput(fw, VIR_FIREWALL_LAYER_IPV6, def->bridge, 53);
@ -553,12 +553,12 @@ networkAddChecksumFirewallRules(virFirewallPtr fw,
virNetworkDefPtr def) virNetworkDefPtr def)
{ {
size_t i; size_t i;
virNetworkIpDefPtr ipv4def; virNetworkIPDefPtr ipv4def;
/* First look for first IPv4 address that has dhcp or tftpboot defined. */ /* First look for first IPv4 address that has dhcp or tftpboot defined. */
/* We support dhcp config on 1 IPv4 interface only. */ /* We support dhcp config on 1 IPv4 interface only. */
for (i = 0; for (i = 0;
(ipv4def = virNetworkDefGetIpByIndex(def, AF_INET, i)); (ipv4def = virNetworkDefGetIPByIndex(def, AF_INET, i));
i++) { i++) {
if (ipv4def->nranges || ipv4def->nhosts) if (ipv4def->nranges || ipv4def->nhosts)
break; break;
@ -579,12 +579,12 @@ networkRemoveChecksumFirewallRules(virFirewallPtr fw,
virNetworkDefPtr def) virNetworkDefPtr def)
{ {
size_t i; size_t i;
virNetworkIpDefPtr ipv4def; virNetworkIPDefPtr ipv4def;
/* First look for first IPv4 address that has dhcp or tftpboot defined. */ /* First look for first IPv4 address that has dhcp or tftpboot defined. */
/* We support dhcp config on 1 IPv4 interface only. */ /* We support dhcp config on 1 IPv4 interface only. */
for (i = 0; for (i = 0;
(ipv4def = virNetworkDefGetIpByIndex(def, AF_INET, i)); (ipv4def = virNetworkDefGetIPByIndex(def, AF_INET, i));
i++) { i++) {
if (ipv4def->nranges || ipv4def->nhosts) if (ipv4def->nranges || ipv4def->nhosts)
break; break;
@ -596,9 +596,9 @@ networkRemoveChecksumFirewallRules(virFirewallPtr fw,
static int static int
networkAddIpSpecificFirewallRules(virFirewallPtr fw, networkAddIPSpecificFirewallRules(virFirewallPtr fw,
virNetworkDefPtr def, virNetworkDefPtr def,
virNetworkIpDefPtr ipdef) virNetworkIPDefPtr ipdef)
{ {
/* NB: in the case of IPv6, routing rules are added when the /* NB: in the case of IPv6, routing rules are added when the
* forward mode is NAT. This is because IPv6 has no NAT. * forward mode is NAT. This is because IPv6 has no NAT.
@ -617,9 +617,9 @@ networkAddIpSpecificFirewallRules(virFirewallPtr fw,
static int static int
networkRemoveIpSpecificFirewallRules(virFirewallPtr fw, networkRemoveIPSpecificFirewallRules(virFirewallPtr fw,
virNetworkDefPtr def, virNetworkDefPtr def,
virNetworkIpDefPtr ipdef) virNetworkIPDefPtr ipdef)
{ {
if (def->forward.type == VIR_NETWORK_FORWARD_NAT) { if (def->forward.type == VIR_NETWORK_FORWARD_NAT) {
if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET))
@ -637,7 +637,7 @@ networkRemoveIpSpecificFirewallRules(virFirewallPtr fw,
int networkAddFirewallRules(virNetworkDefPtr def) int networkAddFirewallRules(virNetworkDefPtr def)
{ {
size_t i; size_t i;
virNetworkIpDefPtr ipdef; virNetworkIPDefPtr ipdef;
virFirewallPtr fw = NULL; virFirewallPtr fw = NULL;
int ret = -1; int ret = -1;
@ -648,18 +648,18 @@ int networkAddFirewallRules(virNetworkDefPtr def)
networkAddGeneralFirewallRules(fw, def); networkAddGeneralFirewallRules(fw, def);
for (i = 0; for (i = 0;
(ipdef = virNetworkDefGetIpByIndex(def, AF_UNSPEC, i)); (ipdef = virNetworkDefGetIPByIndex(def, AF_UNSPEC, i));
i++) { i++) {
if (networkAddIpSpecificFirewallRules(fw, def, ipdef) < 0) if (networkAddIPSpecificFirewallRules(fw, def, ipdef) < 0)
goto cleanup; goto cleanup;
} }
virFirewallStartRollback(fw, 0); virFirewallStartRollback(fw, 0);
for (i = 0; for (i = 0;
(ipdef = virNetworkDefGetIpByIndex(def, AF_UNSPEC, i)); (ipdef = virNetworkDefGetIPByIndex(def, AF_UNSPEC, i));
i++) { i++) {
if (networkRemoveIpSpecificFirewallRules(fw, def, ipdef) < 0) if (networkRemoveIPSpecificFirewallRules(fw, def, ipdef) < 0)
goto cleanup; goto cleanup;
} }
networkRemoveGeneralFirewallRules(fw, def); networkRemoveGeneralFirewallRules(fw, def);
@ -680,7 +680,7 @@ int networkAddFirewallRules(virNetworkDefPtr def)
void networkRemoveFirewallRules(virNetworkDefPtr def) void networkRemoveFirewallRules(virNetworkDefPtr def)
{ {
size_t i; size_t i;
virNetworkIpDefPtr ipdef; virNetworkIPDefPtr ipdef;
virFirewallPtr fw = NULL; virFirewallPtr fw = NULL;
fw = virFirewallNew(); fw = virFirewallNew();
@ -691,9 +691,9 @@ void networkRemoveFirewallRules(virNetworkDefPtr def)
virFirewallStartTransaction(fw, VIR_FIREWALL_TRANSACTION_IGNORE_ERRORS); virFirewallStartTransaction(fw, VIR_FIREWALL_TRANSACTION_IGNORE_ERRORS);
for (i = 0; for (i = 0;
(ipdef = virNetworkDefGetIpByIndex(def, AF_UNSPEC, i)); (ipdef = virNetworkDefGetIPByIndex(def, AF_UNSPEC, i));
i++) { i++) {
if (networkRemoveIpSpecificFirewallRules(fw, def, ipdef) < 0) if (networkRemoveIPSpecificFirewallRules(fw, def, ipdef) < 0)
goto cleanup; goto cleanup;
} }
networkRemoveGeneralFirewallRules(fw, def); networkRemoveGeneralFirewallRules(fw, def);

24
src/nwfilter/nwfilter_ebiptables_driver.c
View File

@ -820,7 +820,7 @@ iptablesHandleSrcMacAddr(virFirewallPtr fw,
static int static int
iptablesHandleIpHdr(virFirewallPtr fw, iptablesHandleIPHdr(virFirewallPtr fw,
virFirewallRulePtr fwrule, virFirewallRulePtr fwrule,
virNWFilterVarCombIterPtr vars, virNWFilterVarCombIterPtr vars,
ipHdrDataDefPtr ipHdr, ipHdrDataDefPtr ipHdr,
@ -972,7 +972,7 @@ iptablesHandleIpHdr(virFirewallPtr fw,
static int static int
iptablesHandleIpHdrAfterStateMatch(virFirewallPtr fw, iptablesHandleIPHdrAfterStateMatch(virFirewallPtr fw,
virFirewallRulePtr fwrule, virFirewallRulePtr fwrule,
virNWFilterVarCombIterPtr vars, virNWFilterVarCombIterPtr vars,
ipHdrDataDefPtr ipHdr, ipHdrDataDefPtr ipHdr,
@ -1200,7 +1200,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw,
&srcMacSkipped) < 0) &srcMacSkipped) < 0)
goto cleanup; goto cleanup;
if (iptablesHandleIpHdr(fw, fwrule, if (iptablesHandleIPHdr(fw, fwrule,
vars, vars,
&rule->p.tcpHdrFilter.ipHdr, &rule->p.tcpHdrFilter.ipHdr,
directionIn, directionIn,
@ -1259,7 +1259,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw,
&srcMacSkipped) < 0) &srcMacSkipped) < 0)
goto cleanup; goto cleanup;
if (iptablesHandleIpHdr(fw, fwrule, if (iptablesHandleIPHdr(fw, fwrule,
vars, vars,
&rule->p.udpHdrFilter.ipHdr, &rule->p.udpHdrFilter.ipHdr,
directionIn, directionIn,
@ -1289,7 +1289,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw,
&srcMacSkipped) < 0) &srcMacSkipped) < 0)
goto cleanup; goto cleanup;
if (iptablesHandleIpHdr(fw, fwrule, if (iptablesHandleIPHdr(fw, fwrule,
vars, vars,
&rule->p.udpliteHdrFilter.ipHdr, &rule->p.udpliteHdrFilter.ipHdr,
directionIn, directionIn,
@ -1314,7 +1314,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw,
&srcMacSkipped) < 0) &srcMacSkipped) < 0)
goto cleanup; goto cleanup;
if (iptablesHandleIpHdr(fw, fwrule, if (iptablesHandleIPHdr(fw, fwrule,
vars, vars,
&rule->p.espHdrFilter.ipHdr, &rule->p.espHdrFilter.ipHdr,
directionIn, directionIn,
@ -1339,7 +1339,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw,
&srcMacSkipped) < 0) &srcMacSkipped) < 0)
goto cleanup; goto cleanup;
if (iptablesHandleIpHdr(fw, fwrule, if (iptablesHandleIPHdr(fw, fwrule,
vars, vars,
&rule->p.ahHdrFilter.ipHdr, &rule->p.ahHdrFilter.ipHdr,
directionIn, directionIn,
@ -1364,7 +1364,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw,
&srcMacSkipped) < 0) &srcMacSkipped) < 0)
goto cleanup; goto cleanup;
if (iptablesHandleIpHdr(fw, fwrule, if (iptablesHandleIPHdr(fw, fwrule,
vars, vars,
&rule->p.sctpHdrFilter.ipHdr, &rule->p.sctpHdrFilter.ipHdr,
directionIn, directionIn,
@ -1400,7 +1400,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw,
&srcMacSkipped) < 0) &srcMacSkipped) < 0)
goto cleanup; goto cleanup;
if (iptablesHandleIpHdr(fw, fwrule, if (iptablesHandleIPHdr(fw, fwrule,
vars, vars,
&rule->p.icmpHdrFilter.ipHdr, &rule->p.icmpHdrFilter.ipHdr,
directionIn, directionIn,
@ -1461,7 +1461,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw,
&srcMacSkipped) < 0) &srcMacSkipped) < 0)
goto cleanup; goto cleanup;
if (iptablesHandleIpHdr(fw, fwrule, if (iptablesHandleIPHdr(fw, fwrule,
vars, vars,
&rule->p.igmpHdrFilter.ipHdr, &rule->p.igmpHdrFilter.ipHdr,
directionIn, directionIn,
@ -1486,7 +1486,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw,
&srcMacSkipped) < 0) &srcMacSkipped) < 0)
goto cleanup; goto cleanup;
if (iptablesHandleIpHdr(fw, fwrule, if (iptablesHandleIPHdr(fw, fwrule,
vars, vars,
&rule->p.allHdrFilter.ipHdr, &rule->p.allHdrFilter.ipHdr,
directionIn, directionIn,
@ -1534,7 +1534,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw,
directionIn, directionIn,
rule); rule);
if (iptablesHandleIpHdrAfterStateMatch(fw, fwrule, if (iptablesHandleIPHdrAfterStateMatch(fw, fwrule,
vars, vars,
&rule->p.allHdrFilter.ipHdr, &rule->p.allHdrFilter.ipHdr,
directionIn) < 0) directionIn) < 0)

2
src/openvz/openvz_conf.c
View File

@ -220,7 +220,7 @@ openvzReadNetworkConf(virDomainDefPtr def,
goto error; goto error;
net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; net->type = VIR_DOMAIN_NET_TYPE_ETHERNET;
if (virDomainNetAppendIpAddress(net, token, AF_UNSPEC, 0) < 0) if (virDomainNetAppendIPAddress(net, token, AF_UNSPEC, 0) < 0)
goto error; goto error;
if (VIR_APPEND_ELEMENT_COPY(def->nets, def->nnets, net) < 0) if (VIR_APPEND_ELEMENT_COPY(def->nets, def->nnets, net) < 0)

2
src/qemu/qemu_driver.c
View File

@ -6988,7 +6988,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn,
char *script = net->script; char *script = net->script;
char *brname = net->data.bridge.brname; char *brname = net->data.bridge.brname;
size_t nips = net->nips; size_t nips = net->nips;
virDomainNetIpDefPtr *ips = net->ips; virDomainNetIPDefPtr *ips = net->ips;
memset(net, 0, sizeof(*net)); memset(net, 0, sizeof(*net));

4
src/util/virsocketaddr.c
View File

@ -1011,7 +1011,7 @@ virSocketAddrPrefixToNetmask(unsigned int prefix,
} }
/** /**
* virSocketAddrGetIpPrefix: * virSocketAddrGetIPPrefix:
* @address: network address * @address: network address
* @netmask: netmask for this network * @netmask: netmask for this network
* @prefix: prefix if specified instead of netmask * @prefix: prefix if specified instead of netmask
@ -1020,7 +1020,7 @@ virSocketAddrPrefixToNetmask(unsigned int prefix,
*/ */
int int
virSocketAddrGetIpPrefix(const virSocketAddr *address, virSocketAddrGetIPPrefix(const virSocketAddr *address,
const virSocketAddr *netmask, const virSocketAddr *netmask,
int prefix) int prefix)
{ {

2
src/util/virsocketaddr.h
View File

@ -125,7 +125,7 @@ int virSocketAddrGetNumNetmaskBits(const virSocketAddr *netmask);
int virSocketAddrPrefixToNetmask(unsigned int prefix, int virSocketAddrPrefixToNetmask(unsigned int prefix,
virSocketAddrPtr netmask, virSocketAddrPtr netmask,
int family); int family);
int virSocketAddrGetIpPrefix(const virSocketAddr *address, int virSocketAddrGetIPPrefix(const virSocketAddr *address,
const virSocketAddr *netmask, const virSocketAddr *netmask,
int prefix); int prefix);
bool virSocketAddrEqual(const virSocketAddr *s1, bool virSocketAddrEqual(const virSocketAddr *s1,

8
src/vbox/vbox_network.c
View File

@ -376,7 +376,7 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const char *xml, bool start)
char *networkNameUtf8 = NULL; char *networkNameUtf8 = NULL;
IHostNetworkInterface *networkInterface = NULL; IHostNetworkInterface *networkInterface = NULL;
virNetworkDefPtr def = virNetworkDefParseString(xml); virNetworkDefPtr def = virNetworkDefParseString(xml);
virNetworkIpDefPtr ipdef = NULL; virNetworkIPDefPtr ipdef = NULL;
unsigned char uuid[VIR_UUID_BUFLEN]; unsigned char uuid[VIR_UUID_BUFLEN];
vboxIIDUnion vboxnetiid; vboxIIDUnion vboxnetiid;
virSocketAddr netmask; virSocketAddr netmask;
@ -402,11 +402,11 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const char *xml, bool start)
* If there weren't any IPv4 addresses, ignore the network (since it's * If there weren't any IPv4 addresses, ignore the network (since it's
* required below to have an IPv4 address) * required below to have an IPv4 address)
*/ */
ipdef = virNetworkDefGetIpByIndex(def, AF_INET, 0); ipdef = virNetworkDefGetIPByIndex(def, AF_INET, 0);
if (!ipdef) if (!ipdef)
goto cleanup; goto cleanup;
if (virNetworkIpDefNetmask(ipdef, &netmask) < 0) if (virNetworkIPDefNetmask(ipdef, &netmask) < 0)
goto cleanup; goto cleanup;
/* the current limitation of hostonly network is that you can't /* the current limitation of hostonly network is that you can't
@ -762,7 +762,7 @@ static char *vboxNetworkGetXMLDesc(virNetworkPtr network, unsigned int flags)
{ {
vboxGlobalData *data = network->conn->privateData; vboxGlobalData *data = network->conn->privateData;
virNetworkDefPtr def = NULL; virNetworkDefPtr def = NULL;
virNetworkIpDefPtr ipdef = NULL; virNetworkIPDefPtr ipdef = NULL;
char *networkNameUtf8 = NULL; char *networkNameUtf8 = NULL;
PRUnichar *networkInterfaceNameUtf16 = NULL; PRUnichar *networkInterfaceNameUtf16 = NULL;
IHostNetworkInterface *networkInterface = NULL; IHostNetworkInterface *networkInterface = NULL;

2
src/xenconfig/xen_common.c
View File

@ -935,7 +935,7 @@ xenParseVif(virConfPtr conf, virDomainDefPtr def, const char *vif_typename)
if (bridge[0] && VIR_STRDUP(net->data.bridge.brname, bridge) < 0) if (bridge[0] && VIR_STRDUP(net->data.bridge.brname, bridge) < 0)
goto cleanup; goto cleanup;
} }
if (ip[0] && virDomainNetAppendIpAddress(net, ip, AF_INET, 0) < 0) if (ip[0] && virDomainNetAppendIPAddress(net, ip, AF_INET, 0) < 0)
goto cleanup; goto cleanup;
if (script && script[0] && if (script && script[0] &&

4
src/xenconfig/xen_sxpr.c
View File

@ -619,14 +619,14 @@ xenParseSxprNets(virDomainDefPtr def,
VIR_STRDUP(net->script, tmp2) < 0) VIR_STRDUP(net->script, tmp2) < 0)
goto cleanup; goto cleanup;
tmp = sexpr_node(node, "device/vif/ip"); tmp = sexpr_node(node, "device/vif/ip");
if (tmp && virDomainNetAppendIpAddress(net, tmp, AF_UNSPEC, 0) < 0) if (tmp && virDomainNetAppendIPAddress(net, tmp, AF_UNSPEC, 0) < 0)
goto cleanup; goto cleanup;
} else { } else {
net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; net->type = VIR_DOMAIN_NET_TYPE_ETHERNET;
if (VIR_STRDUP(net->script, tmp2) < 0) if (VIR_STRDUP(net->script, tmp2) < 0)
goto cleanup; goto cleanup;
tmp = sexpr_node(node, "device/vif/ip"); tmp = sexpr_node(node, "device/vif/ip");
if (tmp && virDomainNetAppendIpAddress(net, tmp, AF_UNSPEC, 0) < 0) if (tmp && virDomainNetAppendIPAddress(net, tmp, AF_UNSPEC, 0) < 0)
goto cleanup; goto cleanup;
} }