New upstream version 1.14.2 upstream/1.14.2

1 files changed, 152 insertions, 7 deletions

diff --git a/shared/nm-meta-setting.c b/shared/nm-meta-setting.c
index 88412739..3e79747f 100644
--- a/shared/nm-meta-setting.c
+++ b/shared/nm-meta-setting.c
@@ -16,13 +16,14 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301 USA.
  *
- * Copyright 2017 Red Hat, Inc.
+ * Copyright 2017 - 2018 Red Hat, Inc.
  */
 
 #include "nm-default.h"
 
 #include "nm-meta-setting.h"
 
+#include "nm-setting-6lowpan.h"
 #include "nm-setting-8021x.h"
 #include "nm-setting-adsl.h"
 #include "nm-setting-bluetooth.h"
@@ -33,6 +34,7 @@
 #include "nm-setting-connection.h"
 #include "nm-setting-dcb.h"
 #include "nm-setting-dummy.h"
+#include "nm-setting-ethtool.h"
 #include "nm-setting-generic.h"
 #include "nm-setting-gsm.h"
 #include "nm-setting-infiniband.h"
@@ -42,6 +44,7 @@
 #include "nm-setting-ip-tunnel.h"
 #include "nm-setting-macsec.h"
 #include "nm-setting-macvlan.h"
+#include "nm-setting-match.h"
 #include "nm-setting-olpc-mesh.h"
 #include "nm-setting-ovs-bridge.h"
 #include "nm-setting-ovs-interface.h"
@@ -63,6 +66,7 @@
 #include "nm-setting-wired.h"
 #include "nm-setting-wireless.h"
 #include "nm-setting-wireless-security.h"
+#include "nm-setting-wpan.h"
 
 /*****************************************************************************/
 
