From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KAuO8-0002EQ-6H for qemu-devel@nongnu.org; Mon, 23 Jun 2008 18:19:52 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KAuO6-0002EB-0I for qemu-devel@nongnu.org; Mon, 23 Jun 2008 18:19:51 -0400 Received: from [199.232.76.173] (port=54142 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KAuO5-0002E8-Ru for qemu-devel@nongnu.org; Mon, 23 Jun 2008 18:19:49 -0400 Received: from mail-in-05.arcor-online.net ([151.189.21.45]:43240) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KAuO5-00027x-Gd for qemu-devel@nongnu.org; Mon, 23 Jun 2008 18:19:49 -0400 Message-ID: <486021F8.5050109@arcor.de> Date: Tue, 24 Jun 2008 00:21:44 +0200 From: Henry Nestler MIME-Version: 1.0 References: In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [4267] Treat DNS a special case among special addresses in slirp ( Jason Wessel). Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Hello Andrzej, Andrzej Zaborowski wrote: > Revision: 4267 > http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4267 > Author: balrog > Date: 2008-04-27 21:45:18 +0000 (Sun, 27 Apr 2008) > > Log Message: > ----------- > Treat DNS a special case among special addresses in slirp (Jason Wessel). > > Modified Paths: > -------------- > trunk/slirp/udp.c > > Modified: trunk/slirp/udp.c > =================================================================== > --- trunk/slirp/udp.c 2008-04-27 21:39:40 UTC (rev 4266) > +++ trunk/slirp/udp.c 2008-04-27 21:45:18 UTC (rev 4267) > @@ -318,11 +318,12 @@ > struct sockaddr_in saddr, daddr; > > saddr = *addr; > - if ((so->so_faddr.s_addr & htonl(0xffffff00)) == special_addr.s_addr && > - addr->sin_addr.s_addr == htonl(0x7f000001)) { > - saddr.sin_addr.s_addr = so->so_faddr.s_addr; > + if ((so->so_faddr.s_addr & htonl(0xffffff00)) == special_addr.s_addr) { > if ((so->so_faddr.s_addr & htonl(0x000000ff)) == htonl(0xff)) > saddr.sin_addr.s_addr = alias_addr.s_addr; > + else if (addr->sin_addr.s_addr == loopback_addr.s_addr || > + ((so->so_faddr.s_addr & htonl(CTL_DNS)) == htonl(CTL_DNS))) > + saddr.sin_addr.s_addr = so->so_faddr.s_addr; > } > daddr.sin_addr = so->so_laddr; > daddr.sin_port = so->so_lport; CoLinux found also a problem on this source lines. We have fixed it more simple: /* Check given address for localhost */ #define is_localhost(addr) \ ((addr).s_addr == 0 || (addr).s_addr == loopback_addr.s_addr) ... int udp_output(struct socket *so, struct mbuf *m, struct sockaddr_in *addr) { struct sockaddr_in saddr, daddr; saddr = *addr; /* Translate connections from localhost to the alias hostname */ if(is_localhost(saddr.sin_addr)) { saddr.sin_addr.s_addr = so->so_faddr.s_addr; } daddr.sin_addr = so->so_laddr; daddr.sin_port = so->so_lport; return udp_output2(so, m, &saddr, &daddr, so->so_iptos); } I can not say, how it would work in your environment. Remember: We have changed the host address into localhost (127.0.0.1) and bind it on 0.0.0.0 all times. So we can simple replace all localhost or 0.0.0.0 with the faked address 10.0.2.2 as source. http://colinux.svn.sourceforge.net/viewvc/colinux/branches/devel/src/colinux/user/slirp/udp.c This is our repository. Currently the last change from this mail is not commited. We need some more tests. -- Henry N.