From patchwork Fri Jul 13 10:37:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Waldenborg X-Patchwork-Id: 170839 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1A6A22C035B for ; Fri, 13 Jul 2012 20:37:41 +1000 (EST) Received: from localhost ([::1]:44491 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SpdFj-0007MD-BO for incoming@patchwork.ozlabs.org; Fri, 13 Jul 2012 06:37:39 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33817) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SpdFX-0007M8-Qj for qemu-devel@nongnu.org; Fri, 13 Jul 2012 06:37:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SpdFW-0003X7-Lg for qemu-devel@nongnu.org; Fri, 13 Jul 2012 06:37:27 -0400 Received: from 0x63.nu ([193.26.17.18]:50477 helo=gagarin) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SpdFW-0003Wj-F1 for qemu-devel@nongnu.org; Fri, 13 Jul 2012 06:37:26 -0400 Received: from andersg by gagarin with local (Exim 4.72) (envelope-from ) id 1SpdFO-00025j-3e; Fri, 13 Jul 2012 12:37:18 +0200 Date: Fri, 13 Jul 2012 12:37:18 +0200 From: Anders Waldenborg To: Jan Kiszka Message-ID: <20120713103717.GA5111@gagarin.0x63.nu> References: <1339503122-32264-1-git-send-email-anders@0x63.nu> <4FF624BA.7000208@web.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4FF624BA.7000208@web.de> User-Agent: Mutt/1.5.20 (2009-06-14) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: andersg@gagarin.0x63.nu X-SA-Exim-Scanned: No (on gagarin); SAEximRunCond expanded to false X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 193.26.17.18 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH v2] slirp: Handle whole 127.0.0.0/8 network as local addresses. 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Changes so translation of remote address to the host's ip address in the virtual network happens for all addresses in the 127.0.0.0/8 network, not just 127.0.0.1. This fixes so that hostfwd bound to addresses such as 127.0.0.2 works. Signed-off-by: Anders Waldenborg --- Thanks for the review! Patch updated according to comments. Notice that the surrounding code in tcp_subr.c uses tabs for indentation. Should I still use space as the coding style mandates (and which makes checkpatch happy)? slirp/main.h | 1 + slirp/slirp.c | 3 +++ slirp/tcp_subr.c | 6 ++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/slirp/main.h b/slirp/main.h index 028df4b..bf601e2 100644 --- a/slirp/main.h +++ b/slirp/main.h @@ -31,6 +31,7 @@ extern char *exec_shell; extern u_int curtime; extern fd_set *global_readfds, *global_writefds, *global_xfds; extern struct in_addr loopback_addr; +extern in_addr_t loopback_mask; extern char *username; extern char *socket_path; extern int towrite_max; diff --git a/slirp/slirp.c b/slirp/slirp.c index 90473eb..9787104 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -29,6 +29,8 @@ /* host loopback address */ struct in_addr loopback_addr; +/* host loopback network mask */ +in_addr_t loopback_mask; /* emulated hosts use the MAC addr 52:55:IP:IP:IP:IP */ static const uint8_t special_ethaddr[ETH_ALEN] = { @@ -191,6 +193,7 @@ static void slirp_init_once(void) #endif loopback_addr.s_addr = htonl(INADDR_LOOPBACK); + loopback_mask = htonl(IN_CLASSA_NET); } static void slirp_state_save(QEMUFile *f, void *opaque); diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c index 0a545c4..064b5e8 100644 --- a/slirp/tcp_subr.c +++ b/slirp/tcp_subr.c @@ -435,8 +435,10 @@ tcp_connect(struct socket *inso) so->so_fport = addr.sin_port; so->so_faddr = addr.sin_addr; /* Translate connections from localhost to the real hostname */ - if (so->so_faddr.s_addr == 0 || so->so_faddr.s_addr == loopback_addr.s_addr) - so->so_faddr = slirp->vhost_addr; + if (so->so_faddr.s_addr == 0 || + (so->so_faddr.s_addr & loopback_mask) == + (loopback_addr.s_addr & loopback_mask)) + so->so_faddr = slirp->vhost_addr; /* Close the accept() socket, set right state */ if (inso->so_state & SS_FACCEPTONCE) {