diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-14 16:13:29 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-14 16:13:30 +0100 |
| commit | 23f87b9973b3755f0e8acd38be7087b7cc601cbe (patch) | |
| tree | cfb6712059dac606006356618d91d951356b7fe1 /io/dns-resolver.c | |
| parent | fbc8ea1ed0704b0cd393e5dc429816a36cb5ed05 (diff) | |
| parent | 563a3987b980a36e6941720a99d5cf36960f78ea (diff) | |
| download | focaccia-qemu-23f87b9973b3755f0e8acd38be7087b7cc601cbe.tar.gz focaccia-qemu-23f87b9973b3755f0e8acd38be7087b7cc601cbe.zip | |
Merge remote-tracking branch 'remotes/berrange/tags/pull-sockets-2017-07-11-3' into staging
Merge sockets 2017/07/11 v3 # gpg: Signature made Fri 14 Jul 2017 16:09:03 BST # gpg: using RSA key 0xBE86EBB415104FDF # gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>" # gpg: aka "Daniel P. Berrange <berrange@redhat.com>" # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF * remotes/berrange/tags/pull-sockets-2017-07-11-3: io: preserve ipv4/ipv6 flags when resolving InetSocketAddress sockets: ensure we don't accept IPv4 clients when IPv4 is disabled sockets: don't block IPv4 clients when listening on "::" sockets: ensure we can bind to both ipv4 & ipv6 separately Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'io/dns-resolver.c')
| -rw-r--r-- | io/dns-resolver.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/io/dns-resolver.c b/io/dns-resolver.c index 57a8896cbb..c072d121c3 100644 --- a/io/dns-resolver.c +++ b/io/dns-resolver.c @@ -116,8 +116,10 @@ static int qio_dns_resolver_lookup_sync_inet(QIODNSResolver *resolver, .numeric = true, .has_to = iaddr->has_to, .to = iaddr->to, - .has_ipv4 = false, - .has_ipv6 = false, + .has_ipv4 = iaddr->has_ipv4, + .ipv4 = iaddr->ipv4, + .has_ipv6 = iaddr->has_ipv6, + .ipv6 = iaddr->ipv6, }; (*addrs)[i] = newaddr; |