From owner-svn-src-all@FreeBSD.ORG  Mon Apr 20 11:22:51 2009
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 C07D5106571A;
	Mon, 20 Apr 2009 11:22:51 +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 AEAAE8FC1F;
	Mon, 20 Apr 2009 11:22:51 +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 n3KBMp8D044792;
	Mon, 20 Apr 2009 11:22:51 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3KBMpTD044791;
	Mon, 20 Apr 2009 11:22:51 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200904201122.n3KBMpTD044791@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Mon, 20 Apr 2009 11:22:51 +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: r191305 - head/usr.sbin/ppp
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: Mon, 20 Apr 2009 11:22:53 -0000

Author: bz
Date: Mon Apr 20 11:22:51 2009
New Revision: 191305
URL: http://svn.freebsd.org/changeset/base/191305

Log:
  Back out r186308:
  
  in case of AF_LINK, which the kernel still returns for an RTAX_GATEWAY
  as an empty sockaddr_dl in the classic tun<n> case.
  Copying the address into the message payload, but not the RTA_GATEWAY
  flag results in rt_xaddrs() in the kernel tripping over that and parsing
  the next attribute set with a flag, i.e. RTA_NETMASK, with the gateway
  address, resulting in bogus route entry.
  
  MFC after:	3 days

Modified:
  head/usr.sbin/ppp/route.c

Modified: head/usr.sbin/ppp/route.c
==============================================================================
--- head/usr.sbin/ppp/route.c	Mon Apr 20 10:40:42 2009	(r191304)
+++ head/usr.sbin/ppp/route.c	Mon Apr 20 11:22:51 2009	(r191305)
@@ -910,10 +910,8 @@ rt_Update(struct bundle *bundle, const s
     p += memcpy_roundup(p, dst, dst->sa_len);
   }
 
-  if (gw != NULL && (gw->sa_family != AF_LINK))
-    rtmes.m_rtm.rtm_addrs |= RTA_GATEWAY;
+  rtmes.m_rtm.rtm_addrs |= RTA_GATEWAY;
   p += memcpy_roundup(p, gw, gw->sa_len);
-
   if (mask) {
     rtmes.m_rtm.rtm_addrs |= RTA_NETMASK;
     p += memcpy_roundup(p, mask, mask->sa_len);