New upstream version 1.27.90 upstream/1.27.90

1 files changed, 71 insertions, 62 deletions

diff --git a/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.h b/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.h
index bb3fa5fc..5d672fed 100644
--- a/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.h
+++ b/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1+ */
 
 #ifndef __NM_LIBNM_SHARED_UTILS_H__
 #define __NM_LIBNM_SHARED_UTILS_H__
@@ -18,89 +18,89 @@
 
 /****************************************************************************/
 
-#define nm_auto_unref_ip_address nm_auto (_nm_ip_address_unref)
-NM_AUTO_DEFINE_FCN0 (NMIPAddress *, _nm_ip_address_unref, nm_ip_address_unref)
+#define nm_auto_unref_ip_address nm_auto(_nm_ip_address_unref)
+NM_AUTO_DEFINE_FCN0(NMIPAddress *, _nm_ip_address_unref, nm_ip_address_unref);
 
-#define nm_auto_unref_ip_route nm_auto (_nm_auto_unref_ip_route)
-NM_AUTO_DEFINE_FCN0 (NMIPRoute *, _nm_auto_unref_ip_route, nm_ip_route_unref)
+#define nm_auto_unref_ip_route nm_auto(_nm_auto_unref_ip_route)
+NM_AUTO_DEFINE_FCN0(NMIPRoute *, _nm_auto_unref_ip_route, nm_ip_route_unref);
 
 #define nm_auto_unref_ip_routing_rule nm_auto(_nm_auto_unref_ip_routing_rule)
-NM_AUTO_DEFINE_FCN0 (NMIPRoutingRule *, _nm_auto_unref_ip_routing_rule, nm_ip_routing_rule_unref)
+NM_AUTO_DEFINE_FCN0(NMIPRoutingRule *, _nm_auto_unref_ip_routing_rule, nm_ip_routing_rule_unref);
 
-#define nm_auto_unref_sriov_vf nm_auto (_nm_auto_unref_sriov_vf)
-NM_AUTO_DEFINE_FCN0 (NMSriovVF *, _nm_auto_unref_sriov_vf, nm_sriov_vf_unref)
+#define nm_auto_unref_sriov_vf nm_auto(_nm_auto_unref_sriov_vf)
+NM_AUTO_DEFINE_FCN0(NMSriovVF *, _nm_auto_unref_sriov_vf, nm_sriov_vf_unref);
 
-#define nm_auto_unref_tc_qdisc nm_auto (_nm_auto_unref_tc_qdisc)
-NM_AUTO_DEFINE_FCN0 (NMTCQdisc *, _nm_auto_unref_tc_qdisc, nm_tc_qdisc_unref)
+#define nm_auto_unref_tc_qdisc nm_auto(_nm_auto_unref_tc_qdisc)
+NM_AUTO_DEFINE_FCN0(NMTCQdisc *, _nm_auto_unref_tc_qdisc, nm_tc_qdisc_unref);
 
-#define nm_auto_unref_tc_tfilter nm_auto (_nm_auto_unref_tc_tfilter)
-NM_AUTO_DEFINE_FCN0 (NMTCTfilter *, _nm_auto_unref_tc_tfilter, nm_tc_tfilter_unref)
+#define nm_auto_unref_tc_tfilter nm_auto(_nm_auto_unref_tc_tfilter)
+NM_AUTO_DEFINE_FCN0(NMTCTfilter *, _nm_auto_unref_tc_tfilter, nm_tc_tfilter_unref);
 
-#define nm_auto_unref_bridge_vlan nm_auto (_nm_auto_unref_bridge_vlan)
-NM_AUTO_DEFINE_FCN0 (NMBridgeVlan *, _nm_auto_unref_bridge_vlan, nm_bridge_vlan_unref)
+#define nm_auto_unref_bridge_vlan nm_auto(_nm_auto_unref_bridge_vlan)
+NM_AUTO_DEFINE_FCN0(NMBridgeVlan *, _nm_auto_unref_bridge_vlan, nm_bridge_vlan_unref);
 
