From owner-p4-projects@FreeBSD.ORG  Mon Feb 16 16:06:55 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 251FA1065672; Mon, 16 Feb 2009 16:06:55 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D8C0D106566C
	for <perforce@freebsd.org>; Mon, 16 Feb 2009 16:06:54 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C80C08FC08
	for <perforce@freebsd.org>; Mon, 16 Feb 2009 16:06:54 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1GG6siU054580
	for <perforce@freebsd.org>; Mon, 16 Feb 2009 16:06:54 GMT
	(envelope-from andre@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1GG6sWk054578
	for perforce@freebsd.org; Mon, 16 Feb 2009 16:06:54 GMT
	(envelope-from andre@freebsd.org)
Date: Mon, 16 Feb 2009 16:06:54 GMT
Message-Id: <200902161606.n1GG6sWk054578@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	andre@freebsd.org using -f
From: Andre Oppermann <andre@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 157794 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Feb 2009 16:06:55 -0000

http://perforce.freebsd.org/chv.cgi?CH=157794

Change 157794 by andre@andre_flirtbox on 2009/02/16 16:06:03

	Do not insert our outgoing interface address when forwarding
	and the source IP is 0.0.0.0.

Affected files ...

.. //depot/projects/tcp_new/netinet/ip_output.c#3 edit

Differences ...

==== //depot/projects/tcp_new/netinet/ip_output.c#3 (text+ko) ====

@@ -362,13 +362,15 @@
 
 	/*
 	 * If the source address is not specified yet, use the address
-	 * of the outoing interface.
+	 * of the outoing interface.  Packet with an unspecified source
+	 * address may be not be forwarded.
 	 */
 	if (ip->ip_src.s_addr == INADDR_ANY) {
-		/* Interface may have no addresses. */
-		if (ia != NULL) {
+		/* XXX: Interface may have no addresses. */
+		if (ia != NULL && !(flags & IP_FORWARDING))
 			ip->ip_src = IA_SIN(ia)->sin_addr;
-		}
+		else
+			goto bad;
 	}
 
 	/*