diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index c5397ddfbd1f1ad56916d18bc8d1e3e555ec7a14..04bb4f0ab6601549d548ad8e588993484e5c4912 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1916,11 +1916,11 @@ virSocketAddrGetIpPrefix; virSocketAddrGetPort; virSocketAddrGetRange; virSocketAddrIsNetmask; -virSocketAddrIsNumeric; virSocketAddrIsPrivate; virSocketAddrIsWildcard; virSocketAddrMask; virSocketAddrMaskByPrefix; +virSocketAddrNumericFamily; virSocketAddrParse; virSocketAddrParseIPv4; virSocketAddrParseIPv6; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 284cd5adbf1b03a46082ca1bfd864c0bd58dcec6..e135249fe20dd0e142321efaa12a18def34ccf3e 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2605,7 +2605,6 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, if (VIR_STRDUP(migrateFrom, "stdio") < 0) goto cleanup; } else { - virSocketAddr listenAddressSocket; bool encloseAddress = false; bool hostIPv6Capable = false; bool qemuIPv6Capable = false; @@ -2627,28 +2626,21 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, virObjectUnref(qemuCaps); if (listenAddress) { - if (virSocketAddrIsNumeric(listenAddress)) { - /* listenAddress is numeric IPv4 or IPv6 */ - if (virSocketAddrParse(&listenAddressSocket, listenAddress, AF_UNSPEC) < 0) + if (virSocketAddrNumericFamily(listenAddress) == AF_INET6) { + if (!qemuIPv6Capable) { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("qemu isn't capable of IPv6")); goto cleanup; - - /* address parsed successfully */ - if (VIR_SOCKET_ADDR_IS_FAMILY(&listenAddressSocket, AF_INET6)) { - if (!qemuIPv6Capable) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("qemu isn't capable of IPv6")); - goto cleanup; - } - if (!hostIPv6Capable) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("host isn't capable of IPv6")); - goto cleanup; - } - /* IPv6 address must be escaped in brackets on the cmd line */ - encloseAddress = true; } + if (!hostIPv6Capable) { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("host isn't capable of IPv6")); + goto cleanup; + } + /* IPv6 address must be escaped in brackets on the cmd line */ + encloseAddress = true; } else { - /* listenAddress is a hostname */ + /* listenAddress is a hostname or IPv4 */ } } else if (qemuIPv6Capable && hostIPv6Capable) { /* Listen on :: instead of 0.0.0.0 if QEMU understands it @@ -2950,15 +2942,17 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, * to be a correct hostname which refers to the target machine). */ if (uri_in == NULL) { + bool encloseAddress = false; + const char *incFormat; + if (virPortAllocatorAcquire(driver->migrationPorts, &port) < 0) goto cleanup; if (migrateHost != NULL) { - if (virSocketAddrIsNumeric(migrateHost) && - virSocketAddrParse(NULL, migrateHost, AF_UNSPEC) < 0) - goto cleanup; + if (virSocketAddrNumericFamily(migrateHost) == AF_INET6) + encloseAddress = true; - if (VIR_STRDUP(hostname, migrateHost) < 0) + if (VIR_STRDUP(hostname, migrateHost) < 0) goto cleanup; } else { if ((hostname = virGetHostname()) == NULL) @@ -2977,7 +2971,12 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, * compatibility with old targets. We at least make the * new targets accept both syntaxes though. */ - if (virAsprintf(uri_out, "tcp:%s:%d", hostname, port) < 0) + if (encloseAddress) + incFormat = "%s:[%s]:%d"; + else + incFormat = "%s:%s:%d"; + + if (virAsprintf(uri_out, incFormat, "tcp", hostname, port) < 0) goto cleanup; } else { bool well_formed_uri; diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 7cc4bded5ee5cf4fca544fdc1a113be741ac209c..7fe7a151c0317904124a18d84d4e68dad3e1c5dc 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -856,26 +856,25 @@ virSocketAddrGetIpPrefix(const virSocketAddr *address, } /** - * virSocketAddrIsNumeric: + * virSocketAddrNumericFamily: * @address: address to check * - * Check if passed address is an IP address in numeric format. For - * instance, for 0.0.0.0 true is returned, for 'examplehost" - * false is returned. + * Check if passed address is an IP address in numeric format. and + * return the address family, otherwise return 0. * - * Returns: true if @address is an IP address, - * false otherwise + * Returns: AF_INET or AF_INET6 if @address is an numeric IP address, + * -1 otherwise. */ -bool -virSocketAddrIsNumeric(const char *address) +int +virSocketAddrNumericFamily(const char *address) { struct addrinfo *res; unsigned short family; if (virSocketAddrParseInternal(&res, address, AF_UNSPEC, false) < 0) - return false; + return -1; family = res->ai_addr->sa_family; freeaddrinfo(res); - return family == AF_INET || family == AF_INET6; + return family; } diff --git a/src/util/virsocketaddr.h b/src/util/virsocketaddr.h index 27defa0614005e4b2b9bc8f68fe2e6ffeb074e8d..35c9c1a589a6005120cb467bd1a8cbaabd97e223 100644 --- a/src/util/virsocketaddr.h +++ b/src/util/virsocketaddr.h @@ -125,5 +125,5 @@ bool virSocketAddrIsPrivate(const virSocketAddr *addr); bool virSocketAddrIsWildcard(const virSocketAddr *addr); -bool virSocketAddrIsNumeric(const char *address); +int virSocketAddrNumericFamily(const char *address); #endif /* __VIR_SOCKETADDR_H__ */ diff --git a/tests/sockettest.c b/tests/sockettest.c index 68b0536225bd806eff01be945014b1ef94b3d3f3..e790b5184162bcbf2ce2128da316790e16b2bf27 100644 --- a/tests/sockettest.c +++ b/tests/sockettest.c @@ -219,19 +219,19 @@ static int testWildcardHelper(const void *opaque) return testWildcard(data->addr, data->pass); } -struct testIsNumericData { +struct testNumericData { const char *addr; - bool pass; + int expected; }; static int -testIsNumericHelper(const void *opaque) +testNumericHelper(const void *opaque) { - const struct testIsNumericData *data = opaque; + const struct testNumericData *data = opaque; - if (virSocketAddrIsNumeric(data->addr)) - return data->pass ? 0 : -1; - return data->pass ? -1 : 0; + if (virSocketAddrNumericFamily(data->addr) != data->expected) + return -1; + return 0; } static int @@ -314,11 +314,11 @@ mymain(void) ret = -1; \ } while (0) -#define DO_TEST_IS_NUMERIC(addr, pass) \ +#define DO_TEST_NUMERIC_FAMILY(addr, pass) \ do { \ - struct testIsNumericData data = { addr, pass}; \ - if (virtTestRun("Test isNumeric " addr, \ - testIsNumericHelper, &data) < 0) \ + struct testNumericData data = { addr, pass }; \ + if (virtTestRun("Test Numeric Family" addr, \ + testNumericHelper, &data) < 0) \ ret = -1; \ } while (0) @@ -385,11 +385,11 @@ mymain(void) DO_TEST_WILDCARD("1", false); DO_TEST_WILDCARD("0.1", false); - DO_TEST_IS_NUMERIC("0.0.0.0", true); - DO_TEST_IS_NUMERIC("::", true); - DO_TEST_IS_NUMERIC("1", true); - DO_TEST_IS_NUMERIC("::ffff", true); - DO_TEST_IS_NUMERIC("examplehost", false); + DO_TEST_NUMERIC_FAMILY("0.0.0.0", AF_INET); + DO_TEST_NUMERIC_FAMILY("::", AF_INET6); + DO_TEST_NUMERIC_FAMILY("1", AF_INET); + DO_TEST_NUMERIC_FAMILY("::ffff", AF_INET6); + DO_TEST_NUMERIC_FAMILY("examplehost", -1); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; }