From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49224) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Smva4-0007Pm-M0 for qemu-devel@nongnu.org; Thu, 05 Jul 2012 19:35:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Smva2-0008UK-Ix for qemu-devel@nongnu.org; Thu, 05 Jul 2012 19:35:28 -0400 Received: from mout.web.de ([212.227.17.11]:60046) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Smva2-0008TG-9J for qemu-devel@nongnu.org; Thu, 05 Jul 2012 19:35:26 -0400 Message-ID: <4FF624BA.7000208@web.de> Date: Fri, 06 Jul 2012 01:35:22 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <1339503122-32264-1-git-send-email-anders@0x63.nu> In-Reply-To: <1339503122-32264-1-git-send-email-anders@0x63.nu> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig7FFA958DA5F71411F80C983F" Subject: Re: [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: Anders Waldenborg Cc: qemu-devel@nongnu.org This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig7FFA958DA5F71411F80C983F Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable On 2012-06-12 14:12, Anders Waldenborg wrote: > 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. >=20 > This fixes hostfwd bound to addresses such as 127.0.0.2 works Looks good, just two nits below. >=20 > 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(-) >=20 > 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 @@ > =20 > /* host loopback address */ > struct in_addr loopback_addr; > +/* host loopback network mask */ > +in_addr_t loopback_mask; > =20 > /* emulated hosts use the MAC addr 52:55:IP:IP:IP:IP */ > static const uint8_t special_ethaddr[ETH_ALEN] =3D { > @@ -191,6 +193,7 @@ static void slirp_init_once(void) > #endif > =20 > loopback_addr.s_addr =3D htonl(INADDR_LOOPBACK); > + loopback_mask =3D htonl(0xff000000); /* 255.0.0.0 */ IN_CLASSA_NET would be clearer. > } > =20 > 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 =3D addr.sin_port; > so->so_faddr =3D addr.sin_addr; > /* Translate connections from localhost to the real hostname */ > - if (so->so_faddr.s_addr =3D=3D 0 || so->so_faddr.s_addr =3D=3D loopba= ck_addr.s_addr) > + if ((so->so_faddr.s_addr =3D=3D 0) || The inner braces are unneeded, also below (wouldn't mind if the above remark didn't require a v2 anyway). > + ((so->so_faddr.s_addr & loopback_mask) =3D=3D > + (loopback_addr.s_addr & loopback_mask))) > so->so_faddr =3D slirp->vhost_addr; > =20 > /* Close the accept() socket, set right state */ >=20 Thanks, Jan --------------enig7FFA958DA5F71411F80C983F Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk/2JLoACgkQitSsb3rl5xSQXgCgja+Ijv0zehUp66E911co1JST DUIAoNYkTKgQ/xV/hLE9cmsMtBILQlgv =Mugp -----END PGP SIGNATURE----- --------------enig7FFA958DA5F71411F80C983F--