[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 4/5] io: preserve ipv4/ipv6 flags when resolving I
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PULL v2 4/5] io: preserve ipv4/ipv6 flags when resolving InetSocketAddress |
Date: |
Wed, 12 Jul 2017 17:18:29 +0100 |
The original InetSocketAddress struct may have has_ipv4 and
has_ipv6 fields set, which will control both the ai_family
used during DNS resolution, and later use of the V6ONLY
flag.
Currently the standalone DNS resolver code drops the
has_ipv4 & has_ipv6 flags after resolving, which means
the later bind() code won't correctly set V6ONLY.
This fixes the following scenarios
-vnc :0,ipv4=off
-vnc :0,ipv6=on
-vnc :::0,ipv4=off
-vnc :::0,ipv6=on
which all mistakenly accepted IPv4 clients
Acked-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
io/dns-resolver.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/io/dns-resolver.c b/io/dns-resolver.c
index 57a8896..c072d12 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;
--
2.9.4
- [Qemu-devel] [PULL v2 0/5] Merge sockets 2017/07/11, Daniel P. Berrange, 2017/07/12
- [Qemu-devel] [PULL v2 1/5] sockets: ensure we can bind to both ipv4 & ipv6 separately, Daniel P. Berrange, 2017/07/12
- [Qemu-devel] [PULL v2 2/5] sockets: don't block IPv4 clients when listening on "::", Daniel P. Berrange, 2017/07/12
- [Qemu-devel] [PULL v2 4/5] io: preserve ipv4/ipv6 flags when resolving InetSocketAddress,
Daniel P. Berrange <=
- [Qemu-devel] [PULL v2 3/5] sockets: ensure we don't accept IPv4 clients when IPv4 is disabled, Daniel P. Berrange, 2017/07/12
- [Qemu-devel] [PULL v2 5/5] tests: add functional test validating ipv4/ipv6 address flag handling, Daniel P. Berrange, 2017/07/12
- Re: [Qemu-devel] [PULL v2 0/5] Merge sockets 2017/07/11, Philippe Mathieu-Daudé, 2017/07/12
- Re: [Qemu-devel] [PULL v2 0/5] Merge sockets 2017/07/11, Peter Maydell, 2017/07/14