@@ -145,201 +149,270 @@ const NMSetting8021xSchemeVtable nm_setting_8021x_scheme_vtable[] = {
 /*****************************************************************************/
 
 const NMMetaSettingInfo nm_meta_setting_infos[] = {
+	[NM_META_SETTING_TYPE_6LOWPAN] = {
+		.meta_type =                NM_META_SETTING_TYPE_6LOWPAN,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
+		.setting_name =             NM_SETTING_6LOWPAN_SETTING_NAME,
+		.get_setting_gtype =        nm_setting_6lowpan_get_type,
+	},
 	[NM_META_SETTING_TYPE_802_1X] = {
 		.meta_type =                NM_META_SETTING_TYPE_802_1X,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_AUX,
 		.setting_name =             NM_SETTING_802_1X_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_802_1x_get_type,
 	},
 	[NM_META_SETTING_TYPE_ADSL] = {
 		.meta_type =                NM_META_SETTING_TYPE_ADSL,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
 		.setting_name =             NM_SETTING_ADSL_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_adsl_get_type,
 	},
 	[NM_META_SETTING_TYPE_BLUETOOTH] = {
 		.meta_type =                NM_META_SETTING_TYPE_BLUETOOTH,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_NON_BASE,
 		.setting_name =             NM_SETTING_BLUETOOTH_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_bluetooth_get_type,
 	},
 	[NM_META_SETTING_TYPE_BOND] = {
 		.meta_type =                NM_META_SETTING_TYPE_BOND,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
 		.setting_name =             NM_SETTING_BOND_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_bond_get_type,
 	},
 	[NM_META_SETTING_TYPE_BRIDGE] = {
 		.meta_type =                NM_META_SETTING_TYPE_BRIDGE,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
 		.setting_name =             NM_SETTING_BRIDGE_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_bridge_get_type,
 	},
 	[NM_META_SETTING_TYPE_BRIDGE_PORT] = {
 		.meta_type =                NM_META_SETTING_TYPE_BRIDGE_PORT,
+		.setting_priority =         NM_SETTING_PRIORITY_AUX,
 		.setting_name =             NM_SETTING_BRIDGE_PORT_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_bridge_port_get_type,
 	},
 	[NM_META_SETTING_TYPE_CDMA] = {
 		.meta_type =                NM_META_SETTING_TYPE_CDMA,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
 		.setting_name =             NM_SETTING_CDMA_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_cdma_get_type,
 	},
 	[NM_META_SETTING_TYPE_CONNECTION] = {
 		.meta_type =                NM_META_SETTING_TYPE_CONNECTION,
+		.setting_priority =         NM_SETTING_PRIORITY_CONNECTION,
 		.setting_name =             NM_SETTING_CONNECTION_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_connection_get_type,
 	},
 	[NM_META_SETTING_TYPE_DCB] = {
 		.meta_type =                NM_META_SETTING_TYPE_DCB,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_AUX,
 		.setting_name =             NM_SETTING_DCB_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_dcb_get_type,
 	},
 	[NM_META_SETTING_TYPE_DUMMY] = {
 		.meta_type =                NM_META_SETTING_TYPE_DUMMY,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
 		.setting_name =             NM_SETTING_DUMMY_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_dummy_get_type,
 	},
+	[NM_META_SETTING_TYPE_ETHTOOL] = {
+		.meta_type =                NM_META_SETTING_TYPE_ETHTOOL,
+		.setting_priority =         NM_SETTING_PRIORITY_AUX,
+		.setting_name =             NM_SETTING_ETHTOOL_SETTING_NAME,
+		.get_setting_gtype =        nm_setting_ethtool_get_type,
+	},
 	[NM_META_SETTING_TYPE_GENERIC] = {
 		.meta_type =                NM_META_SETTING_TYPE_GENERIC,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
 		.setting_name =             NM_SETTING_GENERIC_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_generic_get_type,
 	},
 	[NM_META_SETTING_TYPE_GSM] = {
 		.meta_type =                NM_META_SETTING_TYPE_GSM,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
 		.setting_name =             NM_SETTING_GSM_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_gsm_get_type,
 	},
 	[NM_META_SETTING_TYPE_INFINIBAND] = {
 		.meta_type =                NM_META_SETTING_TYPE_INFINIBAND,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
 		.setting_name =             NM_SETTING_INFINIBAND_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_infiniband_get_type,
 	},
 	[NM_META_SETTING_TYPE_IP4_CONFIG] = {
 		.meta_type =                NM_META_SETTING_TYPE_IP4_CONFIG,
+		.setting_priority =         NM_SETTING_PRIORITY_IP,
 		.setting_name =             NM_SETTING_IP4_CONFIG_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_ip4_config_get_type,
 	},
 	[NM_META_SETTING_TYPE_IP6_CONFIG] = {
 		.meta_type =                NM_META_SETTING_TYPE_IP6_CONFIG,
+		.setting_priority =         NM_SETTING_PRIORITY_IP,
 		.setting_name =             NM_SETTING_IP6_CONFIG_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_ip6_config_get_type,
 	},
 	[NM_META_SETTING_TYPE_IP_TUNNEL] = {
 		.meta_type =                NM_META_SETTING_TYPE_IP_TUNNEL,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
 		.setting_name =             NM_SETTING_IP_TUNNEL_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_ip_tunnel_get_type,
 	},
 	[NM_META_SETTING_TYPE_MACSEC] = {
 		.meta_type =                NM_META_SETTING_TYPE_MACSEC,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
 		.setting_name =             NM_SETTING_MACSEC_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_macsec_get_type,
 	},
 	[NM_META_SETTING_TYPE_MACVLAN] = {
 		.meta_type =                NM_META_SETTING_TYPE_MACVLAN,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
 		.setting_name =             NM_SETTING_MACVLAN_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_macvlan_get_type,
 	},
+	[NM_META_SETTING_TYPE_MATCH] = {
+		.meta_type =                NM_META_SETTING_TYPE_MATCH,
+		.setting_priority =         NM_SETTING_PRIORITY_AUX,
+		.setting_name =             NM_SETTING_MATCH_SETTING_NAME,
+		.get_setting_gtype =        nm_setting_match_get_type,
+	},
 	[NM_META_SETTING_TYPE_OLPC_MESH] = {
 		.meta_type =                NM_META_SETTING_TYPE_OLPC_MESH,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
 		.setting_name =             NM_SETTING_OLPC_MESH_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_olpc_mesh_get_type,
 	},
 	[NM_META_SETTING_TYPE_OVS_BRIDGE] = {
 		.meta_type =                NM_META_SETTING_TYPE_OVS_BRIDGE,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
 		.setting_name =             NM_SETTING_OVS_BRIDGE_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_ovs_bridge_get_type,
 	},
 	[NM_META_SETTING_TYPE_OVS_INTERFACE] = {
 		.meta_type =                NM_META_SETTING_TYPE_OVS_INTERFACE,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
 		.setting_name =             NM_SETTING_OVS_INTERFACE_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_ovs_interface_get_type,
 	},
 	[NM_META_SETTING_TYPE_OVS_PATCH] = {
 		.meta_type =                NM_META_SETTING_TYPE_OVS_PATCH,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
 		.setting_name =             NM_SETTING_OVS_PATCH_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_ovs_patch_get_type,
 	},
 	[NM_META_SETTING_TYPE_OVS_PORT] = {
 		.meta_type =                NM_META_SETTING_TYPE_OVS_PORT,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
 		.setting_name =             NM_SETTING_OVS_PORT_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_ovs_port_get_type,
 	},
 	[NM_META_SETTING_TYPE_PPPOE] = {
 		.meta_type =                NM_META_SETTING_TYPE_PPPOE,
+		.setting_priority =         NM_SETTING_PRIORITY_AUX,
 		.setting_name =             NM_SETTING_PPPOE_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_pppoe_get_type,
 	},
 	[NM_META_SETTING_TYPE_PPP] = {
 		.meta_type =                NM_META_SETTING_TYPE_PPP,
+		.setting_priority =         NM_SETTING_PRIORITY_AUX,
 		.setting_name =             NM_SETTING_PPP_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_ppp_get_type,
 	},
 	[NM_META_SETTING_TYPE_PROXY] = {
 		.meta_type =                NM_META_SETTING_TYPE_PROXY,
+		.setting_priority =         NM_SETTING_PRIORITY_IP,
 		.setting_name =             NM_SETTING_PROXY_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_proxy_get_type,
 	},
 	[NM_META_SETTING_TYPE_SERIAL] = {
 		.meta_type =                NM_META_SETTING_TYPE_SERIAL,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_AUX,
 		.setting_name =             NM_SETTING_SERIAL_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_serial_get_type,
 	},
+	[NM_META_SETTING_TYPE_SRIOV] = {
+		.meta_type =                NM_META_SETTING_TYPE_SRIOV,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_AUX,
+		.setting_name =             NM_SETTING_SRIOV_SETTING_NAME,
+		.get_setting_gtype =        nm_setting_sriov_get_type,
+	},
 	[NM_META_SETTING_TYPE_TC_CONFIG] = {
 		.meta_type =                NM_META_SETTING_TYPE_TC_CONFIG,
+		.setting_priority =         NM_SETTING_PRIORITY_IP,
 		.setting_name =             NM_SETTING_TC_CONFIG_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_tc_config_get_type,
 	},
 	[NM_META_SETTING_TYPE_TEAM] = {
 		.meta_type =                NM_META_SETTING_TYPE_TEAM,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
 		.setting_name =             NM_SETTING_TEAM_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_team_get_type,
 	},
 	[NM_META_SETTING_TYPE_TEAM_PORT] = {
 		.meta_type =                NM_META_SETTING_TYPE_TEAM_PORT,
+		.setting_priority =         NM_SETTING_PRIORITY_AUX,
 		.setting_name =             NM_SETTING_TEAM_PORT_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_team_port_get_type,
 	},
 	[NM_META_SETTING_TYPE_TUN] = {
 		.meta_type =                NM_META_SETTING_TYPE_TUN,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
 		.setting_name =             NM_SETTING_TUN_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_tun_get_type,
 	},
 	[NM_META_SETTING_TYPE_USER] = {
 		.meta_type =                NM_META_SETTING_TYPE_USER,
+		.setting_priority =         NM_SETTING_PRIORITY_USER,
 		.setting_name =             NM_SETTING_USER_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_user_get_type,
 	},
 	[NM_META_SETTING_TYPE_VLAN] = {
 		.meta_type =                NM_META_SETTING_TYPE_VLAN,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
 		.setting_name =             NM_SETTING_VLAN_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_vlan_get_type,
 	},
 	[NM_META_SETTING_TYPE_VPN] = {
 		.meta_type =                NM_META_SETTING_TYPE_VPN,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
 		.setting_name =             NM_SETTING_VPN_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_vpn_get_type,
 	},
 	[NM_META_SETTING_TYPE_VXLAN] = {
 		.meta_type =                NM_META_SETTING_TYPE_VXLAN,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
 		.setting_name =             NM_SETTING_VXLAN_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_vxlan_get_type,
 	},
 	[NM_META_SETTING_TYPE_WIMAX] = {
 		.meta_type =                NM_META_SETTING_TYPE_WIMAX,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
 		.setting_name =             NM_SETTING_WIMAX_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_wimax_get_type,
 	},
 	[NM_META_SETTING_TYPE_WIRED] = {
 		.meta_type =                NM_META_SETTING_TYPE_WIRED,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
 		.setting_name =             NM_SETTING_WIRED_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_wired_get_type,
 	},
 	[NM_META_SETTING_TYPE_WIRELESS] = {
 		.meta_type =                NM_META_SETTING_TYPE_WIRELESS,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
 		.setting_name =             NM_SETTING_WIRELESS_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_wireless_get_type,
 	},
 	[NM_META_SETTING_TYPE_WIRELESS_SECURITY] = {
 		.meta_type =                NM_META_SETTING_TYPE_WIRELESS_SECURITY,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_AUX,
 		.setting_name =             NM_SETTING_WIRELESS_SECURITY_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_wireless_security_get_type,
 	},
+	[NM_META_SETTING_TYPE_WPAN] = {
+		.meta_type =                NM_META_SETTING_TYPE_WPAN,
+		.setting_priority =         NM_SETTING_PRIORITY_HW_BASE,
+		.setting_name =             NM_SETTING_WPAN_SETTING_NAME,
+		.get_setting_gtype =        nm_setting_wpan_get_type,
+	},
 
 	[NM_META_SETTING_TYPE_UNKNOWN] = {
 		.meta_type =                NM_META_SETTING_TYPE_UNKNOWN,
@@ -349,27 +422,99 @@ const NMMetaSettingInfo nm_meta_setting_infos[] = {
 const NMMetaSettingInfo *
 nm_meta_setting_infos_by_name (const char *name)
 {
-	int i;
+	gssize idx;
+
+#if NM_MORE_ASSERTS > 10
+	{
+		guint i, j;
 
-	if (name) {
 		for (i = 0; i < _NM_META_SETTING_TYPE_NUM; i++) {
-			if (nm_streq (nm_meta_setting_infos[i].setting_name, name))
-				return &nm_meta_setting_infos[i];
+			const NMMetaSettingInfo *setting_info = &nm_meta_setting_infos[i];
+
+			nm_assert (setting_info->meta_type == (NMMetaSettingType) i);
+			nm_assert (setting_info->setting_name);
+			nm_assert (setting_info->setting_name[0]);
+			nm_assert (setting_info->get_setting_gtype);
+			nm_assert (setting_info->setting_priority != NM_SETTING_PRIORITY_INVALID);
+			if (   i > 0
+			    && strcmp (nm_meta_setting_infos[i - 1].setting_name, setting_info->setting_name) >= 0) {
+				g_error ("nm_meta_setting_infos[%u, \"%s\"] is wrongly sorted before nm_meta_setting_infos[%u, \"%s\"]. Rearange NMMetaSettingType enum",
+				         i - 1, nm_meta_setting_infos[i - 1].setting_name,
+				         i, setting_info->setting_name);
+			}
+			for (j = 0; j < i; j++) {
+				const NMMetaSettingInfo *s = &nm_meta_setting_infos[j];
+
+				nm_assert (setting_info->get_setting_gtype != s->get_setting_gtype);
+			}
 		}
 	}
-	return NULL;
+#endif
+
+	G_STATIC_ASSERT_EXPR (G_STRUCT_OFFSET (NMMetaSettingInfo, setting_name) == 0);
+	idx = nm_utils_array_find_binary_search (nm_meta_setting_infos,
+	                                         sizeof (NMMetaSettingInfo),
+	                                         _NM_META_SETTING_TYPE_NUM,
+	                                         &name,
+	                                         nm_strcmp_p_with_data,
+	                                         NULL);
+
+	return idx >= 0 ? &nm_meta_setting_infos[idx] : NULL;
 }
 
 const NMMetaSettingInfo *
 nm_meta_setting_infos_by_gtype (GType gtype)
 {
-	int i;
+#if ((NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_INTERNAL)
+	nm_auto_unref_gtypeclass GTypeClass *gtypeclass_unref = NULL;
+	GTypeClass *gtypeclass;
+	NMSettingClass *klass;
+
+	if (!g_type_is_a (gtype, NM_TYPE_SETTING))
+		goto out_none;
+
+	gtypeclass = g_type_class_peek (gtype);
+	if (!gtypeclass)
+		gtypeclass = gtypeclass_unref = g_type_class_ref (gtype);
+
+	nm_assert (NM_IS_SETTING_CLASS (gtypeclass));
+
+	klass = (NMSettingClass *) gtypeclass;
+
+	if (!klass->setting_info)
+		goto out_none;
+
+	nm_assert (klass->setting_info->get_setting_gtype);
+	nm_assert (klass->setting_info->get_setting_gtype () == gtype);
+
+	return klass->setting_info;
+
+out_none:
+
+#if NM_MORE_ASSERTS > 10
+	{
+		int i;
+
+		/* this might hint to a bug, but it would be expected for NM_TYPE_SETTING
+		 * and NM_TYPE_SETTING_IP_CONFIG.
+		 *
+		 * Assert that we didn't lookup for a gtype, which we would expect to find.
+		 * An assertion failure here, hints to a bug in nm_setting_*_class_init().
+		 */
+		for (i = 0; i < _NM_META_SETTING_TYPE_NUM; i++)
+			nm_assert (nm_meta_setting_infos[i].get_setting_gtype () != gtype);
+	}
+#endif
+	return NULL;
+#else
+	guint i;
 
 	for (i = 0; i < _NM_META_SETTING_TYPE_NUM; i++) {
 		if (nm_meta_setting_infos[i].get_setting_gtype () == gtype)
 			return &nm_meta_setting_infos[i];
 	}
 	return NULL;
+#endif
 }
 
 /*****************************************************************************/