From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JqEgS-0003L3-W5
	for qemu-devel@nongnu.org; Sun, 27 Apr 2008 17:45:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JqEgS-0003Kp-1e
	for qemu-devel@nongnu.org; Sun, 27 Apr 2008 17:45:20 -0400
Received: from [199.232.76.173] (port=52386 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JqEgR-0003Ki-Uo
	for qemu-devel@nongnu.org; Sun, 27 Apr 2008 17:45:19 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <balrogg@gmail.com>) id 1JqEgR-0001qT-Ls
	for qemu-devel@nongnu.org; Sun, 27 Apr 2008 17:45:19 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <balrogg@gmail.com>) id 1JqEgR-0006oG-66
	for qemu-devel@nongnu.org; Sun, 27 Apr 2008 21:45:19 +0000
Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <balrog@savannah.gnu.org>) id 1JqEgQ-0006oC-Te
	for qemu-devel@nongnu.org; Sun, 27 Apr 2008 21:45:19 +0000
MIME-Version: 1.0
Errors-To: balrog
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Andrzej Zaborowski <balrogg@gmail.com>
Message-Id: <E1JqEgQ-0006oC-Te@cvs.savannah.gnu.org>
Date: Sun, 27 Apr 2008 21:45:18 +0000
Subject: [Qemu-devel] [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: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

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;