[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20100723090327.2af5ad1f@nehalam>
Date: Fri, 23 Jul 2010 09:03:27 -0700
From: Stephen Hemminger <shemminger@...tta.com>
To: Ben Greear <greearb@...delatech.com>
Cc: netdev@...r.kernel.org
Subject: Re: [iproute2] iproute2: Fix batch-mode for mrules.
On Thu, 15 Jul 2010 15:48:10 -0700
Ben Greear <greearb@...delatech.com> wrote:
> The do_multirule logic was broken in batch mode because
> it expected the preferred_family to be AF_INET or AF_INET6,
> but it then assigned it to RTNL_FAMILY_IPMR or RTNL_FAMILY_IP6MR.
> So, the next iteration of the batch processing, it failed
> the check for AF_INET or AF_INET6.
>
> Signed-off-by: Ben Greear <greearb@...delatech.com>
> ---
> :100644 100644 9c8c6ef... d3b97e2... M ip/iprule.c
> ip/iprule.c | 6 +++++-
> 1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/ip/iprule.c b/ip/iprule.c
> index 9c8c6ef..d3b97e2 100644
> --- a/ip/iprule.c
> +++ b/ip/iprule.c
> @@ -446,8 +446,12 @@ int do_multirule(int argc, char **argv)
> case AF_INET6:
> preferred_family = RTNL_FAMILY_IP6MR;
> break;
> + case RTNL_FAMILY_IPMR:
> + case RTNL_FAMILY_IP6MR:
> + break;
> default:
> - fprintf(stderr, "Multicast rules are only supported for IPv4/IPv6\n");
> + fprintf(stderr, "Multicast rules are only supported for IPv4/IPv6, was: %i\n",
> + preferred_family);
> exit(-1);
> }
>
Applied
--
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists