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

bridge: vlan: add global mcast_startup_query_interval option 

Add control and dump support for the global mcast_startup_query_interval
option which controls the interval between queries in the startup phase.
To be consistent with the same bridge-wide option the value is reported
with USER_HZ granularity and the same granularity is expected when setting
it.
Syntax:
 $ bridge vlan global set dev bridge vid 1 mcast_startup_query_interval 15000

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:03 +03:00 committed by David Ahern
parent 60dcd5c318
commit 061da2e222
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bridge/vlan.c
View File

@ -45,6 +45,7 @@ static void usage(void)
" [ mcast_last_member_count LAST_MEMBER_COUNT ]\n" " [ mcast_last_member_count LAST_MEMBER_COUNT ]\n"
" [ mcast_last_member_interval LAST_MEMBER_INTERVAL ]\n" " [ mcast_last_member_interval LAST_MEMBER_INTERVAL ]\n"
" [ mcast_startup_query_count STARTUP_QUERY_COUNT ]\n" " [ mcast_startup_query_count STARTUP_QUERY_COUNT ]\n"
" [ mcast_startup_query_interval STARTUP_QUERY_INTERVAL ]\n"
" [ mcast_membership_interval MEMBERSHIP_INTERVAL ]\n" " [ mcast_membership_interval MEMBERSHIP_INTERVAL ]\n"
" [ mcast_querier_interval QUERIER_INTERVAL ]\n" " [ mcast_querier_interval QUERIER_INTERVAL ]\n"
" [ mcast_query_interval QUERY_INTERVAL ]\n" " [ mcast_query_interval QUERY_INTERVAL ]\n"
@ -484,6 +485,14 @@ static int vlan_global_option_set(int argc, char **argv)
addattr64(&req.n, 1024, addattr64(&req.n, 1024,
BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL, BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL,
val64); val64);
} else if (strcmp(*argv, "mcast_startup_query_interval") == 0) {
NEXT_ARG();
if (get_u64(&val64, *argv, 0))
invarg("invalid mcast_startup_query_interval",
*argv);
addattr64(&req.n, 1024,
BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_INTVL,
val64);
} else { } else {
if (strcmp(*argv, "help") == 0) if (strcmp(*argv, "help") == 0)
NEXT_ARG(); NEXT_ARG();
@ -850,6 +859,12 @@ static void print_vlan_global_opts(struct rtattr *a, int ifindex)
"mcast_startup_query_count %u ", "mcast_startup_query_count %u ",
rta_getattr_u32(vattr)); rta_getattr_u32(vattr));
} }
if (vtb[BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_INTVL]) {
vattr = vtb[BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_INTVL];
print_lluint(PRINT_ANY, "mcast_startup_query_interval",
"mcast_startup_query_interval %llu ",
rta_getattr_u64(vattr));
}
if (vtb[BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL]) { if (vtb[BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL]) {
vattr = vtb[BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL]; vattr = vtb[BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL];
print_lluint(PRINT_ANY, "mcast_membership_interval", print_lluint(PRINT_ANY, "mcast_membership_interval",

6
man/man8/bridge.8
View File

@ -170,6 +170,8 @@ bridge \- show / manipulate bridge addresses and devices
.IR LAST_MEMBER_INTERVAL " ] [ " .IR LAST_MEMBER_INTERVAL " ] [ "
.B mcast_startup_query_count .B mcast_startup_query_count
.IR STARTUP_QUERY_COUNT " ] [ " .IR STARTUP_QUERY_COUNT " ] [ "
.B mcast_startup_query_interval
.IR STARTUP_QUERY_INTERVAL " ] [ "
.B mcast_membership_interval .B mcast_membership_interval
.IR MEMBERSHIP_INTERVAL " ] [ " .IR MEMBERSHIP_INTERVAL " ] [ "
.B mcast_querier_interval .B mcast_querier_interval
@ -972,6 +974,10 @@ after a "leave" message is received.
.BI mcast_startup_query_count " STARTUP_QUERY_COUNT " .BI mcast_startup_query_count " STARTUP_QUERY_COUNT "
set the number of queries to send during startup phase. Default is 2. set the number of queries to send during startup phase. Default is 2.
.TP
.BI mcast_startup_query_interval " STARTUP_QUERY_INTERVAL "
interval between queries in the startup phase.
.TP .TP
.BI mcast_membership_interval " MEMBERSHIP_INTERVAL " .BI mcast_membership_interval " MEMBERSHIP_INTERVAL "
delay after which the bridge will leave a group, delay after which the bridge will leave a group,