From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47229)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from
	<SRS0=TRES=OS=ens-lyon.org=samuel.thibault@bounce.ens-lyon.org>)
	id 1aWYuL-0005bW-4z
	for qemu-devel@nongnu.org; Thu, 18 Feb 2016 19:26:53 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from
	<SRS0=TRES=OS=ens-lyon.org=samuel.thibault@bounce.ens-lyon.org>)
	id 1aWYuH-0004FE-Vm
	for qemu-devel@nongnu.org; Thu, 18 Feb 2016 19:26:53 -0500
Received: from domu-toccata.ens-lyon.fr ([140.77.166.138]:38656
	helo=sonata.ens-lyon.org) by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from
	<SRS0=TRES=OS=ens-lyon.org=samuel.thibault@bounce.ens-lyon.org>)
	id 1aWYuH-0004Dx-Nj
	for qemu-devel@nongnu.org; Thu, 18 Feb 2016 19:26:49 -0500
Date: Fri, 19 Feb 2016 01:26:45 +0100
From: Samuel Thibault <samuel.thibault@gnu.org>
Message-ID: <20160219002645.GA18844@var.home>
References: <cover.1455471945.git.samuel.thibault@ens-lyon.org>
	<043b3b699753317c270087536c8d239aae2432eb.1455471945.git.samuel.thibault@ens-lyon.org>
	<56C43D3A.1080100@redhat.com>
	<20160217093635.GB3716@var.bordeaux.inria.fr>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20160217093635.GB3716@var.bordeaux.inria.fr>
Subject: Re: [Qemu-devel] [PATCHv7 8/9] slirp: Adding IPv6 address for DNS
	relay
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Thomas Huth <thuth@redhat.com>
Cc: zhanghailiang <zhang.zhanghailiang@huawei.com>, Li Zhijian <lizhijian@cn.fujitsu.com>, Stefan Hajnoczi <stefanha@gmail.com>, Jason Wang <jasowang@redhat.com>, qemu-devel@nongnu.org, Vasiliy Tolstov <v.tolstov@selfip.ru>, Dave Gilbert <dgilbert@redhat.com>, Gonglei <arei.gonglei@huawei.com>, Jan Kiszka <jan.kiszka@siemens.com>, Huangpeng <peter.huangpeng@huawei.com>, Guillaume Subiron <maethor@subiron.org>

Samuel Thibault, on Wed 17 Feb 2016 10:36:35 +0100, wrote:
> That's now like this in my tree:
> 
> diff --git a/slirp/ip6.h b/slirp/ip6.h
> index 9f7623f..9e4844e 100644
> --- a/slirp/ip6.h
> +++ b/slirp/ip6.h
> @@ -70,7 +70,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))

Oops, I meant

+#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)))