[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/11] slirp: Adding IPv6 address for DNS relay
From: |
Samuel Thibault |
Subject: |
[Qemu-devel] [PULL 09/11] slirp: Adding IPv6 address for DNS relay |
Date: |
Tue, 15 Mar 2016 10:42:56 +0100 |
From: Guillaume Subiron <address@hidden>
This patch adds an IPv6 address to the DNS relay. in6_equal_dns() is
developed using this Slirp attribute.
sotranslate_in/out/accept() are also updated to manage the IPv6 case so the
guest can be able to join the host using one of the Slirp addresses.
For now this only points to localhost. Further development will be needed to
automatically fetch the IPv6 address from resolv.conf, and announce this via
RDNSS.
Signed-off-by: Guillaume Subiron <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
---
slirp/ip6.h | 6 +++++-
slirp/slirp.c | 3 +++
slirp/slirp.h | 1 +
slirp/socket.c | 32 ++++++++++++++++++++++++++++++++
4 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/slirp/ip6.h b/slirp/ip6.h
index 731ee72..8ddfa24 100644
--- a/slirp/ip6.h
+++ b/slirp/ip6.h
@@ -72,7 +72,11 @@ static inline bool in6_equal_mach(const struct in6_addr *a,
|| (in6_equal_net(a, &(struct in6_addr)LINKLOCAL_ADDR, 64)\
&& in6_equal_mach(a, &slirp->vhost_addr6, 64)))
-#define in6_equal_dns(a) 0
+#define in6_equal_dns(a)\
+ ((in6_equal_net(a, &slirp->vprefix_addr6, slirp->vprefix_len)\
+ && in6_equal_mach(a, &slirp->vnameserver_addr6, slirp->vprefix_len))\
+ || (in6_equal_net(a, &(struct in6_addr)LINKLOCAL_ADDR, 64)\
+ && in6_equal_mach(a, &slirp->vnameserver_addr6, 64)))
#define in6_equal_host(a)\
(in6_equal_router(a) || in6_equal_dns(a))
diff --git a/slirp/slirp.c b/slirp/slirp.c
index 50b36f4..7a47bb6 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -231,10 +231,13 @@ Slirp *slirp_init(int restricted, struct in_addr vnetwork,
slirp->vprefix_len = 64;
slirp->vhost_addr6 = slirp->vprefix_addr6;
slirp->vhost_addr6.s6_addr[15] = 0x2;
+ slirp->vnameserver_addr6 = slirp->vprefix_addr6;
+ slirp->vnameserver_addr6.s6_addr[15] = 0x3;
#else
inet_pton(AF_INET6, "fec0::0", &slirp->vprefix_addr6);
slirp->vprefix_len = 64;
inet_pton(AF_INET6, "fec0::2", &slirp->vhost_addr6);
+ inet_pton(AF_INET6, "fec0::3", &slirp->vnameserver_addr6);
#endif
if (vhostname) {
pstrcpy(slirp->client_hostname, sizeof(slirp->client_hostname),
diff --git a/slirp/slirp.h b/slirp/slirp.h
index 2850ef1..71f2439 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -212,6 +212,7 @@ struct Slirp {
struct in6_addr vhost_addr6;
struct in_addr vdhcp_startaddr;
struct in_addr vnameserver_addr;
+ struct in6_addr vnameserver_addr6;
struct in_addr client_ipaddr;
char client_hostname[33];
diff --git a/slirp/socket.c b/slirp/socket.c
index 8df9252..b836c42 100644
--- a/slirp/socket.c
+++ b/slirp/socket.c
@@ -771,6 +771,7 @@ void sotranslate_out(struct socket *so, struct
sockaddr_storage *addr)
{
Slirp *slirp = so->slirp;
struct sockaddr_in *sin = (struct sockaddr_in *)addr;
+ struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)addr;
switch (addr->ss_family) {
case AF_INET:
@@ -791,6 +792,19 @@ void sotranslate_out(struct socket *so, struct
sockaddr_storage *addr)
ntohs(sin->sin_port), inet_ntoa(sin->sin_addr)));
break;
+ case AF_INET6:
+ if (in6_equal_net(&so->so_faddr6, &slirp->vprefix_addr6,
+ slirp->vprefix_len)) {
+ if (in6_equal(&so->so_faddr6, &slirp->vnameserver_addr6)) {
+ /*if (get_dns_addr(&addr) < 0) {*/ /* TODO */
+ sin6->sin6_addr = in6addr_loopback;
+ /*}*/
+ } else {
+ sin6->sin6_addr = in6addr_loopback;
+ }
+ }
+ break;
+
default:
break;
}
@@ -800,6 +814,7 @@ void sotranslate_in(struct socket *so, struct
sockaddr_storage *addr)
{
Slirp *slirp = so->slirp;
struct sockaddr_in *sin = (struct sockaddr_in *)addr;
+ struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)addr;
switch (addr->ss_family) {
case AF_INET:
@@ -816,6 +831,16 @@ void sotranslate_in(struct socket *so, struct
sockaddr_storage *addr)
}
break;
+ case AF_INET6:
+ if (in6_equal_net(&so->so_faddr6, &slirp->vprefix_addr6,
+ slirp->vprefix_len)) {
+ if (in6_equal(&sin6->sin6_addr, &in6addr_loopback)
+ || !in6_equal(&so->so_faddr6, &slirp->vhost_addr6)) {
+ sin6->sin6_addr = so->so_faddr6;
+ }
+ }
+ break;
+
default:
break;
}
@@ -837,6 +862,13 @@ void sotranslate_accept(struct socket *so)
}
break;
+ case AF_INET6:
+ if (in6_equal(&so->so_faddr6, &in6addr_any) ||
+ in6_equal(&so->so_faddr6, &in6addr_loopback)) {
+ so->so_faddr6 = slirp->vhost_addr6;
+ }
+ break;
+
default:
break;
}
--
2.7.0
- [Qemu-devel] [PULL 00/11] slirp: Adding IPv6 support to Qemu -net user mode, Samuel Thibault, 2016/03/15
- [Qemu-devel] [PULL 05/11] slirp: Factorizing tcpiphdr structure with an union, Samuel Thibault, 2016/03/15
- [Qemu-devel] [PULL 10/11] qapi-schema, qemu-options & slirp: Adding Qemu options for IPv6 addresses, Samuel Thibault, 2016/03/15
- [Qemu-devel] [PULL 09/11] slirp: Adding IPv6 address for DNS relay,
Samuel Thibault <=
- [Qemu-devel] [PULL 07/11] slirp: Reindent after refactoring, Samuel Thibault, 2016/03/15
- [Qemu-devel] [PULL 04/11] slirp: Adding IPv6 UDP support, Samuel Thibault, 2016/03/15
- [Qemu-devel] [PULL 08/11] slirp: Handle IPv6 in TCP functions, Samuel Thibault, 2016/03/15
- [Qemu-devel] [PULL 03/11] slirp: Adding ICMPv6 error sending, Samuel Thibault, 2016/03/15
- [Qemu-devel] [PULL 02/11] slirp: Fix ICMP error sending, Samuel Thibault, 2016/03/15
- [Qemu-devel] [PULL 11/11] slirp: Add IPv6 support to the TFTP code, Samuel Thibault, 2016/03/15
- [Qemu-devel] [PULL 06/11] slirp: Generalizing and neutralizing various TCP functions before adding IPv6 stuff, Samuel Thibault, 2016/03/15
- [Qemu-devel] [PULL 01/11] slirp: Adding IPv6, ICMPv6 Echo and NDP autoconfiguration, Samuel Thibault, 2016/03/15
- Re: [Qemu-devel] [PULL 00/11] slirp: Adding IPv6 support to Qemu -net user mode, Peter Maydell, 2016/03/15