From 0d1c9b570a40e3eef8c053a229713ac9344a4f83 Mon Sep 17 00:00:00 2001 From: Ben Greear Date: Thu, 15 Jul 2010 15:48:10 -0700 Subject: [PATCH] iproute2: Fix batch-mode for mrules. 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 --- ip/iprule.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ip/iprule.c b/ip/iprule.c index 9c8c6ef6..d3b97e2a 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); }