From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 15 Jul 2020 11:48:45 +0000 (+0200)
Subject: virNetSocketCheckProtocols: lookup IPv6 only if suspecting IPv6
X-Git-Tag: v6.6.0-rc1~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9536379da4c8ed61;p=thirdparty%2Flibvirt.git

virNetSocketCheckProtocols: lookup IPv6 only if suspecting IPv6

There is not much sense trying to disprove host is IPv6 capable
if we know after first round (getifaddrs()) that is is not.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index 1a0cf60286..2edd2a21d6 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -206,7 +206,8 @@ int virNetSocketCheckProtocols(bool *hasIPv4,
     freeifaddrs(ifaddr);
 
 
-    if (virNetSocketCheckProtocolByLookup("::1", AF_INET6, hasIPv6) < 0)
+    if (hasIPv6 &&
+        virNetSocketCheckProtocolByLookup("::1", AF_INET6, hasIPv6) < 0)
         return -1;
 
     VIR_DEBUG("Protocols: v4 %d v6 %d", *hasIPv4, *hasIPv6);