From b6c8e808fcea80da8bb97078ff942a0b9001e1c1 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Wed, 9 Jun 2010 17:41:10 +0200 Subject: [PATCH] ip: add support for multicast rules commit 44a5293c1c47b8c32d9bb0756660ea5d4802acf2 Author: Patrick McHardy Date: Tue Apr 13 17:03:47 2010 +0200 ip: add support for multicast rules Signed-off-by: Patrick McHardy --- ip/ip.c | 3 ++- ip/ip_common.h | 1 + ip/iprule.c | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/ip/ip.c b/ip/ip.c index e0cf1753..9f295334 100644 --- a/ip/ip.c +++ b/ip/ip.c @@ -42,7 +42,7 @@ static void usage(void) "Usage: ip [ OPTIONS ] OBJECT { COMMAND | help }\n" " ip [ -force ] -batch filename\n" "where OBJECT := { link | addr | addrlabel | route | rule | neigh | ntable |\n" -" tunnel | tuntap | maddr | mroute | monitor | xfrm }\n" +" tunnel | tuntap | maddr | mroute | mrule | monitor | xfrm }\n" " OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n" " -f[amily] { inet | inet6 | ipx | dnet | link } |\n" " -o[neline] | -t[imestamp] | -b[atch] [filename] |\n" @@ -76,6 +76,7 @@ static const struct cmd { { "monitor", do_ipmonitor }, { "xfrm", do_xfrm }, { "mroute", do_multiroute }, + { "mrule", do_multirule }, { "help", do_help }, { 0 } }; diff --git a/ip/ip_common.h b/ip/ip_common.h index c8576673..a1141869 100644 --- a/ip/ip_common.h +++ b/ip/ip_common.h @@ -37,6 +37,7 @@ extern int do_iplink(int argc, char **argv); extern int do_ipmonitor(int argc, char **argv); extern int do_multiaddr(int argc, char **argv); extern int do_multiroute(int argc, char **argv); +extern int do_multirule(int argc, char **argv); extern int do_xfrm(int argc, char **argv); static inline int rtm_get_table(struct rtmsg *r, struct rtattr **tb) diff --git a/ip/iprule.c b/ip/iprule.c index 7140375f..9c8c6ef6 100644 --- a/ip/iprule.c +++ b/ip/iprule.c @@ -436,3 +436,20 @@ int do_iprule(int argc, char **argv) exit(-1); } +int do_multirule(int argc, char **argv) +{ + switch (preferred_family) { + case AF_UNSPEC: + case AF_INET: + preferred_family = RTNL_FAMILY_IPMR; + break; + case AF_INET6: + preferred_family = RTNL_FAMILY_IP6MR; + break; + default: + fprintf(stderr, "Multicast rules are only supported for IPv4/IPv6\n"); + exit(-1); + } + + return do_iprule(argc, argv); +} -- 2.39.5