From owner-svn-src-head@FreeBSD.ORG  Sun Dec 14 17:47:33 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D872D1065679;
	Sun, 14 Dec 2008 17:47:33 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BA37C8FC18;
	Sun, 14 Dec 2008 17:47:33 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBEHlXse065235;
	Sun, 14 Dec 2008 17:47:33 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBEHlXGF065234;
	Sun, 14 Dec 2008 17:47:33 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200812141747.mBEHlXGF065234@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sun, 14 Dec 2008 17:47:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186086 - head/sys/netinet
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Dec 2008 17:47:34 -0000

Author: bz
Date: Sun Dec 14 17:47:33 2008
New Revision: 186086
URL: http://svn.freebsd.org/changeset/base/186086

Log:
  Add a check, that is currently under discussion for 8 but that we need
  to keep for 7-STABLE when MFCing in_pcbladdr() to not change the
  behaviour there.
  
  With this a destination route via a loopback interface is treated as
  a valid and reachable thing for IPv4 source address selection, even
  though nothing of that network is ever directly reachable, but it is
  more like a blackhole route.
  With this the source address will be selected and IPsec can grab the
  packets before we would discard them at a later point, encapsulate them
  and send them out from a different tunnel endpoint IP.
  
  Discussed on:	net
  Reported by:	Frank Behrens <frank@harz.behrens.de>
  Tested by:	Frank Behrens <frank@harz.behrens.de>
  MFC after:	4 weeks (just so that I get the mail)

Modified:
  head/sys/netinet/in_pcb.c

Modified: head/sys/netinet/in_pcb.c
==============================================================================
--- head/sys/netinet/in_pcb.c	Sun Dec 14 16:56:47 2008	(r186085)
+++ head/sys/netinet/in_pcb.c	Sun Dec 14 17:47:33 2008	(r186086)
@@ -695,6 +695,10 @@ in_pcbladdr(struct inpcb *inp, struct in
 			ia = ifatoia(ifa_ifwithnet(sintosa(&sain)));
 
 		if (cred == NULL || !jailed(cred)) {
+#if __FreeBSD_version < 800000
+			if (ia == NULL)
+				ia = (struct in_ifaddr *)sro.ro_rt->rt_ifa;
+#endif
 			if (ia == NULL) {
 				error = ENETUNREACH;
 				goto done;