From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59871) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SePxF-0003Kq-0r for qemu-devel@nongnu.org; Tue, 12 Jun 2012 08:12:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SePxC-0003Pl-UY for qemu-devel@nongnu.org; Tue, 12 Jun 2012 08:12:12 -0400 Received: from mta.proceranetworks.com ([194.153.91.40]:39872) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SePxC-0003PI-K0 for qemu-devel@nongnu.org; Tue, 12 Jun 2012 08:12:10 -0400 From: Anders Waldenborg Date: Tue, 12 Jun 2012 14:12:02 +0200 Message-Id: <1339503122-32264-1-git-send-email-anders@0x63.nu> Subject: [Qemu-devel] [PATCH] slirp: Handle whole 127.0.0.0/8 network as local addresses. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jan.kiszka@siemens.com, Anders Waldenborg 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 hostfwd bound to addresses such as 127.0.0.2 works Signed-off-by: Anders Waldenborg --- slirp/main.h | 1 + slirp/slirp.c | 3 +++ slirp/tcp_subr.c | 4 +++- 3 files changed, 7 insertions(+), 1 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..dbb83ec 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(0xff000000); /* 255.0.0.0 */ } static void slirp_state_save(QEMUFile *f, void *opaque); diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c index 0a545c4..71f2b19 100644 --- a/slirp/tcp_subr.c +++ b/slirp/tcp_subr.c @@ -435,7 +435,9 @@ 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) + 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 */ -- 1.7.2.5