From: John Ferlan <jferlan(a)redhat.com&gt; Rename it to virNetDevGetIPv4AddressIoctl and make virNetDevGetIPAddress a wrapper around it, allowing other ways of getting the address to be implemented, and still falling back to the old method. Signed-off-by: John Ferlan <jferlan(a)redhat.com&gt; Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/libvirt_private.syms | 2 +- src/network/bridge_driver.c | 2 +- src/util/virnetdev.c | 48 +++++++++++++++++++++++++++++++++------------ src/util/virnetdev.h | 2 +- 4 files changed, 39 insertions(+), 15 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a092714..b225707 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1708,7 +1708,7 @@ virNetDevDelMulti; virNetDevExists; virNetDevGetFeatures; virNetDevGetIndex; -virNetDevGetIPv4Address; +virNetDevGetIPAddress; virNetDevGetLinkInfo; virNetDevGetMAC; virNetDevGetMTU; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index f865adc..6db368b 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -4559,7 +4559,7 @@ networkGetNetworkAddress(const char *netname, char **netaddr) } if (dev_name) { - if (virNetDevGetIPv4Address(dev_name, &addr) < 0) + if (virNetDevGetIPAddress(dev_name, &addr) < 0) goto cleanup; addrptr = &addr; } diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 54d866e..59593f9 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1386,7 +1386,7 @@ int virNetDevClearIPAddress(const char *ifname, #endif /* defined(__linux__) && defined(HAVE_LIBNL) */ /** - * virNetDevGetIPv4Address: + * virNetDevGetIPv4AddressIoctl: * @ifname: name of the interface whose IP address we want * @addr: filled with the IPv4 address * @@ -1396,22 +1396,21 @@ int virNetDevClearIPAddress(const char *ifname, * Returns 0 on success, -errno on failure. */ #if defined(SIOCGIFADDR) && defined(HAVE_STRUCT_IFREQ) -int virNetDevGetIPv4Address(const char *ifname, - virSocketAddrPtr addr) +static int +virNetDevGetIPv4AddressIoctl(const char *ifname, + virSocketAddrPtr addr) { int fd = -1; int ret = -1; struct ifreq ifr; - memset(addr, 0, sizeof(*addr)); - addr->data.stor.ss_family = AF_UNSPEC; - 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"), ifname); + _("Unable to get IPv4 address for interface %s via ioctl"), + ifname); goto cleanup; } @@ -1427,16 +1426,41 @@ int virNetDevGetIPv4Address(const char *ifname, #else /* ! SIOCGIFADDR */ -int virNetDevGetIPv4Address(const char *ifname ATTRIBUTE_UNUSED, - virSocketAddrPtr addr ATTRIBUTE_UNUSED) +static int +virNetDevGetIPv4AddressIoctl(const char *ifname ATTRIBUTE_UNUSED, + virSocketAddrPtr addr ATTRIBUTE_UNUSED) { - virReportSystemError(ENOSYS, "%s", - _("Unable to get IPv4 address on this platform")); - return -1; + return -2; } #endif /* ! SIOCGIFADDR */ +/** + * 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 = virNetDevGetIPv4AddressIoctl(ifname, addr)) != -2) + return ret; + + virReportSystemError(ENOSYS, "%s", + _("Unable to get IP address on this platform")); + return -1; +} /** * virNetDevValidateConfig: diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 856127b..fb0fd46 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -103,7 +103,7 @@ int virNetDevClearIPAddress(const char *ifname, virSocketAddr *addr, unsigned int prefix) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; -int virNetDevGetIPv4Address(const char *ifname, virSocketAddrPtr addr) +int virNetDevGetIPAddress(const char *ifname, virSocketAddrPtr addr) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; -- 2.0.5

We've been explicitly requesting IPv4 for some reason, even if there were only IPv6 addresses in the network definition. https://bugzilla.redhat.com/show_bug.cgi?id=1192318 --- src/network/bridge_driver.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 6db368b..d195085 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -4485,12 +4485,12 @@ networkReleaseActualDevice(virDomainDefPtr dom, * @netname: the name of a network * @netaddr: string representation of IP address for that network. * - * Attempt to return an IP (v4) address associated with the named + * Attempt to return an IP address associated with the named * network. If a libvirt virtual network, that will be provided in the * configuration. For host bridge and direct (macvtap) networks, we * must do an ioctl to learn the address. * - * Note: This function returns the 1st IPv4 address it finds. It might + * Note: This function returns the first IP address it finds. It might * be useful if it was more flexible, but the current use (getting a * listen address for qemu's vnc/spice graphics server) can only use a * single address anyway. @@ -4525,11 +4525,10 @@ networkGetNetworkAddress(const char *netname, char **netaddr) case VIR_NETWORK_FORWARD_NONE: case VIR_NETWORK_FORWARD_NAT: case VIR_NETWORK_FORWARD_ROUTE: - /* if there's an ipv4def, get it's address */ - ipdef = virNetworkDefGetIpByIndex(netdef, AF_INET, 0); + ipdef = virNetworkDefGetIpByIndex(netdef, AF_UNSPEC, 0); if (!ipdef) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("network '%s' doesn't have an IPv4 address"), + _("network '%s' doesn't have an IP address"), netdef->name); goto cleanup; } -- 2.0.5