svn commit: r191305 - head/usr.sbin/ppp

[Qing Li]

Are you really sure backing this change out is the right thing to do ??

-- Qing
 

> -----Original Message-----
> From: owner-src-committers at FreeBSD.org 
> [mailto:owner-src-committers at FreeBSD.org] On Behalf Of Bjoern A. Zeeb
> Sent: Monday, April 20, 2009 4:23 AM
> To: src-committers at freebsd.org; svn-src-all at freebsd.org; 
> svn-src-head at 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<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);
> 
>