Rearrange this function to be better organized and more correct: * the error codes were changed from the incorrect INVALID_ARG to XML_ERROR * prefix still isn't required, but if present it must be valid or an error will be logged. * don't emit a debug log just because prefix is missing - this is valid. * group everything related to setting prefix in one place rather than scattered through the function. --- src/conf/domain_conf.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e57655e..c5b4815 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6115,15 +6115,9 @@ virDomainNetIPParseXML(xmlNodePtr node) int family = AF_UNSPEC; char *address = NULL; - if (!(prefixStr = virXMLPropString(node, "prefix")) || - (virStrToLong_ui(prefixStr, NULL, 10, &prefixValue) < 0)) { - // Don't shout, as some old config may not have a prefix - VIR_DEBUG("Missing or invalid network prefix"); - } - if (!(address = virXMLPropString(node, "address"))) { - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("Missing network address")); + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Missing required address in <ip>")); goto cleanup; } @@ -6139,11 +6133,22 @@ virDomainNetIPParseXML(xmlNodePtr node) goto cleanup; if (virSocketAddrParse(&ip->address, address, family) < 0) { - virReportError(VIR_ERR_INVALID_ARG, - _("Failed to parse IP address: '%s'"), + virReportError(VIR_ERR_XML_ERROR, + _("Invalid address '%s' in <ip>"), address); goto cleanup; } + + prefixStr = virXMLPropString(node, "prefix"); + if (prefixStr && + ((virStrToLong_ui(prefixStr, NULL, 10, &prefixValue) < 0) || + (family == AF_INET6 && prefixValue > 128) || + (family == AF_INET && prefixValue > 32))) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid prefix value '%s' in <ip>"), + prefixStr); + goto cleanup; + } ip->prefix = prefixValue; ret = ip; -- 2.5.5

Now that we can include <interface type='ethernet'> in tests, we could almost test XML that has an <ip> element in an interface. Except that the test fails when it tries to actually set the IP address for the interface's tap device. This patch mocks virNetDevSetIPAddress() to just return success. --- tests/qemuxml2argvmock.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index c6a1f98..b99496a 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Red Hat, Inc. + * Copyright (C) 2014-2016 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -127,6 +127,14 @@ virNetDevSetMAC(const char *ifname ATTRIBUTE_UNUSED, return 0; } +int virNetDevSetIPAddress(const char *ifname ATTRIBUTE_UNUSED, + virSocketAddr *addr ATTRIBUTE_UNUSED, + virSocketAddr *peer ATTRIBUTE_UNUSED, + unsigned int prefix ATTRIBUTE_UNUSED) +{ + return 0; +} + int virNetDevSetOnline(const char *ifname ATTRIBUTE_UNUSED, bool online ATTRIBUTE_UNUSED) -- 2.5.5

There are times when we don't have a netmask pointer to give to virSocketAddrGetIPPrefix() (e.g. the IP addresses in domain interfaces only have a prefix, no netmask), but it would have caused a segv if we called it with NULL instead of a pointer to a netmask. This patch qualifies the code that would use the netmask or address pointers to check for NULL first. --- src/util/virsocketaddr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 12fe96a..33b1e9e 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2015 Red Hat, Inc. + * Copyright (C) 2009-2016 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1026,9 +1026,9 @@ virSocketAddrGetIPPrefix(const virSocketAddr *address, { if (prefix > 0) { return prefix; - } else if (VIR_SOCKET_ADDR_VALID(netmask)) { + } else if (netmask && VIR_SOCKET_ADDR_VALID(netmask)) { return virSocketAddrGetNumNetmaskBits(netmask); - } else if (VIR_SOCKET_ADDR_IS_FAMILY(address, AF_INET)) { + } else if (address && VIR_SOCKET_ADDR_IS_FAMILY(address, AF_INET)) { /* Return the natural prefix for the network's ip address. * On Linux we could use the IN_CLASSx() macros, but those * aren't guaranteed on all platforms, so we just deal with @@ -1053,7 +1053,7 @@ virSocketAddrGetIPPrefix(const virSocketAddr *address, return 24; } return -1; - } else if (VIR_SOCKET_ADDR_IS_FAMILY(address, AF_INET6)) { + } else if (address && VIR_SOCKET_ADDR_IS_FAMILY(address, AF_INET6)) { if (virSocketAddrIsWildcard(address)) return 0; return 64; -- 2.5.5

lxcContainerRenameAndEnableInterfaces() isn't making a copy of the interface's ifname_guest (into newname), it's just copying the pointer to it. This means that when it later calls VIR_FREE(newname), it's actually freeing up (and fortunately NULLing out, so at least we don't try to access free'd memory) netDef->ifname_guest. --- src/lxc/lxc_container.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 531bbd5..3d9e28b 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -490,7 +490,7 @@ static int lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, { int rc = 0; size_t i, j; - char *newname = NULL; + const char *newname; char *toStr = NULL; char *viaStr = NULL; virDomainNetDefPtr netDef; @@ -552,8 +552,6 @@ static int lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, VIR_FREE(viaStr); } } - - VIR_FREE(newname); } /* enable lo device only if there were other net devices */ @@ -563,7 +561,6 @@ static int lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, error_out: VIR_FREE(toStr); VIR_FREE(viaStr); - VIR_FREE(newname); return rc; } -- 2.5.5

