From owner-svn-src-all@FreeBSD.ORG  Tue Feb  2 20:38:31 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 12EE51065670;
	Tue,  2 Feb 2010 20:38:31 +0000 (UTC)
	(envelope-from qingli@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A12488FC13;
	Tue,  2 Feb 2010 20:38:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o12KcUvB070881;
	Tue, 2 Feb 2010 20:38:30 GMT (envelope-from qingli@svn.freebsd.org)
Received: (from qingli@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o12KcU3E070879;
	Tue, 2 Feb 2010 20:38:30 GMT (envelope-from qingli@svn.freebsd.org)
Message-Id: <201002022038.o12KcU3E070879@svn.freebsd.org>
From: Qing Li <qingli@FreeBSD.org>
Date: Tue, 2 Feb 2010 20:38:30 +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: r203401 - head/sys/netinet
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Feb 2010 20:38:31 -0000

Author: qingli
Date: Tue Feb  2 20:38:30 2010
New Revision: 203401
URL: http://svn.freebsd.org/changeset/base/203401

Log:
  Some of the existing ppp and vpn related scripts create and set
  the IP addresses of the tunnel end points to the same value. In
  these cases the loopback route is not installed for the local
  end.
  
  Verified by:	avg
  MFC after:	5 days

Modified:
  head/sys/netinet/in.c

Modified: head/sys/netinet/in.c
==============================================================================
--- head/sys/netinet/in.c	Tue Feb  2 20:37:11 2010	(r203400)
+++ head/sys/netinet/in.c	Tue Feb  2 20:38:30 2010	(r203401)
@@ -921,6 +921,12 @@ in_ifinit(struct ifnet *ifp, struct in_i
 	if (ia->ia_addr.sin_addr.s_addr == INADDR_ANY)
 		return (0);
 
+	if (ifp->if_flags & IFF_POINTOPOINT) {
+		if (ia->ia_dstaddr.sin_addr.s_addr == ia->ia_addr.sin_addr.s_addr)
+			return (0);
+	}
+
+
 	/*
 	 * add a loopback route to self
 	 */