From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:58334)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <samuel.thibault@ens-lyon.org>) id 1alduv-0007Ik-BO
	for qemu-devel@nongnu.org; Thu, 31 Mar 2016 10:49:50 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <samuel.thibault@ens-lyon.org>) id 1aldup-0003vm-NM
	for qemu-devel@nongnu.org; Thu, 31 Mar 2016 10:49:49 -0400
Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:24339)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <samuel.thibault@ens-lyon.org>) id 1aldup-0003ur-CI
	for qemu-devel@nongnu.org; Thu, 31 Mar 2016 10:49:43 -0400
Date: Thu, 31 Mar 2016 16:49:41 +0200
From: Samuel Thibault <samuel.thibault@gnu.org>
Message-ID: <20160331144941.GT2636@var.bordeaux.inria.fr>
References: <1459416020-19011-1-git-send-email-samuel.thibault@ens-lyon.org>
	<CAFEAcA-HNVBxS_Nb9zvzrd4qXwTHbPNEWiaTfBUeS1SeLCQr7g@mail.gmail.com>
	<20160331125122.GA2636@var.bordeaux.inria.fr>
	<CAFEAcA9nesgOExK_pyw7zWji2Bu_Eib-idBVMCCAWu8DUFHw_A@mail.gmail.com>
	<20160331141959.GP2636@var.bordeaux.inria.fr>
	<CAFEAcA8=pbV_2OKmqmL+i9SuQ4zrz1b_8MaMYDh8WEa6MZVn8g@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <CAFEAcA8=pbV_2OKmqmL+i9SuQ4zrz1b_8MaMYDh8WEa6MZVn8g@mail.gmail.com>
Subject: Re: [Qemu-devel] [PULL 0/5] ipv4-only and ipv6-only support
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: Peter Maydell <peter.maydell@linaro.org>
Cc: "J. Kiszka" <jan.kiszka@siemens.com>, QEMU Developers <qemu-devel@nongnu.org>

Peter Maydell, on Thu 31 Mar 2016 15:44:13 +0100, wrote:
>                  if (get_dns6_addr(&sin6->sin6_addr,
> &sin6->sin6_scope_id) < 0) {
>                  ^
> In file included from /home/petmay01/linaro/qemu-for-merges/slirp/slirp.h:99:0,
>                  from /home/petmay01/linaro/qemu-for-merges/slirp/socket.c:10:
> /home/petmay01/linaro/qemu-for-merges/slirp/libslirp.h:10:5: note:
> expected ‘uint32_t *’ but argument is of type ‘u_long *’

Urgl, so Windows is again not posix-compliant here... I guess the least
ugly workaround is as below.

Samuel

diff --git a/slirp/socket.c b/slirp/socket.c
index 896c27e..3d3c72a 100644
--- a/slirp/socket.c
+++ b/slirp/socket.c
@@ -796,7 +796,10 @@ void sotranslate_out(struct socket *so, struct sockaddr_storage *addr)
         if (in6_equal_net(&so->so_faddr6, &slirp->vprefix_addr6,
                     slirp->vprefix_len)) {
             if (in6_equal(&so->so_faddr6, &slirp->vnameserver_addr6)) {
-                if (get_dns6_addr(&sin6->sin6_addr, &sin6->sin6_scope_id) < 0) {
+                uint32_t scope_id;
+                if (get_dns6_addr(&sin6->sin6_addr, &scope_id) >= 0) {
+                    sin6->sin6_scope_id = scope_id;
+                } else {
                     sin6->sin6_addr = in6addr_loopback;
                 }
             } else {