-#define nm_auto_unref_team_link_watcher nm_auto (_nm_auto_unref_team_link_watcher)
-NM_AUTO_DEFINE_FCN0 (NMTeamLinkWatcher *, _nm_auto_unref_team_link_watcher, nm_team_link_watcher_unref)
+#define nm_auto_unref_team_link_watcher nm_auto(_nm_auto_unref_team_link_watcher)
+NM_AUTO_DEFINE_FCN0(NMTeamLinkWatcher *,
+                    _nm_auto_unref_team_link_watcher,
+                    nm_team_link_watcher_unref);
 
-#define nm_auto_unref_wgpeer nm_auto (_nm_auto_unref_wgpeer)
-NM_AUTO_DEFINE_FCN0 (NMWireGuardPeer *, _nm_auto_unref_wgpeer, nm_wireguard_peer_unref)
+#define nm_auto_unref_wgpeer nm_auto(_nm_auto_unref_wgpeer)
+NM_AUTO_DEFINE_FCN0(NMWireGuardPeer *, _nm_auto_unref_wgpeer, nm_wireguard_peer_unref);
 
 /****************************************************************************/
 
-const char **nm_utils_bond_option_arp_ip_targets_split (const char *arp_ip_target);
+const char **nm_utils_bond_option_arp_ip_targets_split(const char *arp_ip_target);
 
-void _nm_setting_bond_remove_options_miimon (NMSettingBond *s_bond);
-void _nm_setting_bond_remove_options_arp_interval (NMSettingBond *s_bond);
+void _nm_setting_bond_remove_options_miimon(NMSettingBond *s_bond);
+void _nm_setting_bond_remove_options_arp_interval(NMSettingBond *s_bond);
 
 typedef enum {
-	NM_BOND_MODE_UNKNOWN      = -1,
-
-	/* The numeric values correspond to kernel's numbering of the modes. */
-	NM_BOND_MODE_ROUNDROBIN   = 0,
-	NM_BOND_MODE_ACTIVEBACKUP = 1,
-	NM_BOND_MODE_XOR          = 2,
-	NM_BOND_MODE_BROADCAST    = 3,
-	NM_BOND_MODE_8023AD       = 4,
-	NM_BOND_MODE_TLB          = 5,
-	NM_BOND_MODE_ALB          = 6,
-	_NM_BOND_MODE_NUM,
+    NM_BOND_MODE_UNKNOWN = -1,
+
+    /* The numeric values correspond to kernel's numbering of the modes. */
+    NM_BOND_MODE_ROUNDROBIN   = 0,
+    NM_BOND_MODE_ACTIVEBACKUP = 1,
+    NM_BOND_MODE_XOR          = 2,
+    NM_BOND_MODE_BROADCAST    = 3,
+    NM_BOND_MODE_8023AD       = 4,
+    NM_BOND_MODE_TLB          = 5,
+    NM_BOND_MODE_ALB          = 6,
+    _NM_BOND_MODE_NUM,
 } NMBondMode;
 
-NMBondMode _nm_setting_bond_mode_from_string (const char *str);
+NMBondMode _nm_setting_bond_mode_from_string(const char *str);
 
 /*****************************************************************************/
 
 static inline guint32
-nm_utils_vlan_priority_map_get_max_prio (NMVlanPriorityMap map, gboolean from)
+nm_utils_vlan_priority_map_get_max_prio(NMVlanPriorityMap map, gboolean from)
 {
-	if (map == NM_VLAN_INGRESS_MAP) {
-		return   from
-		       ? 7u /* MAX_8021P_PRIO */
-		       : (guint32) G_MAXUINT32 /* MAX_SKB_PRIO */;
-	}
-	nm_assert (map == NM_VLAN_EGRESS_MAP);
-	return   from
-	       ? (guint32) G_MAXUINT32 /* MAX_SKB_PRIO */
-	       : 7u /* MAX_8021P_PRIO */;
+    if (map == NM_VLAN_INGRESS_MAP) {
+        return from ? 7u /* MAX_8021P_PRIO */
+                    : (guint32) G_MAXUINT32 /* MAX_SKB_PRIO */;
+    }
+    nm_assert(map == NM_VLAN_EGRESS_MAP);
+    return from ? (guint32) G_MAXUINT32 /* MAX_SKB_PRIO */
+                : 7u /* MAX_8021P_PRIO */;
 }
 
