fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-12 11:30:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: don't require birdge multicast_snooping with multicast_router auto,enabled

Browse source 
This does not match kernel behavior. You seem to be able to configure
multicast_snooping=auto,enabled with multicast_snooping off just fine.

Possibly this constrained was inspired by `ip link`, which says:

  mcast_router MULTICAST_ROUTER - set bridge's multicast router if IGMP
  snooping is enabled.

But kernel doesn't enforce this:

  ip link delete br0 2>/dev/null; \
  ip link add br0 type bridge mcast_router 1 mcast_snooping 0; \
  grep ^ /sys/devices/virtual/net/br0/bridge/{multicast_router,multicast_snooping}

gives:

    /sys/devices/virtual/net/br0/bridge/multicast_router:1
    /sys/devices/virtual/net/br0/bridge/multicast_snooping:0

We probably should not implement additional constrains on top of what
kernel does, if the conditions are that obscure.

Fixes: e01d3b4c2b ('nm-setting-bridge: add 'multicast-router' bridge option')
(cherry picked from commit f9721385ce)
This commit is contained in:
Thomas Haller 2020-06-10 17:30:35 +02:00
parent 4b84eeba57
commit f55dd41f2e
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
3 changed files with 16 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clients/common/settings-docs.h.in
View file

@ -121,7 +121,7 @@
#define DESCRIBE_DOC_NM_SETTING_BRIDGE_MAX_AGE N_("The Spanning Tree Protocol (STP) maximum message age, in seconds.")
#define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_QUERIER N_("Enable or disable sending of multicast queries by the bridge. If not specified the option is disabled.")
#define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR N_("If enabled the bridge's own IP address is used as the source address for IGMP queries otherwise the default of 0.0.0.0 is used.")
#define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_ROUTER N_("Sets bridge's multicast router. multicast-snooping must be enabled for this option to work. Supported values are: 'auto', 'disabled', 'enabled'. If not specified the default value is 'auto'.")
#define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_ROUTER N_("Sets bridge's multicast router. Multicast-snooping must be enabled for this option to work. Supported values are: 'auto', 'disabled', 'enabled'. If not specified the default value is 'auto'.")
#define DESCRIBE_DOC_NM_SETTING_BRIDGE_MULTICAST_SNOOPING N_("Controls whether IGMP snooping is enabled for this bridge. Note that if snooping was automatically disabled due to hash collisions, the system may refuse to enable the feature until the collisions are resolved.")
#define DESCRIBE_DOC_NM_SETTING_BRIDGE_PRIORITY N_("Sets the Spanning Tree Protocol (STP) priority for this bridge. Lower values are \"better\"; the lowest priority bridge will be elected the root bridge.")
#define DESCRIBE_DOC_NM_SETTING_BRIDGE_STP N_("Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.")

40
libnm-core/nm-setting-bridge.c
View file

@ -1122,31 +1122,17 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
return FALSE;
}
if (priv->multicast_router) {
if (!NM_IN_STRSET (priv->multicast_router,
"auto",
"enabled",
"disabled")) {
g_set_error_literal (error,
NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_INVALID_PROPERTY,
_("is not a valid option"));
g_prefix_error (error, "%s.%s: ", NM_SETTING_BRIDGE_SETTING_NAME, NM_SETTING_BRIDGE_MULTICAST_ROUTER);
return FALSE;
}
if ( NM_IN_STRSET (priv->multicast_router,
"auto",
"enabled")
&& !priv->multicast_snooping) {
g_set_error (error,
NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_INVALID_PROPERTY,
_("'%s' option requires '%s' option to be enabled"),
NM_SETTING_BRIDGE_MULTICAST_ROUTER, NM_SETTING_BRIDGE_MULTICAST_SNOOPING);
g_prefix_error (error, "%s.%s: ", NM_SETTING_BRIDGE_SETTING_NAME, NM_SETTING_BRIDGE_MULTICAST_ROUTER);
return FALSE;
}
if (!NM_IN_STRSET (priv->multicast_router,
NULL,
"auto",
"enabled",
"disabled")) {
g_set_error_literal (error,
NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_INVALID_PROPERTY,
_("is not a valid option"));
g_prefix_error (error, "%s.%s: ", NM_SETTING_BRIDGE_SETTING_NAME, NM_SETTING_BRIDGE_MULTICAST_ROUTER);
return FALSE;
}
/* Failures from here on are NORMALIZABLE... */
@ -1775,8 +1761,8 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
/**
* NMSettingBridge:multicast-router:
*
* Sets bridge's multicast router.
* multicast-snooping must be enabled for this option to work.
* Sets bridge's multicast router. Multicast-snooping must be enabled
* for this option to work.
*
* Supported values are: 'auto', 'disabled', 'enabled'.
* If not specified the default value is 'auto'.

4
libnm-core/tests/test-setting.c
View file

@ -1980,10 +1980,10 @@ test_bridge_verify (void)
/* multicast-router */
test_verify_options_bridge (FALSE,
"multicast-router", "nonsense");
test_verify_options_bridge (FALSE,
test_verify_options_bridge (TRUE,
"multicast-snooping", "no",
"multicast-router", "auto");
test_verify_options_bridge (FALSE,
test_verify_options_bridge (TRUE,
"multicast-snooping", "no",
"multicast-router", "enabled");
test_verify_options_bridge (TRUE,