base: move bridge defines to libnm-base/nm-base.h

2 files changed, 87 insertions, 85 deletions

diff --git a/src/libnm-base/nm-base.h b/src/libnm-base/nm-base.h
index ca8a59d742..483e40e1f2 100644
--- a/src/libnm-base/nm-base.h
+++ b/src/libnm-base/nm-base.h
@@ -265,6 +265,93 @@ NM_IS_IP_CONFIG_SOURCE_RTPROT(NMIPConfigSource source)
     return source > NM_IP_CONFIG_SOURCE_UNKNOWN && source <= _NM_IP_CONFIG_SOURCE_RTPROT_LAST;
 }
 
+/*****************************************************************************/
+
+/* IEEE 802.1D-1998 timer values */
+#define NM_BRIDGE_HELLO_TIME_MIN     1u
+#define NM_BRIDGE_HELLO_TIME_DEF     2u
+#define NM_BRIDGE_HELLO_TIME_DEF_SYS (NM_BRIDGE_HELLO_TIME_DEF * 100u)
+#define NM_BRIDGE_HELLO_TIME_MAX     10u
+
+#define NM_BRIDGE_FORWARD_DELAY_MIN     2u
+#define NM_BRIDGE_FORWARD_DELAY_DEF     15u
+#define NM_BRIDGE_FORWARD_DELAY_DEF_SYS (NM_BRIDGE_FORWARD_DELAY_DEF * 100u)
+#define NM_BRIDGE_FORWARD_DELAY_MAX     30u
+
+#define NM_BRIDGE_MAX_AGE_MIN     6u
+#define NM_BRIDGE_MAX_AGE_DEF     20u
+#define NM_BRIDGE_MAX_AGE_DEF_SYS (NM_BRIDGE_MAX_AGE_DEF * 100u)
+#define NM_BRIDGE_MAX_AGE_MAX     40u
+
+/* IEEE 802.1D-1998 Table 7.4 */
+#define NM_BRIDGE_AGEING_TIME_MIN     0u
+#define NM_BRIDGE_AGEING_TIME_DEF     300u
+#define NM_BRIDGE_AGEING_TIME_DEF_SYS (NM_BRIDGE_AGEING_TIME_DEF * 100u)
+#define NM_BRIDGE_AGEING_TIME_MAX     1000000u
+
+#define NM_BRIDGE_PORT_PRIORITY_MIN 0u
+#define NM_BRIDGE_PORT_PRIORITY_DEF 32u
+#define NM_BRIDGE_PORT_PRIORITY_MAX 63u
+
+#define NM_BRIDGE_PORT_PATH_COST_MIN 0u
+#define NM_BRIDGE_PORT_PATH_COST_DEF 100u
+#define NM_BRIDGE_PORT_PATH_COST_MAX 65535u
+
+#define NM_BRIDGE_MULTICAST_HASH_MAX_MIN 1u
+#define NM_BRIDGE_MULTICAST_HASH_MAX_DEF 4096u
+#define NM_BRIDGE_MULTICAST_HASH_MAX_MAX ((guint) G_MAXUINT32)
+
+#define NM_BRIDGE_STP_DEF TRUE
+
+#define NM_BRIDGE_GROUP_ADDRESS_DEF_BIN 0x01, 0x80, 0xC2, 0x00, 0x00, 0x00
+#define NM_BRIDGE_GROUP_ADDRESS_DEF_STR "01:80:C2:00:00:00"
+
+#define NM_BRIDGE_PRIORITY_MIN 0u
+#define NM_BRIDGE_PRIORITY_DEF 0x8000u
+#define NM_BRIDGE_PRIORITY_MAX ((guint) G_MAXUINT16)
+
+#define NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_MIN 0u
+#define NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEF 2u
+#define NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_MAX ((guint) G_MAXUINT32)
+
+#define NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_MIN ((guint64) 0)
+#define NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEF ((guint64) 100)
+#define NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_MAX G_MAXUINT64
+
+#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 NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_MIN ((guint64) 0)
+#define NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_DEF ((guint64) 25500)
+#define NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_MAX G_MAXUINT64
+
+#define NM_BRIDGE_MULTICAST_QUERIER_DEF FALSE
+
+#define NM_BRIDGE_MULTICAST_QUERY_INTERVAL_MIN ((guint64) 0)
+#define NM_BRIDGE_MULTICAST_QUERY_INTERVAL_DEF ((guint64) 12500)
+#define NM_BRIDGE_MULTICAST_QUERY_INTERVAL_MAX G_MAXUINT64
+
+#define NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_MIN ((guint64) 0)
+#define NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEF ((guint64) 1000)
+#define NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_MAX G_MAXUINT64
+
+#define NM_BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEF FALSE
+
+#define NM_BRIDGE_MULTICAST_SNOOPING_DEF TRUE
+
+#define NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_MIN 0u
+#define NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEF 2u
+#define NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_MAX ((guint) G_MAXUINT32)
+
+#define NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_MIN ((guint64) 0)
+#define NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEF ((guint64) 3125)
+#define NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_MAX G_MAXUINT64
+
+#define NM_BRIDGE_VLAN_STATS_ENABLED_DEF FALSE
+
+#define NM_BRIDGE_VLAN_DEFAULT_PVID_DEF 1u
+
 /****************************************************************************/
 
 #endif /* __NM_LIBNM_BASE_H__ */