-gboolean nm_utils_vlan_priority_map_parse_str (NMVlanPriorityMap map_type,
-                                               const char *str,
-                                               gboolean allow_wildcard_to,
-                                               guint32 *out_from,
-                                               guint32 *out_to,
-                                               gboolean *out_has_wildcard_to);
+gboolean nm_utils_vlan_priority_map_parse_str(NMVlanPriorityMap map_type,
+                                              const char *      str,
+                                              gboolean          allow_wildcard_to,
+                                              guint32 *         out_from,
+                                              guint32 *         out_to,
+                                              gboolean *        out_has_wildcard_to);
 
 /*****************************************************************************/
 
 static inline int
-nm_setting_ip_config_get_addr_family (NMSettingIPConfig *s_ip)
+nm_setting_ip_config_get_addr_family(NMSettingIPConfig *s_ip)
 {
-	if (NM_IS_SETTING_IP4_CONFIG (s_ip))
-		return AF_INET;
-	if (NM_IS_SETTING_IP6_CONFIG (s_ip))
-		return AF_INET6;
-	g_return_val_if_reached (AF_UNSPEC);
+    if (NM_IS_SETTING_IP4_CONFIG(s_ip))
+        return AF_INET;
+    if (NM_IS_SETTING_IP6_CONFIG(s_ip))
+        return AF_INET6;
+    g_return_val_if_reached(AF_UNSPEC);
 }
 
 /*****************************************************************************/
@@ -125,19 +125,28 @@ nm_setting_ip_config_get_addr_family (NMSettingIPConfig *s_ip)
 
 /*****************************************************************************/
 
-extern const char *const nm_auth_permission_names_by_idx[NM_CLIENT_PERMISSION_LAST];
+extern const char *const        nm_auth_permission_names_by_idx[NM_CLIENT_PERMISSION_LAST];
 extern const NMClientPermission nm_auth_permission_sorted[NM_CLIENT_PERMISSION_LAST];
 
-const char *nm_auth_permission_to_string (NMClientPermission permission);
-NMClientPermission nm_auth_permission_from_string (const char *str);
+const char *       nm_auth_permission_to_string(NMClientPermission permission);
+NMClientPermission nm_auth_permission_from_string(const char *str);
 
 /*****************************************************************************/
 
-NMClientPermissionResult nm_client_permission_result_from_string (const char *nm);
-const char *nm_client_permission_result_to_string (NMClientPermissionResult permission);
+NMClientPermissionResult nm_client_permission_result_from_string(const char *nm);
+const char *             nm_client_permission_result_to_string(NMClientPermissionResult permission);
 
-guint8 nm_utils_route_type_by_name (const char *name);
+guint8 nm_utils_route_type_by_name(const char *name);
 
-const char *nm_utils_route_type2str (guint8 val, char *buf, gsize len);
+const char *nm_utils_route_type2str(guint8 val, char *buf, gsize len);
+
+gboolean nm_utils_validate_dhcp4_vendor_class_id(const char *vci, GError **error);
+
+/*****************************************************************************/
+
+#define NM_SETTINGS_CONNECTION_PERMISSION_USER        "user"
+#define NM_SETTINGS_CONNECTION_PERMISSION_USER_PREFIX "user:"
+
+gboolean nm_settings_connection_validate_permission_user(const char *item, gssize len);
 
 #endif /* __NM_LIBNM_SHARED_UTILS_H__ */