matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bridge: vlan: add global mcast_snooping option 

Add control and dump support for the global mcast_snooping option which
controls if multicast snooping is enabled or disabled for a single vlan.
Syntax: $ bridge vlan global set dev bridge vid 1 mcast_snooping 1

Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: David Ahern <dsahern@kernel.org>
This commit is contained in:
Nikolay Aleksandrov 2021-08-28 14:07:53 +03:00 committed by David Ahern
parent dee5eb05e5
commit 1f608d590c
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bridge/vlan.c
View File

@ -9,6 +9,7 @@
#include <linux/if_bridge.h> #include <linux/if_bridge.h>
#include <linux/if_ether.h> #include <linux/if_ether.h>
#include <string.h> #include <string.h>
#include <errno.h>
#include "json_print.h" #include "json_print.h"
#include "libnetlink.h" #include "libnetlink.h"
@ -38,6 +39,7 @@ static void usage(void)
" bridge vlan { show } [ dev DEV ] [ vid VLAN_ID ]\n" " bridge vlan { show } [ dev DEV ] [ vid VLAN_ID ]\n"
" bridge vlan { tunnelshow } [ dev DEV ] [ vid VLAN_ID ]\n" " bridge vlan { tunnelshow } [ dev DEV ] [ vid VLAN_ID ]\n"
" bridge vlan global { set } vid VLAN_ID dev DEV\n" " bridge vlan global { set } vid VLAN_ID dev DEV\n"
" [ mcast_snooping MULTICAST_SNOOPING ]\n"
" bridge vlan global { show } [ dev DEV ] [ vid VLAN_ID ]\n"); " bridge vlan global { show } [ dev DEV ] [ vid VLAN_ID ]\n");
exit(-1); exit(-1);
} }
@ -355,6 +357,7 @@ static int vlan_global_option_set(int argc, char **argv)
short vid_end = -1; short vid_end = -1;
char *d = NULL; char *d = NULL;
short vid = -1; short vid = -1;
__u8 val8;
afspec = addattr_nest(&req.n, sizeof(req), afspec = addattr_nest(&req.n, sizeof(req),
BRIDGE_VLANDB_GLOBAL_OPTIONS); BRIDGE_VLANDB_GLOBAL_OPTIONS);
@ -397,6 +400,12 @@ static int vlan_global_option_set(int argc, char **argv)
if (vid_end != -1) if (vid_end != -1)
addattr16(&req.n, sizeof(req), addattr16(&req.n, sizeof(req),
BRIDGE_VLANDB_GOPTS_RANGE, vid_end); BRIDGE_VLANDB_GOPTS_RANGE, vid_end);
} else if (strcmp(*argv, "mcast_snooping") == 0) {
NEXT_ARG();
if (get_u8(&val8, *argv, 0))
invarg("invalid mcast_snooping", *argv);
addattr8(&req.n, 1024,
BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING, val8);
} else { } else {
if (strcmp(*argv, "help") == 0) if (strcmp(*argv, "help") == 0)
NEXT_ARG(); NEXT_ARG();
@ -702,7 +711,7 @@ static int print_vlan_stats(struct nlmsghdr *n, void *arg)
static void print_vlan_global_opts(struct rtattr *a, int ifindex) static void print_vlan_global_opts(struct rtattr *a, int ifindex)
{ {
struct rtattr *vtb[BRIDGE_VLANDB_GOPTS_MAX + 1]; struct rtattr *vtb[BRIDGE_VLANDB_GOPTS_MAX + 1], *vattr;
__u16 vid, vrange = 0; __u16 vid, vrange = 0;
if ((a->rta_type & NLA_TYPE_MASK) != BRIDGE_VLANDB_GLOBAL_OPTIONS) if ((a->rta_type & NLA_TYPE_MASK) != BRIDGE_VLANDB_GLOBAL_OPTIONS)
@ -729,6 +738,13 @@ static void print_vlan_global_opts(struct rtattr *a, int ifindex)
} }
print_range("vlan", vid, vrange); print_range("vlan", vid, vrange);
print_nl(); print_nl();
print_string(PRINT_FP, NULL, "%-" __stringify(IFNAMSIZ) "s ", "");
if (vtb[BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING]) {
vattr = vtb[BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING];
print_uint(PRINT_ANY, "mcast_snooping", "mcast_snooping %u ",
rta_getattr_u8(vattr));
}
print_nl();
close_json_object(); close_json_object();
} }

11
man/man8/bridge.8
View File

@ -157,7 +157,9 @@ bridge \- show / manipulate bridge addresses and devices
.B dev .B dev
.I DEV .I DEV
.B vid .B vid
.IR VID " [ ]" .IR VID " [ "
.B mcast_snooping
.IR MULTICAST_SNOOPING " ]"
.ti -8 .ti -8
.BR "bridge vlan global" " [ " show " ] [ " .BR "bridge vlan global" " [ " show " ] [ "
@ -922,6 +924,13 @@ supported for global options.
.BI vid " VID" .BI vid " VID"
the VLAN ID that identifies the vlan. the VLAN ID that identifies the vlan.
.TP
.BI mcast_snooping " MULTICAST_SNOOPING "
turn multicast snooping for VLAN entry with VLAN ID on
.RI ( MULTICAST_SNOOPING " > 0) "
or off
.RI ( MULTICAST_SNOOPING " == 0). Default is on. "
.SS bridge vlan global show - list global vlan options. .SS bridge vlan global show - list global vlan options.
This command displays the global VLAN options for each VLAN entry. This command displays the global VLAN options for each VLAN entry.