From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JpmPJ-0008AD-Ab
	for qemu-devel@nongnu.org; Sat, 26 Apr 2008 11:33:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JpmPI-00089w-CR
	for qemu-devel@nongnu.org; Sat, 26 Apr 2008 11:33:44 -0400
Received: from [199.232.76.173] (port=39113 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JpmPI-00089t-6r
	for qemu-devel@nongnu.org; Sat, 26 Apr 2008 11:33:44 -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 1JpmPI-0007wL-07
	for qemu-devel@nongnu.org; Sat, 26 Apr 2008 11:33:44 -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 1JpmPH-000175-7D
	for qemu-devel@nongnu.org; Sat, 26 Apr 2008 15:33:43 +0000
Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <balrog@savannah.gnu.org>) id 1JpmPG-000170-Qa
	for qemu-devel@nongnu.org; Sat, 26 Apr 2008 15:33:43 +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: <E1JpmPG-000170-Qa@cvs.savannah.gnu.org>
Date: Sat, 26 Apr 2008 15:33:42 +0000
Subject: [Qemu-devel] [4259] Fix slirp udp source address contamination
	(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: 4259
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4259
Author:   balrog
Date:     2008-04-26 15:33:41 +0000 (Sat, 26 Apr 2008)

Log Message:
-----------
Fix slirp udp source address contamination (Jason Wessel)

Modified Paths:
--------------
    trunk/slirp/udp.c

Modified: trunk/slirp/udp.c
===================================================================
--- trunk/slirp/udp.c	2008-04-26 14:50:48 UTC (rev 4258)
+++ trunk/slirp/udp.c	2008-04-26 15:33:41 UTC (rev 4259)
@@ -318,7 +318,8 @@
     struct sockaddr_in saddr, daddr;
 
     saddr = *addr;
-    if ((so->so_faddr.s_addr & htonl(0xffffff00)) == special_addr.s_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(0x000000ff)) == htonl(0xff))
             saddr.sin_addr.s_addr = alias_addr.s_addr;