colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm: adjust bridge defines NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_*

Browse Source
This commit is contained in:
Thomas Haller
2020-05-05 12:38:37 +02:00
parent ec9e58ee01
commit a75ec12d8b
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libnm-core/nm-core-internal.h
View File

@@ -121,7 +121,10 @@
#define NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEF ((guint64) 100) #define NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEF ((guint64) 100)
#define NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_MAX G_MAXUINT64 #define NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_MAX G_MAXUINT64
#define BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT 26000 #define NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_MIN ((guint64) 0)
#define NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEF ((guint64) 26000)
#define NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_MAX G_MAXUINT64
#define BRIDGE_MULTICAST_QUERIER_INTERVAL_DEFAULT 25500 #define BRIDGE_MULTICAST_QUERIER_INTERVAL_DEFAULT 25500
#define BRIDGE_MULTICAST_QUERIER_DEFAULT FALSE #define BRIDGE_MULTICAST_QUERIER_DEFAULT FALSE
#define BRIDGE_MULTICAST_QUERY_INTERVAL_DEFAULT 12500 #define BRIDGE_MULTICAST_QUERY_INTERVAL_DEFAULT 12500

4
libnm-core/nm-setting-bridge.c
View File

@@ -1575,7 +1575,7 @@ nm_setting_bridge_init (NMSettingBridge *setting)
priv->max_age = NM_BRIDGE_MAX_AGE_DEF; priv->max_age = NM_BRIDGE_MAX_AGE_DEF;
priv->multicast_last_member_count = NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEF; priv->multicast_last_member_count = NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEF;
priv->multicast_last_member_interval = NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEF; priv->multicast_last_member_interval = NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEF;
priv->multicast_membership_interval = BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT; priv->multicast_membership_interval = NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEF;
priv->multicast_hash_max = NM_BRIDGE_MULTICAST_HASH_MAX_DEF; priv->multicast_hash_max = NM_BRIDGE_MULTICAST_HASH_MAX_DEF;
priv->multicast_snooping = BRIDGE_MULTICAST_SNOOPING_DEFAULT; priv->multicast_snooping = BRIDGE_MULTICAST_SNOOPING_DEFAULT;
priv->priority = NM_BRIDGE_PRIORITY_DEF; priv->priority = NM_BRIDGE_PRIORITY_DEF;
@@ -2150,7 +2150,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *klass)
*/ */
obj_properties[PROP_MULTICAST_MEMBERSHIP_INTERVAL] = obj_properties[PROP_MULTICAST_MEMBERSHIP_INTERVAL] =
g_param_spec_uint64 (NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL, "", "", g_param_spec_uint64 (NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL, "", "",
0, G_MAXUINT64, BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEFAULT, NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_MIN, NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_MAX, NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEF,
G_PARAM_READWRITE | G_PARAM_READWRITE |
NM_SETTING_PARAM_INFERRABLE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS); G_PARAM_STATIC_STRINGS);

2
src/devices/nm-device-bridge.c
View File

@@ -288,7 +288,7 @@ static const Option master_options[] = {
FALSE, FALSE, FALSE }, FALSE, FALSE, FALSE },
{ NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL, "multicast_membership_interval", { NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL, "multicast_membership_interval",
NULL, NULL, NULL, NULL,
0, G_MAXUINT64, 26000, NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_MIN, NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_MAX, NM_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL_DEF,
FALSE, FALSE, FALSE }, FALSE, FALSE, FALSE },
{ NM_SETTING_BRIDGE_MULTICAST_QUERIER, "multicast_querier", { NM_SETTING_BRIDGE_MULTICAST_QUERIER, "multicast_querier",
NULL, NULL, NULL, NULL,