Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latestt pu

1 files changed, 37 insertions, 27 deletions

diff --git a/libnm-core/nm-setting-bridge.h b/libnm-core/nm-setting-bridge.h
index ee8b45f6..6bd5100f 100644
--- a/libnm-core/nm-setting-bridge.h
+++ b/libnm-core/nm-setting-bridge.h
@@ -23,37 +23,29 @@ G_BEGIN_DECLS
 
 #define NM_SETTING_BRIDGE_SETTING_NAME "bridge"
 
-#define NM_SETTING_BRIDGE_MAC_ADDRESS    "mac-address"
-#define NM_SETTING_BRIDGE_STP            "stp"
-#define NM_SETTING_BRIDGE_PRIORITY       "priority"
-#define NM_SETTING_BRIDGE_FORWARD_DELAY  "forward-delay"
-#define NM_SETTING_BRIDGE_HELLO_TIME     "hello-time"
-#define NM_SETTING_BRIDGE_MAX_AGE        "max-age"
-#define NM_SETTING_BRIDGE_AGEING_TIME    "ageing-time"
-#define NM_SETTING_BRIDGE_GROUP_FORWARD_MASK "group-forward-mask"
-#define NM_SETTING_BRIDGE_MULTICAST_SNOOPING "multicast-snooping"
-#define NM_SETTING_BRIDGE_VLAN_FILTERING     "vlan-filtering"
-#define NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID  "vlan-default-pvid"
-#define NM_SETTING_BRIDGE_VLANS              "vlans"
+#define NM_SETTING_BRIDGE_MAC_ADDRESS                     "mac-address"
+#define NM_SETTING_BRIDGE_STP                             "stp"
+#define NM_SETTING_BRIDGE_PRIORITY                        "priority"
+#define NM_SETTING_BRIDGE_FORWARD_DELAY                   "forward-delay"
+#define NM_SETTING_BRIDGE_HELLO_TIME                      "hello-time"
+#define NM_SETTING_BRIDGE_MAX_AGE                         "max-age"
+#define NM_SETTING_BRIDGE_AGEING_TIME                     "ageing-time"
+#define NM_SETTING_BRIDGE_GROUP_FORWARD_MASK              "group-forward-mask"
+#define NM_SETTING_BRIDGE_MULTICAST_SNOOPING              "multicast-snooping"
+#define NM_SETTING_BRIDGE_MULTICAST_ROUTER                "multicast-router"
+#define NM_SETTING_BRIDGE_MULTICAST_QUERIER               "multicast-querier"
+#define NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR      "multicast-query-use-ifaddr"
+#define NM_SETTING_BRIDGE_VLAN_FILTERING                  "vlan-filtering"
+#define NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID               "vlan-default-pvid"
+#define NM_SETTING_BRIDGE_VLANS                           "vlans"
+#define NM_SETTING_BRIDGE_GROUP_ADDRESS                   "group-address"
+#define NM_SETTING_BRIDGE_VLAN_PROTOCOL                   "vlan-protocol"
+#define NM_SETTING_BRIDGE_VLAN_STATS_ENABLED              "vlan-stats-enabled"
 
 #define NM_BRIDGE_VLAN_VID_MIN            1
 #define NM_BRIDGE_VLAN_VID_MAX            4094
 
-/**
- * NMSettingBridge:
- *
- * Bridging Settings
- */
-struct _NMSettingBridge {
-	NMSetting parent;
-};
-
-typedef struct {
-	NMSettingClass parent;
-
-	/*< private >*/
-	gpointer padding[4];
-} NMSettingBridgeClass;
+typedef struct _NMSettingBridgeClass NMSettingBridgeClass;
 
 typedef struct _NMBridgeVlan NMBridgeVlan;
 
@@ -130,6 +122,24 @@ char         * nm_bridge_vlan_to_str (const NMBridgeVlan *vlan, GError **error);
 NM_AVAILABLE_IN_1_18
 NMBridgeVlan * nm_bridge_vlan_from_str (const char *str, GError **error);
 
+NM_AVAILABLE_IN_1_24
+const char *   nm_setting_bridge_get_group_address (const NMSettingBridge *setting);
+
+NM_AVAILABLE_IN_1_24
+const char *   nm_setting_bridge_get_vlan_protocol (const NMSettingBridge *setting);
+
+NM_AVAILABLE_IN_1_24
+gboolean nm_setting_bridge_get_vlan_stats_enabled (const NMSettingBridge *setting);
+
+NM_AVAILABLE_IN_1_24
+const char *   nm_setting_bridge_get_multicast_router (const NMSettingBridge *setting);
+
+NM_AVAILABLE_IN_1_24
+gboolean nm_setting_bridge_get_multicast_query_use_ifaddr (const NMSettingBridge *setting);
+
+NM_AVAILABLE_IN_1_24
+gboolean nm_setting_bridge_get_multicast_querier (const NMSettingBridge *setting);
+
 G_END_DECLS
 
 #endif /* __NM_SETTING_BRIDGE_H__ */