| Message ID | 1484645552-29440-4-git-send-email-liuhangbin@gmail.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | stephen hemminger |
| Headers | show |
On 17/01/17 10:32, Hangbin Liu wrote: > This patch implements support for the IFLA_BR_MCAST_STATS_ENABLED > attribute in iproute2 so it can change the mcast state. > > Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> > --- It is not state, it is _stats_. Calling it mcast_state is completely wrong, please change the name to something like mcast_stats_enabled which is closer to the sysfs and netlink attribute. > ip/iplink_bridge.c | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c > index 8caf53a..622bd07 100644 > --- a/ip/iplink_bridge.c > +++ b/ip/iplink_bridge.c > @@ -49,6 +49,7 @@ static void print_explain(FILE *f) > " [ mcast_query_interval QUERY_INTERVAL ]\n" > " [ mcast_query_response_interval QUERY_RESPONSE_INTERVAL ]\n" > " [ mcast_startup_query_interval STARTUP_QUERY_INTERVAL ]\n" > + " [ mcast_state MCAST_STATE ]\n" > " [ nf_call_iptables NF_CALL_IPTABLES ]\n" > " [ nf_call_ip6tables NF_CALL_IP6TABLES ]\n" > " [ nf_call_arptables NF_CALL_ARPTABLES ]\n" > @@ -299,6 +300,14 @@ static int bridge_parse_opt(struct link_util *lu, int argc, char **argv, > > addattr64(n, 1024, IFLA_BR_MCAST_STARTUP_QUERY_INTVL, > mcast_startup_query_intvl); > + } else if (matches(*argv, "mcast_state") == 0) { > + __u8 mcast_state; > + > + NEXT_ARG(); > + if (get_u8(&mcast_state, *argv, 0)) > + invarg("invalid mcast_state", *argv); > + addattr8(n, 1024, IFLA_BR_MCAST_STATS_ENABLED, > + mcast_state); > } else if (matches(*argv, "nf_call_iptables") == 0) { > __u8 nf_call_ipt; > > @@ -524,6 +533,10 @@ static void bridge_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) > fprintf(f, "mcast_startup_query_interval %llu ", > rta_getattr_u64(tb[IFLA_BR_MCAST_STARTUP_QUERY_INTVL])); > > + if (tb[IFLA_BR_MCAST_STATS_ENABLED]) > + fprintf(f, "mcast_state %u ", > + rta_getattr_u8(tb[IFLA_BR_MCAST_STATS_ENABLED])); > + > if (tb[IFLA_BR_NF_CALL_IPTABLES]) > fprintf(f, "nf_call_iptables %u ", > rta_getattr_u8(tb[IFLA_BR_NF_CALL_IPTABLES])); >
diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c index 8caf53a..622bd07 100644 --- a/ip/iplink_bridge.c +++ b/ip/iplink_bridge.c @@ -49,6 +49,7 @@ static void print_explain(FILE *f) " [ mcast_query_interval QUERY_INTERVAL ]\n" " [ mcast_query_response_interval QUERY_RESPONSE_INTERVAL ]\n" " [ mcast_startup_query_interval STARTUP_QUERY_INTERVAL ]\n" + " [ mcast_state MCAST_STATE ]\n" " [ nf_call_iptables NF_CALL_IPTABLES ]\n" " [ nf_call_ip6tables NF_CALL_IP6TABLES ]\n" " [ nf_call_arptables NF_CALL_ARPTABLES ]\n" @@ -299,6 +300,14 @@ static int bridge_parse_opt(struct link_util *lu, int argc, char **argv, addattr64(n, 1024, IFLA_BR_MCAST_STARTUP_QUERY_INTVL, mcast_startup_query_intvl); + } else if (matches(*argv, "mcast_state") == 0) { + __u8 mcast_state; + + NEXT_ARG(); + if (get_u8(&mcast_state, *argv, 0)) + invarg("invalid mcast_state", *argv); + addattr8(n, 1024, IFLA_BR_MCAST_STATS_ENABLED, + mcast_state); } else if (matches(*argv, "nf_call_iptables") == 0) { __u8 nf_call_ipt; @@ -524,6 +533,10 @@ static void bridge_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) fprintf(f, "mcast_startup_query_interval %llu ", rta_getattr_u64(tb[IFLA_BR_MCAST_STARTUP_QUERY_INTVL])); + if (tb[IFLA_BR_MCAST_STATS_ENABLED]) + fprintf(f, "mcast_state %u ", + rta_getattr_u8(tb[IFLA_BR_MCAST_STATS_ENABLED])); + if (tb[IFLA_BR_NF_CALL_IPTABLES]) fprintf(f, "nf_call_iptables %u ", rta_getattr_u8(tb[IFLA_BR_NF_CALL_IPTABLES]));
This patch implements support for the IFLA_BR_MCAST_STATS_ENABLED attribute in iproute2 so it can change the mcast state. Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> --- ip/iplink_bridge.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)