From patchwork Thu Apr 28 12:18:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 616183 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qwbTb2gSWz9t7W for ; Thu, 28 Apr 2016 22:18:43 +1000 (AEST) Received: from localhost ([::1]:48461 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avku1-0003hR-9u for incoming@patchwork.ozlabs.org; Thu, 28 Apr 2016 08:18:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49399) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avktd-00034P-Qt for qemu-devel@nongnu.org; Thu, 28 Apr 2016 08:18:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1avktZ-0003aT-PT for qemu-devel@nongnu.org; Thu, 28 Apr 2016 08:18:17 -0400 Received: from mail2-relais-roc.national.inria.fr ([192.134.164.83]:61088) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avktZ-0003aD-IU for qemu-devel@nongnu.org; Thu, 28 Apr 2016 08:18:13 -0400 X-IronPort-AV: E=Sophos;i="5.24,546,1454972400"; d="scan'208";a="216194162" Received: from unknown (HELO var.youpi.perso.aquilenet.fr) ([193.50.110.248]) by mail2-relais-roc.national.inria.fr with ESMTP/TLS/AES128-GCM-SHA256; 28 Apr 2016 14:18:08 +0200 Received: from samy by var.youpi.perso.aquilenet.fr with local (Exim 4.87) (envelope-from ) id 1avktU-0002rA-Lf; Thu, 28 Apr 2016 14:18:08 +0200 Date: Thu, 28 Apr 2016 14:18:08 +0200 From: Samuel Thibault To: Programmingkid Message-ID: <20160428121808.GE3153@var.bordeaux.inria.fr> References: <3CC6094E-027E-417D-A110-4E60100A9756@gmail.com> <20160426190042.GC25204@work-vm> <9DF8AED7-D573-4CE4-BA8C-897B2A89A183@gmail.com> <571FCBBF.8020405@redhat.com> <7516025E-F08C-4DD4-B1D1-E822C96B7B0A@gmail.com> <57205D8A.5010107@redhat.com> <51A2E196-A95B-4133-BC9E-2B820502633E@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <51A2E196-A95B-4133-BC9E-2B820502633E@gmail.com> 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.83 Subject: Re: [Qemu-devel] Is anyone able to load a web page from a guest operating system? X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , "Dr. David Alan Gilbert" , qemu-devel qemu-devel Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Programmingkid, on Wed 27 Apr 2016 20:25:26 -0400, wrote: > Found out which patch was causing problems. This one: > > commit 5379229a2708df3a1506113315214c3ce5325859 > Author: Guillaume Subiron > Date: Sat Dec 19 22:24:59 2015 +0100 > > slirp: Factorizing address translation Could you try the attached patch? Samuel Reviewed-by: John Arbuckle diff --git a/slirp/ip_icmp.c b/slirp/ip_icmp.c index 590dada..5ffc7a6 100644 --- a/slirp/ip_icmp.c +++ b/slirp/ip_icmp.c @@ -186,7 +186,7 @@ icmp_input(struct mbuf *m, int hlen) sotranslate_out(so, &addr); if(sendto(so->s, icmp_ping_msg, strlen(icmp_ping_msg), 0, - (struct sockaddr *)&addr, sizeof(addr)) == -1) { + (struct sockaddr *)&addr, sockaddr_size(&addr)) == -1) { DEBUG_MISC((dfd,"icmp_input udp sendto tx errno = %d-%s\n", errno,strerror(errno))); icmp_send_error(m, ICMP_UNREACH, ICMP_UNREACH_NET, 0, strerror(errno)); diff --git a/slirp/socket.c b/slirp/socket.c index bd97b2d..a10eff1 100644 --- a/slirp/socket.c +++ b/slirp/socket.c @@ -627,7 +627,7 @@ sosendto(struct socket *so, struct mbuf *m) /* Don't care what port we get */ ret = sendto(so->s, m->m_data, m->m_len, 0, - (struct sockaddr *)&addr, sizeof(addr)); + (struct sockaddr *)&addr, sockaddr_size(&addr)); if (ret < 0) return -1; diff --git a/slirp/socket.h b/slirp/socket.h index 7dca506..b602e69 100644 --- a/slirp/socket.h +++ b/slirp/socket.h @@ -122,6 +122,18 @@ static inline int sockaddr_equal(struct sockaddr_storage *a, return 0; } +static inline socklen_t sockaddr_size(struct sockaddr_storage *a) +{ + switch (a->ss_family) { + case AF_INET: + return sizeof(struct sockaddr_in); + case AF_INET6: + return sizeof(struct sockaddr_in6); + default: + g_assert_not_reached(); + } +} + struct socket *solookup(struct socket **, struct socket *, struct sockaddr_storage *, struct sockaddr_storage *); struct socket *socreate(Slirp *); diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c index 32ff452..58eaf59 100644 --- a/slirp/tcp_subr.c +++ b/slirp/tcp_subr.c @@ -413,7 +413,7 @@ int tcp_fconnect(struct socket *so, unsigned short af) sotranslate_out(so, &addr); /* We don't care what port we get */ - ret = connect(s,(struct sockaddr *)&addr,sizeof (addr)); + ret = connect(s,(struct sockaddr *)&addr, sockaddr_size(&addr)); /* * If it's not in progress, it failed, so we just return 0,