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

bridge: vlan: add global mcast_querier option 

Add control and dump support for the global mcast_querier option which
controls if the bridge will act as a multicast querier for that vlan.
Syntax: $ bridge vlan global set dev bridge vid 1 mcast_querier 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:08:04 +03:00 committed by David Ahern
parent 061da2e222
commit 7ad5505bb5
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bridge/vlan.c
View File

@ -40,6 +40,7 @@ static void usage(void)
" 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" " [ mcast_snooping MULTICAST_SNOOPING ]\n"
" [ mcast_querier MULTICAST_QUERIER ]\n"
" [ mcast_igmp_version IGMP_VERSION ]\n" " [ mcast_igmp_version IGMP_VERSION ]\n"
" [ mcast_mld_version MLD_VERSION ]\n" " [ mcast_mld_version MLD_VERSION ]\n"
" [ mcast_last_member_count LAST_MEMBER_COUNT ]\n" " [ mcast_last_member_count LAST_MEMBER_COUNT ]\n"
@ -418,6 +419,12 @@ static int vlan_global_option_set(int argc, char **argv)
invarg("invalid mcast_snooping", *argv); invarg("invalid mcast_snooping", *argv);
addattr8(&req.n, 1024, addattr8(&req.n, 1024,
BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING, val8); BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING, val8);
} else if (strcmp(*argv, "mcast_querier") == 0) {
NEXT_ARG();
if (get_u8(&val8, *argv, 0))
invarg("invalid mcast_querier", *argv);
addattr8(&req.n, 1024,
BRIDGE_VLANDB_GOPTS_MCAST_QUERIER, val8);
} else if (strcmp(*argv, "mcast_igmp_version") == 0) { } else if (strcmp(*argv, "mcast_igmp_version") == 0) {
NEXT_ARG(); NEXT_ARG();
if (get_u8(&val8, *argv, 0)) if (get_u8(&val8, *argv, 0))
@ -831,6 +838,11 @@ static void print_vlan_global_opts(struct rtattr *a, int ifindex)
print_uint(PRINT_ANY, "mcast_snooping", "mcast_snooping %u ", print_uint(PRINT_ANY, "mcast_snooping", "mcast_snooping %u ",
rta_getattr_u8(vattr)); rta_getattr_u8(vattr));
} }
if (vtb[BRIDGE_VLANDB_GOPTS_MCAST_QUERIER]) {
vattr = vtb[BRIDGE_VLANDB_GOPTS_MCAST_QUERIER];
print_uint(PRINT_ANY, "mcast_querier", "mcast_querier %u ",
rta_getattr_u8(vattr));
}
if (vtb[BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION]) { if (vtb[BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION]) {
vattr = vtb[BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION]; vattr = vtb[BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION];
print_uint(PRINT_ANY, "mcast_igmp_version", print_uint(PRINT_ANY, "mcast_igmp_version",

10
man/man8/bridge.8
View File

@ -160,6 +160,8 @@ bridge \- show / manipulate bridge addresses and devices
.IR VID " [ " .IR VID " [ "
.B mcast_snooping .B mcast_snooping
.IR MULTICAST_SNOOPING " ] [ " .IR MULTICAST_SNOOPING " ] [ "
.B mcast_querier
.IR MULTICAST_QUERIER " ] [ "
.B mcast_igmp_version .B mcast_igmp_version
.IR IGMP_VERSION " ] [ " .IR IGMP_VERSION " ] [ "
.B mcast_mld_version .B mcast_mld_version
@ -951,6 +953,14 @@ turn multicast snooping for VLAN entry with VLAN ID on
or off or off
.RI ( MULTICAST_SNOOPING " == 0). Default is on. " .RI ( MULTICAST_SNOOPING " == 0). Default is on. "
.TP
.BI mcast_querier " MULTICAST_QUERIER "
enable
.RI ( MULTICAST_QUERIER " > 0) "
or disable
.RI ( MULTICAST_QUERIER " == 0) "
IGMP/MLD querier, ie sending of multicast queries by the bridge. Default is disabled.
.TP .TP
.BI mcast_igmp_version " IGMP_VERSION " .BI mcast_igmp_version " IGMP_VERSION "
set the IGMP version. Default is 2. set the IGMP version. Default is 2.