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

bridge: vlan: add global mcast_querier_interval option 

Add control and dump support for the global mcast_querier_interval
option which controls the interval after which if no other router
queries are seen the bridge will start sending its own queries.
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_querier_interval 13000

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:00 +03:00 committed by David Ahern
parent 3ae784f589
commit ebcee09ca1
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bridge/vlan.c
View File

@ -46,6 +46,7 @@ static void usage(void)
" [ 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_membership_interval MEMBERSHIP_INTERVAL ]\n" " [ mcast_membership_interval MEMBERSHIP_INTERVAL ]\n"
" [ mcast_querier_interval QUERIER_INTERVAL ]\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);
} }
@ -457,6 +458,14 @@ static int vlan_global_option_set(int argc, char **argv)
addattr64(&req.n, 1024, addattr64(&req.n, 1024,
BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL, BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL,
val64); val64);
} else if (strcmp(*argv, "mcast_querier_interval") == 0) {
NEXT_ARG();
if (get_u64(&val64, *argv, 0))
invarg("invalid mcast_querier_interval",
*argv);
addattr64(&req.n, 1024,
BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL,
val64);
} else { } else {
if (strcmp(*argv, "help") == 0) if (strcmp(*argv, "help") == 0)
NEXT_ARG(); NEXT_ARG();
@ -829,6 +838,12 @@ static void print_vlan_global_opts(struct rtattr *a, int ifindex)
"mcast_membership_interval %llu ", "mcast_membership_interval %llu ",
rta_getattr_u64(vattr)); rta_getattr_u64(vattr));
} }
if (vtb[BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL]) {
vattr = vtb[BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL];
print_lluint(PRINT_ANY, "mcast_querier_interval",
"mcast_querier_interval %llu ",
rta_getattr_u64(vattr));
}
print_nl(); print_nl();
close_json_object(); close_json_object();
} }

12
man/man8/bridge.8
View File

@ -171,7 +171,9 @@ bridge \- show / manipulate bridge addresses and devices
.B mcast_startup_query_count .B mcast_startup_query_count
.IR STARTUP_QUERY_COUNT " ] [ " .IR STARTUP_QUERY_COUNT " ] [ "
.B mcast_membership_interval .B mcast_membership_interval
.IR MEMBERSHIP_INTERVAL " ]" .IR MEMBERSHIP_INTERVAL " ] [ "
.B mcast_querier_interval
.IR QUERIER_INTERVAL " ]"
.ti -8 .ti -8
.BR "bridge vlan global" " [ " show " ] [ " .BR "bridge vlan global" " [ " show " ] [ "
@ -971,6 +973,14 @@ set the number of queries to send during startup phase. Default is 2.
delay after which the bridge will leave a group, delay after which the bridge will leave a group,
if no membership reports for this group are received. if no membership reports for this group are received.
.TP
.BI mcast_querier_interval " QUERIER_INTERVAL "
interval between queries sent by other routers. If no queries are seen
after this delay has passed, the bridge will start to send its own queries
(as if
.BI mcast_querier
was enabled).
.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.