--- v2
+++ v1
@@ -1,95 +1,90 @@
From: Nikolay Aleksandrov <nikolay@nvidia.com>
-Add control and dump support for the global mcast_last_member_interval
-option which controls the interval between queries to find remaining
-members of a group after a leave message. 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.
-The default is 100 (1 second).
+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_last_member_interval 200
+ $ bridge vlan global set dev bridge vid 1 mcast_querier_interval 13000
Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
---
-v2: adjust help msg alignment to fit in 100 columns
-
- bridge/vlan.c | 16 ++++++++++++++++
- man/man8/bridge.8 | 7 +++++++
- 2 files changed, 23 insertions(+)
+ bridge/vlan.c | 15 +++++++++++++++
+ man/man8/bridge.8 | 12 +++++++++++-
+ 2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/bridge/vlan.c b/bridge/vlan.c
-index 2c6ebedd2d5f..2a3dffdbac44 100644
+index 757c34c6497b..c7cd069c29a4 100644
--- a/bridge/vlan.c
+++ b/bridge/vlan.c
-@@ -43,6 +43,7 @@ static void usage(void)
- " [ mcast_igmp_version IGMP_VERSION ]\n"
- " [ mcast_mld_version MLD_VERSION ]\n"
- " [ mcast_last_member_count LAST_MEMBER_COUNT ]\n"
-+ " [ mcast_last_member_interval LAST_MEMBER_INTERVAL ]\n"
- " [ mcast_startup_query_count STARTUP_QUERY_COUNT ]\n"
+@@ -45,6 +45,7 @@ static void usage(void)
+ " [ mcast_last_member_interval LAST_MEMBER_INTERVAL ]\n"
+ " [ mcast_startup_query_count STARTUP_QUERY_COUNT ]\n"
+ " [ mcast_membership_interval MEMBERSHIP_INTERVAL ]\n"
++ " [ mcast_querier_interval QUERIER_INTERVAL ]\n"
" bridge vlan global { show } [ dev DEV ] [ vid VLAN_ID ]\n");
exit(-1);
-@@ -361,6 +362,7 @@ static int vlan_global_option_set(int argc, char **argv)
- short vid_end = -1;
- char *d = NULL;
- short vid = -1;
-+ __u64 val64;
- __u32 val32;
- __u8 val8;
-
-@@ -438,6 +440,14 @@ static int vlan_global_option_set(int argc, char **argv)
- addattr32(&req.n, 1024,
- BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT,
- val32);
-+ } else if (strcmp(*argv, "mcast_last_member_interval") == 0) {
+ }
+@@ -456,6 +457,14 @@ static int vlan_global_option_set(int argc, char **argv)
+ addattr64(&req.n, 1024,
+ BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL,
+ val64);
++ } else if (strcmp(*argv, "mcast_querier_interval") == 0) {
+ NEXT_ARG();
+ if (get_u64(&val64, *argv, 0))
-+ invarg("invalid mcast_last_member_interval",
++ invarg("invalid mcast_querier_interval",
+ *argv);
+ addattr64(&req.n, 1024,
-+ BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL,
++ BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL,
+ val64);
} else {
if (matches(*argv, "help") == 0)
NEXT_ARG();
-@@ -792,6 +802,12 @@ static void print_vlan_global_opts(struct rtattr *a, int ifindex)
- "mcast_last_member_count %u ",
- rta_getattr_u32(vattr));
+@@ -828,6 +837,12 @@ static void print_vlan_global_opts(struct rtattr *a, int ifindex)
+ "mcast_membership_interval %llu ",
+ rta_getattr_u64(vattr));
}
-+ if (vtb[BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL]) {
-+ vattr = vtb[BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL];
-+ print_lluint(PRINT_ANY, "mcast_last_member_interval",
-+ "mcast_last_member_interval %llu ",
++ 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));
+ }
- if (vtb[BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT]) {
- vattr = vtb[BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT];
- print_uint(PRINT_ANY, "mcast_startup_query_count",
+ print_nl();
+ close_json_object();
+ }
diff --git a/man/man8/bridge.8 b/man/man8/bridge.8
-index 7741382321cb..0d973a9db0e0 100644
+index a026ca16f89a..f5c72ec83f93 100644
--- a/man/man8/bridge.8
+++ b/man/man8/bridge.8
-@@ -166,6 +166,8 @@ bridge \- show / manipulate bridge addresses and devices
- .IR MLD_VERSION " ] [ "
- .B mcast_last_member_count
- .IR LAST_MEMBER_COUNT " ] [ "
-+.B mcast_last_member_interval
-+.IR LAST_MEMBER_INTERVAL " ] [ "
+@@ -171,7 +171,9 @@ bridge \- show / manipulate bridge addresses and devices
.B mcast_startup_query_count
- .IR STARTUP_QUERY_COUNT " ]"
+ .IR STARTUP_QUERY_COUNT " ] [ "
+ .B mcast_membership_interval
+-.IR MEMBERSHIP_INTERVAL " ]"
++.IR MEMBERSHIP_INTERVAL " ] [ "
++.B mcast_querier_interval
++.IR QUERIER_INTERVAL " ]"
-@@ -953,6 +955,11 @@ set multicast last member count, ie the number of queries the bridge
- will send before stopping forwarding a multicast group after a "leave"
- message has been received. Default is 2.
+ .ti -8
+ .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,
+ if no membership reports for this group are received.
+.TP
-+.BI mcast_last_member_interval " LAST_MEMBER_INTERVAL "
-+interval between queries to find remaining members of a group,
-+after a "leave" message is received.
++.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).
+
- .TP
- .BI mcast_startup_query_count " STARTUP_QUERY_COUNT "
- set the number of queries to send during startup phase. Default is 2.
+ .SS bridge vlan global show - list global vlan options.
+
+ This command displays the global VLAN options for each VLAN entry.
--
2.31.1