From owner-svn-src-all@FreeBSD.ORG Tue Apr 21 04:47:21 2009 Return-Path: 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 A064D1065674 for ; Tue, 21 Apr 2009 04:47:21 +0000 (UTC) (envelope-from qingli@speakeasy.net) Received: from mail8.sea5.speakeasy.net (mail8.sea5.speakeasy.net [69.17.117.10]) by mx1.freebsd.org (Postfix) with ESMTP id 7CFCE8FC14 for ; Tue, 21 Apr 2009 04:47:21 +0000 (UTC) (envelope-from qingli@speakeasy.net) Received: (qmail 27853 invoked from network); 21 Apr 2009 04:20:40 -0000 Received: from dsl081-051-194.sfo1.dsl.speakeasy.net (HELO qm8nwm5acsx) ([64.81.51.194]) (envelope-sender ) by mail8.sea5.speakeasy.net (qmail-ldap-1.03) with SMTP for ; 21 Apr 2009 04:20:40 -0000 From: "Qing Li" To: "'Bjoern A. Zeeb'" , , , Date: Mon, 20 Apr 2009 21:20:38 -0700 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Mailer: Microsoft Office Outlook, Build 11.0.5510 In-Reply-To: <200904201122.n3KBMpTD044791@svn.freebsd.org> X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.5579 Thread-Index: AcnBqmiVjwCKGDKDSl6u4oLBr+k1oAAjglEg Message-Id: <20090421044721.7CFCE8FC14@mx1.freebsd.org> Cc: Subject: RE: 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Apr 2009 04:47:21 -0000 Are you really sure backing this change out is the right thing to do ?? -- Qing > -----Original Message----- > From: owner-src-committers@FreeBSD.org > [mailto:owner-src-committers@FreeBSD.org] On Behalf Of Bjoern A. Zeeb > Sent: Monday, April 20, 2009 4:23 AM > To: src-committers@freebsd.org; svn-src-all@freebsd.org; > svn-src-head@freebsd.org > Subject: svn commit: r191305 - head/usr.sbin/ppp > > 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 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); > >