svn commit: r260379 - head/sys/net

[Sergey Kandaurov]

07.01.2014 2:36 пользователь "Alexander V. Chernikov" <melifaro at freebsd.org>
написал:
>
> Author: melifaro
> Date: Mon Jan  6 22:36:20 2014
> New Revision: 260379
> URL: http://svnweb.freebsd.org/changeset/base/260379
>
> Log:
>   Partially fix IPv4 interface routes deletion in RADIX_MPATH.
>
>   Noticed by:   Nikolay Denev <ndenev at gmail.com>
>   MFC after:    1 month
>
> Modified:
>   head/sys/net/radix_mpath.c
>   head/sys/net/route.c
>
> Modified: head/sys/net/radix_mpath.c
>
==============================================================================
> --- head/sys/net/radix_mpath.c  Mon Jan  6 19:14:46 2014        (r260378)
> +++ head/sys/net/radix_mpath.c  Mon Jan  6 22:36:20 2014        (r260379)
> @@ -112,11 +112,16 @@ rt_mpath_matchgate(struct rtentry *rt, s
>                 if (rt->rt_gateway->sa_family == AF_LINK) {
>                         if (!memcmp(rt->rt_ifa->ifa_addr, gate,
gate->sa_len))
>                                 break;
> -               } else {
> -                       if (rt->rt_gateway->sa_len == gate->sa_len &&
> -                           !memcmp(rt->rt_gateway, gate, gate->sa_len))
> -                               break;
>                 }
> +
> +               /*
> +                * Check for other options:
> +                * 1) Routes with 'real' IPv4/IPv6 gateway
> +                * 2) Loopback host routes (another AF_LINK/sockadd_dl
check)

sockaddr_dl