Commit c9a641 (first appearred in 1.2.12) added support for setting the guest-side IP address of veth devices in lxc domains. Unfortunately, it hardcoded the assumption that the proper prefix for any IP address with no explicit prefix in the config should be "24"; that is only correct for class C IPv4 addresses, but not for any other IPv4 address, nor for any IPv6 address. The good news is that there is already a function in libvirt that will determine the proper default prefix for any IP address. This patch replaces the use of the ill-fated VIR_SOCKET_ADDR_DEFAULT_PREFIX with calls to virSocketAddrGetIPPrefix(). --- src/lxc/lxc_container.c | 17 ++++++++++++----- src/util/virsocketaddr.h | 1 - 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 3d9e28b..304aa86 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2015 Red Hat, Inc. + * Copyright (C) 2008-2016 Red Hat, Inc. * Copyright (C) 2008 IBM Corp. * Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. * @@ -514,12 +514,19 @@ static int lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, for (j = 0; j < netDef->nips; j++) { virDomainNetIPDefPtr ip = netDef->ips[j]; - unsigned int prefix = (ip->prefix > 0) ? ip->prefix : - VIR_SOCKET_ADDR_DEFAULT_PREFIX; + int prefix; char *ipStr = virSocketAddrFormat(&ip->address); - VIR_DEBUG("Adding IP address '%s/%u' to '%s'", - ipStr, ip->prefix, newname); + if ((prefix = virSocketAddrGetIPPrefix(&ip->address, + NULL, ip->prefix)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to determine prefix for IP address '%s'"), + ipStr); + goto error_out; + } + + VIR_DEBUG("Adding IP address '%s/%d' to '%s'", + ipStr, prefix, newname); if (virNetDevSetIPAddress(newname, &ip->address, NULL, prefix) < 0) { virReportError(VIR_ERR_SYSTEM_ERROR, _("Failed to set IP address '%s' on %s"), diff --git a/src/util/virsocketaddr.h b/src/util/virsocketaddr.h index 990e31c..7ee993b 100644 --- a/src/util/virsocketaddr.h +++ b/src/util/virsocketaddr.h @@ -54,7 +54,6 @@ typedef struct { # define VIR_SOCKET_ADDR_FAMILY(s) \ ((s)->data.sa.sa_family) -# define VIR_SOCKET_ADDR_DEFAULT_PREFIX 24 # define VIR_SOCKET_ADDR_IPV4_ALL "0.0.0.0" # define VIR_SOCKET_ADDR_IPV6_ALL "::" -- 2.5.5

We need to clear these out without freeing the object completely. --- src/conf/domain_conf.c | 14 +++++++++++++- src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c5b4815..899b6af 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1737,7 +1737,8 @@ virDomainActualNetDefFree(virDomainActualNetDefPtr def) VIR_FREE(def); } -void virDomainNetDefFree(virDomainNetDefPtr def) +void +virDomainNetDefClear(virDomainNetDefPtr def) { size_t i; @@ -1753,6 +1754,7 @@ void virDomainNetDefFree(virDomainNetDefPtr def) case VIR_DOMAIN_NET_TYPE_VHOSTUSER: virDomainChrSourceDefFree(def->data.vhostuser); + def->data.vhostuser = NULL; break; case VIR_DOMAIN_NET_TYPE_SERVER: @@ -1767,6 +1769,7 @@ void virDomainNetDefFree(virDomainNetDefPtr def) VIR_FREE(def->data.network.name); VIR_FREE(def->data.network.portgroup); virDomainActualNetDefFree(def->data.network.actual); + def->data.network.actual = NULL; break; case VIR_DOMAIN_NET_TYPE_BRIDGE: @@ -1811,10 +1814,19 @@ void virDomainNetDefFree(virDomainNetDefPtr def) VIR_FREE(def->filter); virNWFilterHashTableFree(def->filterparams); + def->filterparams = NULL; virNetDevBandwidthFree(def->bandwidth); + def->bandwidth = NULL; virNetDevVlanClear(&def->vlan); +} +void +virDomainNetDefFree(virDomainNetDefPtr def) +{ + if (!def) + return; + virDomainNetDefClear(def); VIR_FREE(def); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 8529a78..b9dc174 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2492,6 +2492,7 @@ virDomainControllerDefPtr virDomainControllerDefNew(virDomainControllerType type); void virDomainFSDefFree(virDomainFSDefPtr def); void virDomainActualNetDefFree(virDomainActualNetDefPtr def); +void virDomainNetDefClear(virDomainNetDefPtr def); void virDomainNetDefFree(virDomainNetDefPtr def); void virDomainSmartcardDefFree(virDomainSmartcardDefPtr def); void virDomainChrDefFree(virDomainChrDefPtr def); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 36e3901..807ffce 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -372,6 +372,7 @@ virDomainMemoryFindInactiveByDef; virDomainMemoryInsert; virDomainMemoryRemove; virDomainNetAppendIPAddress; +virDomainNetDefClear; virDomainNetDefFormat; virDomainNetDefFree; virDomainNetFind; -- 2.5.5

This patch removes the expanded and duplicated code that all sprung out of two well-intentioned-but-useless settings of net->data.(bridge|ethernet).ipaddr. qemu has never supported even a single IP address in the interface config, much less a list of them. All of the instances of "clearing out the IP addresses" that are now in this function originated with commit d8dbd6 "Basic domain XML conversions for Xen/QEMU drivers" in May 2009, but even then the single "ipaddr" in the struct for type='ethernet' and type='bridge' wasn't used in the qemu driver (only in xen and openvz). Since then anyone who added a new interface type also tacked on another unnecessary clearing of ipaddr, and when it was made into a list of IPs (so far supported only by the LXC driver) this simple setting was turned into a loop (well, multiple loops) to clear them all. --- src/qemu/qemu_driver.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 294a1b0..517d0b8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6998,7 +6998,6 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, (brname = virDomainNetGetActualBridgeName(net))) { char *brnamecopy; - size_t j; if (VIR_STRDUP(brnamecopy, brname) < 0) goto cleanup; @@ -7010,29 +7009,18 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; net->script = NULL; net->data.ethernet.dev = brnamecopy; - for (j = 0; j < net->nips; j++) - VIR_FREE(net->ips[j]); - VIR_FREE(net->ips); - net->nips = 0; - } else { /* actualType is either NETWORK or DIRECT. In either * case, the best we can do is NULL everything out. */ - size_t j; virDomainActualNetDefFree(net->data.network.actual); memset(net, 0, sizeof(*net)); net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; net->script = NULL; net->data.ethernet.dev = NULL; - for (j = 0; j < net->nips; j++) - VIR_FREE(net->ips[j]); - VIR_FREE(net->ips); - net->nips = 0; } } else if (net->type == VIR_DOMAIN_NET_TYPE_DIRECT) { - size_t j; VIR_FREE(net->data.direct.linkdev); memset(net, 0, sizeof(*net)); @@ -7040,23 +7028,15 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; net->script = NULL; net->data.ethernet.dev = NULL; - for (j = 0; j < net->nips; j++) - VIR_FREE(net->ips[j]); - VIR_FREE(net->ips); - net->nips = 0; } else if (net->type == VIR_DOMAIN_NET_TYPE_BRIDGE) { char *script = net->script; char *brname = net->data.bridge.brname; - size_t nips = net->nips; - virDomainNetIPDefPtr *ips = net->ips; memset(net, 0, sizeof(*net)); net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; net->script = script; net->data.ethernet.dev = brname; - net->nips = nips; - net->ips = ips; } VIR_FREE(net->virtPortProfile); -- 2.5.5

in qemuConnectDomainXMLToNative. This function was only accounting for about 1/10 of all the allocated items in the NetDef prior to memseting it to all 0's. On top of that, it was going to great pains to learn the name of the bridge device, but then never doing anything useful with it (just putting it into data.ethernet.dev, which is *never* used when building a qemu commandline). (I think this again all started off as code with good intentions, but it was never completed, and instead was just Frankensteinically cargo-culted into the odd mish mash we have today). The resulting code is much simpler, produces exactly the same output, and doesn't leak memory. --- src/qemu/qemu_driver.c | 56 ++++++-------------------------------------------- 1 file changed, 6 insertions(+), 50 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 517d0b8..4a8cb7a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6987,62 +6987,18 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, unsigned int bootIndex = net->info.bootIndex; char *model = net->model; virMacAddr mac = net->mac; + char *script = net->script; - if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) { - int actualType = virDomainNetGetActualType(net); - const char *brname; - - VIR_FREE(net->data.network.name); - VIR_FREE(net->data.network.portgroup); - if ((actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) && - (brname = virDomainNetGetActualBridgeName(net))) { - - char *brnamecopy; - - if (VIR_STRDUP(brnamecopy, brname) < 0) - goto cleanup; - - virDomainActualNetDefFree(net->data.network.actual); - - memset(net, 0, sizeof(*net)); - - net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; - net->script = NULL; - net->data.ethernet.dev = brnamecopy; - } else { - /* actualType is either NETWORK or DIRECT. In either - * case, the best we can do is NULL everything out. - */ - virDomainActualNetDefFree(net->data.network.actual); - memset(net, 0, sizeof(*net)); - - net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; - net->script = NULL; - net->data.ethernet.dev = NULL; - } - } else if (net->type == VIR_DOMAIN_NET_TYPE_DIRECT) { - VIR_FREE(net->data.direct.linkdev); + net->model = NULL; + net->script = NULL; - memset(net, 0, sizeof(*net)); - - net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; - net->script = NULL; - net->data.ethernet.dev = NULL; - } else if (net->type == VIR_DOMAIN_NET_TYPE_BRIDGE) { - char *script = net->script; - char *brname = net->data.bridge.brname; - - memset(net, 0, sizeof(*net)); - - net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; - net->script = script; - net->data.ethernet.dev = brname; - } + virDomainNetDefClear(net); - VIR_FREE(net->virtPortProfile); + net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; net->info.bootIndex = bootIndex; net->model = model; net->mac = mac; + net->script = script; } if (!(cmd = qemuProcessCreatePretendCmd(conn, driver, vm, NULL, -- 2.5.5

When support for <interface type='ethernet'> was added in commit 9a4b705f back in 2010, it erroneously looked at <source dev='blah'/> for a user-specified guest-side interface name. This was never documented though. (that attribute already existed at the time in the data.ethernet union member of virDomainNetDef, but apparently had no practical use - it was only used as a storage place for a NetDef's bridge name during qemuDomainXMLToNative(), but even then that was never used for anything). When support for similar guest-side device naming was added to the lxc driver several years later, it was put in a new subelement <guest dev='blah'/>. In the intervening years, since there was no validation that ethernet.dev was NULL in the other drivers that didn't actually use it, innocent souls who were adding other features assuming they needed to account for non-NULL ethernet.dev when really they didn't, so little bits of the usual pointless cargo-cult code showed up. This patch not only switches the openvz driver to use the documented <guest dev='blah'/> notation for naming the guest-side device (just in case anyone is still using the openvz driver), and logs an error if anyone tries to set <source dev='blah'/> for a type='ethernet' interface, it also removes the cargo-cult uses of ethernet.dev and <source dev='blah'/>, and eliminates if from the RNG and from virDomainNetDef. NB: I decided on this course of action after mentioning the inconsistency here: https://www.redhat.com/archives/libvir-list/2016-May/msg02038.html and getting encouragement do eliminate it in a later IRC discussion with danpb. --- docs/schemas/domaincommon.rng | 3 --- src/conf/domain_conf.c | 32 +++++++++++++++++++--------- src/conf/domain_conf.h | 1 - src/openvz/openvz_driver.c | 5 ++--- src/qemu/qemu_hotplug.c | 6 +----- tests/xml2sexprdata/xml2sexpr-net-routed.xml | 1 - 6 files changed, 25 insertions(+), 23 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 162c2e0..b81b558 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2142,9 +2142,6 @@ <interleave> <optional> <element name="source"> - <attribute name="dev"> - <ref name="deviceName"/> - </attribute> <empty/> </element> </optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 899b6af..4802e03 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1749,7 +1749,6 @@ virDomainNetDefClear(virDomainNetDefPtr def) switch (def->type) { case VIR_DOMAIN_NET_TYPE_ETHERNET: - VIR_FREE(def->data.ethernet.dev); break; case VIR_DOMAIN_NET_TYPE_VHOSTUSER: @@ -9004,12 +9003,31 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, def->type == VIR_DOMAIN_NET_TYPE_BRIDGE && xmlStrEqual(cur->name, BAD_CAST "source")) { bridge = virXMLPropString(cur, "bridge"); - } else if (!dev && - (def->type == VIR_DOMAIN_NET_TYPE_ETHERNET || - def->type == VIR_DOMAIN_NET_TYPE_DIRECT) && + } else if (!dev && def->type == VIR_DOMAIN_NET_TYPE_DIRECT && xmlStrEqual(cur->name, BAD_CAST "source")) { dev = virXMLPropString(cur, "dev"); mode = virXMLPropString(cur, "mode"); + } else if (!dev && def->type == VIR_DOMAIN_NET_TYPE_ETHERNET && + xmlStrEqual(cur->name, BAD_CAST "source")) { + /* This clause is only necessary because from 2010 to + * 2016 it was possible (but never documented) to + * configure the name of the guest-side interface of + * an openvz domain with <source dev='blah'/>. That + * was blatant misuse of <source>, so was likely + * (hopefully) never used, but just in case there was + * somebody using it, we need to generate an error. If + * the openvz driver is ever deprecated, this clause + * can be removed from here. + */ + if ((dev = virXMLPropString(cur, "dev"))) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid attempt to set <interface type='ethernet'> " + "device name with <source dev='%s'/>. " + "Use <target dev='%s'/> (for host-side) " + "or <guest dev='%s'/> (for guest-side) instead."), + dev, dev, dev); + goto error; + } } else if (!vhostuser_path && !vhostuser_mode && !vhostuser_type && def->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER && xmlStrEqual(cur->name, BAD_CAST "source")) { @@ -9260,10 +9278,6 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, break; case VIR_DOMAIN_NET_TYPE_ETHERNET: - if (dev != NULL) { - def->data.ethernet.dev = dev; - dev = NULL; - } break; case VIR_DOMAIN_NET_TYPE_BRIDGE: @@ -20787,8 +20801,6 @@ virDomainNetDefFormat(virBufferPtr buf, break; case VIR_DOMAIN_NET_TYPE_ETHERNET: - virBufferEscapeString(buf, "<source dev='%s'/>\n", - def->data.ethernet.dev); break; case VIR_DOMAIN_NET_TYPE_VHOSTUSER: diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index b9dc174..e93bd5c 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -931,7 +931,6 @@ struct _virDomainNetDef { } backend; union { struct { - char *dev; } ethernet; virDomainChrSourceDefPtr vhostuser; struct { diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index b66883f..b114246 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -862,9 +862,8 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, /* if net is ethernet and the user has specified guest interface name, * let's use it; otherwise generate a new one */ - if (net->type == VIR_DOMAIN_NET_TYPE_ETHERNET && - net->data.ethernet.dev != NULL) { - if (VIR_STRDUP(guest_ifname, net->data.ethernet.dev) == -1) + if (net->ifname_guest) { + if (VIR_STRDUP(guest_ifname, net->ifname_guest) < 0) goto cleanup; } else { guest_ifname = openvzGenerateContainerVethName(veid); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index f695903..e0b8230 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2345,11 +2345,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, break; case VIR_DOMAIN_NET_TYPE_ETHERNET: - if (STRNEQ_NULLABLE(olddev->data.ethernet.dev, - newdev->data.ethernet.dev)) { - needReconnect = true; - } - break; + break; case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: diff --git a/tests/xml2sexprdata/xml2sexpr-net-routed.xml b/tests/xml2sexprdata/xml2sexpr-net-routed.xml index f34dbaa..2adc3a7 100644 --- a/tests/xml2sexprdata/xml2sexpr-net-routed.xml +++ b/tests/xml2sexprdata/xml2sexpr-net-routed.xml @@ -20,7 +20,6 @@ <interface type="ethernet"> <mac address="00:11:22:33:44:55"/> <ip address="172.14.5.6"/> - <source dev="eth3"/> <script path="vif-routed"/> <target dev="vif4.0"/> </interface> -- 2.5.5

This patch splits virnetdev.[ch] into multiple files, with the new virnetdevip.[ch] containing all the functions related to setting and retrieving IP-related info for a device (both addresses and routes). --- po/POTFILES.in | 1 + src/Makefile.am | 1 + src/libvirt_private.syms | 13 +- src/lxc/lxc_container.c | 14 +- src/network/bridge_driver.c | 15 +- src/util/virnetdev.c | 711 ---------------------------------------- src/util/virnetdevip.c | 778 ++++++++++++++++++++++++++++++++++++++++++++ src/util/virnetdevip.h | 50 +++ 8 files changed, 853 insertions(+), 730 deletions(-) create mode 100644 src/util/virnetdevip.c create mode 100644 src/util/virnetdevip.h diff --git a/po/POTFILES.in b/po/POTFILES.in index 822cfbc..f27d448 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -213,6 +213,7 @@ src/util/virlog.c src/util/virnetdev.c src/util/virnetdevbandwidth.c src/util/virnetdevbridge.c +src/util/virnetdevip.c src/util/virnetdevmacvlan.c src/util/virnetdevmidonet.c src/util/virnetdevopenvswitch.c diff --git a/src/Makefile.am b/src/Makefile.am index a14cb3f..f56dcc2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -138,6 +138,7 @@ UTIL_SOURCES = \ util/virnetdev.h util/virnetdev.c \ util/virnetdevbandwidth.h util/virnetdevbandwidth.c \ util/virnetdevbridge.h util/virnetdevbridge.c \ + util/virnetdevip.h util/virnetdevip.c \ util/virnetdevmacvlan.c util/virnetdevmacvlan.h \ util/virnetdevmidonet.h util/virnetdevmidonet.c \ util/virnetdevopenvswitch.h util/virnetdevopenvswitch.c \ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 807ffce..bd7b730 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1850,15 +1850,12 @@ virMacAddrSetRaw; # util/virnetdev.h virNetDevAddMulti; -virNetDevAddRoute; -virNetDevClearIPAddress; virNetDevDelMulti; virNetDevExists; virNetDevFeatureTypeFromString; virNetDevFeatureTypeToString; virNetDevGetFeatures; virNetDevGetIndex; -virNetDevGetIPAddress; virNetDevGetLinkInfo; virNetDevGetMAC; virNetDevGetMTU; @@ -1884,7 +1881,6 @@ virNetDevRxFilterFree; virNetDevRxFilterModeTypeFromString; virNetDevRxFilterModeTypeToString; virNetDevRxFilterNew; -virNetDevSetIPAddress; virNetDevSetMAC; virNetDevSetMTU; virNetDevSetMTUFromDevice; @@ -1897,7 +1893,6 @@ virNetDevSetRcvMulti; virNetDevSetupControl; virNetDevSysfsFile; virNetDevValidateConfig; -virNetDevWaitDadFinish; # util/virnetdevbandwidth.h @@ -1931,6 +1926,14 @@ virNetDevBridgeSetSTPDelay; virNetDevBridgeSetVlanFiltering; +# util/virnetdevip.h +virNetDevIPAddrAdd; +virNetDevIPAddrDel; +virNetDevIPAddrGet; +virNetDevIPRouteAdd; +virNetDevIPWaitDadFinish; + + # util/virnetdevmacvlan.h virNetDevMacVLanCreate; virNetDevMacVLanCreateWithVPortProfile; diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 304aa86..a95472c 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -66,7 +66,7 @@ #include "virfile.h" #include "virusb.h" #include "vircommand.h" -#include "virnetdev.h" +#include "virnetdevip.h" #include "virprocess.h" #include "virstring.h" @@ -527,7 +527,7 @@ static int lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, VIR_DEBUG("Adding IP address '%s/%d' to '%s'", ipStr, prefix, newname); - if (virNetDevSetIPAddress(newname, &ip->address, NULL, prefix) < 0) { + if (virNetDevIPAddrAdd(newname, &ip->address, NULL, prefix) < 0) { virReportError(VIR_ERR_SYSTEM_ERROR, _("Failed to set IP address '%s' on %s"), ipStr, newname); @@ -548,11 +548,11 @@ static int lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, for (j = 0; j < netDef->nroutes; j++) { virNetworkRouteDefPtr route = netDef->routes[j]; - if (virNetDevAddRoute(newname, - virNetworkRouteDefGetAddress(route), - virNetworkRouteDefGetPrefix(route), - virNetworkRouteDefGetGateway(route), - virNetworkRouteDefGetMetric(route)) < 0) { + if (virNetDevIPRouteAdd(newname, + virNetworkRouteDefGetAddress(route), + virNetworkRouteDefGetPrefix(route), + virNetworkRouteDefGetGateway(route), + virNetworkRouteDefGetMetric(route)) < 0) { goto error_out; } VIR_FREE(toStr); diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 130b77d..135f7bd 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -62,10 +62,11 @@ #include "virdnsmasq.h" #include "configmake.h" #include "virnetdev.h" -#include "virpci.h" +#include "virnetdevip.h" #include "virnetdevbridge.h" #include "virnetdevtap.h" #include "virnetdevvportprofile.h" +#include "virpci.h" #include "virdbus.h" #include "virfile.h" #include "virstring.h" @@ -1986,8 +1987,8 @@ networkAddAddrToBridge(virNetworkObjPtr network, return -1; } - if (virNetDevSetIPAddress(network->def->bridge, - &ipdef->address, NULL, prefix) < 0) + if (virNetDevIPAddrAdd(network->def->bridge, + &ipdef->address, NULL, prefix) < 0) return -1; return 0; @@ -2034,8 +2035,8 @@ networkAddRouteToBridge(virNetworkObjPtr network, return -1; } - if (virNetDevAddRoute(network->def->bridge, addr, - prefix, gateway, metric) < 0) { + if (virNetDevIPRouteAdd(network->def->bridge, addr, + prefix, gateway, metric) < 0) { return -1; } return 0; @@ -2058,7 +2059,7 @@ networkWaitDadFinish(virNetworkObjPtr network) goto cleanup; } - ret = (naddrs == 0) ? 0 : virNetDevWaitDadFinish(addrs, naddrs); + ret = (naddrs == 0) ? 0 : virNetDevIPWaitDadFinish(addrs, naddrs); cleanup: VIR_FREE(addrs); @@ -4769,7 +4770,7 @@ networkGetNetworkAddress(const char *netname, char **netaddr) } if (dev_name) { - if (virNetDevGetIPAddress(dev_name, &addr) < 0) + if (virNetDevIPAddrGet(dev_name, &addr) < 0) goto cleanup; addrptr = &addr; } diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index fb71c7b..729c121 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -34,10 +34,6 @@ #include "virstring.h" #include "virutil.h" -#if HAVE_GETIFADDRS -# include <ifaddrs.h> -#endif - #include <sys/ioctl.h> #include <net/if.h> #include <fcntl.h> @@ -97,7 +93,6 @@ VIR_LOG_INIT("util.netdev"); # define FEATURE_BIT_IS_SET(blocks, index, field) \ (FEATURE_WORD(blocks, index, field) & FEATURE_FIELD_FLAG(index)) #endif -#define VIR_DAD_WAIT_TIMEOUT 20 /* seconds */ typedef enum { VIR_MCAST_TYPE_INDEX_TOKEN, @@ -1012,712 +1007,6 @@ int virNetDevGetVLanID(const char *ifname ATTRIBUTE_UNUSED, #endif /* ! SIOCGIFVLAN */ -#if defined(__linux__) && defined(HAVE_LIBNL) - -static int -virNetDevGetIPAddressBinary(virSocketAddr *addr, void **data, size_t *len) -{ - if (!addr) - return -1; - - switch (VIR_SOCKET_ADDR_FAMILY(addr)) { - case AF_INET: - *data = &addr->data.inet4.sin_addr; - *len = sizeof(struct in_addr); - break; - case AF_INET6: - *data = &addr->data.inet6.sin6_addr; - *len = sizeof(struct in6_addr); - break; - default: - return -1; - } - return 0; -} - -static struct nl_msg * -virNetDevCreateNetlinkAddressMessage(int messageType, - const char *ifname, - virSocketAddr *addr, - unsigned int prefix, - virSocketAddr *broadcast, - virSocketAddr *peer) -{ - struct nl_msg *nlmsg = NULL; - struct ifaddrmsg ifa; - unsigned int ifindex; - void *addrData = NULL; - void *peerData = NULL; - void *broadcastData = NULL; - size_t addrDataLen; - - if (virNetDevGetIPAddressBinary(addr, &addrData, &addrDataLen) < 0) - return NULL; - - if (peer && VIR_SOCKET_ADDR_VALID(peer)) { - if (virNetDevGetIPAddressBinary(peer, &peerData, &addrDataLen) < 0) - return NULL; - } else if (broadcast) { - if (virNetDevGetIPAddressBinary(broadcast, &broadcastData, - &addrDataLen) < 0) - return NULL; - } - - /* Get the interface index */ - if ((ifindex = if_nametoindex(ifname)) == 0) - return NULL; - - if (!(nlmsg = nlmsg_alloc_simple(messageType, - NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL))) { - virReportOOMError(); - return NULL; - } - - memset(&ifa, 0, sizeof(ifa)); - - ifa.ifa_prefixlen = prefix; - ifa.ifa_family = VIR_SOCKET_ADDR_FAMILY(addr); - ifa.ifa_index = ifindex; - ifa.ifa_scope = 0; - - if (nlmsg_append(nlmsg, &ifa, sizeof(ifa), NLMSG_ALIGNTO) < 0) - goto buffer_too_small; - - if (nla_put(nlmsg, IFA_LOCAL, addrDataLen, addrData) < 0) - goto buffer_too_small; - - if (peerData) { - if (nla_put(nlmsg, IFA_ADDRESS, addrDataLen, peerData) < 0) - goto buffer_too_small; - } - - if (broadcastData) { - if (nla_put(nlmsg, IFA_BROADCAST, addrDataLen, broadcastData) < 0) - goto buffer_too_small; - } - - return nlmsg; - - buffer_too_small: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("allocated netlink buffer is too small")); - nlmsg_free(nlmsg); - return NULL; -} - -/** - * virNetDevSetIPAddress: - * @ifname: the interface name - * @addr: the IP address (IPv4 or IPv6) - * @peer: The IP address of peer (IPv4 or IPv6) - * @prefix: number of 1 bits in the netmask - * - * Add an IP address to an interface. This function *does not* remove - * any previously added IP addresses - that must be done separately with - * brDelInetAddress. - * - * Returns 0 in case of success or -1 in case of error. - */ -int virNetDevSetIPAddress(const char *ifname, - virSocketAddr *addr, - virSocketAddr *peer, - unsigned int prefix) -{ - virSocketAddr *broadcast = NULL; - int ret = -1; - struct nl_msg *nlmsg = NULL; - struct nlmsghdr *resp = NULL; - unsigned int recvbuflen; - - /* The caller needs to provide a correct address */ - if (VIR_SOCKET_ADDR_FAMILY(addr) == AF_INET && - !(peer && VIR_SOCKET_ADDR_VALID(peer))) { - /* compute a broadcast address if this is IPv4 */ - if (VIR_ALLOC(broadcast) < 0) - return -1; - - if (virSocketAddrBroadcastByPrefix(addr, prefix, broadcast) < 0) - goto cleanup; - } - - if (!(nlmsg = virNetDevCreateNetlinkAddressMessage(RTM_NEWADDR, ifname, - addr, prefix, - broadcast, peer))) - goto cleanup; - - if (virNetlinkCommand(nlmsg, &resp, &recvbuflen, 0, 0, - NETLINK_ROUTE, 0) < 0) - goto cleanup; - - - if (virNetlinkGetErrorCode(resp, recvbuflen) < 0) { - virReportError(VIR_ERR_SYSTEM_ERROR, - _("Error adding IP address to %s"), ifname); - goto cleanup; - } - - ret = 0; - cleanup: - nlmsg_free(nlmsg); - VIR_FREE(resp); - VIR_FREE(broadcast); - return ret; -} - -/** - * virNetDevAddRoute: - * @ifname: the interface name - * @addr: the IP network address (IPv4 or IPv6) - * @prefix: number of 1 bits in the netmask - * @gateway: via address for route (same as @addr) - * - * Add a route for a network IP address to an interface. This function - * *does not* remove any previously added IP static routes. - * - * Returns 0 in case of success or -1 in case of error. - */ -int -virNetDevAddRoute(const char *ifname, - virSocketAddrPtr addr, - unsigned int prefix, - virSocketAddrPtr gateway, - unsigned int metric) -{ - int ret = -1; - struct nl_msg *nlmsg = NULL; - struct nlmsghdr *resp = NULL; - unsigned int recvbuflen; - unsigned int ifindex; - struct rtmsg rtmsg; - void *gatewayData = NULL; - void *addrData = NULL; - size_t addrDataLen; - int errCode; - virSocketAddr defaultAddr; - virSocketAddrPtr actualAddr; - char *toStr = NULL; - char *viaStr = NULL; - - actualAddr = addr; - - /* If we have no valid network address, then use the default one */ - if (!addr || !VIR_SOCKET_ADDR_VALID(addr)) { - VIR_DEBUG("computing default address"); - int family = VIR_SOCKET_ADDR_FAMILY(gateway); - if (family == AF_INET) { - if (virSocketAddrParseIPv4(&defaultAddr, VIR_SOCKET_ADDR_IPV4_ALL) < 0) - goto cleanup; - } else { - if (virSocketAddrParseIPv6(&defaultAddr, VIR_SOCKET_ADDR_IPV6_ALL) < 0) - goto cleanup; - } - - actualAddr = &defaultAddr; - } - - toStr = virSocketAddrFormat(actualAddr); - viaStr = virSocketAddrFormat(gateway); - VIR_DEBUG("Adding route %s/%d via %s", toStr, prefix, viaStr); - - if (virNetDevGetIPAddressBinary(actualAddr, &addrData, &addrDataLen) < 0 || - virNetDevGetIPAddressBinary(gateway, &gatewayData, &addrDataLen) < 0) - goto cleanup; - - /* Get the interface index */ - if ((ifindex = if_nametoindex(ifname)) == 0) - goto cleanup; - - if (!(nlmsg = nlmsg_alloc_simple(RTM_NEWROUTE, - NLM_F_REQUEST | NLM_F_CREATE | - NLM_F_EXCL))) { - virReportOOMError(); - goto cleanup; - } - - memset(&rtmsg, 0, sizeof(rtmsg)); - - rtmsg.rtm_family = VIR_SOCKET_ADDR_FAMILY(gateway); - rtmsg.rtm_table = RT_TABLE_MAIN; - rtmsg.rtm_scope = RT_SCOPE_UNIVERSE; - rtmsg.rtm_protocol = RTPROT_BOOT; - rtmsg.rtm_type = RTN_UNICAST; - rtmsg.rtm_dst_len = prefix; - - if (nlmsg_append(nlmsg, &rtmsg, sizeof(rtmsg), NLMSG_ALIGNTO) < 0) - goto buffer_too_small; - - if (prefix > 0 && nla_put(nlmsg, RTA_DST, addrDataLen, addrData) < 0) - goto buffer_too_small; - - if (nla_put(nlmsg, RTA_GATEWAY, addrDataLen, gatewayData) < 0) - goto buffer_too_small; - - if (nla_put_u32(nlmsg, RTA_OIF, ifindex) < 0) - goto buffer_too_small; - - if (metric > 0 && nla_put_u32(nlmsg, RTA_PRIORITY, metric) < 0) - goto buffer_too_small; - - if (virNetlinkCommand(nlmsg, &resp, &recvbuflen, 0, 0, - NETLINK_ROUTE, 0) < 0) - goto cleanup; - - if ((errCode = virNetlinkGetErrorCode(resp, recvbuflen)) < 0) { - virReportSystemError(errCode, _("Error adding route to %s"), ifname); - goto cleanup; - } - - ret = 0; - cleanup: - VIR_FREE(toStr); - VIR_FREE(viaStr); - nlmsg_free(nlmsg); - return ret; - - buffer_too_small: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("allocated netlink buffer is too small")); - goto cleanup; -} - -/** - * virNetDevClearIPAddress: - * @ifname: the interface name - * @addr: the IP address (IPv4 or IPv6) - * @prefix: number of 1 bits in the netmask - * - * Delete an IP address from an interface. - * - * Returns 0 in case of success or -1 in case of error. - */ -int virNetDevClearIPAddress(const char *ifname, - virSocketAddr *addr, - unsigned int prefix) -{ - int ret = -1; - struct nl_msg *nlmsg = NULL; - struct nlmsghdr *resp = NULL; - unsigned int recvbuflen; - - if (!(nlmsg = virNetDevCreateNetlinkAddressMessage(RTM_DELADDR, ifname, - addr, prefix, - NULL, NULL))) - goto cleanup; - - if (virNetlinkCommand(nlmsg, &resp, &recvbuflen, 0, 0, - NETLINK_ROUTE, 0) < 0) - goto cleanup; - - if (virNetlinkGetErrorCode(resp, recvbuflen) < 0) { - virReportError(VIR_ERR_SYSTEM_ERROR, - _("Error removing IP address from %s"), ifname); - goto cleanup; - } - - ret = 0; - cleanup: - nlmsg_free(nlmsg); - VIR_FREE(resp); - return ret; -} - -/* return true if there is a known address with 'tentative' flag set */ -static bool -virNetDevParseDadStatus(struct nlmsghdr *nlh, int len, - virSocketAddrPtr *addrs, size_t count) -{ - struct ifaddrmsg *ifaddrmsg_ptr; - unsigned int ifaddrmsg_len; - struct rtattr *rtattr_ptr; - size_t i; - struct in6_addr *addr; - - VIR_WARNINGS_NO_CAST_ALIGN - for (; NLMSG_OK(nlh, len); nlh = NLMSG_NEXT(nlh, len)) { - VIR_WARNINGS_RESET - if (NLMSG_PAYLOAD(nlh, 0) < sizeof(struct ifaddrmsg)) { - /* Message without payload is the last one. */ - break; - } - - ifaddrmsg_ptr = (struct ifaddrmsg *)NLMSG_DATA(nlh); - if (!(ifaddrmsg_ptr->ifa_flags & IFA_F_TENTATIVE)) { - /* Not tentative: we are not interested in this entry. */ - continue; - } - - ifaddrmsg_len = IFA_PAYLOAD(nlh); - VIR_WARNINGS_NO_CAST_ALIGN - rtattr_ptr = (struct rtattr *) IFA_RTA(ifaddrmsg_ptr); - for (; RTA_OK(rtattr_ptr, ifaddrmsg_len); - rtattr_ptr = RTA_NEXT(rtattr_ptr, ifaddrmsg_len)) { - VIR_WARNINGS_RESET - if (RTA_PAYLOAD(rtattr_ptr) != sizeof(struct in6_addr)) { - /* No address: ignore. */ - continue; - } - - /* We check only known addresses. */ - for (i = 0; i < count; i++) { - addr = &addrs[i]->data.inet6.sin6_addr; - if (!memcmp(addr, RTA_DATA(rtattr_ptr), - sizeof(struct in6_addr))) { - /* We found matching tentative address. */ - return true; - } - } - } - } - return false; -} - -/* return after DAD finishes for all known IPv6 addresses or an error */ -int -virNetDevWaitDadFinish(virSocketAddrPtr *addrs, size_t count) -{ - struct nl_msg *nlmsg = NULL; - struct ifaddrmsg ifa; - struct nlmsghdr *resp = NULL; - unsigned int recvbuflen; - int ret = -1; - bool dad = true; - time_t max_time = time(NULL) + VIR_DAD_WAIT_TIMEOUT; - - if (!(nlmsg = nlmsg_alloc_simple(RTM_GETADDR, - NLM_F_REQUEST | NLM_F_DUMP))) { - virReportOOMError(); - return -1; - } - - memset(&ifa, 0, sizeof(ifa)); - /* DAD is for IPv6 adresses only. */ - ifa.ifa_family = AF_INET6; - if (nlmsg_append(nlmsg, &ifa, sizeof(ifa), NLMSG_ALIGNTO) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("allocated netlink buffer is too small")); - goto cleanup; - } - - /* Periodically query netlink until DAD finishes on all known addresses. */ - while (dad && time(NULL) < max_time) { - if (virNetlinkCommand(nlmsg, &resp, &recvbuflen, 0, 0, - NETLINK_ROUTE, 0) < 0) - goto cleanup; - - if (virNetlinkGetErrorCode(resp, recvbuflen) < 0) { - virReportError(VIR_ERR_SYSTEM_ERROR, "%s", - _("error reading DAD state information")); - goto cleanup; - } - - /* Parse response. */ - dad = virNetDevParseDadStatus(resp, recvbuflen, addrs, count); - if (dad) - usleep(1000 * 10); - - VIR_FREE(resp); - } - /* Check timeout. */ - if (dad) { - virReportError(VIR_ERR_SYSTEM_ERROR, - _("Duplicate Address Detection " - "not finished in %d seconds"), VIR_DAD_WAIT_TIMEOUT); - } else { - ret = 0; - } - - cleanup: - VIR_FREE(resp); - nlmsg_free(nlmsg); - return ret; -} - -#else /* defined(__linux__) && defined(HAVE_LIBNL) */ - -int virNetDevSetIPAddress(const char *ifname, - virSocketAddr *addr, - virSocketAddr *peer, - unsigned int prefix) -{ - virCommandPtr cmd = NULL; - char *addrstr = NULL, *bcaststr = NULL, *peerstr = NULL; - virSocketAddr broadcast; - int ret = -1; - - if (!(addrstr = virSocketAddrFormat(addr))) - goto cleanup; - - if (peer && VIR_SOCKET_ADDR_VALID(peer) && !(peerstr = virSocketAddrFormat(peer))) - goto cleanup; - - /* format up a broadcast address if this is IPv4 */ - if (!peerstr && ((VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_INET)) && - ((virSocketAddrBroadcastByPrefix(addr, prefix, &broadcast) < 0) || - !(bcaststr = virSocketAddrFormat(&broadcast))))) { - goto cleanup; - } - -# ifdef IFCONFIG_PATH - cmd = virCommandNew(IFCONFIG_PATH); - virCommandAddArg(cmd, ifname); - if (VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_INET6)) - virCommandAddArg(cmd, "inet6"); - else - virCommandAddArg(cmd, "inet"); - virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); - if (peerstr) - virCommandAddArgList(cmd, "pointopoint", peerstr, NULL); - if (bcaststr) - virCommandAddArgList(cmd, "broadcast", bcaststr, NULL); - virCommandAddArg(cmd, "alias"); -# else - cmd = virCommandNew(IP_PATH); - virCommandAddArgList(cmd, "addr", "add", NULL); - virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); - if (peerstr) - virCommandAddArgList(cmd, "peer", peerstr, NULL); - if (bcaststr) - virCommandAddArgList(cmd, "broadcast", bcaststr, NULL); - virCommandAddArgList(cmd, "dev", ifname, NULL); -# endif - - if (virCommandRun(cmd, NULL) < 0) - goto cleanup; - - ret = 0; - cleanup: - VIR_FREE(addrstr); - VIR_FREE(bcaststr); - VIR_FREE(peerstr); - virCommandFree(cmd); - return ret; -} - -int -virNetDevAddRoute(const char *ifname, - virSocketAddrPtr addr, - unsigned int prefix, - virSocketAddrPtr gateway, - unsigned int metric) -{ - virCommandPtr cmd = NULL; - char *addrstr = NULL, *gatewaystr = NULL; - int ret = -1; - - if (!(addrstr = virSocketAddrFormat(addr))) - goto cleanup; - if (!(gatewaystr = virSocketAddrFormat(gateway))) - goto cleanup; - cmd = virCommandNew(IP_PATH); - virCommandAddArgList(cmd, "route", "add", NULL); - virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); - virCommandAddArgList(cmd, "via", gatewaystr, "dev", ifname, - "proto", "static", "metric", NULL); - virCommandAddArgFormat(cmd, "%u", metric); - - if (virCommandRun(cmd, NULL) < 0) - goto cleanup; - - ret = 0; - cleanup: - VIR_FREE(addrstr); - VIR_FREE(gatewaystr); - virCommandFree(cmd); - return ret; -} - -int virNetDevClearIPAddress(const char *ifname, - virSocketAddr *addr, - unsigned int prefix) -{ - virCommandPtr cmd = NULL; - char *addrstr; - int ret = -1; - - if (!(addrstr = virSocketAddrFormat(addr))) - goto cleanup; -# ifdef IFCONFIG_PATH - cmd = virCommandNew(IFCONFIG_PATH); - virCommandAddArg(cmd, ifname); - if (VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_INET6)) - virCommandAddArg(cmd, "inet6"); - else - virCommandAddArg(cmd, "inet"); - virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); - virCommandAddArg(cmd, "-alias"); -# else - cmd = virCommandNew(IP_PATH); - virCommandAddArgList(cmd, "addr", "del", NULL); - virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); - virCommandAddArgList(cmd, "dev", ifname, NULL); -# endif - - if (virCommandRun(cmd, NULL) < 0) - goto cleanup; - - ret = 0; - cleanup: - VIR_FREE(addrstr); - virCommandFree(cmd); - return ret; -} - -/* return after DAD finishes for all known IPv6 addresses or an error */ -int -virNetDevWaitDadFinish(virSocketAddrPtr *addrs ATTRIBUTE_UNUSED, - size_t count ATTRIBUTE_UNUSED) -{ - virReportSystemError(ENOSYS, "%s", - _("Unable to wait for IPv6 DAD on this platform")); - return -1; -} - -#endif /* defined(__linux__) && defined(HAVE_LIBNL) */ - -/** - * virNetDevGetIPv4AddressIoctl: - * @ifname: name of the interface whose IP address we want - * @addr: filled with the IPv4 address - * - * This function gets the IPv4 address for the interface @ifname - * and stores it in @addr - * - * Returns 0 on success, -errno on failure. - */ -#if defined(SIOCGIFADDR) && defined(HAVE_STRUCT_IFREQ) -static int -virNetDevGetIPv4AddressIoctl(const char *ifname, - virSocketAddrPtr addr) -{ - int fd = -1; - int ret = -1; - struct ifreq ifr; - - if ((fd = virNetDevSetupControl(ifname, &ifr)) < 0) - return -1; - - if (ioctl(fd, SIOCGIFADDR, (char *)&ifr) < 0) { - virReportSystemError(errno, - _("Unable to get IPv4 address for interface %s via ioctl"), - ifname); - goto cleanup; - } - - addr->data.stor.ss_family = AF_INET; - addr->len = sizeof(addr->data.inet4); - memcpy(&addr->data.inet4, &ifr.ifr_addr, addr->len); - ret = 0; - - cleanup: - VIR_FORCE_CLOSE(fd); - return ret; -} - -#else /* ! SIOCGIFADDR */ - -static int -virNetDevGetIPv4AddressIoctl(const char *ifname ATTRIBUTE_UNUSED, - virSocketAddrPtr addr ATTRIBUTE_UNUSED) -{ - return -2; -} - -#endif /* ! SIOCGIFADDR */ - -/** - * virNetDevGetifaddrsAddress: - * @ifname: name of the interface whose IP address we want - * @addr: filled with the IP address - * - * This function gets the IP address for the interface @ifname - * and stores it in @addr - * - * Returns 0 on success, -1 on failure, -2 on unsupported. - */ -#if HAVE_GETIFADDRS -static int -virNetDevGetifaddrsAddress(const char *ifname, - virSocketAddrPtr addr) -{ - struct ifaddrs *ifap, *ifa; - int ret = -1; - - if (getifaddrs(&ifap) < 0) { - virReportSystemError(errno, - _("Could not get interface list for '%s'"), - ifname); - return -1; - } - - for (ifa = ifap; ifa; ifa = ifa->ifa_next) { - int family = ifa->ifa_addr->sa_family; - - if (STRNEQ_NULLABLE(ifa->ifa_name, ifname)) - continue; - if (family != AF_INET6 && family != AF_INET) - continue; - - if (family == AF_INET6) { - addr->len = sizeof(addr->data.inet6); - memcpy(&addr->data.inet6, ifa->ifa_addr, addr->len); - } else { - addr->len = sizeof(addr->data.inet4); - memcpy(&addr->data.inet4, ifa->ifa_addr, addr->len); - } - addr->data.stor.ss_family = family; - ret = 0; - goto cleanup; - } - - virReportError(VIR_ERR_INTERNAL_ERROR, - _("no IP address found for interface '%s'"), - ifname); - cleanup: - freeifaddrs(ifap); - return ret; -} - -#else /* ! HAVE_GETIFADDRS */ - -static int -virNetDevGetifaddrsAddress(const char *ifname ATTRIBUTE_UNUSED, - virSocketAddrPtr addr ATTRIBUTE_UNUSED) -{ - return -2; -} - -#endif - -/** - * virNetDevGetIPAddress: - * @ifname: name of the interface whose IP address we want - * @addr: filled with the IPv4 address - * - * This function gets the IPv4 address for the interface @ifname - * and stores it in @addr - * - * Returns 0 on success, -errno on failure. - */ -int -virNetDevGetIPAddress(const char *ifname, - virSocketAddrPtr addr) -{ - int ret; - - memset(addr, 0, sizeof(*addr)); - addr->data.stor.ss_family = AF_UNSPEC; - - if ((ret = virNetDevGetifaddrsAddress(ifname, addr)) != -2) - return ret; - - if ((ret = virNetDevGetIPv4AddressIoctl(ifname, addr)) != -2) - return ret; - - virReportSystemError(ENOSYS, "%s", - _("Unable to get IP address on this platform")); - return -1; -} - /** * virNetDevValidateConfig: * @ifname: Name of the interface diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c new file mode 100644 index 0000000..044f2bc --- /dev/null +++ b/src/util/virnetdevip.c @@ -0,0 +1,778 @@ +/* + * Copyright (C) 2007-2016 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: + * Mark McLoughlin <markmc@redhat.com> + * Daniel P. Berrange <berrange@redhat.com> + */ + +#include <config.h> + +#include "virnetdevip.h" +#include "virnetdev.h" +#include "virnetlink.h" +#include "virfile.h" +#include "virerror.h" +#include "viralloc.h" +#include "virlog.h" +#include "virstring.h" +#include "virutil.h" + +#if HAVE_GETIFADDRS +# include <ifaddrs.h> +#endif + +#include <sys/ioctl.h> +#include <net/if.h> +#include <fcntl.h> + +#ifdef __linux__ +# include <linux/sockios.h> +# include <linux/if_vlan.h> +# define VIR_NETDEV_FAMILY AF_PACKET +#elif defined(HAVE_STRUCT_IFREQ) && defined(AF_LOCAL) +# define VIR_NETDEV_FAMILY AF_LOCAL +#else +# undef HAVE_STRUCT_IFREQ +#endif + +#define VIR_DAD_WAIT_TIMEOUT 20 /* seconds */ + +#define VIR_FROM_THIS VIR_FROM_NONE + +VIR_LOG_INIT("util.netdevip"); + +#if defined(__linux__) && defined(HAVE_LIBNL) + +static int +virNetDevGetIPAddressBinary(virSocketAddr *addr, void **data, size_t *len) +{ + if (!addr) + return -1; + + switch (VIR_SOCKET_ADDR_FAMILY(addr)) { + case AF_INET: + *data = &addr->data.inet4.sin_addr; + *len = sizeof(struct in_addr); + break; + case AF_INET6: + *data = &addr->data.inet6.sin6_addr; + *len = sizeof(struct in6_addr); + break; + default: + return -1; + } + return 0; +} + +static struct nl_msg * +virNetDevCreateNetlinkAddressMessage(int messageType, + const char *ifname, + virSocketAddr *addr, + unsigned int prefix, + virSocketAddr *broadcast, + virSocketAddr *peer) +{ + struct nl_msg *nlmsg = NULL; + struct ifaddrmsg ifa; + unsigned int ifindex; + void *addrData = NULL; + void *peerData = NULL; + void *broadcastData = NULL; + size_t addrDataLen; + + if (virNetDevGetIPAddressBinary(addr, &addrData, &addrDataLen) < 0) + return NULL; + + if (peer && VIR_SOCKET_ADDR_VALID(peer)) { + if (virNetDevGetIPAddressBinary(peer, &peerData, &addrDataLen) < 0) + return NULL; + } else if (broadcast) { + if (virNetDevGetIPAddressBinary(broadcast, &broadcastData, + &addrDataLen) < 0) + return NULL; + } + + /* Get the interface index */ + if ((ifindex = if_nametoindex(ifname)) == 0) + return NULL; + + if (!(nlmsg = nlmsg_alloc_simple(messageType, + NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL))) { + virReportOOMError(); + return NULL; + } + + memset(&ifa, 0, sizeof(ifa)); + + ifa.ifa_prefixlen = prefix; + ifa.ifa_family = VIR_SOCKET_ADDR_FAMILY(addr); + ifa.ifa_index = ifindex; + ifa.ifa_scope = 0; + + if (nlmsg_append(nlmsg, &ifa, sizeof(ifa), NLMSG_ALIGNTO) < 0) + goto buffer_too_small; + + if (nla_put(nlmsg, IFA_LOCAL, addrDataLen, addrData) < 0) + goto buffer_too_small; + + if (peerData) { + if (nla_put(nlmsg, IFA_ADDRESS, addrDataLen, peerData) < 0) + goto buffer_too_small; + } + + if (broadcastData) { + if (nla_put(nlmsg, IFA_BROADCAST, addrDataLen, broadcastData) < 0) + goto buffer_too_small; + } + + return nlmsg; + + buffer_too_small: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("allocated netlink buffer is too small")); + nlmsg_free(nlmsg); + return NULL; +} + +/** + * virNetDevIPAddrAdd: + * @ifname: the interface name + * @addr: the IP address (IPv4 or IPv6) + * @peer: The IP address of peer (IPv4 or IPv6) + * @prefix: number of 1 bits in the netmask + * + * Add an IP address to an interface. This function *does not* remove + * any previously added IP addresses - that must be done separately with + * virNetDevIPAddrClear. + * + * Returns 0 in case of success or -1 in case of error. + */ +int +virNetDevIPAddrAdd(const char *ifname, + virSocketAddr *addr, + virSocketAddr *peer, + unsigned int prefix) +{ + virSocketAddr *broadcast = NULL; + int ret = -1; + struct nl_msg *nlmsg = NULL; + struct nlmsghdr *resp = NULL; + unsigned int recvbuflen; + + /* The caller needs to provide a correct address */ + if (VIR_SOCKET_ADDR_FAMILY(addr) == AF_INET && + !(peer && VIR_SOCKET_ADDR_VALID(peer))) { + /* compute a broadcast address if this is IPv4 */ + if (VIR_ALLOC(broadcast) < 0) + return -1; + + if (virSocketAddrBroadcastByPrefix(addr, prefix, broadcast) < 0) + goto cleanup; + } + + if (!(nlmsg = virNetDevCreateNetlinkAddressMessage(RTM_NEWADDR, ifname, + addr, prefix, + broadcast, peer))) + goto cleanup; + + if (virNetlinkCommand(nlmsg, &resp, &recvbuflen, 0, 0, + NETLINK_ROUTE, 0) < 0) + goto cleanup; + + + if (virNetlinkGetErrorCode(resp, recvbuflen) < 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Error adding IP address to %s"), ifname); + goto cleanup; + } + + ret = 0; + cleanup: + nlmsg_free(nlmsg); + VIR_FREE(resp); + VIR_FREE(broadcast); + return ret; +} + + +/** + * virNetDevIPAddrDel: + * @ifname: the interface name + * @addr: the IP address (IPv4 or IPv6) + * @prefix: number of 1 bits in the netmask + * + * Delete an IP address from an interface. + * + * Returns 0 in case of success or -1 in case of error. + */ +int +virNetDevIPAddrDel(const char *ifname, + virSocketAddr *addr, + unsigned int prefix) +{ + int ret = -1; + struct nl_msg *nlmsg = NULL; + struct nlmsghdr *resp = NULL; + unsigned int recvbuflen; + + if (!(nlmsg = virNetDevCreateNetlinkAddressMessage(RTM_DELADDR, ifname, + addr, prefix, + NULL, NULL))) + goto cleanup; + + if (virNetlinkCommand(nlmsg, &resp, &recvbuflen, 0, 0, + NETLINK_ROUTE, 0) < 0) + goto cleanup; + + if (virNetlinkGetErrorCode(resp, recvbuflen) < 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Error removing IP address from %s"), ifname); + goto cleanup; + } + + ret = 0; + cleanup: + nlmsg_free(nlmsg); + VIR_FREE(resp); + return ret; +} + + +/** + * virNetDevIPRouteAdd: + * @ifname: the interface name + * @addr: the IP network address (IPv4 or IPv6) + * @prefix: number of 1 bits in the netmask + * @gateway: via address for route (same as @addr) + * + * Add a route for a network IP address to an interface. This function + * *does not* remove any previously added IP static routes. + * + * Returns 0 in case of success or -1 in case of error. + */ +int +virNetDevIPRouteAdd(const char *ifname, + virSocketAddrPtr addr, + unsigned int prefix, + virSocketAddrPtr gateway, + unsigned int metric) +{ + int ret = -1; + struct nl_msg *nlmsg = NULL; + struct nlmsghdr *resp = NULL; + unsigned int recvbuflen; + unsigned int ifindex; + struct rtmsg rtmsg; + void *gatewayData = NULL; + void *addrData = NULL; + size_t addrDataLen; + int errCode; + virSocketAddr defaultAddr; + virSocketAddrPtr actualAddr; + char *toStr = NULL; + char *viaStr = NULL; + + actualAddr = addr; + + /* If we have no valid network address, then use the default one */ + if (!addr || !VIR_SOCKET_ADDR_VALID(addr)) { + VIR_DEBUG("computing default address"); + int family = VIR_SOCKET_ADDR_FAMILY(gateway); + if (family == AF_INET) { + if (virSocketAddrParseIPv4(&defaultAddr, VIR_SOCKET_ADDR_IPV4_ALL) < 0) + goto cleanup; + } else { + if (virSocketAddrParseIPv6(&defaultAddr, VIR_SOCKET_ADDR_IPV6_ALL) < 0) + goto cleanup; + } + + actualAddr = &defaultAddr; + } + + toStr = virSocketAddrFormat(actualAddr); + viaStr = virSocketAddrFormat(gateway); + VIR_DEBUG("Adding route %s/%d via %s", toStr, prefix, viaStr); + + if (virNetDevGetIPAddressBinary(actualAddr, &addrData, &addrDataLen) < 0 || + virNetDevGetIPAddressBinary(gateway, &gatewayData, &addrDataLen) < 0) + goto cleanup; + + /* Get the interface index */ + if ((ifindex = if_nametoindex(ifname)) == 0) + goto cleanup; + + if (!(nlmsg = nlmsg_alloc_simple(RTM_NEWROUTE, + NLM_F_REQUEST | NLM_F_CREATE | + NLM_F_EXCL))) { + virReportOOMError(); + goto cleanup; + } + + memset(&rtmsg, 0, sizeof(rtmsg)); + + rtmsg.rtm_family = VIR_SOCKET_ADDR_FAMILY(gateway); + rtmsg.rtm_table = RT_TABLE_MAIN; + rtmsg.rtm_scope = RT_SCOPE_UNIVERSE; + rtmsg.rtm_protocol = RTPROT_BOOT; + rtmsg.rtm_type = RTN_UNICAST; + rtmsg.rtm_dst_len = prefix; + + if (nlmsg_append(nlmsg, &rtmsg, sizeof(rtmsg), NLMSG_ALIGNTO) < 0) + goto buffer_too_small; + + if (prefix > 0 && nla_put(nlmsg, RTA_DST, addrDataLen, addrData) < 0) + goto buffer_too_small; + + if (nla_put(nlmsg, RTA_GATEWAY, addrDataLen, gatewayData) < 0) + goto buffer_too_small; + + if (nla_put_u32(nlmsg, RTA_OIF, ifindex) < 0) + goto buffer_too_small; + + if (metric > 0 && nla_put_u32(nlmsg, RTA_PRIORITY, metric) < 0) + goto buffer_too_small; + + if (virNetlinkCommand(nlmsg, &resp, &recvbuflen, 0, 0, + NETLINK_ROUTE, 0) < 0) + goto cleanup; + + if ((errCode = virNetlinkGetErrorCode(resp, recvbuflen)) < 0) { + virReportSystemError(errCode, _("Error adding route to %s"), ifname); + goto cleanup; + } + + ret = 0; + cleanup: + VIR_FREE(toStr); + VIR_FREE(viaStr); + nlmsg_free(nlmsg); + return ret; + + buffer_too_small: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("allocated netlink buffer is too small")); + goto cleanup; +} + + +/* return true if there is a known address with 'tentative' flag set */ +static bool +virNetDevIPParseDadStatus(struct nlmsghdr *nlh, int len, + virSocketAddrPtr *addrs, size_t count) +{ + struct ifaddrmsg *ifaddrmsg_ptr; + unsigned int ifaddrmsg_len; + struct rtattr *rtattr_ptr; + size_t i; + struct in6_addr *addr; + + VIR_WARNINGS_NO_CAST_ALIGN + for (; NLMSG_OK(nlh, len); nlh = NLMSG_NEXT(nlh, len)) { + VIR_WARNINGS_RESET + if (NLMSG_PAYLOAD(nlh, 0) < sizeof(struct ifaddrmsg)) { + /* Message without payload is the last one. */ + break; + } + + ifaddrmsg_ptr = (struct ifaddrmsg *)NLMSG_DATA(nlh); + if (!(ifaddrmsg_ptr->ifa_flags & IFA_F_TENTATIVE)) { + /* Not tentative: we are not interested in this entry. */ + continue; + } + + ifaddrmsg_len = IFA_PAYLOAD(nlh); + VIR_WARNINGS_NO_CAST_ALIGN + rtattr_ptr = (struct rtattr *) IFA_RTA(ifaddrmsg_ptr); + for (; RTA_OK(rtattr_ptr, ifaddrmsg_len); + rtattr_ptr = RTA_NEXT(rtattr_ptr, ifaddrmsg_len)) { + VIR_WARNINGS_RESET + if (RTA_PAYLOAD(rtattr_ptr) != sizeof(struct in6_addr)) { + /* No address: ignore. */ + continue; + } + + /* We check only known addresses. */ + for (i = 0; i < count; i++) { + addr = &addrs[i]->data.inet6.sin6_addr; + if (!memcmp(addr, RTA_DATA(rtattr_ptr), + sizeof(struct in6_addr))) { + /* We found matching tentative address. */ + return true; + } + } + } + } + return false; +} + + +/* return after DAD finishes for all known IPv6 addresses or an error */ +int +virNetDevIPWaitDadFinish(virSocketAddrPtr *addrs, size_t count) +{ + struct nl_msg *nlmsg = NULL; + struct ifaddrmsg ifa; + struct nlmsghdr *resp = NULL; + unsigned int recvbuflen; + int ret = -1; + bool dad = true; + time_t max_time = time(NULL) + VIR_DAD_WAIT_TIMEOUT; + + if (!(nlmsg = nlmsg_alloc_simple(RTM_GETADDR, + NLM_F_REQUEST | NLM_F_DUMP))) { + virReportOOMError(); + return -1; + } + + memset(&ifa, 0, sizeof(ifa)); + /* DAD is for IPv6 adresses only. */ + ifa.ifa_family = AF_INET6; + if (nlmsg_append(nlmsg, &ifa, sizeof(ifa), NLMSG_ALIGNTO) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("allocated netlink buffer is too small")); + goto cleanup; + } + + /* Periodically query netlink until DAD finishes on all known addresses. */ + while (dad && time(NULL) < max_time) { + if (virNetlinkCommand(nlmsg, &resp, &recvbuflen, 0, 0, + NETLINK_ROUTE, 0) < 0) + goto cleanup; + + if (virNetlinkGetErrorCode(resp, recvbuflen) < 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, "%s", + _("error reading DAD state information")); + goto cleanup; + } + + /* Parse response. */ + dad = virNetDevIPParseDadStatus(resp, recvbuflen, addrs, count); + if (dad) + usleep(1000 * 10); + + VIR_FREE(resp); + } + /* Check timeout. */ + if (dad) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Duplicate Address Detection " + "not finished in %d seconds"), VIR_DAD_WAIT_TIMEOUT); + } else { + ret = 0; + } + + cleanup: + VIR_FREE(resp); + nlmsg_free(nlmsg); + return ret; +} + + +#else /* defined(__linux__) && defined(HAVE_LIBNL) */ + + +int +virNetDevIPAddrAdd(const char *ifname, + virSocketAddr *addr, + virSocketAddr *peer, + unsigned int prefix) +{ + virCommandPtr cmd = NULL; + char *addrstr = NULL, *bcaststr = NULL, *peerstr = NULL; + virSocketAddr broadcast; + int ret = -1; + + if (!(addrstr = virSocketAddrFormat(addr))) + goto cleanup; + + if (peer && VIR_SOCKET_ADDR_VALID(peer) && !(peerstr = virSocketAddrFormat(peer))) + goto cleanup; + + /* format up a broadcast address if this is IPv4 */ + if (!peerstr && ((VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_INET)) && + ((virSocketAddrBroadcastByPrefix(addr, prefix, &broadcast) < 0) || + !(bcaststr = virSocketAddrFormat(&broadcast))))) { + goto cleanup; + } + +# ifdef IFCONFIG_PATH + cmd = virCommandNew(IFCONFIG_PATH); + virCommandAddArg(cmd, ifname); + if (VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_INET6)) + virCommandAddArg(cmd, "inet6"); + else + virCommandAddArg(cmd, "inet"); + virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); + if (peerstr) + virCommandAddArgList(cmd, "pointopoint", peerstr, NULL); + if (bcaststr) + virCommandAddArgList(cmd, "broadcast", bcaststr, NULL); + virCommandAddArg(cmd, "alias"); +# else + cmd = virCommandNew(IP_PATH); + virCommandAddArgList(cmd, "addr", "add", NULL); + virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); + if (peerstr) + virCommandAddArgList(cmd, "peer", peerstr, NULL); + if (bcaststr) + virCommandAddArgList(cmd, "broadcast", bcaststr, NULL); + virCommandAddArgList(cmd, "dev", ifname, NULL); +# endif + + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + ret = 0; + cleanup: + VIR_FREE(addrstr); + VIR_FREE(bcaststr); + VIR_FREE(peerstr); + virCommandFree(cmd); + return ret; +} + + +int +virNetDevIPAddrDel(const char *ifname, + virSocketAddr *addr, + unsigned int prefix) +{ + virCommandPtr cmd = NULL; + char *addrstr; + int ret = -1; + + if (!(addrstr = virSocketAddrFormat(addr))) + goto cleanup; +# ifdef IFCONFIG_PATH + cmd = virCommandNew(IFCONFIG_PATH); + virCommandAddArg(cmd, ifname); + if (VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_INET6)) + virCommandAddArg(cmd, "inet6"); + else + virCommandAddArg(cmd, "inet"); + virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); + virCommandAddArg(cmd, "-alias"); +# else + cmd = virCommandNew(IP_PATH); + virCommandAddArgList(cmd, "addr", "del", NULL); + virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); + virCommandAddArgList(cmd, "dev", ifname, NULL); +# endif + + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + ret = 0; + cleanup: + VIR_FREE(addrstr); + virCommandFree(cmd); + return ret; +} + + +int +virNetDevIPRouteAdd(const char *ifname, + virSocketAddrPtr addr, + unsigned int prefix, + virSocketAddrPtr gateway, + unsigned int metric) +{ + virCommandPtr cmd = NULL; + char *addrstr = NULL, *gatewaystr = NULL; + int ret = -1; + + if (!(addrstr = virSocketAddrFormat(addr))) + goto cleanup; + if (!(gatewaystr = virSocketAddrFormat(gateway))) + goto cleanup; + cmd = virCommandNew(IP_PATH); + virCommandAddArgList(cmd, "route", "add", NULL); + virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); + virCommandAddArgList(cmd, "via", gatewaystr, "dev", ifname, + "proto", "static", "metric", NULL); + virCommandAddArgFormat(cmd, "%u", metric); + + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + ret = 0; + cleanup: + VIR_FREE(addrstr); + VIR_FREE(gatewaystr); + virCommandFree(cmd); + return ret; +} + + +/* return after DAD finishes for all known IPv6 addresses or an error */ +int +virNetDevWaitDadFinish(virSocketAddrPtr *addrs ATTRIBUTE_UNUSED, + size_t count ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Unable to wait for IPv6 DAD on this platform")); + return -1; +} + + +#endif /* defined(__linux__) && defined(HAVE_LIBNL) */ + + +/** + * virNetDevGetIPv4AddressIoctl: + * @ifname: name of the interface whose IP address we want + * @addr: filled with the IPv4 address + * + * This function gets the IPv4 address for the interface @ifname + * and stores it in @addr + * + * Returns 0 on success, -errno on failure. + */ +#if defined(SIOCGIFADDR) && defined(HAVE_STRUCT_IFREQ) +static int +virNetDevGetIPv4AddressIoctl(const char *ifname, + virSocketAddrPtr addr) +{ + int fd = -1; + int ret = -1; + struct ifreq ifr; + + if ((fd = virNetDevSetupControl(ifname, &ifr)) < 0) + return -1; + + if (ioctl(fd, SIOCGIFADDR, (char *)&ifr) < 0) { + virReportSystemError(errno, + _("Unable to get IPv4 address for interface %s via ioctl"), + ifname); + goto cleanup; + } + + addr->data.stor.ss_family = AF_INET; + addr->len = sizeof(addr->data.inet4); + memcpy(&addr->data.inet4, &ifr.ifr_addr, addr->len); + ret = 0; + + cleanup: + VIR_FORCE_CLOSE(fd); + return ret; +} + +#else /* ! SIOCGIFADDR */ + +static int +virNetDevGetIPv4AddressIoctl(const char *ifname ATTRIBUTE_UNUSED, + virSocketAddrPtr addr ATTRIBUTE_UNUSED) +{ + return -2; +} + +#endif /* ! SIOCGIFADDR */ + +/** + * virNetDevGetifaddrsAddress: + * @ifname: name of the interface whose IP address we want + * @addr: filled with the IP address + * + * This function gets the IP address for the interface @ifname + * and stores it in @addr + * + * Returns 0 on success, -1 on failure, -2 on unsupported. + */ +#if HAVE_GETIFADDRS +static int +virNetDevGetifaddrsAddress(const char *ifname, + virSocketAddrPtr addr) +{ + struct ifaddrs *ifap, *ifa; + int ret = -1; + + if (getifaddrs(&ifap) < 0) { + virReportSystemError(errno, + _("Could not get interface list for '%s'"), + ifname); + return -1; + } + + for (ifa = ifap; ifa; ifa = ifa->ifa_next) { + int family = ifa->ifa_addr->sa_family; + + if (STRNEQ_NULLABLE(ifa->ifa_name, ifname)) + continue; + if (family != AF_INET6 && family != AF_INET) + continue; + + if (family == AF_INET6) { + addr->len = sizeof(addr->data.inet6); + memcpy(&addr->data.inet6, ifa->ifa_addr, addr->len); + } else { + addr->len = sizeof(addr->data.inet4); + memcpy(&addr->data.inet4, ifa->ifa_addr, addr->len); + } + addr->data.stor.ss_family = family; + ret = 0; + goto cleanup; + } + + virReportError(VIR_ERR_INTERNAL_ERROR, + _("no IP address found for interface '%s'"), + ifname); + cleanup: + freeifaddrs(ifap); + return ret; +} + +#else /* ! HAVE_GETIFADDRS */ + +static int +virNetDevGetifaddrsAddress(const char *ifname ATTRIBUTE_UNUSED, + virSocketAddrPtr addr ATTRIBUTE_UNUSED) +{ + return -2; +} + +#endif + +/** + * virNetDevIPIPAddrGet: + * @ifname: name of the interface whose IP address we want + * @addr: filled with the IPv4 address + * + * This function gets the IPv4 address for the interface @ifname + * and stores it in @addr + * + * Returns 0 on success, -errno on failure. + */ +int +virNetDevIPAddrGet(const char *ifname, + virSocketAddrPtr addr) +{ + int ret; + + memset(addr, 0, sizeof(*addr)); + addr->data.stor.ss_family = AF_UNSPEC; + + if ((ret = virNetDevGetifaddrsAddress(ifname, addr)) != -2) + return ret; + + if ((ret = virNetDevGetIPv4AddressIoctl(ifname, addr)) != -2) + return ret; + + virReportSystemError(ENOSYS, "%s", + _("Unable to get IP address on this platform")); + return -1; +} diff --git a/src/util/virnetdevip.h b/src/util/virnetdevip.h new file mode 100644 index 0000000..f60465d --- /dev/null +++ b/src/util/virnetdevip.h @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2007-2016 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: + * Mark McLoughlin <markmc@redhat.com> + * Daniel P. Berrange <berrange@redhat.com> + */ + +#ifndef __VIR_NETDEVIP_H__ +# define __VIR_NETDEVIP_H__ + +# include "virsocketaddr.h" + +/* manipulating/querying the netdev */ +int virNetDevIPAddrAdd(const char *ifname, + virSocketAddr *addr, + virSocketAddr *peer, + unsigned int prefix) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; +int virNetDevIPRouteAdd(const char *ifname, + virSocketAddrPtr addr, + unsigned int prefix, + virSocketAddrPtr gateway, + unsigned int metric) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4) + ATTRIBUTE_RETURN_CHECK; +int virNetDevIPAddrDel(const char *ifname, + virSocketAddr *addr, + unsigned int prefix) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; +int virNetDevIPAddrGet(const char *ifname, virSocketAddrPtr addr) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; +int virNetDevIPWaitDadFinish(virSocketAddrPtr *addrs, size_t count) + ATTRIBUTE_NONNULL(1); + +#endif /* __VIR_NETDEVIP_H__ */ -- 2.5.5

These functions all need to be called from a utility function that must be located in the util directory, so we move them all into util/virnetdevip.[ch] now that it exists. Function and struct names were appropriately changed for the new location, but all code is unchanged aside from motion and renaming. --- src/conf/domain_conf.c | 36 ++++++------- src/conf/domain_conf.h | 16 ++---- src/conf/network_conf.c | 16 +++--- src/conf/network_conf.h | 4 +- src/conf/networkcommon_conf.c | 107 ++++---------------------------------- src/conf/networkcommon_conf.h | 55 +++++++------------- src/libvirt_private.syms | 16 +++--- src/lxc/lxc_container.c | 12 ++--- src/lxc/lxc_native.c | 12 ++--- src/network/bridge_driver.c | 14 ++--- src/network/bridge_driver_linux.c | 6 +-- src/util/virnetdevip.c | 69 ++++++++++++++++++++++++ src/util/virnetdevip.h | 29 +++++++++++ 13 files changed, 191 insertions(+), 201 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4802e03..f380271 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1806,7 +1806,7 @@ virDomainNetDefClear(virDomainNetDefPtr def) VIR_FREE(def->ips); for (i = 0; i < def->nroutes; i++) - virNetworkRouteDefFree(def->routes[i]); + virNetDevIPRouteFree(def->routes[i]); VIR_FREE(def->routes); virDomainDeviceInfoClear(&def->info); @@ -2214,7 +2214,7 @@ void virDomainHostdevDefClear(virDomainHostdevDefPtr def) VIR_FREE(def->source.caps.u.net.ips[i]); VIR_FREE(def->source.caps.u.net.ips); for (i = 0; i < def->source.caps.u.net.nroutes; i++) - virNetworkRouteDefFree(def->source.caps.u.net.routes[i]); + virNetDevIPRouteFree(def->source.caps.u.net.routes[i]); VIR_FREE(def->source.caps.u.net.routes); break; } @@ -6115,11 +6115,11 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, return ret; } -static virDomainNetIPDefPtr +static virNetDevIPAddrPtr virDomainNetIPParseXML(xmlNodePtr node) { /* Parse the prefix in every case */ - virDomainNetIPDefPtr ip = NULL, ret = NULL; + virNetDevIPAddrPtr ip = NULL, ret = NULL; char *prefixStr = NULL; unsigned int prefixValue = 0; char *familyStr = NULL; @@ -6246,7 +6246,7 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node ATTRIBUTE_UNUSED, if (nipnodes) { size_t i; for (i = 0; i < nipnodes; i++) { - virDomainNetIPDefPtr ip = virDomainNetIPParseXML(ipnodes[i]); + virNetDevIPAddrPtr ip = virDomainNetIPParseXML(ipnodes[i]); if (!ip) goto error; @@ -6266,9 +6266,9 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node ATTRIBUTE_UNUSED, if (nroutenodes) { size_t i; for (i = 0; i < nroutenodes; i++) { - virNetworkRouteDefPtr route = NULL; + virNetDevIPRoutePtr route = NULL; - if (!(route = virNetworkRouteDefParseXML(_("Domain hostdev device"), + if (!(route = virNetDevIPRouteParseXML(_("Domain hostdev device"), routenodes[i], ctxt))) goto error; @@ -6276,7 +6276,7 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node ATTRIBUTE_UNUSED, if (VIR_APPEND_ELEMENT(def->source.caps.u.net.routes, def->source.caps.u.net.nroutes, route) < 0) { - virNetworkRouteDefFree(route); + virNetDevIPRouteFree(route); goto error; } } @@ -8883,7 +8883,7 @@ virDomainNetAppendIPAddress(virDomainNetDefPtr def, int family, unsigned int prefix) { - virDomainNetIPDefPtr ipDef = NULL; + virNetDevIPAddrPtr ipDef = NULL; if (VIR_ALLOC(ipDef) < 0) return -1; @@ -8955,9 +8955,9 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, int ret, val; size_t i; size_t nips = 0; - virDomainNetIPDefPtr *ips = NULL; + virNetDevIPAddrPtr *ips = NULL; size_t nroutes = 0; - virNetworkRouteDefPtr *routes = NULL; + virNetDevIPRoutePtr *routes = NULL; if (VIR_ALLOC(def) < 0) return NULL; @@ -9074,7 +9074,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, ctxt->node = tmpnode; } } else if (xmlStrEqual(cur->name, BAD_CAST "ip")) { - virDomainNetIPDefPtr ip = NULL; + virNetDevIPAddrPtr ip = NULL; if (!(ip = virDomainNetIPParseXML(cur))) goto error; @@ -9082,13 +9082,13 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, if (VIR_APPEND_ELEMENT(ips, nips, ip) < 0) goto error; } else if (xmlStrEqual(cur->name, BAD_CAST "route")) { - virNetworkRouteDefPtr route = NULL; - if (!(route = virNetworkRouteDefParseXML(_("Domain interface"), + virNetDevIPRoutePtr route = NULL; + if (!(route = virNetDevIPRouteParseXML(_("Domain interface"), cur, ctxt))) goto error; if (VIR_APPEND_ELEMENT(routes, nroutes, route) < 0) { - virNetworkRouteDefFree(route); + virNetDevIPRouteFree(route); goto error; } } else if (!ifname && @@ -20270,7 +20270,7 @@ virDomainFSDefFormat(virBufferPtr buf, } static int -virDomainNetIPsFormat(virBufferPtr buf, virDomainNetIPDefPtr *ips, size_t nips) +virDomainNetIPsFormat(virBufferPtr buf, virNetDevIPAddrPtr *ips, size_t nips) { size_t i; @@ -20300,13 +20300,13 @@ virDomainNetIPsFormat(virBufferPtr buf, virDomainNetIPDefPtr *ips, size_t nips) static int virDomainNetRoutesFormat(virBufferPtr buf, - virNetworkRouteDefPtr *routes, + virNetDevIPRoutePtr *routes, size_t nroutes) { size_t i; for (i = 0; i < nroutes; i++) - if (virNetworkRouteDefFormat(buf, routes[i]) < 0) + if (virNetDevIPRouteFormat(buf, routes[i]) < 0) return -1; return 0; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index e93bd5c..c529b09 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -41,6 +41,7 @@ # include "numa_conf.h" # include "virnetdevmacvlan.h" # include "virsysinfo.h" +# include "virnetdevip.h" # include "virnetdevvportprofile.h" # include "virnetdevbandwidth.h" # include "virnetdevvlan.h" @@ -382,13 +383,6 @@ typedef enum { VIR_DOMAIN_HOSTDEV_CAPS_TYPE_LAST } virDomainHostdevCapsType; -typedef struct _virDomainNetIPDef virDomainNetIPDef; -typedef virDomainNetIPDef *virDomainNetIPDefPtr; -struct _virDomainNetIPDef { - virSocketAddr address; /* ipv4 or ipv6 address */ - unsigned int prefix; /* number of 1 bits in the net mask */ -}; - typedef struct _virDomainHostdevCaps virDomainHostdevCaps; typedef virDomainHostdevCaps *virDomainHostdevCapsPtr; struct _virDomainHostdevCaps { @@ -403,9 +397,9 @@ struct _virDomainHostdevCaps { struct { char *iface; size_t nips; - virDomainNetIPDefPtr *ips; + virNetDevIPAddrPtr *ips; size_t nroutes; - virNetworkRouteDefPtr *routes; + virNetDevIPRoutePtr *routes; } net; } u; }; @@ -985,9 +979,9 @@ struct _virDomainNetDef { int trustGuestRxFilters; /* enum virTristateBool */ int linkstate; size_t nips; - virDomainNetIPDefPtr *ips; + virNetDevIPAddrPtr *ips; size_t nroutes; - virNetworkRouteDefPtr *routes; + virNetDevIPRoutePtr *routes; }; /* Used for prefix of ifname of any network name generated dynamically diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 5ae2bdf..fb2a48d 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -406,7 +406,7 @@ virNetworkDefFree(virNetworkDefPtr def) VIR_FREE(def->ips); for (i = 0; i < def->nroutes && def->routes; i++) - virNetworkRouteDefFree(def->routes[i]); + virNetDevIPRouteFree(def->routes[i]); VIR_FREE(def->routes); for (i = 0; i < def->nPortGroups && def->portGroups; i++) @@ -804,7 +804,7 @@ virNetworkDefGetIPByIndex(const virNetworkDef *def, } /* return routes[index], or NULL if there aren't enough routes */ -virNetworkRouteDefPtr +virNetDevIPRoutePtr virNetworkDefGetRouteByIndex(const virNetworkDef *def, int family, size_t n) { @@ -818,7 +818,7 @@ virNetworkDefGetRouteByIndex(const virNetworkDef *def, /* find the nth route of type "family" */ for (i = 0; i < def->nroutes; i++) { - virSocketAddrPtr addr = virNetworkRouteDefGetAddress(def->routes[i]); + virSocketAddrPtr addr = virNetDevIPRouteGetAddress(def->routes[i]); if (VIR_SOCKET_ADDR_IS_FAMILY(addr, family) && (n-- <= 0)) { return def->routes[i]; @@ -2261,9 +2261,9 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) goto error; /* parse each definition */ for (i = 0; i < nRoutes; i++) { - virNetworkRouteDefPtr route = NULL; + virNetDevIPRoutePtr route = NULL; - if (!(route = virNetworkRouteDefParseXML(def->name, + if (!(route = virNetDevIPRouteParseXML(def->name, routeNodes[i], ctxt))) goto error; @@ -2283,8 +2283,8 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) size_t j; virSocketAddr testAddr, testGw; bool addrMatch; - virNetworkRouteDefPtr gwdef = def->routes[i]; - virSocketAddrPtr gateway = virNetworkRouteDefGetGateway(gwdef); + virNetDevIPRoutePtr gwdef = def->routes[i]; + virSocketAddrPtr gateway = virNetDevIPRouteGetGateway(gwdef); addrMatch = false; for (j = 0; j < nips; j++) { virNetworkIPDefPtr def2 = &def->ips[j]; @@ -2876,7 +2876,7 @@ virNetworkDefFormatBuf(virBufferPtr buf, } for (i = 0; i < def->nroutes; i++) { - if (virNetworkRouteDefFormat(buf, def->routes[i]) < 0) + if (virNetDevIPRouteFormat(buf, def->routes[i]) < 0) goto error; } diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 18f4d1e..e7ce674 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -243,7 +243,7 @@ struct _virNetworkDef { virNetworkIPDefPtr ips; /* ptr to array of IP addresses on this network */ size_t nroutes; - virNetworkRouteDefPtr *routes; /* ptr to array of static routes on this interface */ + virNetDevIPRoutePtr *routes; /* ptr to array of static routes on this interface */ virNetworkDNSDef dns; /* dns related configuration */ virNetDevVPortProfilePtr virtPortProfile; @@ -354,7 +354,7 @@ virPortGroupDefPtr virPortGroupFindByName(virNetworkDefPtr net, virNetworkIPDefPtr virNetworkDefGetIPByIndex(const virNetworkDef *def, int family, size_t n); -virNetworkRouteDefPtr +virNetDevIPRoutePtr virNetworkDefGetRouteByIndex(const virNetworkDef *def, int family, size_t n); int virNetworkIPDefPrefix(const virNetworkIPDef *def); diff --git a/src/conf/networkcommon_conf.c b/src/conf/networkcommon_conf.c index 8f9d4b8..12be819 100644 --- a/src/conf/networkcommon_conf.c +++ b/src/conf/networkcommon_conf.c @@ -32,34 +32,8 @@ #define VIR_FROM_THIS VIR_FROM_NETWORK -struct _virNetworkRouteDef { - char *family; /* ipv4 or ipv6 - default is ipv4 */ - virSocketAddr address; /* Routed Network IP address */ - - /* One or the other of the following two will be used for a given - * Network address, but never both. The parser guarantees this. - * The virSocketAddrGetIPPrefix() can be used to get a - * valid prefix. - */ - virSocketAddr netmask; /* ipv4 - either netmask or prefix specified */ - unsigned int prefix; /* ipv6 - only prefix allowed */ - bool has_prefix; /* prefix= was specified */ - unsigned int metric; /* value for metric (defaults to 1) */ - bool has_metric; /* metric= was specified */ - virSocketAddr gateway; /* gateway IP address for ip-route */ -}; - -void -virNetworkRouteDefFree(virNetworkRouteDefPtr def) -{ - if (!def) - return; - VIR_FREE(def->family); - VIR_FREE(def); -} - -virNetworkRouteDefPtr -virNetworkRouteDefCreate(const char *errorDetail, +virNetDevIPRoutePtr +virNetDevIPRouteCreate(const char *errorDetail, char *family, const char *address, const char *netmask, @@ -69,7 +43,7 @@ virNetworkRouteDefCreate(const char *errorDetail, unsigned int metric, bool hasMetric) { - virNetworkRouteDefPtr def = NULL; + virNetDevIPRoutePtr def = NULL; virSocketAddr testAddr; if (VIR_ALLOC(def) < 0) @@ -242,21 +216,21 @@ virNetworkRouteDefCreate(const char *errorDetail, return def; error: - virNetworkRouteDefFree(def); + virNetDevIPRouteFree(def); return NULL; } -virNetworkRouteDefPtr -virNetworkRouteDefParseXML(const char *errorDetail, +virNetDevIPRoutePtr +virNetDevIPRouteParseXML(const char *errorDetail, xmlNodePtr node, xmlXPathContextPtr ctxt) { /* - * virNetworkRouteDef object is already allocated as part + * virNetDevIPRoute object is already allocated as part * of an array. On failure clear: it out, but don't free it. */ - virNetworkRouteDefPtr def = NULL; + virNetDevIPRoutePtr def = NULL; xmlNodePtr save; char *family = NULL; char *address = NULL, *netmask = NULL; @@ -302,7 +276,7 @@ virNetworkRouteDefParseXML(const char *errorDetail, } } - def = virNetworkRouteDefCreate(errorDetail, family, address, netmask, + def = virNetDevIPRouteCreate(errorDetail, family, address, netmask, gateway, prefix, hasPrefix, metric, hasMetric); @@ -316,8 +290,8 @@ virNetworkRouteDefParseXML(const char *errorDetail, } int -virNetworkRouteDefFormat(virBufferPtr buf, - const virNetworkRouteDef *def) +virNetDevIPRouteFormat(virBufferPtr buf, + const virNetDevIPRoute *def) { int result = -1; char *addr = NULL; @@ -354,62 +328,3 @@ virNetworkRouteDefFormat(virBufferPtr buf, cleanup: return result; } - -virSocketAddrPtr -virNetworkRouteDefGetAddress(virNetworkRouteDefPtr def) -{ - if (def) - return &def->address; - - return NULL; -} - -int -virNetworkRouteDefGetPrefix(virNetworkRouteDefPtr def) -{ - int prefix = 0; - virSocketAddr zero; - - if (!def) - return -1; - - /* this creates an all-0 address of the appropriate family */ - ignore_value(virSocketAddrParse(&zero, - (VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET) - ? VIR_SOCKET_ADDR_IPV4_ALL - : VIR_SOCKET_ADDR_IPV6_ALL), - VIR_SOCKET_ADDR_FAMILY(&def->address))); - - if (virSocketAddrEqual(&def->address, &zero)) { - if (def->has_prefix && def->prefix == 0) - prefix = 0; - else if ((VIR_SOCKET_ADDR_IS_FAMILY(&def->netmask, AF_INET) && - virSocketAddrEqual(&def->netmask, &zero))) - prefix = 0; - else - prefix = virSocketAddrGetIPPrefix(&def->address, &def->netmask, - def->prefix); - } else { - prefix = virSocketAddrGetIPPrefix(&def->address, &def->netmask, - def->prefix); - } - - return prefix; -} - -unsigned int -virNetworkRouteDefGetMetric(virNetworkRouteDefPtr def) -{ - if (def && def->has_metric && def->metric > 0) - return def->metric; - - return 1; -} - -virSocketAddrPtr -virNetworkRouteDefGetGateway(virNetworkRouteDefPtr def) -{ - if (def) - return &def->gateway; - return NULL; -} diff --git a/src/conf/networkcommon_conf.h b/src/conf/networkcommon_conf.h index 1500d0f..160f80b 100644 --- a/src/conf/networkcommon_conf.h +++ b/src/conf/networkcommon_conf.h @@ -31,42 +31,25 @@ # include "internal.h" # include "virbuffer.h" # include "virsocketaddr.h" - -typedef struct _virNetworkRouteDef virNetworkRouteDef; -typedef virNetworkRouteDef *virNetworkRouteDefPtr; - -void -virNetworkRouteDefFree(virNetworkRouteDefPtr def); - -virNetworkRouteDefPtr -virNetworkRouteDefCreate(const char *networkName, - char *family, - const char *address, - const char *netmask, - const char *gateway, - unsigned int prefix, - bool hasPrefix, - unsigned int metric, - bool hasMetric); - -virNetworkRouteDefPtr -virNetworkRouteDefParseXML(const char *networkName, - xmlNodePtr node, - xmlXPathContextPtr ctxt); +# include "virnetdevip.h" + +virNetDevIPRoutePtr +virNetDevIPRouteCreate(const char *networkName, + char *family, + const char *address, + const char *netmask, + const char *gateway, + unsigned int prefix, + bool hasPrefix, + unsigned int metric, + bool hasMetric); + +virNetDevIPRoutePtr +virNetDevIPRouteParseXML(const char *networkName, + xmlNodePtr node, + xmlXPathContextPtr ctxt); int -virNetworkRouteDefFormat(virBufferPtr buf, - const virNetworkRouteDef *def); - -virSocketAddrPtr -virNetworkRouteDefGetAddress(virNetworkRouteDefPtr def); - -int -virNetworkRouteDefGetPrefix(virNetworkRouteDefPtr def); - -unsigned int -virNetworkRouteDefGetMetric(virNetworkRouteDefPtr def); - -virSocketAddrPtr -virNetworkRouteDefGetGateway(virNetworkRouteDefPtr def); +virNetDevIPRouteFormat(virBufferPtr buf, + const virNetDevIPRoute *def); #endif /* __NETWORKCOMMON_CONF_H__ */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index bd7b730..151cf9f 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -644,14 +644,9 @@ virNetworkEventStateRegisterID; # conf/networkcommon_conf.h -virNetworkRouteDefCreate; -virNetworkRouteDefFormat; -virNetworkRouteDefFree; -virNetworkRouteDefGetAddress; -virNetworkRouteDefGetGateway; -virNetworkRouteDefGetMetric; -virNetworkRouteDefGetPrefix; -virNetworkRouteDefParseXML; +virNetDevIPRouteCreate; +virNetDevIPRouteFormat; +virNetDevIPRouteParseXML; # conf/node_device_conf.h @@ -1931,6 +1926,11 @@ virNetDevIPAddrAdd; virNetDevIPAddrDel; virNetDevIPAddrGet; virNetDevIPRouteAdd; +virNetDevIPRouteFree; +virNetDevIPRouteGetAddress; +virNetDevIPRouteGetGateway; +virNetDevIPRouteGetMetric; +virNetDevIPRouteGetPrefix; virNetDevIPWaitDadFinish; diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index a95472c..1000d88 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -513,7 +513,7 @@ static int lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, goto error_out; for (j = 0; j < netDef->nips; j++) { - virDomainNetIPDefPtr ip = netDef->ips[j]; + virNetDevIPAddrPtr ip = netDef->ips[j]; int prefix; char *ipStr = virSocketAddrFormat(&ip->address); @@ -546,13 +546,13 @@ static int lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, /* Set the routes */ for (j = 0; j < netDef->nroutes; j++) { - virNetworkRouteDefPtr route = netDef->routes[j]; + virNetDevIPRoutePtr route = netDef->routes[j]; if (virNetDevIPRouteAdd(newname, - virNetworkRouteDefGetAddress(route), - virNetworkRouteDefGetPrefix(route), - virNetworkRouteDefGetGateway(route), - virNetworkRouteDefGetMetric(route)) < 0) { + virNetDevIPRouteGetAddress(route), + virNetDevIPRouteGetPrefix(route), + virNetDevIPRouteGetGateway(route), + virNetDevIPRouteGetMetric(route)) < 0) { goto error_out; } VIR_FREE(toStr); diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 9ad1b08..8294d29 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -419,7 +419,7 @@ typedef struct { char *macvlanmode; char *vlanid; char *name; - virDomainNetIPDefPtr *ips; + virNetDevIPAddrPtr *ips; size_t nips; char *gateway_ipv4; char *gateway_ipv6; @@ -430,10 +430,10 @@ typedef struct { static int lxcAddNetworkRouteDefinition(const char *address, int family, - virNetworkRouteDefPtr **routes, + virNetDevIPRoutePtr **routes, size_t *nroutes) { - virNetworkRouteDefPtr route = NULL; + virNetDevIPRoutePtr route = NULL; char *familyStr = NULL; char *zero = NULL; @@ -444,7 +444,7 @@ lxcAddNetworkRouteDefinition(const char *address, if (VIR_STRDUP(familyStr, family == AF_INET ? "ipv4" : "ipv6") < 0) goto error; - if (!(route = virNetworkRouteDefCreate(_("Domain interface"), familyStr, + if (!(route = virNetDevIPRouteCreate(_("Domain interface"), familyStr, zero, NULL, address, 0, false, 0, false))) goto error; @@ -460,7 +460,7 @@ lxcAddNetworkRouteDefinition(const char *address, error: VIR_FREE(familyStr); VIR_FREE(zero); - virNetworkRouteDefFree(route); + virNetDevIPRouteFree(route); return -1; } @@ -601,7 +601,7 @@ lxcNetworkWalkCallback(const char *name, virConfValuePtr value, void *data) STREQ(name, "lxc.network.ipv6")) { int family = AF_INET; char **ipparts = NULL; - virDomainNetIPDefPtr ip = NULL; + virNetDevIPAddrPtr ip = NULL; if (VIR_ALLOC(ip) < 0) return -1; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 135f7bd..63c6e76 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2020,12 +2020,12 @@ networkStartHandleMACTableManagerMode(virNetworkObjPtr network, /* add an IP (static) route to a bridge */ static int networkAddRouteToBridge(virNetworkObjPtr network, - virNetworkRouteDefPtr routedef) + virNetDevIPRoutePtr routedef) { - int prefix = virNetworkRouteDefGetPrefix(routedef); - unsigned int metric = virNetworkRouteDefGetMetric(routedef); - virSocketAddrPtr addr = virNetworkRouteDefGetAddress(routedef); - virSocketAddrPtr gateway = virNetworkRouteDefGetGateway(routedef); + int prefix = virNetDevIPRouteGetPrefix(routedef); + unsigned int metric = virNetDevIPRouteGetMetric(routedef); + virSocketAddrPtr addr = virNetDevIPRouteGetAddress(routedef); + virSocketAddrPtr gateway = virNetDevIPRouteGetGateway(routedef); if (prefix < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -2076,7 +2076,7 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver, bool v4present = false, v6present = false; virErrorPtr save_err = NULL; virNetworkIPDefPtr ipdef; - virNetworkRouteDefPtr routedef; + virNetDevIPRoutePtr routedef; char *macTapIfName = NULL; int tapfd = -1; @@ -2171,7 +2171,7 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver, virSocketAddrPtr gateway = NULL; routedef = network->def->routes[i]; - gateway = virNetworkRouteDefGetGateway(routedef); + gateway = virNetDevIPRouteGetGateway(routedef); /* Add the IP route to the bridge */ /* ignore errors, error msg will be generated */ diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_linux.c index b41a1ba..3effcdc 100644 --- a/src/network/bridge_driver_linux.c +++ b/src/network/bridge_driver_linux.c @@ -69,7 +69,7 @@ int networkCheckRouteCollision(virNetworkDefPtr def) char iface[17], dest[128], mask[128]; unsigned int addr_val, mask_val; virNetworkIPDefPtr ipdef; - virNetworkRouteDefPtr routedef; + virNetDevIPRoutePtr routedef; int num; size_t i; @@ -130,8 +130,8 @@ int networkCheckRouteCollision(virNetworkDefPtr def) i++) { virSocketAddr r_mask, r_addr; - virSocketAddrPtr tmp_addr = virNetworkRouteDefGetAddress(routedef); - int r_prefix = virNetworkRouteDefGetPrefix(routedef); + virSocketAddrPtr tmp_addr = virNetDevIPRouteGetAddress(routedef); + int r_prefix = virNetDevIPRouteGetPrefix(routedef); if (!tmp_addr || virSocketAddrMaskByPrefix(tmp_addr, r_prefix, &r_addr) < 0 || diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index 044f2bc..619f926 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -776,3 +776,72 @@ virNetDevIPAddrGet(const char *ifname, _("Unable to get IP address on this platform")); return -1; } + +/* manipulating the virNetDevIPRoute object */ +void +virNetDevIPRouteFree(virNetDevIPRoutePtr def) +{ + if (!def) + return; + VIR_FREE(def->family); + VIR_FREE(def); +} + +virSocketAddrPtr +virNetDevIPRouteGetAddress(virNetDevIPRoutePtr def) +{ + if (def) + return &def->address; + + return NULL; +} + +int +virNetDevIPRouteGetPrefix(virNetDevIPRoutePtr def) +{ + int prefix = 0; + virSocketAddr zero; + + if (!def) + return -1; + + /* this creates an all-0 address of the appropriate family */ + ignore_value(virSocketAddrParse(&zero, + (VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET) + ? VIR_SOCKET_ADDR_IPV4_ALL + : VIR_SOCKET_ADDR_IPV6_ALL), + VIR_SOCKET_ADDR_FAMILY(&def->address))); + + if (virSocketAddrEqual(&def->address, &zero)) { + if (def->has_prefix && def->prefix == 0) + prefix = 0; + else if ((VIR_SOCKET_ADDR_IS_FAMILY(&def->netmask, AF_INET) && + virSocketAddrEqual(&def->netmask, &zero))) + prefix = 0; + else + prefix = virSocketAddrGetIPPrefix(&def->address, &def->netmask, + def->prefix); + } else { + prefix = virSocketAddrGetIPPrefix(&def->address, &def->netmask, + def->prefix); + } + + return prefix; +} + +unsigned int +virNetDevIPRouteGetMetric(virNetDevIPRoutePtr def) +{ + if (def && def->has_metric && def->metric > 0) + return def->metric; + + return 1; +} + +virSocketAddrPtr +virNetDevIPRouteGetGateway(virNetDevIPRoutePtr def) +{ + if (def) + return &def->gateway; + return NULL; +} diff --git a/src/util/virnetdevip.h b/src/util/virnetdevip.h index f60465d..7a07b73 100644 --- a/src/util/virnetdevip.h +++ b/src/util/virnetdevip.h @@ -25,6 +25,28 @@ # include "virsocketaddr.h" +typedef struct { + virSocketAddr address; /* ipv4 or ipv6 address */ + unsigned int prefix; /* number of 1 bits in the net mask */ +} virNetDevIPAddr, *virNetDevIPAddrPtr; + +typedef struct { + char *family; /* ipv4 or ipv6 - default is ipv4 */ + virSocketAddr address; /* Routed Network IP address */ + + /* One or the other of the following two will be used for a given + * Network address, but never both. The parser guarantees this. + * The virSocketAddrGetIPPrefix() can be used to get a + * valid prefix. + */ + virSocketAddr netmask; /* ipv4 - either netmask or prefix specified */ + unsigned int prefix; /* ipv6 - only prefix allowed */ + bool has_prefix; /* prefix= was specified */ + unsigned int metric; /* value for metric (defaults to 1) */ + bool has_metric; /* metric= was specified */ + virSocketAddr gateway; /* gateway IP address for ip-route */ +} virNetDevIPRoute, *virNetDevIPRoutePtr; + /* manipulating/querying the netdev */ int virNetDevIPAddrAdd(const char *ifname, virSocketAddr *addr, @@ -47,4 +69,11 @@ int virNetDevIPAddrGet(const char *ifname, virSocketAddrPtr addr) int virNetDevIPWaitDadFinish(virSocketAddrPtr *addrs, size_t count) ATTRIBUTE_NONNULL(1); +/* virNetDevIPRoute object */ +void virNetDevIPRouteFree(virNetDevIPRoutePtr def); +virSocketAddrPtr virNetDevIPRouteGetAddress(virNetDevIPRoutePtr def); +int virNetDevIPRouteGetPrefix(virNetDevIPRoutePtr def); +unsigned int virNetDevIPRouteGetMetric(virNetDevIPRoutePtr def); +virSocketAddrPtr virNetDevIPRouteGetGateway(virNetDevIPRoutePtr def); + #endif /* __VIR_NETDEVIP_H__ */ -- 2.5.5

There are currently two places in the domain where this combination is used, and there is about to be another. This patch puts them together for brevity and uniformity. As with the newly-renamed virNetDevIPAddr and virNetDevIPRoute objects, the new virNetDevIPInfo object will need to be accessed by a utility function that calls low level Netlink functions (so we don't want it to be in the conf directory) and will be called from multiple hypervisor drivers (so it can't be in any hypervisor directory); the most appropriate place is thus once again the util directory. The parse and format functions are in conf/domain_conf.c because only the domain XML (i.e. *not* the network XML) has this exact combination of IP addresses plus routes. They will end up being static, but since they aren't being called yet, they are declared right before their definition to avoid a "defined but not used" compile error. That will be changed to static once they are in use. Likewise virDomainNetIPInfoFormat() will end up being the only caller to virDomainNetRoutesFormat() and virDomainNetIPsFormat(), so it will just subsume those functions, but we can't do that until they are no longer called. (It would have been nice to include the interface name within the virNetDevIPInfo object (with a slight name change), but that can't be done cleanly, because in each case the interface name is provided in a different place in the XML relative to the routes and IP addresses, so putting it in this object would actually make the code more confused rather than simpler). --- docs/schemas/domaincommon.rng | 27 +++++++++++++++++ src/conf/domain_conf.c | 68 +++++++++++++++++++++++++++++++++++++++++++ src/libvirt_private.syms | 1 + src/util/virnetdevip.c | 16 ++++++++++ src/util/virnetdevip.h | 11 +++++++ 5 files changed, 123 insertions(+) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index b81b558..ab89dab 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2629,6 +2629,33 @@ </optional> </interleave> </define> + + <!-- + All ip-related info for either the host or guest side of an interface + --> + <define name="interface-ip-info"> + <zeroOrMore> + <element name="ip"> + <attribute name="address"> + <ref name="ipAddr"/> + </attribute> + <optional> + <attribute name="family"> + <ref name="addr-family"/> + </attribute> + </optional> + <optional> + <attribute name="prefix"> + <ref name="ipPrefix"/> + </attribute> + </optional> + <empty/> + </element> + </zeroOrMore> + <zeroOrMore> + <ref name="route"/> + </zeroOrMore> + </define> <!-- An emulator description is just a path to the binary used for the task --> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f380271..548c750 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6173,6 +6173,58 @@ virDomainNetIPParseXML(xmlNodePtr node) return ret; } + +/* fill in a virNetDevIPInfoPtr from the <route> and <ip> + * elements found in the given XML context. + * + * return 0 on success (including none found) and -1 on failure. + */ +int +virDomainNetIPInfoParseXML(const char *source, + xmlXPathContextPtr ctxt, + virNetDevIPInfoPtr def); +int +virDomainNetIPInfoParseXML(const char *source, + xmlXPathContextPtr ctxt, + virNetDevIPInfoPtr def) + +{ + xmlNodePtr *nodes = NULL; + virNetDevIPAddrPtr ip = NULL; + virNetDevIPRoutePtr route = NULL; + int nnodes; + int ret = -1; + size_t i; + + if ((nnodes = virXPathNodeSet("./ip", ctxt, &nodes)) < 0) + goto cleanup; + + for (i = 0; i < nnodes; i++) { + if (!(ip = virDomainNetIPParseXML(nodes[i])) || + VIR_APPEND_ELEMENT(def->ips, def->nips, ip) < 0) + goto cleanup; + } + VIR_FREE(nodes); + + if ((nnodes = virXPathNodeSet("./route", ctxt, &nodes)) < 0) + goto cleanup; + + for (i = 0; i < nnodes; i++) { + if (!(route = virNetDevIPRouteParseXML(source, nodes[i], ctxt)) || + VIR_APPEND_ELEMENT(def->routes, def->nroutes, route) < 0) + goto cleanup; + } + + ret = 0; + cleanup: + if (ret < 0) + virNetDevIPInfoClear(def); + VIR_FREE(ip); + virNetDevIPRouteFree(route); + VIR_FREE(nodes); + return ret; +} + static int virDomainHostdevDefParseXMLCaps(xmlNodePtr node ATTRIBUTE_UNUSED, xmlXPathContextPtr ctxt, @@ -20311,6 +20363,22 @@ virDomainNetRoutesFormat(virBufferPtr buf, return 0; } + +int +virDomainNetIPInfoFormat(virBufferPtr buf, + virNetDevIPInfoPtr def); +int +virDomainNetIPInfoFormat(virBufferPtr buf, + virNetDevIPInfoPtr def) +{ + if (virDomainNetIPsFormat(buf, def->ips, def->nips) < 0) + return -1; + if (virDomainNetRoutesFormat(buf, def->routes, def->nroutes) < 0) + return -1; + return 0; +} + + static int virDomainHostdevDefFormatSubsys(virBufferPtr buf, virDomainHostdevDefPtr def, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 151cf9f..f6c3d45 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1925,6 +1925,7 @@ virNetDevBridgeSetVlanFiltering; virNetDevIPAddrAdd; virNetDevIPAddrDel; virNetDevIPAddrGet; +virNetDevIPInfoClear; virNetDevIPRouteAdd; virNetDevIPRouteFree; virNetDevIPRouteGetAddress; diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index 619f926..376d4ad 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -845,3 +845,19 @@ virNetDevIPRouteGetGateway(virNetDevIPRoutePtr def) return &def->gateway; return NULL; } + +/* manipulating the virNetDevIPInfo object */ + +void +virNetDevIPInfoClear(virNetDevIPInfoPtr ip) +{ + size_t i; + + for (i = 0; i < ip->nips; i++) + VIR_FREE(ip->ips[i]); + VIR_FREE(ip->ips); + + for (i = 0; i < ip->nroutes; i++) + virNetDevIPRouteFree(ip->routes[i]); + VIR_FREE(ip->routes); +} diff --git a/src/util/virnetdevip.h b/src/util/virnetdevip.h index 7a07b73..be41636 100644 --- a/src/util/virnetdevip.h +++ b/src/util/virnetdevip.h @@ -47,6 +47,14 @@ typedef struct { virSocketAddr gateway; /* gateway IP address for ip-route */ } virNetDevIPRoute, *virNetDevIPRoutePtr; +/* A full set of all IP config info for a network device */ +typedef struct { + size_t nips; + virNetDevIPAddrPtr *ips; + size_t nroutes; + virNetDevIPRoutePtr *routes; +} virNetDevIPInfo, *virNetDevIPInfoPtr; + /* manipulating/querying the netdev */ int virNetDevIPAddrAdd(const char *ifname, virSocketAddr *addr, @@ -76,4 +84,7 @@ int virNetDevIPRouteGetPrefix(virNetDevIPRoutePtr def); unsigned int virNetDevIPRouteGetMetric(virNetDevIPRoutePtr def); virSocketAddrPtr virNetDevIPRouteGetGateway(virNetDevIPRoutePtr def); +/* virNetDevIPInfo object */ +void virNetDevIPInfoClear(virNetDevIPInfoPtr ip); + #endif /* __VIR_NETDEVIP_H__ */ -- 2.5.5

a.k.a. <hostdev mode='capabilities' type='net'>. This replaces the existing nips, ips, nroutes, and routes with a single virNetDevIPInfo, and simplifies the code by calling that object's parse/format/clear functions instead of open coding. --- docs/schemas/domaincommon.rng | 22 +----------- src/conf/domain_conf.c | 80 ++++++------------------------------------- src/conf/domain_conf.h | 7 ++-- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_native.c | 18 +++++----- 5 files changed, 24 insertions(+), 105 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index ab89dab..38590a6 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4034,27 +4034,7 @@ <ref name="deviceName"/> </element> </element> - <zeroOrMore> - <element name="ip"> - <attribute name="address"> - <ref name="ipAddr"/> - </attribute> - <optional> - <attribute name="family"> - <ref name="addr-family"/> - </attribute> - </optional> - <optional> - <attribute name="prefix"> - <ref name="ipPrefix"/> - </attribute> - </optional> - <empty/> - </element> - </zeroOrMore> - <zeroOrMore> - <ref name="route"/> - </zeroOrMore> + <ref name="interface-ip-info"/> </interleave> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 548c750..7072f86 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2184,8 +2184,6 @@ virDomainHostdevSubsysSCSIiSCSIClear(virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc void virDomainHostdevDefClear(virDomainHostdevDefPtr def) { - size_t i; - if (!def) return; @@ -2209,13 +2207,8 @@ void virDomainHostdevDefClear(virDomainHostdevDefPtr def) VIR_FREE(def->source.caps.u.misc.chardev); break; case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET: - VIR_FREE(def->source.caps.u.net.iface); - for (i = 0; i < def->source.caps.u.net.nips; i++) - VIR_FREE(def->source.caps.u.net.ips[i]); - VIR_FREE(def->source.caps.u.net.ips); - for (i = 0; i < def->source.caps.u.net.nroutes; i++) - virNetDevIPRouteFree(def->source.caps.u.net.routes[i]); - VIR_FREE(def->source.caps.u.net.routes); + VIR_FREE(def->source.caps.u.net.ifname); + virNetDevIPInfoClear(&def->source.caps.u.net.ip); break; } break; @@ -6232,10 +6225,6 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node ATTRIBUTE_UNUSED, virDomainHostdevDefPtr def) { xmlNodePtr sourcenode; - xmlNodePtr *ipnodes = NULL; - int nipnodes; - xmlNodePtr *routenodes = NULL; - int nroutenodes; int ret = -1; /* @type is passed in from the caller rather than read from the @@ -6284,55 +6273,15 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node ATTRIBUTE_UNUSED, } break; case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET: - if (!(def->source.caps.u.net.iface = + if (!(def->source.caps.u.net.ifname = virXPathString("string(./source/interface[1])", ctxt))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing <interface> element in hostdev net device")); goto error; } - - /* Parse possible IP addresses */ - if ((nipnodes = virXPathNodeSet("./ip", ctxt, &ipnodes)) < 0) + if (virDomainNetIPInfoParseXML(_("Domain hostdev device"), + ctxt, &def->source.caps.u.net.ip) < 0) goto error; - - if (nipnodes) { - size_t i; - for (i = 0; i < nipnodes; i++) { - virNetDevIPAddrPtr ip = virDomainNetIPParseXML(ipnodes[i]); - - if (!ip) - goto error; - - if (VIR_APPEND_ELEMENT(def->source.caps.u.net.ips, - def->source.caps.u.net.nips, ip) < 0) { - VIR_FREE(ip); - goto error; - } - } - } - - /* Look for possible gateways */ - if ((nroutenodes = virXPathNodeSet("./route", ctxt, &routenodes)) < 0) - goto error; - - if (nroutenodes) { - size_t i; - for (i = 0; i < nroutenodes; i++) { - virNetDevIPRoutePtr route = NULL; - - if (!(route = virNetDevIPRouteParseXML(_("Domain hostdev device"), - routenodes[i], - ctxt))) - goto error; - - - if (VIR_APPEND_ELEMENT(def->source.caps.u.net.routes, - def->source.caps.u.net.nroutes, route) < 0) { - virNetDevIPRouteFree(route); - goto error; - } - } - } break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -6342,8 +6291,6 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node ATTRIBUTE_UNUSED, } ret = 0; error: - VIR_FREE(ipnodes); - VIR_FREE(routenodes); return ret; } @@ -13722,8 +13669,8 @@ static int virDomainHostdevMatchCapsNet(virDomainHostdevDefPtr a, virDomainHostdevDefPtr b) { - return STREQ_NULLABLE(a->source.caps.u.net.iface, - b->source.caps.u.net.iface); + return STREQ_NULLABLE(a->source.caps.u.net.ifname, + b->source.caps.u.net.ifname); } @@ -20519,7 +20466,7 @@ virDomainHostdevDefFormatCaps(virBufferPtr buf, break; case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET: virBufferEscapeString(buf, "<interface>%s</interface>\n", - def->source.caps.u.net.iface); + def->source.caps.u.net.ifname); break; default: virReportError(VIR_ERR_INTERNAL_ERROR, @@ -20531,14 +20478,9 @@ virDomainHostdevDefFormatCaps(virBufferPtr buf, virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</source>\n"); - if (def->source.caps.type == VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET) { - if (virDomainNetIPsFormat(buf, def->source.caps.u.net.ips, - def->source.caps.u.net.nips) < 0) - return -1; - if (virDomainNetRoutesFormat(buf, def->source.caps.u.net.routes, - def->source.caps.u.net.nroutes) < 0) - return -1; - } + if (def->source.caps.type == VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET && + virDomainNetIPInfoFormat(buf, &def->source.caps.u.net.ip) < 0) + return -1; return 0; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index c529b09..0c723de 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -395,11 +395,8 @@ struct _virDomainHostdevCaps { char *chardev; } misc; struct { - char *iface; - size_t nips; - virNetDevIPAddrPtr *ips; - size_t nroutes; - virNetDevIPRoutePtr *routes; + char *ifname; + virNetDevIPInfo ip; } net; } u; }; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 2aee41c..e58ff1b 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1984,7 +1984,7 @@ static int virLXCControllerMoveInterfaces(virLXCControllerPtr ctrl) if (hdcaps.type != VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET) continue; - if (virNetDevSetNamespace(hdcaps.u.net.iface, ctrl->initpid) < 0) + if (virNetDevSetNamespace(hdcaps.u.net.ifname, ctrl->initpid) < 0) return -1; } diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 8294d29..f074f03 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -402,7 +402,7 @@ lxcCreateHostdevDef(int mode, int type, const char *data) hostdev->source.caps.type = type; if (type == VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET && - VIR_STRDUP(hostdev->source.caps.u.net.iface, data) < 0) { + VIR_STRDUP(hostdev->source.caps.u.net.ifname, data) < 0) { virDomainHostdevDefFree(hostdev); hostdev = NULL; } @@ -492,25 +492,25 @@ lxcAddNetworkDefinition(lxcNetworkParseData *data) /* This still requires the user to manually setup the vlan interface * on the host */ if (isVlan && data->vlanid) { - VIR_FREE(hostdev->source.caps.u.net.iface); - if (virAsprintf(&hostdev->source.caps.u.net.iface, + VIR_FREE(hostdev->source.caps.u.net.ifname); + if (virAsprintf(&hostdev->source.caps.u.net.ifname, "%s.%s", data->link, data->vlanid) < 0) goto error; } - hostdev->source.caps.u.net.ips = data->ips; - hostdev->source.caps.u.net.nips = data->nips; + hostdev->source.caps.u.net.ip.ips = data->ips; + hostdev->source.caps.u.net.ip.nips = data->nips; if (data->gateway_ipv4 && lxcAddNetworkRouteDefinition(data->gateway_ipv4, AF_INET, - &hostdev->source.caps.u.net.routes, - &hostdev->source.caps.u.net.nroutes) < 0) + &hostdev->source.caps.u.net.ip.routes, + &hostdev->source.caps.u.net.ip.nroutes) < 0) goto error; if (data->gateway_ipv6 && lxcAddNetworkRouteDefinition(data->gateway_ipv6, AF_INET6, - &hostdev->source.caps.u.net.routes, - &hostdev->source.caps.u.net.nroutes) < 0) + &hostdev->source.caps.u.net.ip.routes, + &hostdev->source.caps.u.net.ip.nroutes) < 0) goto error; if (VIR_EXPAND_N(data->def->hostdevs, data->def->nhostdevs, 1) < 0) -- 2.5.5

All the same information was already there, just in slightly different places in the virDomainNetDef. --- docs/schemas/domaincommon.rng | 22 +------------------ src/conf/domain_conf.c | 50 ++++++------------------------------------- src/conf/domain_conf.h | 7 ++---- src/libxl/libxl_conf.c | 10 ++++----- src/libxl/libxl_domain.c | 2 +- src/lxc/lxc_container.c | 10 ++++----- src/lxc/lxc_native.c | 12 +++++------ src/openvz/openvz_driver.c | 10 ++++----- src/uml/uml_conf.c | 4 ++-- src/vbox/vbox_common.c | 6 +++--- src/vz/vz_sdk.c | 2 +- src/xenconfig/xen_common.c | 12 +++++------ src/xenconfig/xen_sxpr.c | 12 +++++------ 13 files changed, 49 insertions(+), 110 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 38590a6..563cb3c 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2420,27 +2420,7 @@ <empty/> </element> </optional> - <zeroOrMore> - <element name="ip"> - <attribute name="address"> - <ref name="ipAddr"/> - </attribute> - <optional> - <attribute name="family"> - <ref name="addr-family"/> - </attribute> - </optional> - <optional> - <attribute name="prefix"> - <ref name="ipPrefix"/> - </attribute> - </optional> - <empty/> - </element> - </zeroOrMore> - <zeroOrMore> - <ref name="route"/> - </zeroOrMore> + <ref name="interface-ip-info"/> <optional> <element name="script"> <attribute name="path"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7072f86..9dcfb57 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1740,8 +1740,6 @@ virDomainActualNetDefFree(virDomainActualNetDefPtr def) void virDomainNetDefClear(virDomainNetDefPtr def) { - size_t i; - if (!def) return; @@ -1801,14 +1799,7 @@ virDomainNetDefClear(virDomainNetDefPtr def) VIR_FREE(def->ifname_guest); VIR_FREE(def->ifname_guest_actual); - for (i = 0; i < def->nips; i++) - VIR_FREE(def->ips[i]); - VIR_FREE(def->ips); - - for (i = 0; i < def->nroutes; i++) - virNetDevIPRouteFree(def->routes[i]); - VIR_FREE(def->routes); - + virNetDevIPInfoClear(&def->guestIP); virDomainDeviceInfoClear(&def->info); VIR_FREE(def->filter); @@ -8890,7 +8881,7 @@ virDomainNetAppendIPAddress(virDomainNetDefPtr def, goto error; ipDef->prefix = prefix; - if (VIR_APPEND_ELEMENT(def->ips, def->nips, ipDef) < 0) + if (VIR_APPEND_ELEMENT(def->guestIP.ips, def->guestIP.nips, ipDef) < 0) goto error; return 0; @@ -8952,11 +8943,6 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, virDomainActualNetDefPtr actual = NULL; xmlNodePtr oldnode = ctxt->node; int ret, val; - size_t i; - size_t nips = 0; - virNetDevIPAddrPtr *ips = NULL; - size_t nroutes = 0; - virNetDevIPRoutePtr *routes = NULL; if (VIR_ALLOC(def) < 0) return NULL; @@ -9072,24 +9058,6 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, localport = virXPathString("string(./local/@port)", ctxt); ctxt->node = tmpnode; } - } else if (xmlStrEqual(cur->name, BAD_CAST "ip")) { - virNetDevIPAddrPtr ip = NULL; - - if (!(ip = virDomainNetIPParseXML(cur))) - goto error; - - if (VIR_APPEND_ELEMENT(ips, nips, ip) < 0) - goto error; - } else if (xmlStrEqual(cur->name, BAD_CAST "route")) { - virNetDevIPRoutePtr route = NULL; - if (!(route = virNetDevIPRouteParseXML(_("Domain interface"), - cur, ctxt))) - goto error; - - if (VIR_APPEND_ELEMENT(routes, nroutes, route) < 0) { - virNetDevIPRouteFree(route); - goto error; - } } else if (!ifname && xmlStrEqual(cur->name, BAD_CAST "target")) { ifname = virXMLPropString(cur, "dev"); @@ -9412,12 +9380,9 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, break; } - for (i = 0; i < nips; i++) { - if (VIR_APPEND_ELEMENT(def->ips, def->nips, ips[i]) < 0) - goto error; - } - def->nroutes = nroutes; - def->routes = routes; + if (virDomainNetIPInfoParseXML(_("guest interface"), + ctxt, &def->guestIP) < 0) + goto error; if (script != NULL) { def->script = script; @@ -9699,7 +9664,6 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, VIR_FREE(addrtype); VIR_FREE(domain_name); VIR_FREE(trustGuestRxFilters); - VIR_FREE(ips); VIR_FREE(vhost_path); VIR_FREE(localaddr); VIR_FREE(localport); @@ -20891,9 +20855,7 @@ virDomainNetDefFormat(virBufferPtr buf, return -1; } - if (virDomainNetIPsFormat(buf, def->ips, def->nips) < 0) - return -1; - if (virDomainNetRoutesFormat(buf, def->routes, def->nroutes) < 0) + if (virDomainNetIPInfoFormat(buf, &def->guestIP) < 0) return -1; virBufferEscapeString(buf, "<script path='%s'/>\n", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 0c723de..0df5579 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -966,8 +966,9 @@ struct _virDomainNetDef { char *script; char *domain_name; /* backend domain name */ char *ifname; - char *ifname_guest; char *ifname_guest_actual; + char *ifname_guest; + virNetDevIPInfo guestIP; virDomainDeviceInfo info; char *filter; virNWFilterHashTablePtr filterparams; @@ -975,10 +976,6 @@ struct _virDomainNetDef { virNetDevVlan vlan; int trustGuestRxFilters; /* enum virTristateBool */ int linkstate; - size_t nips; - virNetDevIPAddrPtr *ips; - size_t nroutes; - virNetDevIPRoutePtr *routes; }; /* Used for prefix of ifname of any network name generated dynamically diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 5989819..eb10156 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1,7 +1,7 @@ /* * libxl_conf.c: libxl configuration management * - * Copyright (C) 2012-2014 Red Hat, Inc. + * Copyright (C) 2012-2014, 2016 Red Hat, Inc. * Copyright (c) 2011-2013 SUSE LINUX Products GmbH, Nuernberg, Germany. * Copyright (C) 2011 Univention GmbH. * @@ -908,8 +908,8 @@ libxlMakeNic(virDomainDefPtr def, case VIR_DOMAIN_NET_TYPE_ETHERNET: if (VIR_STRDUP(x_nic->script, l_nic->script) < 0) goto cleanup; - if (l_nic->nips > 0) { - x_nic->ip = virSocketAddrFormat(&l_nic->ips[0]->address); + if (l_nic->guestIP.nips > 0) { + x_nic->ip = virSocketAddrFormat(&l_nic->guestIP.ips[0]->address); if (!x_nic->ip) goto cleanup; } @@ -924,8 +924,8 @@ libxlMakeNic(virDomainDefPtr def, goto cleanup; } - if (l_nic->nips > 0) { - x_nic->ip = virSocketAddrFormat(&l_nic->ips[0]->address); + if (l_nic->guestIP.nips > 0) { + x_nic->ip = virSocketAddrFormat(&l_nic->guestIP.ips[0]->address); if (!x_nic->ip) goto cleanup; } diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 221af87..6f76cae 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -296,7 +296,7 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, (dev->data.net->type == VIR_DOMAIN_NET_TYPE_BRIDGE || dev->data.net->type == VIR_DOMAIN_NET_TYPE_ETHERNET || dev->data.net->type == VIR_DOMAIN_NET_TYPE_NETWORK)) { - if (dev->data.net->nips > 1) { + if (dev->data.net->guestIP.nips > 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("multiple IP addresses not supported on device type %s"), virDomainNetTypeToString(dev->data.net->type)); diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 1000d88..a5ced92 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -512,8 +512,8 @@ static int lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, if (rc < 0) goto error_out; - for (j = 0; j < netDef->nips; j++) { - virNetDevIPAddrPtr ip = netDef->ips[j]; + for (j = 0; j < netDef->guestIP.nips; j++) { + virNetDevIPAddrPtr ip = netDef->guestIP.ips[j]; int prefix; char *ipStr = virSocketAddrFormat(&ip->address); @@ -537,7 +537,7 @@ static int lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, VIR_FREE(ipStr); } - if (netDef->nips || + if (netDef->guestIP.nips || netDef->linkstate == VIR_DOMAIN_NET_INTERFACE_LINK_STATE_UP) { VIR_DEBUG("Enabling %s", newname); rc = virNetDevSetOnline(newname, true); @@ -545,8 +545,8 @@ static int lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, goto error_out; /* Set the routes */ - for (j = 0; j < netDef->nroutes; j++) { - virNetDevIPRoutePtr route = netDef->routes[j]; + for (j = 0; j < netDef->guestIP.nroutes; j++) { + virNetDevIPRoutePtr route = netDef->guestIP.routes[j]; if (virNetDevIPRouteAdd(newname, virNetDevIPRouteGetAddress(route), diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index f074f03..e1dde3a 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -522,19 +522,19 @@ lxcAddNetworkDefinition(lxcNetworkParseData *data) data->name))) goto error; - net->ips = data->ips; - net->nips = data->nips; + net->guestIP.ips = data->ips; + net->guestIP.nips = data->nips; if (data->gateway_ipv4 && lxcAddNetworkRouteDefinition(data->gateway_ipv4, AF_INET, - &net->routes, - &net->nroutes) < 0) + &net->guestIP.routes, + &net->guestIP.nroutes) < 0) goto error; if (data->gateway_ipv6 && lxcAddNetworkRouteDefinition(data->gateway_ipv6, AF_INET6, - &net->routes, - &net->nroutes) < 0) + &net->guestIP.routes, + &net->guestIP.nroutes) < 0) goto error; if (VIR_EXPAND_N(data->def->nets, data->def->nnets, 1) < 0) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index b114246..48c264b 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1,7 +1,7 @@ /* * openvz_driver.c: core driver methods for managing OpenVZ VEs * - * Copyright (C) 2010-2015 Red Hat, Inc. + * Copyright (C) 2010-2016 Red Hat, Inc. * Copyright (C) 2006, 2007 Binary Karma * Copyright (C) 2006 Shuveb Hussain * Copyright (C) 2007 Anoop Joe Cyriac @@ -856,7 +856,7 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, if (net->type == VIR_DOMAIN_NET_TYPE_BRIDGE || (net->type == VIR_DOMAIN_NET_TYPE_ETHERNET && - net->nips == 0)) { + net->guestIP.nips == 0)) { virBuffer buf = VIR_BUFFER_INITIALIZER; int veid = openvzGetVEID(vpsid); @@ -906,12 +906,12 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, virCommandAddArg(cmd, "--netif_add"); virCommandAddArgBuffer(cmd, &buf); } else if (net->type == VIR_DOMAIN_NET_TYPE_ETHERNET && - net->nips > 0) { + net->guestIP.nips > 0) { size_t i; /* --ipadd ip */ - for (i = 0; i < net->nips; i++) { - char *ipStr = virSocketAddrFormat(&net->ips[i]->address); + for (i = 0; i < net->guestIP.nips; i++) { + char *ipStr = virSocketAddrFormat(&net->guestIP.ips[i]->address); if (!ipStr) goto cleanup; virCommandAddArgList(cmd, "--ipadd", ipStr, NULL); diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index a97ae64..dc68203 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -1,7 +1,7 @@ /* * uml_conf.c: UML driver configuration * - * Copyright (C) 2006-2014 Red Hat, Inc. + * Copyright (C) 2006-2014, 2016 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -173,7 +173,7 @@ umlBuildCommandLineNet(virConnectPtr conn, virBufferAddLit(&buf, "tuntap,"); if (def->ifname) virBufferAdd(&buf, def->ifname, -1); - if (def->nips > 0) { + if (def->guestIP.nips > 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("IP address not supported for ethernet interface")); goto error; diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 6dd5b9c..8e49268 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -1313,11 +1313,11 @@ vboxAttachNetwork(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) } else if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_BRIDGE) { VIR_DEBUG("NIC(%zu): brname: %s", i, def->nets[i]->data.bridge.brname); VIR_DEBUG("NIC(%zu): script: %s", i, def->nets[i]->script); - if (def->nets[i]->nips == 1) { - char *ipStr = virSocketAddrFormat(&def->nets[i]->ips[0]->address); + if (def->nets[i]->guestIP.nips == 1) { + char *ipStr = virSocketAddrFormat(&def->nets[i]->guestIP.ips[0]->address); VIR_DEBUG("NIC(%zu): ipaddr: %s", i, ipStr); VIR_FREE(ipStr); - } else if (def->nets[i]->nips > 1) { + } else if (def->nets[i]->guestIP.nips > 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Driver does not support setting multiple IP addresses")); return -1; diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index cb06240..5c92f97 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -2566,7 +2566,7 @@ static int prlsdkCheckNetUnsupportedParams(virDomainNetDefPtr net) return -1; } - if (net->ifname_guest) { + if (net->guestIf.name) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Setting guest interface name is not " "supported by vz driver.")); diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index 2fe29fd..f62a5b1 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -1153,11 +1153,11 @@ xenFormatNet(virConnectPtr conn, switch (net->type) { case VIR_DOMAIN_NET_TYPE_BRIDGE: virBufferAsprintf(&buf, ",bridge=%s", net->data.bridge.brname); - if (net->nips == 1) { - char *ipStr = virSocketAddrFormat(&net->ips[0]->address); + if (net->guestIP.nips == 1) { + char *ipStr = virSocketAddrFormat(&net->guestIP.ips[0]->address); virBufferAsprintf(&buf, ",ip=%s", ipStr); VIR_FREE(ipStr); - } else if (net->nips > 1) { + } else if (net->guestIP.nips > 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Driver does not support setting multiple IP addresses")); goto cleanup; @@ -1168,11 +1168,11 @@ xenFormatNet(virConnectPtr conn, case VIR_DOMAIN_NET_TYPE_ETHERNET: if (net->script) virBufferAsprintf(&buf, ",script=%s", net->script); - if (net->nips == 1) { - char *ipStr = virSocketAddrFormat(&net->ips[0]->address); + if (net->guestIP.nips == 1) { + char *ipStr = virSocketAddrFormat(&net->guestIP.ips[0]->address); virBufferAsprintf(&buf, ",ip=%s", ipStr); VIR_FREE(ipStr); - } else if (net->nips > 1) { + } else if (net->guestIP.nips > 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Driver does not support setting multiple IP addresses")); goto cleanup; diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c index 21de1a2..ea6c177 100644 --- a/src/xenconfig/xen_sxpr.c +++ b/src/xenconfig/xen_sxpr.c @@ -1875,11 +1875,11 @@ xenFormatSxprNet(virConnectPtr conn, script = def->script; virBufferEscapeSexpr(buf, "(script '%s')", script); - if (def->nips == 1) { - char *ipStr = virSocketAddrFormat(&def->ips[0]->address); + if (def->guestIP.nips == 1) { + char *ipStr = virSocketAddrFormat(&def->guestIP.ips[0]->address); virBufferEscapeSexpr(buf, "(ip '%s')", ipStr); VIR_FREE(ipStr); - } else if (def->nips > 1) { + } else if (def->guestIP.nips > 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Driver does not support setting multiple IP addresses")); return -1; @@ -1916,11 +1916,11 @@ xenFormatSxprNet(virConnectPtr conn, if (def->script) virBufferEscapeSexpr(buf, "(script '%s')", def->script); - if (def->nips == 1) { - char *ipStr = virSocketAddrFormat(&def->ips[0]->address); + if (def->guestIP.nips == 1) { + char *ipStr = virSocketAddrFormat(&def->guestIP.ips[0]->address); virBufferEscapeSexpr(buf, "(ip '%s')", ipStr); VIR_FREE(ipStr); - } else if (def->nips > 1) { + } else if (def->guestIP.nips > 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Driver does not support setting multiple IP addresses")); return -1; -- 2.5.5

libvirt's qemu driver doesn't have direct access to the config on the guest side of a network interface, and currently doesn't have any method in place to even inform the guest of the desired config. In the future, an unenforceable attempt to set the guest-side IP info could be made by adding a static host entry to the appropriate dnsmasq configuration (or changing the default dhcp client address on the qemu commandline for type='user' interfaces), or enhancing the guest agent to allow setting an IP address, but for now it can't have any effect, and we don't want to give the illusion that it does. To prevent the "disappearance" of any existing configs with ip address/route info (due to parser failure), this check is added in the newly implemented qemuDomainDeviceDefValidate(), which is only called when a domain is defined or started, *not* when it is reread from disk at libvirtd startup. --- src/qemu/qemu_domain.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e3267e4..1fca13f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2204,6 +2204,38 @@ qemuDomainDefValidate(const virDomainDef *def, } +static int +qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, + const virDomainDef *def ATTRIBUTE_UNUSED, + void *opaque) +{ + virQEMUDriverPtr driver = opaque; + virQEMUCapsPtr qemuCaps = NULL; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + int ret = -1; + + qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator); + + if (dev->type == VIR_DOMAIN_DEVICE_NET) { + const virDomainNetDef *net = dev->data.net; + + if (net->guestIP.nroutes || net->guestIP.nips) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Invalid attempt to set network interface " + "guest-side IP route and/or address info, " + "not supported by QEMU")); + goto cleanup; + } + } + + ret = 0; + cleanup: + virObjectUnref(qemuCaps); + virObjectUnref(cfg); + return ret; +} + + static const char * qemuDomainDefaultNetModel(const virDomainDef *def, virQEMUCapsPtr qemuCaps) @@ -2456,6 +2488,8 @@ virDomainDefParserConfig virQEMUDriverDomainDefParserConfig = { .domainPostParseCallback = qemuDomainDefPostParse, .assignAddressesCallback = qemuDomainDefAssignAddresses, .domainValidateCallback = qemuDomainDefValidate, + .deviceValidateCallback = qemuDomainDeviceDefValidate, + .features = VIR_DOMAIN_DEF_FEATURE_MEMORY_HOTPLUG | VIR_DOMAIN_DEF_FEATURE_OFFLINE_VCPUPIN }; -- 2.5.5

virDomainNetIPInfoFormat() and virDomainNetIPInfoParseXML() were previously defined as global functions (but declared in the .c file directly above their definition) to avoid the "static function defined but not called" error during compile. Now that both are used, they can be properly defined as static functions. And since virDomainNetIPInfoFormat() is now the only caller of virDomainNetIPsFormat() and virDomainNetRoutesFormat(), those two functions can simply be subsumed into virDomainNetIPInfoFormat(). --- src/conf/domain_conf.c | 46 ++++++++++------------------------------------ 1 file changed, 10 insertions(+), 36 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9dcfb57..df52ac9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6163,11 +6163,7 @@ virDomainNetIPParseXML(xmlNodePtr node) * * return 0 on success (including none found) and -1 on failure. */ -int -virDomainNetIPInfoParseXML(const char *source, - xmlXPathContextPtr ctxt, - virNetDevIPInfoPtr def); -int +static int virDomainNetIPInfoParseXML(const char *source, xmlXPathContextPtr ctxt, virNetDevIPInfoPtr def) @@ -20232,14 +20228,16 @@ virDomainFSDefFormat(virBufferPtr buf, return 0; } + static int -virDomainNetIPsFormat(virBufferPtr buf, virNetDevIPAddrPtr *ips, size_t nips) +virDomainNetIPInfoFormat(virBufferPtr buf, + virNetDevIPInfoPtr def) { size_t i; /* Output IP addresses */ - for (i = 0; i < nips; i++) { - virSocketAddrPtr address = &ips[i]->address; + for (i = 0; i < def->nips; i++) { + virSocketAddrPtr address = &def->ips[i]->address; char *ipStr = virSocketAddrFormat(address); const char *familyStr = NULL; @@ -20254,42 +20252,18 @@ virDomainNetIPsFormat(virBufferPtr buf, virNetDevIPAddrPtr *ips, size_t nips) VIR_FREE(ipStr); if (familyStr) virBufferAsprintf(buf, " family='%s'", familyStr); - if (ips[i]->prefix != 0) - virBufferAsprintf(buf, " prefix='%u'", ips[i]->prefix); + if (def->ips[i]->prefix) + virBufferAsprintf(buf, " prefix='%u'", def->ips[i]->prefix); virBufferAddLit(buf, "/>\n"); } - return 0; -} - -static int -virDomainNetRoutesFormat(virBufferPtr buf, - virNetDevIPRoutePtr *routes, - size_t nroutes) -{ - size_t i; - for (i = 0; i < nroutes; i++) - if (virNetDevIPRouteFormat(buf, routes[i]) < 0) + for (i = 0; i < def->nroutes; i++) + if (virNetDevIPRouteFormat(buf, def->routes[i]) < 0) return -1; return 0; } -int -virDomainNetIPInfoFormat(virBufferPtr buf, - virNetDevIPInfoPtr def); -int -virDomainNetIPInfoFormat(virBufferPtr buf, - virNetDevIPInfoPtr def) -{ - if (virDomainNetIPsFormat(buf, def->ips, def->nips) < 0) - return -1; - if (virDomainNetRoutesFormat(buf, def->routes, def->nroutes) < 0) - return -1; - return 0; -} - - static int virDomainHostdevDefFormatSubsys(virBufferPtr buf, virDomainHostdevDefPtr def, -- 2.5.5

It makes more sense to have the logging at the lower level so other callers can share the goodness. While removing so much stuff from / touching so many lines in lxcContainerRenameAndEnableInterfaces() (which used to have this debug/error logging), label names were changed and it was updated to use the now-more-common method of initializing ret to -1 (failure), then setting to 0 right before the cleanup label. --- src/lxc/lxc_container.c | 60 +++++++++++++++++++++---------------------------- src/util/virnetdevip.c | 32 ++++++++++++++++++++++---- 2 files changed, 53 insertions(+), 39 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index a5ced92..09ad8cb 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -484,33 +484,32 @@ lxcContainerGetNetDef(virDomainDefPtr vmDef, const char *devName) * * Returns 0 on success or nonzero in case of error */ -static int lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, - size_t nveths, - char **veths) +static int +lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, + size_t nveths, + char **veths) { - int rc = 0; + int ret = -1; size_t i, j; const char *newname; - char *toStr = NULL; - char *viaStr = NULL; virDomainNetDefPtr netDef; bool privNet = vmDef->features[VIR_DOMAIN_FEATURE_PRIVNET] == VIR_TRISTATE_SWITCH_ON; for (i = 0; i < nveths; i++) { if (!(netDef = lxcContainerGetNetDef(vmDef, veths[i]))) - return -1; + goto cleanup; newname = netDef->ifname_guest; if (!newname) { - rc = -1; - goto error_out; + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Missing device name for container-side veth")); + goto cleanup; } VIR_DEBUG("Renaming %s to %s", veths[i], newname); - rc = virNetDevSetName(veths[i], newname); - if (rc < 0) - goto error_out; + if (virNetDevSetName(veths[i], newname) < 0) + goto cleanup; for (j = 0; j < netDef->guestIP.nips; j++) { virNetDevIPAddrPtr ip = netDef->guestIP.ips[j]; @@ -519,30 +518,23 @@ static int lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, if ((prefix = virSocketAddrGetIPPrefix(&ip->address, NULL, ip->prefix)) < 0) { + ipStr = virSocketAddrFormat(&ip->address); virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to determine prefix for IP address '%s'"), ipStr); - goto error_out; - } - - VIR_DEBUG("Adding IP address '%s/%d' to '%s'", - ipStr, prefix, newname); - if (virNetDevIPAddrAdd(newname, &ip->address, NULL, prefix) < 0) { - virReportError(VIR_ERR_SYSTEM_ERROR, - _("Failed to set IP address '%s' on %s"), - ipStr, newname); VIR_FREE(ipStr); - goto error_out; + goto cleanup; } - VIR_FREE(ipStr); + + if (virNetDevIPAddrAdd(newname, &ip->address, NULL, prefix) < 0) + goto cleanup; } if (netDef->guestIP.nips || netDef->linkstate == VIR_DOMAIN_NET_INTERFACE_LINK_STATE_UP) { VIR_DEBUG("Enabling %s", newname); - rc = virNetDevSetOnline(newname, true); - if (rc < 0) - goto error_out; + if (virNetDevSetOnline(newname, true) < 0) + goto cleanup; /* Set the routes */ for (j = 0; j < netDef->guestIP.nroutes; j++) { @@ -553,22 +545,20 @@ static int lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, virNetDevIPRouteGetPrefix(route), virNetDevIPRouteGetGateway(route), virNetDevIPRouteGetMetric(route)) < 0) { - goto error_out; + goto cleanup; } - VIR_FREE(toStr); - VIR_FREE(viaStr); } } } /* enable lo device only if there were other net devices */ - if (veths || privNet) - rc = virNetDevSetOnline("lo", true); + if ((veths || privNet) && + virNetDevSetOnline("lo", true) < 0) + goto cleanup; - error_out: - VIR_FREE(toStr); - VIR_FREE(viaStr); - return rc; + ret = 0; + cleanup: + return ret; } diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index 376d4ad..dad342f 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -173,6 +173,13 @@ virNetDevIPAddrAdd(const char *ifname, struct nl_msg *nlmsg = NULL; struct nlmsghdr *resp = NULL; unsigned int recvbuflen; + char *ipStr = NULL; + char *peerStr = NULL; + char *bcastStr = NULL; + + ipStr = virSocketAddrFormat(addr); + if (peer && VIR_SOCKET_ADDR_VALID(peer)) + peerStr = virSocketAddrFormat(peer); /* The caller needs to provide a correct address */ if (VIR_SOCKET_ADDR_FAMILY(addr) == AF_INET && @@ -181,28 +188,45 @@ virNetDevIPAddrAdd(const char *ifname, if (VIR_ALLOC(broadcast) < 0) return -1; - if (virSocketAddrBroadcastByPrefix(addr, prefix, broadcast) < 0) + if (virSocketAddrBroadcastByPrefix(addr, prefix, broadcast) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to determine broadcast address for '%s/%d'"), + ipStr, prefix); goto cleanup; + } + bcastStr = virSocketAddrFormat(broadcast); } + VIR_DEBUG("Adding IP address %s/%d%s%s%s%s to %s", ipStr, prefix, + peerStr ? " peer " : "", peerStr ? peerStr : "", + bcastStr ? " bcast " : "", bcastStr ? bcastStr : "", + ifname); + if (!(nlmsg = virNetDevCreateNetlinkAddressMessage(RTM_NEWADDR, ifname, addr, prefix, broadcast, peer))) goto cleanup; - if (virNetlinkCommand(nlmsg, &resp, &recvbuflen, 0, 0, - NETLINK_ROUTE, 0) < 0) + if (virNetlinkCommand(nlmsg, &resp, &recvbuflen, + 0, 0, NETLINK_ROUTE, 0) < 0) goto cleanup; if (virNetlinkGetErrorCode(resp, recvbuflen) < 0) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Error adding IP address to %s"), ifname); + _("Failed to add IP address %s/%d%s%s%s%s to %s"), + ipStr, prefix, + peerStr ? " peer " : "", peerStr ? peerStr : "", + bcastStr ? " bcast " : "", bcastStr ? bcastStr : "", + ifname); goto cleanup; } ret = 0; cleanup: + VIR_FREE(ipStr); + VIR_FREE(peerStr); + VIR_FREE(bcastStr); nlmsg_free(nlmsg); VIR_FREE(resp); VIR_FREE(broadcast); -- 2.5.5

This patch takes the code out of lxcContainerRenameAndEnableInterfaces() that adds all IP addresses and IP routes to the interface, and puts it into a utility function virNetDevIPInfoAddToDev() in virnetdevip.c so that it can be used by anyone. One small change in functionality - lxcContainerRenameAndEnableInterfaces() previously would add all IP addresses to the interface while it was still offline, then set the interface online, and then add the routes. Because I don't want the utility function to set the interface online, I've moved this up so the interface is first set online, then IP addresses and routes are added. This is the same order that the network service from initscripts (in ifup-ether) does it, so it shouldn't pose any problem (and hasn't, in the tests that I've run). --- src/libvirt_private.syms | 1 + src/lxc/lxc_container.c | 46 +++++++++---------------------------- src/util/virnetdevip.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ src/util/virnetdevip.h | 2 ++ 4 files changed, 74 insertions(+), 35 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index f6c3d45..a7f62f8 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1925,6 +1925,7 @@ virNetDevBridgeSetVlanFiltering; virNetDevIPAddrAdd; virNetDevIPAddrDel; virNetDevIPAddrGet; +virNetDevIPInfoAddToDev; virNetDevIPInfoClear; virNetDevIPRouteAdd; virNetDevIPRouteFree; diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 09ad8cb..916a37b 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -490,7 +490,7 @@ lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, char **veths) { int ret = -1; - size_t i, j; + size_t i; const char *newname; virDomainNetDefPtr netDef; bool privNet = vmDef->features[VIR_DOMAIN_FEATURE_PRIVNET] == @@ -509,52 +509,28 @@ lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, VIR_DEBUG("Renaming %s to %s", veths[i], newname); if (virNetDevSetName(veths[i], newname) < 0) - goto cleanup; - - for (j = 0; j < netDef->guestIP.nips; j++) { - virNetDevIPAddrPtr ip = netDef->guestIP.ips[j]; - int prefix; - char *ipStr = virSocketAddrFormat(&ip->address); - - if ((prefix = virSocketAddrGetIPPrefix(&ip->address, - NULL, ip->prefix)) < 0) { - ipStr = virSocketAddrFormat(&ip->address); - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to determine prefix for IP address '%s'"), - ipStr); - VIR_FREE(ipStr); - goto cleanup; - } - - if (virNetDevIPAddrAdd(newname, &ip->address, NULL, prefix) < 0) - goto cleanup; - } + goto cleanup; + /* Only enable this device if there is a reason to do so (either + * at least one IP was specified, or link state was set to up in + * the config) + */ if (netDef->guestIP.nips || netDef->linkstate == VIR_DOMAIN_NET_INTERFACE_LINK_STATE_UP) { VIR_DEBUG("Enabling %s", newname); if (virNetDevSetOnline(newname, true) < 0) goto cleanup; - - /* Set the routes */ - for (j = 0; j < netDef->guestIP.nroutes; j++) { - virNetDevIPRoutePtr route = netDef->guestIP.routes[j]; - - if (virNetDevIPRouteAdd(newname, - virNetDevIPRouteGetAddress(route), - virNetDevIPRouteGetPrefix(route), - virNetDevIPRouteGetGateway(route), - virNetDevIPRouteGetMetric(route)) < 0) { - goto cleanup; - } - } } + + /* set IP addresses and routes */ + if (virNetDevIPInfoAddToDev(newname, &netDef->guestIP) < 0) + goto cleanup; } /* enable lo device only if there were other net devices */ if ((veths || privNet) && virNetDevSetOnline("lo", true) < 0) - goto cleanup; + goto cleanup; ret = 0; cleanup: diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index dad342f..dad2a78 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -885,3 +885,63 @@ virNetDevIPInfoClear(virNetDevIPInfoPtr ip) virNetDevIPRouteFree(ip->routes[i]); VIR_FREE(ip->routes); } + + +/** + * virNetDevIPInfoAddToDev: + * @ifname: name of device to operate on + * @ipInfo: list of routes and IP addresses to add to this device + * + * All IP routes and IP addresses in ipInfo are added to the named device. + * + * Returns: 0 on success, -1 (and error reported) on failure. + */ +int +virNetDevIPInfoAddToDev(const char *ifname, + virNetDevIPInfo const *ipInfo) +{ + int ret = -1; + size_t i; + char *ipStr = NULL; + int prefix; + + /* add all IP addresses */ + for (i = 0; i < ipInfo->nips; i++) { + virNetDevIPAddrPtr ip = ipInfo->ips[i]; + + ipStr = virSocketAddrFormat(&ip->address); + if ((prefix = virSocketAddrGetIPPrefix(&ip->address, + NULL, ip->prefix)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to determine prefix for IP address '%s'"), + ipStr); + goto cleanup; + } + if (virNetDevIPAddrAdd(ifname, &ip->address, NULL, prefix) < 0) + goto cleanup; + VIR_FREE(ipStr); + } + + /* add all routes */ + for (i = 0; i < ipInfo->nroutes; i++) { + virNetDevIPRoutePtr route = ipInfo->routes[i]; + + ipStr = virSocketAddrFormat(&route->address); + if ((prefix = virNetDevIPRouteGetPrefix(route)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to determine prefix for route with destination '%s'"), + ipStr); + goto cleanup; + } + if (virNetDevIPRouteAdd(ifname, &route->address, prefix, + &route->gateway, + virNetDevIPRouteGetMetric(route)) < 0) + goto cleanup; + VIR_FREE(ipStr); + } + + ret = 0; + cleanup: + VIR_FREE(ipStr); + return ret; +} diff --git a/src/util/virnetdevip.h b/src/util/virnetdevip.h index be41636..66c5c00 100644 --- a/src/util/virnetdevip.h +++ b/src/util/virnetdevip.h @@ -86,5 +86,7 @@ virSocketAddrPtr virNetDevIPRouteGetGateway(virNetDevIPRoutePtr def); /* virNetDevIPInfo object */ void virNetDevIPInfoClear(virNetDevIPInfoPtr ip); +int virNetDevIPInfoAddToDev(const char *ifname, + virNetDevIPInfo const *ipInfo); #endif /* __VIR_NETDEVIP_H__ */ -- 2.5.5

The version of virNetDevIPRouteAdd() has a bit of code to create the appropriate "0.0.0.0" or "::" virSocketAddr when the addr passed in is NULL or invalid, but the alternate implementation (used on platforms that don't support libnl) had no such code, making the two implementations semantically diferent. This patch corrects that oversight. --- src/util/virnetdevip.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index dad2a78..6889f81 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -618,9 +618,27 @@ virNetDevIPRouteAdd(const char *ifname, { virCommandPtr cmd = NULL; char *addrstr = NULL, *gatewaystr = NULL; + virSocketAddr defaultAddr; + virSocketAddrPtr actualAddr; int ret = -1; - if (!(addrstr = virSocketAddrFormat(addr))) + actualAddr = addr; + + /* If we have no valid network address, then use the default one */ + if (!addr || !VIR_SOCKET_ADDR_VALID(addr)) { + int family = VIR_SOCKET_ADDR_FAMILY(gateway); + if (family == AF_INET) { + if (virSocketAddrParseIPv4(&defaultAddr, VIR_SOCKET_ADDR_IPV4_ALL) < 0) + goto cleanup; + } else { + if (virSocketAddrParseIPv6(&defaultAddr, VIR_SOCKET_ADDR_IPV6_ALL) < 0) + goto cleanup; + } + + actualAddr = &defaultAddr; + } + + if (!(addrstr = virSocketAddrFormat(actualAddr))) goto cleanup; if (!(gatewaystr = virSocketAddrFormat(gateway))) goto cleanup; -- 2.5.5