diff --git a/src/libnm-core-intern/nm-core-internal.h b/src/libnm-core-intern/nm-core-internal.h
index 9c6ad45cc7..fa05f51989 100644
--- a/src/libnm-core-intern/nm-core-internal.h
+++ b/src/libnm-core-intern/nm-core-internal.h
@@ -80,91 +80,6 @@
 #include "nm-vpn-editor-plugin.h"
 #include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 
-/* IEEE 802.1D-1998 timer values */
-#define NM_BRIDGE_HELLO_TIME_MIN     1u
-#define NM_BRIDGE_HELLO_TIME_DEF     2u
-#define NM_BRIDGE_HELLO_TIME_DEF_SYS (NM_BRIDGE_HELLO_TIME_DEF * 100u)
-#define NM_BRIDGE_HELLO_TIME_MAX     10u
-
-#define NM_BRIDGE_FORWARD_DELAY_MIN     2u
-#define NM_BRIDGE_FORWARD_DELAY_DEF     15u
-#define NM_BRIDGE_FORWARD_DELAY_DEF_SYS (NM_BRIDGE_FORWARD_DELAY_DEF * 100u)
-#define NM_BRIDGE_FORWARD_DELAY_MAX     30u
-
-#define NM_BRIDGE_MAX_AGE_MIN     6u
-#define NM_BRIDGE_MAX_AGE_DEF     20u
-#define NM_BRIDGE_MAX_AGE_DEF_SYS (NM_BRIDGE_MAX_AGE_DEF * 100u)
-#define NM_BRIDGE_MAX_AGE_MAX     40u
-
-/* IEEE 802.1D-1998 Table 7.4 */
-#define NM_BRIDGE_AGEING_TIME_MIN     0u
-#define NM_BRIDGE_AGEING_TIME_DEF     300u
-#define NM_BRIDGE_AGEING_TIME_DEF_SYS (NM_BRIDGE_AGEING_TIME_DEF * 100u)
-#define NM_BRIDGE_AGEING_TIME_MAX     1000000u
-
-#define NM_BRIDGE_PORT_PRIORITY_MIN 0u
-#define NM_BRIDGE_PORT_PRIORITY_DEF 32u
-#define NM_BRIDGE_PORT_PRIORITY_MAX 63u
-
-#define NM_BRIDGE_PORT_PATH_COST_MIN 0u
-#define NM_BRIDGE_PORT_PATH_COST_DEF 100u
-#define NM_BRIDGE_PORT_PATH_COST_MAX 65535u
-
-#define NM_BRIDGE_MULTICAST_HASH_MAX_MIN 1u
-#define NM_BRIDGE_MULTICAST_HASH_MAX_DEF 4096u
-#define NM_BRIDGE_MULTICAST_HASH_MAX_MAX ((guint) G_MAXUINT32)
-
-#define NM_BRIDGE_STP_DEF TRUE
-
-#define NM_BRIDGE_GROUP_ADDRESS_DEF_BIN 0x01, 0x80, 0xC2, 0x00, 0x00, 0x00
-#define NM_BRIDGE_GROUP_ADDRESS_DEF_STR "01:80:C2:00:00:00"
-
-#define NM_BRIDGE_PRIORITY_MIN 0u
-#define NM_BRIDGE_PRIORITY_DEF 0x8000u
-#define NM_BRIDGE_PRIORITY_MAX ((guint) G_MAXUINT16)
-
-#define NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_MIN 0u
-#define NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_DEF 2u
-#define NM_BRIDGE_MULTICAST_LAST_MEMBER_COUNT_MAX ((guint) G_MAXUINT32)
-
-#define NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_MIN ((guint64) 0)
-#define NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_DEF ((guint64) 100)
-#define NM_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL_MAX G_MAXUINT64
-
-#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 NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_MIN ((guint64) 0)
-#define NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_DEF ((guint64) 25500)
-#define NM_BRIDGE_MULTICAST_QUERIER_INTERVAL_MAX G_MAXUINT64
-
-#define NM_BRIDGE_MULTICAST_QUERIER_DEF FALSE
-
-#define NM_BRIDGE_MULTICAST_QUERY_INTERVAL_MIN ((guint64) 0)
-#define NM_BRIDGE_MULTICAST_QUERY_INTERVAL_DEF ((guint64) 12500)
-#define NM_BRIDGE_MULTICAST_QUERY_INTERVAL_MAX G_MAXUINT64
-
-#define NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_MIN ((guint64) 0)
-#define NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_DEF ((guint64) 1000)
-#define NM_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL_MAX G_MAXUINT64
-
-#define NM_BRIDGE_MULTICAST_QUERY_USE_IFADDR_DEF FALSE
-
-#define NM_BRIDGE_MULTICAST_SNOOPING_DEF TRUE
-
-#define NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_MIN 0u
-#define NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_DEF 2u
-#define NM_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT_MAX ((guint) G_MAXUINT32)
-
-#define NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_MIN ((guint64) 0)
-#define NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_DEF ((guint64) 3125)
-#define NM_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL_MAX G_MAXUINT64
-
-#define NM_BRIDGE_VLAN_STATS_ENABLED_DEF FALSE
-
-#define NM_BRIDGE_VLAN_DEFAULT_PVID_DEF 1u
-
 /* NM_SETTING_COMPARE_FLAG_INFERRABLE: check whether a device-generated
  * connection can be replaced by a already-defined connection. This flag only
  * takes into account properties marked with the %NM_SETTING_PARAM_INFERRABLE