From patchwork Mon Feb 8 10:28:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 8247541 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7A2B2BEEE5 for ; Mon, 8 Feb 2016 10:29:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B975320396 for ; Mon, 8 Feb 2016 10:29:23 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A1C2F2039C for ; Mon, 8 Feb 2016 10:29:22 +0000 (UTC) Received: from localhost ([::1]:43210 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSj4M-0003Xs-0z for patchwork-qemu-devel@patchwork.kernel.org; Mon, 08 Feb 2016 05:29:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55208) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSj48-0003X6-DI for qemu-devel@nongnu.org; Mon, 08 Feb 2016 05:29:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aSj44-0006H2-Pu for qemu-devel@nongnu.org; Mon, 08 Feb 2016 05:29:08 -0500 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:44203) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSj44-0006GH-J7 for qemu-devel@nongnu.org; Mon, 08 Feb 2016 05:29:04 -0500 X-IronPort-AV: E=Sophos;i="5.22,415,1449529200"; d="scan'208";a="163814477" Received: from unknown (HELO var.youpi.perso.aquilenet.fr) ([193.50.110.192]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/AES128-GCM-SHA256; 08 Feb 2016 11:29:00 +0100 Received: from samy by var.youpi.perso.aquilenet.fr with local (Exim 4.86) (envelope-from ) id 1aSj40-0007qg-IH; Mon, 08 Feb 2016 11:29:00 +0100 From: Samuel Thibault To: qemu-devel@nongnu.org Date: Mon, 8 Feb 2016 11:28:57 +0100 Message-Id: <7921dd1416882a2ebee89a18a3f966fcbe2c5b49.1454927009.git.samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.134.164.104 Cc: Thomas Huth , zhanghailiang , Li Zhijian , Stefan Hajnoczi , Jason Wang , Dave Gilbert , Vasiliy Tolstov , Huangpeng , Gonglei , Jan Kiszka , Samuel Thibault , Yang Hongyang , Guillaume Subiron Subject: [Qemu-devel] [PATCHv7 8/9] slirp: Adding IPv6 address for DNS relay X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Guillaume Subiron 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 Signed-off-by: Samuel Thibault --- slirp/ip6.h | 5 ++++- slirp/slirp.c | 1 + slirp/slirp.h | 1 + slirp/socket.c | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 38 insertions(+), 1 deletion(-) diff --git a/slirp/ip6.h b/slirp/ip6.h index 9e65acd..c799421 100644 --- a/slirp/ip6.h +++ b/slirp/ip6.h @@ -74,7 +74,10 @@ static inline int in6_equal_mach(struct in6_addr a, struct in6_addr b, || (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_net(a, (struct in6_addr)LINKLOCAL_ADDR, 64))\ + && in6_equal_mach(a, slirp->vnameserver_addr6, slirp->vprefix_len)) #define in6_equal_host(a)\ (in6_equal_router(a) || in6_equal_dns(a)) diff --git a/slirp/slirp.c b/slirp/slirp.c index cca5a80..4d6203a 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -233,6 +233,7 @@ Slirp *slirp_init(int restricted, struct in_addr vnetwork, slirp->bootp_filename = g_strdup(bootfile); slirp->vdhcp_startaddr = vdhcp_start; slirp->vnameserver_addr = vnameserver; + inet_pton(AF_INET6, "fec0::3", &slirp->vnameserver_addr6); if (vdnssearch) { translate_dnssearch(slirp, vdnssearch); diff --git a/slirp/slirp.h b/slirp/slirp.h index 3261815..88d9be1 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -230,6 +230,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 d4b02c8..5d4930a 100644 --- a/slirp/socket.c +++ b/slirp/socket.c @@ -747,6 +747,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: @@ -767,6 +768,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; } @@ -776,6 +790,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: @@ -792,6 +807,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; } @@ -813,6 +838,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; }