From patchwork Thu Mar 31 14:19:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 8713811 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EB38C9F30C for ; Thu, 31 Mar 2016 14:20:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 00BA82026C for ; Thu, 31 Mar 2016 14:20:44 +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 C60E820253 for ; Thu, 31 Mar 2016 14:20:42 +0000 (UTC) Received: from localhost ([::1]:60738 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aldSj-0008M3-0j for patchwork-qemu-devel@patchwork.kernel.org; Thu, 31 Mar 2016 10:20:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51135) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aldSW-0008Lp-MD for qemu-devel@nongnu.org; Thu, 31 Mar 2016 10:20:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aldSQ-0004gk-Sg for qemu-devel@nongnu.org; Thu, 31 Mar 2016 10:20:28 -0400 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:49392) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aldSQ-0004gY-Fy for qemu-devel@nongnu.org; Thu, 31 Mar 2016 10:20:22 -0400 X-IronPort-AV: E=Sophos;i="5.24,422,1454972400"; d="scan'208";a="171885195" Received: from nat-inria-bordeaux-52-gw-01-bso.bordeaux.inria.fr (HELO var.youpi.perso.aquilenet.fr) ([194.199.1.52]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/AES128-GCM-SHA256; 31 Mar 2016 16:19:59 +0200 Received: from samy by var.youpi.perso.aquilenet.fr with local (Exim 4.87) (envelope-from ) id 1aldS3-0004fo-Qu; Thu, 31 Mar 2016 16:19:59 +0200 Date: Thu, 31 Mar 2016 16:19:59 +0200 From: Samuel Thibault To: Peter Maydell Message-ID: <20160331141959.GP2636@var.bordeaux.inria.fr> References: <1459416020-19011-1-git-send-email-samuel.thibault@ens-lyon.org> <20160331125122.GA2636@var.bordeaux.inria.fr> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21+34 (58baf7c9f32f) (2010-12-30) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.134.164.104 Cc: "J. Kiszka" , QEMU Developers Subject: Re: [Qemu-devel] [PULL 0/5] ipv4-only and ipv6-only support 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 Peter Maydell, on Thu 31 Mar 2016 15:11:27 +0100, wrote: > On 31 March 2016 at 13:51, Samuel Thibault wrote: > > Peter Maydell, on Thu 31 Mar 2016 13:47:28 +0100, wrote: > >> On 31 March 2016 at 10:20, Samuel Thibault wrote: > >> > Update version for v2.6.0-rc0 release (2016-03-30 19:25:40 +0100) > >> > > >> > are available in the git repository at: > >> > > >> > http://people.debian.org/~sthibault/qemu.git tags/samuel-thibault-2 > >> > > >> > for you to fetch changes up to c99751f2a711e9eecf60901520c6d4197bdaf9b4: > >> > > >> > slirp: Add RDNSS advertisement (2016-03-31 11:18:13 +0200) > >> > > >> > ---------------------------------------------------------------- > >> > slirp updates (2) > >> > > >> > ---------------------------------------------------------------- > >> > Samuel Thibault (5): > >> > slirp: Allow disabling IPv4 or IPv6 > >> > slirp: Split get_dns_addr > >> > slirp: Add dns6 resolution > >> > slirp: Support link-local DNS addresses > >> > slirp: Add RDNSS advertisement > >> > >> Hi. I'm afraid this doesn't build for Windows: > > > > Indeed, I forgot to fix the the windows version of the function, could > > you try with the attached change? > > I'm afraid that's not sufficient: Ah, this is using -Werror, OK, here are more fixes. Samuel diff --git a/slirp/libslirp.h b/slirp/libslirp.h index 81bd139..b6fc584 100644 --- a/slirp/libslirp.h +++ b/slirp/libslirp.h @@ -7,7 +7,7 @@ struct Slirp; typedef struct Slirp Slirp; int get_dns_addr(struct in_addr *pdns_addr); -int get_dns6_addr(struct in6_addr *pdns6_addr, unsigned *scope_id); +int get_dns6_addr(struct in6_addr *pdns6_addr, uint32_t *scope_id); Slirp *slirp_init(int restricted, bool in_enabled, struct in_addr vnetwork, struct in_addr vnetmask, struct in_addr vhost, diff --git a/slirp/slirp.c b/slirp/slirp.c index c6bcc6e..551a63c 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -46,9 +50,13 @@ static QTAILQ_HEAD(slirp_instances, Slirp) slirp_instances = QTAILQ_HEAD_INITIALIZER(slirp_instances); static struct in_addr dns_addr; +#ifndef _WIN32 static struct in6_addr dns6_addr; +#endif static u_int dns_addr_time; +#ifndef _WIN32 static u_int dns6_addr_time; +#endif #define TIMEOUT_FAST 2 /* milliseconds */ #define TIMEOUT_SLOW 499 /* milliseconds */ @@ -110,7 +110,7 @@ int get_dns_addr(struct in_addr *pdns_addr) return 0; } -int get_dns6_addr(struct in6_addr *pdns6_addr, unsigned *scope_id) +int get_dns6_addr(struct in6_addr *pdns6_addr, uint32_t *scope_id) { return -1; } @@ -146,7 +146,7 @@ static int get_dns_addr_cached(void *pdns_addr, void *cached_addr, } static int get_dns_addr_resolv_conf(int af, void *pdns_addr, void *cached_addr, - socklen_t addrlen, unsigned *scope_id, + socklen_t addrlen, uint32_t *scope_id, u_int *cached_time) { char buff[512]; @@ -229,7 +229,7 @@ int get_dns_addr(struct in_addr *pdns_addr) sizeof(dns_addr), NULL, &dns_addr_time); } -int get_dns6_addr(struct in6_addr *pdns6_addr, unsigned *scope_id) +int get_dns6_addr(struct in6_addr *pdns6_addr, uint32_t *scope_id) { static struct stat dns6_addr_stat;