about summary refs log tree commit diff
path: root/libnm-util/nm-connection.c
diff options
context:
space:
mode:
Diffstat (limited to 'libnm-util/nm-connection.c')
-rw-r--r--libnm-util/nm-connection.c2212
1 files changed, 0 insertions, 2212 deletions
diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c
deleted file mode 100644
index 3ddea2d7..00000000
--- a/libnm-util/nm-connection.c
+++ /dev/null
@@ -1,2212 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA.
- *
- * Copyright 2007 - 2013 Red Hat, Inc.
- * Copyright 2007 - 2008 Novell, Inc.
- */
-
-#include "nm-default.h"
-
-#include <dbus/dbus-glib.h>
-#include <string.h>
-
-#include "nm-connection.h"
-#include "nm-utils.h"
-#include "nm-dbus-glib-types.h"
-#include "nm-setting-private.h"
-
-#include "nm-setting-8021x.h"
-#include "nm-setting-bluetooth.h"
-#include "nm-setting-connection.h"
-#include "nm-setting-infiniband.h"
-#include "nm-setting-ip4-config.h"
-#include "nm-setting-ip6-config.h"
-#include "nm-setting-ppp.h"
-#include "nm-setting-pppoe.h"
-#include "nm-setting-wimax.h"
-#include "nm-setting-wired.h"
-#include "nm-setting-adsl.h"
-#include "nm-setting-wireless.h"
-#include "nm-setting-wireless-security.h"
-#include "nm-setting-serial.h"
-#include "nm-setting-vpn.h"
-#include "nm-setting-olpc-mesh.h"
-#include "nm-setting-bond.h"
-#include "nm-setting-team.h"
-#include "nm-setting-team-port.h"
-#include "nm-setting-bridge.h"
-#include "nm-setting-bridge-port.h"
-#include "nm-setting-vlan.h"
-#include "nm-setting-serial.h"
-#include "nm-setting-gsm.h"
-#include "nm-setting-cdma.h"
-
-/**
- * SECTION:nm-connection
- * @short_description: Describes a connection to specific network or provider
- * @include: nm-connection.h
- *
- * An #NMConnection describes all the settings and configuration values that
- * are necessary to configure network devices for operation on a specific
- * network.  Connections are the fundamental operating object for
- * NetworkManager; no device is connected without a #NMConnection, or
- * disconnected without having been connected with a #NMConnection.
- *
- * Each #NMConnection contains a list of #NMSetting objects usually referenced
- * by name (using nm_connection_get_setting_by_name()) or by type (with
- * nm_connection_get_setting()).  The settings describe the actual parameters
- * with which the network devices are configured, including device-specific
- * parameters (MTU, SSID, APN, channel, rate, etc) and IP-level parameters
- * (addresses, routes, addressing methods, etc).
- *
- */
-
-/**
- * nm_connection_error_quark:
- *
- * Registers an error quark for #NMConnection if necessary.
- *
- * Returns: the error quark used for #NMConnection errors.
- **/
-GQuark
-nm_connection_error_quark (void)
-{
-	static GQuark quark;
-
-	if (G_UNLIKELY (!quark))
-		quark = g_quark_from_static_string ("nm-connection-error-quark");
-	return quark;
-}
-
-typedef struct {
-	GHashTable *settings;
-
-	/* D-Bus path of the connection, if any */
-	char *path;
-} NMConnectionPrivate;
-
-#define NM_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_CONNECTION, NMConnectionPrivate))
-
-G_DEFINE_TYPE (NMConnection, nm_connection, G_TYPE_OBJECT)
-
-enum {
-	PROP_0,
-	PROP_PATH,
-
-	LAST_PROP
-};
-
-enum {
-	SECRETS_UPDATED,
-	SECRETS_CLEARED,
-	CHANGED,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-static NMSettingVerifyResult _nm_connection_verify (NMConnection *connection, GError **error);
-
-/*****************************************************************************/
-
-/**
- * nm_connection_lookup_setting_type:
- * @name: a setting name
- *
- * Returns the #GType of the setting's class for a given setting name.
- *
- * Returns: the #GType of the setting's class
- **/
-GType
-nm_connection_lookup_setting_type (const char *name)
-{
-	return _nm_setting_lookup_setting_type (name);
-}
-
-/**
- * nm_connection_lookup_setting_type_by_quark:
- * @error_quark: a setting error quark
- *
- * Returns the #GType of the setting's class for a given setting error quark.
- * Useful for figuring out which setting a returned error is for.
- *
- * Returns: the #GType of the setting's class
- **/
-GType
-nm_connection_lookup_setting_type_by_quark (GQuark error_quark)
-{
-	return _nm_setting_lookup_setting_type_by_quark (error_quark);
-}
-
-/**
- * nm_connection_create_setting:
- * @name: a setting name
- *
- * Create a new #NMSetting object of the desired type, given a setting name.
- *
- * Returns: (transfer full): the new setting object, or %NULL if the setting name was unknown
- **/
-NMSetting *
-nm_connection_create_setting (const char *name)
-{
-	GType type;
-	NMSetting *setting = NULL;
-
-	g_return_val_if_fail (name != NULL, NULL);
-
-	type = nm_connection_lookup_setting_type (name);
-	if (type)
-		setting = (NMSetting *) g_object_new (type, NULL);
-
-	return setting;
-}
-
-static void
-setting_changed_cb (NMSetting *setting,
-                    GParamSpec *pspec,
-                    NMConnection *self)
-{
-	g_signal_emit (self, signals[CHANGED], 0);
-}
-
-static gboolean
-_setting_release (gpointer key, gpointer value, gpointer user_data)
-{
-	g_signal_handlers_disconnect_by_func (user_data, setting_changed_cb, value);
-	return TRUE;
-}
-
-static void
-_nm_connection_add_setting (NMConnection *connection, NMSetting *setting)
-{
-	NMConnectionPrivate *priv = NM_CONNECTION_GET_PRIVATE (connection);
-	const char *name = G_OBJECT_TYPE_NAME (setting);
-	NMSetting *s_old;
-
-	if ((s_old = g_hash_table_lookup (priv->settings, (gpointer) name)))
-		g_signal_handlers_disconnect_by_func (s_old, setting_changed_cb, connection);
-	g_hash_table_insert (priv->settings, (gpointer) name, setting);
-	/* Listen for property changes so we can emit the 'changed' signal */
-	g_signal_connect (setting, "notify", (GCallback) setting_changed_cb, connection);
-}
-
-/**
- * nm_connection_add_setting:
- * @connection: a #NMConnection
- * @setting: (transfer full): the #NMSetting to add to the connection object
- *
- * Adds a #NMSetting to the connection, replacing any previous #NMSetting of the
- * same name which has previously been added to the #NMConnection.  The
- * connection takes ownership of the #NMSetting object and does not increase
- * the setting object's reference count.
- **/
-void
-nm_connection_add_setting (NMConnection *connection, NMSetting *setting)
-{
-	g_return_if_fail (NM_IS_CONNECTION (connection));
-	g_return_if_fail (NM_IS_SETTING (setting));
-
-	_nm_connection_add_setting (connection, setting);
-	g_signal_emit (connection, signals[CHANGED], 0);
-}
-
-/**
- * nm_connection_remove_setting:
- * @connection: a #NMConnection
- * @setting_type: the #GType of the setting object to remove
- *
- * Removes the #NMSetting with the given #GType from the #NMConnection.  This
- * operation dereferences the #NMSetting object.
- **/
-void
-nm_connection_remove_setting (NMConnection *connection, GType setting_type)
-{
-	NMConnectionPrivate *priv;
-	NMSetting *setting;
-	const char *setting_name;
-
-	g_return_if_fail (NM_IS_CONNECTION (connection));
-	g_return_if_fail (g_type_is_a (setting_type, NM_TYPE_SETTING));
-
-	priv = NM_CONNECTION_GET_PRIVATE (connection);
-	setting_name = g_type_name (setting_type);
-	setting = g_hash_table_lookup (priv->settings, setting_name);
-	if (setting) {
-		g_signal_handlers_disconnect_by_func (setting, setting_changed_cb, connection);
-		g_hash_table_remove (priv->settings, setting_name);
-		g_signal_emit (connection, signals[CHANGED], 0);
-	}
-}
-
-/**
- * nm_connection_get_setting:
- * @connection: a #NMConnection
- * @setting_type: the #GType of the setting object to return
- *
- * Gets the #NMSetting with the given #GType, if one has been previously added
- * to the #NMConnection.
- *
- * Returns: (transfer none): the #NMSetting, or %NULL if no setting of that type was previously
- * added to the #NMConnection
- **/
-NMSetting *
-nm_connection_get_setting (NMConnection *connection, GType setting_type)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-	g_return_val_if_fail (g_type_is_a (setting_type, NM_TYPE_SETTING), NULL);
-
-	return (NMSetting *) g_hash_table_lookup (NM_CONNECTION_GET_PRIVATE (connection)->settings,
-	                                          g_type_name (setting_type));
-}
-
-/**
- * nm_connection_get_setting_by_name:
- * @connection: a #NMConnection
- * @name: a setting name
- *
- * Gets the #NMSetting with the given name, if one has been previously added
- * the #NMConnection.
- *
- * Returns: (transfer none): the #NMSetting, or %NULL if no setting with that name was previously
- * added to the #NMConnection
- **/
-NMSetting *
-nm_connection_get_setting_by_name (NMConnection *connection, const char *name)
-{
-	GType type;
-
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-	g_return_val_if_fail (name != NULL, NULL);
-
-	type = nm_connection_lookup_setting_type (name);
-
-	return type ? nm_connection_get_setting (connection, type) : NULL;
-}
-
-static gboolean
-validate_permissions_type (GHashTable *hash, GError **error)
-{
-	GHashTable *s_con;
-	GValue *permissions;
-
-	/* Ensure the connection::permissions item (if present) is the correct
-	 * type, otherwise the g_object_set() will throw a warning and ignore the
-	 * error, leaving us with no permissions.
-	 */
-	s_con = g_hash_table_lookup (hash, NM_SETTING_CONNECTION_SETTING_NAME);
-	if (s_con) {
-		permissions = g_hash_table_lookup (s_con, NM_SETTING_CONNECTION_PERMISSIONS);
-		if (permissions) {
-			if (   !G_VALUE_HOLDS (permissions, G_TYPE_STRV)
-			    && !G_VALUE_HOLDS (permissions, DBUS_TYPE_G_LIST_OF_STRING)) {
-				g_set_error_literal (error,
-				                     NM_SETTING_ERROR,
-				                     NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH,
-				                     "Wrong permissions property type; should be a list of strings.");
-				return FALSE;
-			}
-		}
-	}
-	return TRUE;
-}
-
-/**
- * _nm_connection_replace_settings:
- * @connection: a #NMConnection
- * @new_settings: (element-type utf8 GLib.HashTable): a #GHashTable of settings
- **/
-void
-_nm_connection_replace_settings (NMConnection *connection,
-                                 GHashTable *new_settings)
-{
-	NMConnectionPrivate *priv = NM_CONNECTION_GET_PRIVATE (connection);
-	GHashTableIter iter;
-	const char *setting_name;
-	GHashTable *setting_hash;
-	gboolean changed;
-
-	g_return_if_fail (NM_IS_CONNECTION (connection));
-	g_return_if_fail (new_settings != NULL);
-
-	priv = NM_CONNECTION_GET_PRIVATE (connection);
-
-	if ((changed = g_hash_table_size (priv->settings) > 0))
-		g_hash_table_foreach_remove (priv->settings, _setting_release, connection);
-
-	g_hash_table_iter_init (&iter, new_settings);
-	while (g_hash_table_iter_next (&iter, (gpointer) &setting_name, (gpointer) &setting_hash)) {
-		GType type = nm_connection_lookup_setting_type (setting_name);
-
-		if (type) {
-			NMSetting *setting = nm_setting_new_from_hash (type, setting_hash);
-
-			if (setting) {
-				_nm_connection_add_setting (connection, setting);
-				changed = TRUE;
-			}
-		}
-	}
-
-	if (changed)
-		g_signal_emit (connection, signals[CHANGED], 0);
-}
-
-/**
- * nm_connection_replace_settings:
- * @connection: a #NMConnection
- * @new_settings: (element-type utf8 GLib.HashTable): a #GHashTable of settings
- * @error: location to store error, or %NULL
- *
- * Returns: %TRUE if the settings were valid and added to the connection, %FALSE
- * if they were not
- **/
-gboolean
-nm_connection_replace_settings (NMConnection *connection,
-                                GHashTable *new_settings,
-                                GError **error)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE);
-	g_return_val_if_fail (new_settings != NULL, FALSE);
-	g_return_val_if_fail (!error || !*error, FALSE);
-
-	if (!validate_permissions_type (new_settings, error))
-		return FALSE;
-
-	_nm_connection_replace_settings (connection, new_settings);
-	return nm_connection_verify (connection, error);
-}
-
-/**
- * nm_connection_replace_settings_from_connection:
- * @connection: a #NMConnection
- * @new_connection: a #NMConnection to replace the settings of @connection with
- * @error: location to store error, or %NULL
- *
- * Deep-copies the settings of @new_conenction and replaces the settings of @connection
- * with the copied settings.
- *
- * Returns: %TRUE if the settings were valid after replacing the connection, %FALSE
- * if they were not. Regardless of whether %TRUE or %FALSE is returned, the connection
- * is successfully replaced. %FALSE only means, that the connection does not verify
- * at the end of the operation.
- *
- * Since: 0.9.10
- **/
-gboolean
-nm_connection_replace_settings_from_connection (NMConnection *connection,
-                                                NMConnection *new_connection,
-                                                GError **error)
-{
-	NMConnectionPrivate *priv;
-	GHashTableIter iter;
-	NMSetting *setting;
-	gboolean changed = FALSE;
-	gboolean valid;
-
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE);
-	g_return_val_if_fail (NM_IS_CONNECTION (new_connection), FALSE);
-	g_return_val_if_fail (!error || !*error, FALSE);
-
-	/* When 'connection' and 'new_connection' are the same object simply return
-	 * in order not to destroy 'connection' */
-	if (connection == new_connection)
-		goto out;
-
-	/* No need to validate permissions like nm_connection_replace_settings()
-	 * since we're dealing with an NMConnection which has already done that.
-	 */
-
-	priv = NM_CONNECTION_GET_PRIVATE (connection);
-	if ((changed = g_hash_table_size (priv->settings) > 0))
-		g_hash_table_foreach_remove (priv->settings, _setting_release, connection);
-
-	if (g_hash_table_size (NM_CONNECTION_GET_PRIVATE (new_connection)->settings)) {
-		g_hash_table_iter_init (&iter, NM_CONNECTION_GET_PRIVATE (new_connection)->settings);
-		while (g_hash_table_iter_next (&iter, NULL, (gpointer) &setting))
-			_nm_connection_add_setting (connection, nm_setting_duplicate (setting));
-		changed = TRUE;
-	}
-
-out:
-	valid =  nm_connection_verify (connection, error);
-	if (changed)
-		g_signal_emit (connection, signals[CHANGED], 0);
-	return valid;
-}
-
-/**
- * nm_connection_compare:
- * @a: a #NMConnection
- * @b: a second #NMConnection to compare with the first
- * @flags: compare flags, e.g. %NM_SETTING_COMPARE_FLAG_EXACT
- *
- * Compares two #NMConnection objects for similarity, with comparison behavior
- * modified by a set of flags.  See nm_setting_compare() for a description of
- * each flag's behavior.
- *
- * Returns: %TRUE if the comparison succeeds, %FALSE if it does not
- **/
-gboolean
-nm_connection_compare (NMConnection *a,
-                       NMConnection *b,
-                       NMSettingCompareFlags flags)
-{
-	GHashTableIter iter;
-	NMSetting *src;
-
-	if (a == b)
-		return TRUE;
-	if (!a || !b)
-		return FALSE;
-
-	/* B / A: ensure settings in B that are not in A make the comparison fail */
-	if (g_hash_table_size (NM_CONNECTION_GET_PRIVATE (a)->settings) !=
-	    g_hash_table_size (NM_CONNECTION_GET_PRIVATE (b)->settings))
-		return FALSE;
-
-	/* A / B: ensure all settings in A match corresponding ones in B */
-	g_hash_table_iter_init (&iter, NM_CONNECTION_GET_PRIVATE (a)->settings);
-	while (g_hash_table_iter_next (&iter, NULL, (gpointer) &src)) {
-		NMSetting *cmp = nm_connection_get_setting (b, G_OBJECT_TYPE (src));
-
-		if (!cmp || !nm_setting_compare (src, cmp, flags))
-			return FALSE;
-	}
-
-	return TRUE;
-}
-
-static void
-diff_one_connection (NMConnection *a,
-                     NMConnection *b,
-                     NMSettingCompareFlags flags,
-                     gboolean invert_results,
-                     GHashTable *diffs)
-{
-	NMConnectionPrivate *priv = NM_CONNECTION_GET_PRIVATE (a);
-	GHashTableIter iter;
-	NMSetting *a_setting = NULL;
-
-	g_hash_table_iter_init (&iter, priv->settings);
-	while (g_hash_table_iter_next (&iter, NULL, (gpointer) &a_setting)) {
-		NMSetting *b_setting = NULL;
-		const char *setting_name = nm_setting_get_name (a_setting);
-		GHashTable *results;
-		gboolean new_results = TRUE;
-
-		if (b)
-			b_setting = nm_connection_get_setting (b, G_OBJECT_TYPE (a_setting));
-
-		results = g_hash_table_lookup (diffs, setting_name);
-		if (results)
-			new_results = FALSE;
-
-		if (!nm_setting_diff (a_setting, b_setting, flags, invert_results, &results)) {
-			if (new_results)
-				g_hash_table_insert (diffs, g_strdup (setting_name), results);
-		}
-	}
-}
-
-/**
- * nm_connection_diff:
- * @a: a #NMConnection
- * @b: a second #NMConnection to compare with the first
- * @flags: compare flags, e.g. %NM_SETTING_COMPARE_FLAG_EXACT
- * @out_settings: (element-type utf8 GLib.HashTable): if the
- * connections differ, on return a hash table mapping setting names to
- * second-level GHashTable (utf8 to guint32), which contains the key names that
- * differ mapped to one or more of %NMSettingDiffResult as a bitfield
- *
- * Compares two #NMConnection objects for similarity, with comparison behavior
- * modified by a set of flags.  See nm_setting_compare() for a description of
- * each flag's behavior.  If the connections differ, settings and keys within
- * each setting that differ are added to the returned @out_settings hash table.
- * No values are returned, only key names.
- *
- * Returns: %TRUE if the connections contain the same values, %FALSE if they do
- * not
- **/
-gboolean
-nm_connection_diff (NMConnection *a,
-                    NMConnection *b,
-                    NMSettingCompareFlags flags,
-                    GHashTable **out_settings)
-{
-	GHashTable *diffs;
-
-	g_return_val_if_fail (NM_IS_CONNECTION (a), FALSE);
-	g_return_val_if_fail (out_settings != NULL, FALSE);
-	g_return_val_if_fail (*out_settings == NULL, FALSE);
-	if (b)
-		g_return_val_if_fail (NM_IS_CONNECTION (b), FALSE);
-
-	if (a == b)
-		return TRUE;
-
-	diffs = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_hash_table_destroy);
-
-	/* Diff A to B, then B to A to capture keys in B that aren't in A */
-	diff_one_connection (a, b, flags, FALSE, diffs);
-	if (b)
-		diff_one_connection (b, a, flags, TRUE, diffs);
-
-	if (g_hash_table_size (diffs) == 0)
-		g_hash_table_destroy (diffs);
-	else
-		*out_settings = diffs;
-
-	return *out_settings ? FALSE : TRUE;
-}
-
-static gboolean
-_normalize_virtual_iface_name (NMConnection *self)
-{
-	NMConnectionPrivate *priv = NM_CONNECTION_GET_PRIVATE (self);
-	GHashTableIter h_iter;
-	NMSetting *setting;
-	NMSettingConnection *s_con;
-	const char *interface_name;
-	char *virtual_iface_name = NULL;
-	gboolean was_modified = FALSE;
-	const char *prop_name = NULL;
-
-	/* search for settings that might need normalization of the interface name. */
-	g_hash_table_iter_init (&h_iter, priv->settings);
-	while (   !prop_name
-	       && g_hash_table_iter_next (&h_iter, NULL, (void **) &setting)) {
-		if (NM_IS_SETTING_BOND (setting))
-			prop_name = NM_SETTING_BOND_INTERFACE_NAME;
-		else if (NM_IS_SETTING_BRIDGE (setting))
-			prop_name = NM_SETTING_BRIDGE_INTERFACE_NAME;
-		else if (NM_IS_SETTING_TEAM (setting))
-			prop_name = NM_SETTING_TEAM_INTERFACE_NAME;
-		else if (NM_IS_SETTING_VLAN (setting))
-			prop_name = NM_SETTING_VLAN_INTERFACE_NAME;
-	}
-	if (!prop_name)
-		return FALSE;
-
-	s_con = nm_connection_get_setting_connection (self);
-	g_return_val_if_fail (s_con, FALSE);
-
-	interface_name = nm_setting_connection_get_interface_name (s_con);
-
-	/* read the potential virtual_iface_name from the setting. */
-	g_object_get (setting, prop_name, &virtual_iface_name, NULL);
-
-	if (g_strcmp0 (interface_name, virtual_iface_name) != 0) {
-		if (interface_name) {
-			/* interface_name is set and overwrites the virtual_iface_name. */
-			g_object_set (setting, prop_name, interface_name, NULL);
-		} else {
-			/* interface in NMSettingConnection must be set. */
-			g_object_set (s_con, NM_SETTING_CONNECTION_INTERFACE_NAME, virtual_iface_name, NULL);
-		}
-		was_modified = TRUE;
-	}
-
-	g_free (virtual_iface_name);
-
-	return was_modified;
-}
-
-static gboolean
-_normalize_ip_config (NMConnection *self, GHashTable *parameters)
-{
-	NMSettingConnection *s_con = nm_connection_get_setting_connection (self);
-	const char *default_ip4_method = NM_SETTING_IP4_CONFIG_METHOD_AUTO;
-	const char *default_ip6_method = NULL;
-	NMSettingIP4Config *s_ip4;
-	NMSettingIP6Config *s_ip6;
-	NMSetting *setting;
-
-	if (parameters)
-		default_ip6_method = g_hash_table_lookup (parameters, NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD);
-	if (!default_ip6_method)
-		default_ip6_method = NM_SETTING_IP6_CONFIG_METHOD_AUTO;
-
-	s_ip4 = nm_connection_get_setting_ip4_config (self);
-	s_ip6 = nm_connection_get_setting_ip6_config (self);
-
-	if (nm_setting_connection_get_master (s_con)) {
-		/* Slave connections don't have IP configuration. */
-
-		if (s_ip4)
-			nm_connection_remove_setting (self, NM_TYPE_SETTING_IP4_CONFIG);
-
-		if (s_ip6)
-			nm_connection_remove_setting (self, NM_TYPE_SETTING_IP6_CONFIG);
-
-		return s_ip4 || s_ip6;
-	} else {
-		/* Ensure all non-slave connections have IP4 and IP6 settings objects. If no
-		 * IP6 setting was specified, then assume that means IP6 config is allowed
-		 * to fail. But if no IP4 setting was specified, assume the caller was just
-		 * being lazy.
-		 */
-		if (!s_ip4) {
-			setting = nm_setting_ip4_config_new ();
-
-			g_object_set (setting,
-			              NM_SETTING_IP4_CONFIG_METHOD, default_ip4_method,
-			              NULL);
-			nm_connection_add_setting (self, setting);
-		}
-		if (!s_ip6) {
-			setting = nm_setting_ip6_config_new ();
-
-			g_object_set (setting,
-			              NM_SETTING_IP6_CONFIG_METHOD, default_ip6_method,
-			              NM_SETTING_IP6_CONFIG_MAY_FAIL, TRUE,
-			              NULL);
-			nm_connection_add_setting (self, setting);
-		}
-		return !s_ip4 || !s_ip6;
-	}
-}
-
-/**
- * nm_connection_verify:
- * @connection: the #NMConnection to verify
- * @error: location to store error, or %NULL
- *
- * Validates the connection and all its settings.  Each setting's properties
- * have allowed values, and some values are dependent on other values.  For
- * example, if a Wi-Fi connection is security enabled, the #NMSettingWireless
- * setting object's 'security' property must contain the setting name of the
- * #NMSettingWirelessSecurity object, which must also be present in the
- * connection for the connection to be valid.  As another example, the
- * #NMSettingWired object's 'mac-address' property must be a validly formatted
- * MAC address.  The returned #GError contains information about which
- * setting and which property failed validation, and how it failed validation.
- *
- * Returns: %TRUE if the connection is valid, %FALSE if it is not
- **/
-gboolean
-nm_connection_verify (NMConnection *connection, GError **error)
-{
-	NMSettingVerifyResult result;
-
-	result = _nm_connection_verify (connection, error);
-
-	/* we treat normalizable connections as valid. */
-	if (result == NM_SETTING_VERIFY_NORMALIZABLE)
-		g_clear_error (error);
-
-	return result == NM_SETTING_VERIFY_SUCCESS || result == NM_SETTING_VERIFY_NORMALIZABLE;
-}
-
-static NMSettingVerifyResult
-_nm_connection_verify (NMConnection *connection, GError **error)
-{
-	NMConnectionPrivate *priv;
-	NMSettingConnection *s_con;
-	NMSettingIP4Config *s_ip4;
-	NMSettingIP6Config *s_ip6;
-	GHashTableIter iter;
-	gpointer value;
-	GSList *all_settings = NULL, *setting_i;
-	NMSettingVerifyResult success = NM_SETTING_VERIFY_ERROR;
-	NMSetting *base;
-	const char *ctype;
-	GError *normalizable_error = NULL;
-	NMSettingVerifyResult normalizable_error_type = NM_SETTING_VERIFY_SUCCESS;
-
-	if (error)
-		g_return_val_if_fail (*error == NULL, NM_SETTING_VERIFY_ERROR);
-
-	if (!NM_IS_CONNECTION (connection)) {
-		g_set_error_literal (error,
-		                     NM_SETTING_CONNECTION_ERROR,
-		                     NM_SETTING_CONNECTION_ERROR_UNKNOWN,
-		                     "invalid connection; failed verification");
-		g_return_val_if_fail (NM_IS_CONNECTION (connection), NM_SETTING_VERIFY_ERROR);
-	}
-
-	priv = NM_CONNECTION_GET_PRIVATE (connection);
-
-	/* First, make sure there's at least 'connection' setting */
-	s_con = nm_connection_get_setting_connection (connection);
-	if (!s_con) {
-		g_set_error_literal (error,
-		                     NM_CONNECTION_ERROR,
-		                     NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND,
-		                     "connection setting not found");
-		goto EXIT;
-	}
-
-	/* Build up the list of settings */
-	g_hash_table_iter_init (&iter, priv->settings);
-	while (g_hash_table_iter_next (&iter, NULL, &value)) {
-		/* Order NMSettingConnection so that it will be verified first.
-		 * The reason is, that NMSettingConnection:verify() modifies the connection
-		 * by setting NMSettingConnection:interface_name. So we want to call that
-		 * verify() first, because the order can affect the outcome.
-		 * Another reason is, that errors in this setting might be more fundamental
-		 * and should be checked and reported with higher priority.
-		 * Another reason is, that some settings look especially at the
-		 * NMSettingConnection, so they find it first in the all_settings list. */
-		if (value == s_con)
-			all_settings = g_slist_append (all_settings, value);
-		else
-			all_settings = g_slist_prepend (all_settings, value);
-	}
-	all_settings = g_slist_reverse (all_settings);
-
-	/* Now, run the verify function of each setting */
-	for (setting_i = all_settings; setting_i; setting_i = setting_i->next) {
-		GError *verify_error = NULL;
-		NMSettingVerifyResult verify_result;
-
-		/* verify all settings. We stop if we find the first non-normalizable
-		 * @NM_SETTING_VERIFY_ERROR. If we find normalizable errors we continue
-		 * but remember the error to return it to the user.
-		 * @NM_SETTING_VERIFY_NORMALIZABLE_ERROR has a higher priority then
-		 * @NM_SETTING_VERIFY_NORMALIZABLE, so, if we encounter such an error type,
-		 * we remember it instead (to return it as output).
-		 **/
-		verify_result = _nm_setting_verify (NM_SETTING (setting_i->data), all_settings, &verify_error);
-		if (verify_result == NM_SETTING_VERIFY_NORMALIZABLE ||
-		    verify_result == NM_SETTING_VERIFY_NORMALIZABLE_ERROR) {
-			if (   verify_result == NM_SETTING_VERIFY_NORMALIZABLE_ERROR
-			    && normalizable_error_type == NM_SETTING_VERIFY_NORMALIZABLE) {
-				/* NORMALIZABLE_ERROR has higher priority. */
-				g_clear_error (&normalizable_error);
-			}
-			if (!normalizable_error) {
-				g_propagate_error (&normalizable_error, verify_error);
-				verify_error = NULL;
-				normalizable_error_type = verify_result;
-			}
-		} else if (verify_result != NM_SETTING_VERIFY_SUCCESS) {
-			g_propagate_error (error, verify_error);
-			g_slist_free (all_settings);
-			g_return_val_if_fail (verify_result == NM_SETTING_VERIFY_ERROR, success);
-			goto EXIT;
-		}
-		g_clear_error (&verify_error);
-	}
-	g_slist_free (all_settings);
-
-	/* Now make sure the given 'type' setting can actually be the base setting
-	 * of the connection.  Can't have type=ppp for example.
-	 */
-	ctype = nm_setting_connection_get_connection_type (s_con);
-	if (!ctype) {
-		g_set_error_literal (error,
-		                     NM_CONNECTION_ERROR,
-		                     NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID,
-		                     "connection type missing");
-		goto EXIT;
-	}
-
-	base = nm_connection_get_setting_by_name (connection, ctype);
-	if (!base) {
-		g_set_error_literal (error,
-		                     NM_CONNECTION_ERROR,
-		                     NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID,
-		                     "base setting GType not found");
-		goto EXIT;
-	}
-
-	if (!_nm_setting_is_base_type (base)) {
-		g_set_error (error,
-		             NM_CONNECTION_ERROR,
-		             NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID,
-		             "connection type '%s' is not a base type",
-		             ctype);
-		goto EXIT;
-	}
-
-	s_ip4 = nm_connection_get_setting_ip4_config (connection);
-	s_ip6 = nm_connection_get_setting_ip6_config (connection);
-
-	if (nm_setting_connection_get_master (s_con)) {
-		if ((normalizable_error_type == NM_SETTING_VERIFY_SUCCESS ||
-		    (normalizable_error_type == NM_SETTING_VERIFY_NORMALIZABLE))  && (s_ip4 || s_ip6)) {
-			g_clear_error (&normalizable_error);
-			g_set_error (&normalizable_error,
-			             NM_CONNECTION_ERROR,
-			             NM_CONNECTION_ERROR_INVALID_SETTING,
-			             "slave connection cannot have an IP%c setting",
-			             s_ip4 ? '4' : '6');
-			/* having a slave with IP config *was* and is a verify() error. */
-			normalizable_error_type = NM_SETTING_VERIFY_NORMALIZABLE_ERROR;
-		}
-	} else {
-		if (normalizable_error_type == NM_SETTING_VERIFY_SUCCESS && (!s_ip4 || !s_ip6)) {
-			g_set_error (&normalizable_error,
-			             NM_CONNECTION_ERROR,
-			             NM_CONNECTION_ERROR_SETTING_NOT_FOUND,
-			             "connection needs an IP%c setting",
-			             !s_ip4 ? '4' : '6');
-			/* having a master without IP config was not a verify() error, accept
-			 * it for backward compatibility. */
-			normalizable_error_type = NM_SETTING_VERIFY_NORMALIZABLE;
-		}
-	}
-
-	if (normalizable_error_type != NM_SETTING_VERIFY_SUCCESS) {
-		g_propagate_error (error, normalizable_error);
-		normalizable_error = NULL;
-		success = normalizable_error_type;
-	} else
-		success = NM_SETTING_VERIFY_SUCCESS;
-
-EXIT:
-	g_clear_error (&normalizable_error);
-	return success;
-}
-
-/**
- * nm_connection_normalize:
- * @connection: the #NMConnection to normalize
- * @parameters: (allow-none) (element-type utf8 gpointer): a #GHashTable with
- * normalization parameters to allow customization of the normalization by providing
- * specific arguments. Unknown arguments will be ignored and the default will be
- * used. The keys must be strings, hashed by g_str_hash() and g_str_equal() functions.
- * The values are opaque and depend on the parameter name.
- * @modified: (out) (allow-none): outputs whether any settings were modified.
- * @error: location to store error, or %NULL. Contains the reason,
- * why the connection is invalid, if the function returns an error.
- *
- * Does some basic normalization and fixup of well known inconsistencies
- * and deprecated fields. If the connection was modified in any way,
- * the output parameter @modified is set %TRUE.
- *
- * Finally the connection will be verified and %TRUE returns if the connection
- * is valid. As this function only performs some specific normalization steps
- * it cannot repair all connections. If the connection has errors that
- * cannot be normalized, the connection will not be modified.
- *
- * Returns: %TRUE if the connection is valid, %FALSE if it is not
- *
- * Since: 1.0
- **/
-gboolean
-nm_connection_normalize (NMConnection *connection,
-                         GHashTable *parameters,
-                         gboolean *modified,
-                         GError **error)
-{
-	NMSettingVerifyResult success;
-	gboolean was_modified = FALSE;
-	GError *normalizable_error = NULL;
-
-	success = _nm_connection_verify (connection, &normalizable_error);
-
-	if (success == NM_SETTING_VERIFY_ERROR ||
-	    success == NM_SETTING_VERIFY_SUCCESS) {
-		if (normalizable_error)
-			g_propagate_error (error, normalizable_error);
-		goto EXIT;
-	}
-	g_assert (success == NM_SETTING_VERIFY_NORMALIZABLE || success == NM_SETTING_VERIFY_NORMALIZABLE_ERROR);
-	g_clear_error (&normalizable_error);
-
-	/* Try to perform all kind of normalizations on the settings to fix it.
-	 * We only do this, after verifying that the connection contains no un-normalizable
-	 * errors, because in that case we rather fail without touching the settings. */
-
-	was_modified |= _normalize_virtual_iface_name (connection);
-	was_modified |= _normalize_ip_config (connection, parameters);
-
-	/* Verify anew. */
-	success = _nm_connection_verify (connection, error);
-
-	/* we would expect, that after normalization, the connection can be verified. */
-	g_return_val_if_fail (success == NM_SETTING_VERIFY_SUCCESS, success);
-
-	/* we would expect, that the connection was modified during normalization. */
-	g_return_val_if_fail (was_modified, success);
-
-EXIT:
-	if (modified)
-		*modified = was_modified;
-
-	return success == NM_SETTING_VERIFY_SUCCESS;
-}
-
-/**
- * nm_connection_update_secrets:
- * @connection: the #NMConnection
- * @setting_name: the setting object name to which the secrets apply
- * @secrets: (element-type utf8 GObject.Value): a #GHashTable mapping
- * string:#GValue of setting property names and secrets of the given @setting_name
- * @error: location to store error, or %NULL
- *
- * Update the specified setting's secrets, given a hash table of secrets
- * intended for that setting (deserialized from D-Bus for example).  Will also
- * extract the given setting's secrets hash if given a hash of hashes, as would
- * be returned from nm_connection_to_hash().  If @setting_name is %NULL, expects
- * a fully serialized #NMConnection as returned by nm_connection_to_hash() and
- * will update all secrets from all settings contained in @secrets.
- *
- * Returns: %TRUE if the secrets were successfully updated, %FALSE if the update
- * failed (tried to update secrets for a setting that doesn't exist, etc)
- **/
-gboolean
-nm_connection_update_secrets (NMConnection *connection,
-                              const char *setting_name,
-                              GHashTable *secrets,
-                              GError **error)
-{
-	NMSetting *setting;
-	gboolean success = TRUE, updated = FALSE;
-	GHashTable *setting_hash = NULL;
-	GHashTableIter iter;
-	const char *key;
-	gboolean hashed_connection = FALSE;
-	int success_detail;
-
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE);
-	g_return_val_if_fail (secrets != NULL, FALSE);
-	if (error)
-		g_return_val_if_fail (*error == NULL, FALSE);
-
-	/* Empty @secrets means success */
-	if (g_hash_table_size (secrets) == 0)
-		return TRUE;
-
-	/* For backwards compatibility, this function accepts either a hashed
-	 * connection (GHashTable of GHashTables of GValues) or a single hashed
-	 * setting (GHashTable of GValues).
-	 */
-	g_hash_table_iter_init (&iter, secrets);
-	while (g_hash_table_iter_next (&iter, (gpointer) &key, NULL)) {
-		if (_nm_setting_lookup_setting_type (key) != G_TYPE_INVALID) {
-			/* @secrets looks like a hashed connection */
-			hashed_connection = TRUE;
-			break;
-		}
-	}
-
-	if (setting_name) {
-		/* Update just one setting's secrets */
-		setting = nm_connection_get_setting_by_name (connection, setting_name);
-		if (!setting) {
-			g_set_error_literal (error,
-			                     NM_CONNECTION_ERROR,
-			                     NM_CONNECTION_ERROR_SETTING_NOT_FOUND,
-			                     setting_name);
-			return FALSE;
-		}
-
-		if (hashed_connection) {
-			setting_hash = g_hash_table_lookup (secrets, setting_name);
-			if (!setting_hash) {
-				/* The hashed connection that didn't contain any secrets for
-				 * @setting_name; just return success.
-				 */
-				return TRUE;
-			}
-		}
-
-		g_signal_handlers_block_by_func (setting, (GCallback) setting_changed_cb, connection);
-		success_detail = _nm_setting_update_secrets (setting,
-		                                             setting_hash ?: secrets,
-		                                             error);
-		g_signal_handlers_unblock_by_func (setting, (GCallback) setting_changed_cb, connection);
-
-		if (success_detail == NM_SETTING_UPDATE_SECRET_ERROR)
-			return FALSE;
-		if (success_detail == NM_SETTING_UPDATE_SECRET_SUCCESS_MODIFIED)
-			updated = TRUE;
-	} else {
-		if (!hashed_connection) {
-			g_set_error_literal (error,
-			                     NM_CONNECTION_ERROR,
-			                     NM_CONNECTION_ERROR_SETTING_NOT_FOUND,
-			                     key);
-			return FALSE;
-		}
-
-		/* check first, whether all the settings exist... */
-		g_hash_table_iter_init (&iter, secrets);
-		while (g_hash_table_iter_next (&iter, (gpointer) &key, NULL)) {
-			setting = nm_connection_get_setting_by_name (connection, key);
-			if (!setting) {
-				g_set_error_literal (error,
-				                     NM_CONNECTION_ERROR,
-				                     NM_CONNECTION_ERROR_SETTING_NOT_FOUND,
-				                     key);
-				return FALSE;
-			}
-		}
-
-		/* Update each setting with any secrets from the hashed connection */
-		g_hash_table_iter_init (&iter, secrets);
-		while (g_hash_table_iter_next (&iter, (gpointer) &key, (gpointer) &setting_hash)) {
-			/* Update the secrets for this setting */
-			setting = nm_connection_get_setting_by_name (connection, key);
-
-			g_signal_handlers_block_by_func (setting, (GCallback) setting_changed_cb, connection);
-			success_detail = _nm_setting_update_secrets (setting, setting_hash, error);
-			g_signal_handlers_unblock_by_func (setting, (GCallback) setting_changed_cb, connection);
-
-			if (success_detail == NM_SETTING_UPDATE_SECRET_ERROR) {
-				success = FALSE;
-				break;
-			}
-			if (success_detail == NM_SETTING_UPDATE_SECRET_SUCCESS_MODIFIED)
-				updated = TRUE;
-		}
-	}
-
-	if (updated) {
-		g_signal_emit (connection, signals[SECRETS_UPDATED], 0, setting_name);
-		g_signal_emit (connection, signals[CHANGED], 0);
-	}
-
-	return success;
-}
-
-/**
- * nm_connection_need_secrets:
- * @connection: the #NMConnection
- * @hints: (out) (element-type utf8) (allow-none) (transfer container):
- *   the address of a pointer to a #GPtrArray, initialized to %NULL, which on
- *   return points to an allocated #GPtrArray containing the property names of
- *   secrets of the #NMSetting which may be required; the caller owns the array
- *   and must free the array itself with g_ptr_array_free(), but not free its
- *   elements
- *
- * Returns the name of the first setting object in the connection which would
- * need secrets to make a successful connection.  The returned hints are only
- * intended as a guide to what secrets may be required, because in some
- * circumstances, there is no way to conclusively determine exactly which
- * secrets are needed.
- *
- * Returns: the setting name of the #NMSetting object which has invalid or
- *   missing secrets
- **/
-const char *
-nm_connection_need_secrets (NMConnection *connection,
-                            GPtrArray **hints)
-{
-	NMConnectionPrivate *priv;
-	GHashTableIter hiter;
-	GSList *settings = NULL;
-	GSList *iter;
-	const char *name = NULL;
-	NMSetting *setting;
-
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-	if (hints)
-		g_return_val_if_fail (*hints == NULL, NULL);
-
-	priv = NM_CONNECTION_GET_PRIVATE (connection);
-
-	/* Get list of settings in priority order */
-	g_hash_table_iter_init (&hiter, priv->settings);
-	while (g_hash_table_iter_next (&hiter, NULL, (gpointer) &setting))
-		settings = g_slist_insert_sorted (settings, setting, _nm_setting_compare_priority);
-
-	for (iter = settings; iter; iter = g_slist_next (iter)) {
-		GPtrArray *secrets;
-
-		setting = NM_SETTING (iter->data);
-		secrets = nm_setting_need_secrets (setting);
-		if (secrets) {
-			if (hints)
-				*hints = secrets;
-			else
-				g_ptr_array_free (secrets, TRUE);
-
-			name = nm_setting_get_name (setting);
-			break;
-		}
-	}
-
-	g_slist_free (settings);
-	return name;
-}
-
-/**
- * nm_connection_clear_secrets:
- * @connection: the #NMConnection
- *
- * Clears and frees any secrets that may be stored in the connection, to avoid
- * keeping secret data in memory when not needed.
- **/
-void
-nm_connection_clear_secrets (NMConnection *connection)
-{
-	GHashTableIter iter;
-	NMSetting *setting;
-	gboolean changed = FALSE;
-
-	g_return_if_fail (NM_IS_CONNECTION (connection));
-
-	g_hash_table_iter_init (&iter, NM_CONNECTION_GET_PRIVATE (connection)->settings);
-	while (g_hash_table_iter_next (&iter, NULL, (gpointer) &setting)) {
-		g_signal_handlers_block_by_func (setting, (GCallback) setting_changed_cb, connection);
-		changed |= _nm_setting_clear_secrets (setting);
-		g_signal_handlers_unblock_by_func (setting, (GCallback) setting_changed_cb, connection);
-	}
-
-	g_signal_emit (connection, signals[SECRETS_CLEARED], 0);
-	if (changed)
-		g_signal_emit (connection, signals[CHANGED], 0);
-}
-
-/**
- * nm_connection_clear_secrets_with_flags:
- * @connection: the #NMConnection
- * @func: (scope call): function to be called to determine whether a
- *     specific secret should be cleared or not
- * @user_data: caller-supplied data passed to @func
- *
- * Clears and frees secrets determined by @func.
- **/
-void
-nm_connection_clear_secrets_with_flags (NMConnection *connection,
-                                        NMSettingClearSecretsWithFlagsFn func,
-                                        gpointer user_data)
-{
-	GHashTableIter iter;
-	NMSetting *setting;
-	gboolean changed = FALSE;
-
-	g_return_if_fail (NM_IS_CONNECTION (connection));
-
-	g_hash_table_iter_init (&iter, NM_CONNECTION_GET_PRIVATE (connection)->settings);
-	while (g_hash_table_iter_next (&iter, NULL, (gpointer) &setting)) {
-		g_signal_handlers_block_by_func (setting, (GCallback) setting_changed_cb, connection);
-		changed |= _nm_setting_clear_secrets_with_flags (setting, func, user_data);
-		g_signal_handlers_unblock_by_func (setting, (GCallback) setting_changed_cb, connection);
-	}
-
-	g_signal_emit (connection, signals[SECRETS_CLEARED], 0);
-	if (changed)
-		g_signal_emit (connection, signals[CHANGED], 0);
-}
-
-/**
- * nm_connection_to_hash:
- * @connection: the #NMConnection
- * @flags: hash flags, e.g. %NM_SETTING_HASH_FLAG_ALL
- *
- * Converts the #NMConnection into a #GHashTable describing the connection,
- * suitable for marshalling over D-Bus or serializing.  The hash table mapping
- * is string:#GHashTable with each element in the returned hash representing
- * a #NMSetting object.  The keys are setting object names, and the values
- * are #GHashTables mapping string:GValue, each of which represents the
- * properties of the #NMSetting object.
- *
- * Returns: (transfer full) (element-type utf8 GLib.HashTable): a new
- * #GHashTable describing the connection, its settings, and each setting's
- * properties.  The caller owns the hash table and must unref the hash table
- * with g_hash_table_unref() when it is no longer needed.
- **/
-GHashTable *
-nm_connection_to_hash (NMConnection *connection, NMSettingHashFlags flags)
-{
-	NMConnectionPrivate *priv;
-	GHashTableIter iter;
-	gpointer key, data;
-	GHashTable *ret, *setting_hash;
-
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	ret = g_hash_table_new_full (g_str_hash, g_str_equal,
-	                             g_free, (GDestroyNotify) g_hash_table_unref);
-
-	priv = NM_CONNECTION_GET_PRIVATE (connection);
-
-	/* Add each setting's hash to the main hash */
-	g_hash_table_iter_init (&iter, priv->settings);
-	while (g_hash_table_iter_next (&iter, &key, &data)) {
-		NMSetting *setting = NM_SETTING (data);
-
-		setting_hash = nm_setting_to_hash (setting, flags);
-		if (setting_hash)
-			g_hash_table_insert (ret, g_strdup (nm_setting_get_name (setting)), setting_hash);
-	}
-
-	/* Don't send empty hashes */
-	if (g_hash_table_size (ret) < 1) {
-		g_hash_table_destroy (ret);
-		ret = NULL;
-	}
-
-	return ret;
-}
-
-/**
- * nm_connection_is_type:
- * @connection: the #NMConnection
- * @type: a setting name to check the connection's type against (like
- * %NM_SETTING_WIRELESS_SETTING_NAME or %NM_SETTING_WIRED_SETTING_NAME)
- *
- * A convenience function to check if the given @connection is a particular
- * type (ie wired, Wi-Fi, ppp, etc). Checks the #NMSettingConnection:type
- * property of the connection and matches that against @type.
- *
- * Returns: %TRUE if the connection is of the given @type, %FALSE if not
- **/
-gboolean
-nm_connection_is_type (NMConnection *connection, const char *type)
-{
-	NMSettingConnection *s_con;
-	const char *type2;
-
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE);
-	g_return_val_if_fail (type != NULL, FALSE);
-
-	s_con = nm_connection_get_setting_connection (connection);
-	if (!s_con)
-		return FALSE;
-
-	type2 = nm_setting_connection_get_connection_type (s_con);
-
-	return (g_strcmp0 (type2, type) == 0);
-}
-
-/**
- * nm_connection_for_each_setting_value:
- * @connection: the #NMConnection
- * @func: (scope call): user-supplied function called for each setting's property
- * @user_data: user data passed to @func at each invocation
- *
- * Iterates over the properties of each #NMSetting object in the #NMConnection,
- * calling the supplied user function for each property.
- **/
-void
-nm_connection_for_each_setting_value (NMConnection *connection,
-                                      NMSettingValueIterFn func,
-                                      gpointer user_data)
-{
-	GHashTableIter iter;
-	gpointer value;
-
-	g_return_if_fail (NM_IS_CONNECTION (connection));
-	g_return_if_fail (func != NULL);
-
-	g_hash_table_iter_init (&iter, NM_CONNECTION_GET_PRIVATE (connection)->settings);
-	while (g_hash_table_iter_next (&iter, NULL, &value))
-		nm_setting_enumerate_values (NM_SETTING (value), func, user_data);
-}
-
-/**
- * nm_connection_dump:
- * @connection: the #NMConnection
- *
- * Print the connection to stdout.  For debugging purposes ONLY, should NOT
- * be used for serialization of the connection or machine-parsed in any way. The
- * output format is not guaranteed to be stable and may change at any time.
- **/
-void
-nm_connection_dump (NMConnection *connection)
-{
-	GHashTableIter iter;
-	NMSetting *setting;
-	const char *setting_name;
-	char *str;
-
-	if (!connection)
-		return;
-
-	g_hash_table_iter_init (&iter, NM_CONNECTION_GET_PRIVATE (connection)->settings);
-	while (g_hash_table_iter_next (&iter, (gpointer) &setting_name, (gpointer) &setting)) {
-		str = nm_setting_to_string (setting);
-		g_print ("%s\n", str);
-		g_free (str);
-	}
-}
-
-/**
- * nm_connection_set_path:
- * @connection: the #NMConnection
- * @path: the D-Bus path of the connection as given by the settings service
- * which provides the connection
- *
- * Sets the D-Bus path of the connection.  This property is not serialized, and
- * is only for the reference of the caller.  Sets the #NMConnection:path
- * property.
- **/
-void
-nm_connection_set_path (NMConnection *connection, const char *path)
-{
-	NMConnectionPrivate *priv;
-
-	g_return_if_fail (NM_IS_CONNECTION (connection));
-
-	priv = NM_CONNECTION_GET_PRIVATE (connection);
-
-	g_free (priv->path);
-	priv->path = NULL;
-
-	if (path)
-		priv->path = g_strdup (path);
-}
-
-/**
- * nm_connection_get_path:
- * @connection: the #NMConnection
- *
- * Returns the connection's D-Bus path.
- *
- * Returns: the D-Bus path of the connection, previously set by a call to
- * nm_connection_set_path().
- **/
-const char *
-nm_connection_get_path (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return NM_CONNECTION_GET_PRIVATE (connection)->path;
-}
-
-/**
- * nm_connection_get_interface_name:
- * @connection: The #NMConnection
- *
- * Returns the interface name as stored in NMSettingConnection:interface_name.
- * If the connection contains no NMSettingConnection, it will return %NULL.
- *
- * For hardware devices and software devices created outside of NetworkManager,
- * this name is used to match the device. for software devices created by
- * NetworkManager, this is the name of the created interface.
- *
- * Returns: Name of the kernel interface or %NULL
- *
- * Since: 1.0
- */
-const char *
-nm_connection_get_interface_name (NMConnection *connection)
-{
-	NMSettingConnection *s_con;
-
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	s_con = nm_connection_get_setting_connection (connection);
-
-	return s_con ? nm_setting_connection_get_interface_name (s_con) : NULL;
-}
-
-/**
- * nm_connection_get_virtual_iface_name:
- * @connection: The #NMConnection
- *
- * Returns the name of the virtual kernel interface which the connection
- * needs to use if specified in the settings. This function abstracts all
- * connection types which require this functionality. For all other
- * connection types, this function will return %NULL.
- *
- * Returns: Name of the kernel interface or %NULL
- */
-const char *
-nm_connection_get_virtual_iface_name (NMConnection *connection)
-{
-	NMSettingConnection *s_con;
-	const char *type;
-	NMSetting *base;
-
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_return_val_if_fail (s_con, NULL);
-
-	type = nm_setting_connection_get_connection_type (s_con);
-	g_return_val_if_fail (type, NULL);
-
-	base = nm_connection_get_setting_by_name (connection, type);
-	if (!base)
-		return NULL;
-
-	return nm_setting_get_virtual_iface_name (base);
-}
-
-/**
- * nm_connection_new:
- *
- * Creates a new #NMConnection object with no #NMSetting objects.
- *
- * Returns: the new empty #NMConnection object
- **/
-NMConnection *
-nm_connection_new (void)
-{
-	return (NMConnection *) g_object_new (NM_TYPE_CONNECTION, NULL);
-}
-
-/**
- * _nm_connection_new_from_hash:
- * @hash: (element-type utf8 GLib.HashTable): the #GHashTable describing
- * the connection
- *
- * Creates a new #NMConnection from a hash table describing the connection.  See
- * nm_connection_to_hash() for a description of the expected hash table.
- *
- * Returns: the new #NMConnection object, populated with settings created
- * from the values in the hash table.
- **/
-NMConnection *
-_nm_connection_new_from_hash (GHashTable *hash)
-{
-	NMConnection *connection;
-
-	g_return_val_if_fail (hash != NULL, NULL);
-
-	connection = nm_connection_new ();
-	_nm_connection_replace_settings (connection, hash);
-	return connection;
-}
-
-/**
- * nm_connection_new_from_hash:
- * @hash: (element-type utf8 GLib.HashTable): the #GHashTable describing
- * the connection
- * @error: on unsuccessful return, an error
- *
- * Creates a new #NMConnection from a hash table describing the connection.  See
- * nm_connection_to_hash() for a description of the expected hash table.
- *
- * Returns: the new #NMConnection object, populated with settings created
- * from the values in the hash table, or %NULL if the connection failed to
- * validate
- **/
-NMConnection *
-nm_connection_new_from_hash (GHashTable *hash, GError **error)
-{
-	NMConnection *connection;
-
-	g_return_val_if_fail (hash != NULL, NULL);
-
-	if (!validate_permissions_type (hash, error))
-		return NULL;
-
-	connection = _nm_connection_new_from_hash (hash);
-	if (!nm_connection_verify (connection, error))
-		g_clear_object (&connection);
-	return connection;
-}
-
-/**
- * nm_connection_duplicate:
- * @connection: the #NMConnection to duplicate
- *
- * Duplicates a #NMConnection.
- *
- * Returns: (transfer full): a new #NMConnection containing the same settings and properties
- * as the source #NMConnection
- **/
-NMConnection *
-nm_connection_duplicate (NMConnection *connection)
-{
-	NMConnection *dup;
-	GHashTableIter iter;
-	NMSetting *setting;
-
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	dup = nm_connection_new ();
-	nm_connection_set_path (dup, nm_connection_get_path (connection));
-
-	g_hash_table_iter_init (&iter, NM_CONNECTION_GET_PRIVATE (connection)->settings);
-	while (g_hash_table_iter_next (&iter, NULL, (gpointer) &setting))
-		_nm_connection_add_setting (dup, nm_setting_duplicate (setting));
-
-	return dup;
-}
-
-/**
- * nm_connection_get_uuid:
- * @connection: the #NMConnection
- *
- * A shortcut to return the UUID from the connection's #NMSettingConnection.
- *
- * Returns: the UUID from the connection's 'connection' setting
- **/
-const char *
-nm_connection_get_uuid (NMConnection *connection)
-{
-	NMSettingConnection *s_con;
-
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_return_val_if_fail (s_con != NULL, NULL);
-
-	return nm_setting_connection_get_uuid (s_con);
-}
-
-/**
- * nm_connection_get_id:
- * @connection: the #NMConnection
- *
- * A shortcut to return the ID from the connection's #NMSettingConnection.
- *
- * Returns: the ID from the connection's 'connection' setting
- **/
-const char *
-nm_connection_get_id (NMConnection *connection)
-{
-	NMSettingConnection *s_con;
-
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_return_val_if_fail (s_con != NULL, NULL);
-
-	return nm_setting_connection_get_id (s_con);
-}
-
-/**
- * nm_connection_get_connection_type:
- * @connection: the #NMConnection
- *
- * A shortcut to return the type from the connection's #NMSettingConnection.
- *
- * Returns: the type from the connection's 'connection' setting
- *
- * Since: 0.9.10
- **/
-const char *
-nm_connection_get_connection_type (NMConnection *connection)
-{
-	NMSettingConnection *s_con;
-
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_return_val_if_fail (s_con != NULL, NULL);
-
-	return nm_setting_connection_get_connection_type (s_con);
-}
-
-/**
- * nm_connection_get_virtual_device_description:
- * @connection: an #NMConnection for a virtual device type
- *
- * Returns the name that nm_device_disambiguate_names() would
- * return for the virtual device that would be created for @connection.
- * Eg, "VLAN (eth1.1)".
- *
- * Returns: (transfer full): the name of @connection's device,
- *   or %NULL if @connection is not a virtual connection type
- *
- * Since: 0.9.10
- */
-char *
-nm_connection_get_virtual_device_description (NMConnection *connection)
-{
-	const char *iface, *type, *display_type;
-	NMSettingConnection *s_con;
-
-	iface = nm_connection_get_virtual_iface_name (connection);
-	if (!iface)
-		return NULL;
-
-	s_con = nm_connection_get_setting_connection (connection);
-	g_return_val_if_fail (s_con != NULL, NULL);
-	type = nm_setting_connection_get_connection_type (s_con);
-
-	if (!strcmp (type, NM_SETTING_BOND_SETTING_NAME))
-		display_type = _("Bond");
-	else if (!strcmp (type, NM_SETTING_TEAM_SETTING_NAME))
-		display_type = _("Team");
-	else if (!strcmp (type, NM_SETTING_BRIDGE_SETTING_NAME))
-		display_type = _("Bridge");
-	else if (!strcmp (type, NM_SETTING_VLAN_SETTING_NAME))
-		display_type = _("VLAN");
-	else {
-		g_warning ("Unrecognized virtual device type '%s'", type);
-		display_type = type;
-	}
-
-	return g_strdup_printf ("%s (%s)", display_type, iface);
-}
-
-/*****************************************************************************/
-
-/**
- * nm_connection_get_setting_802_1x:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSetting8021x the connection might contain.
- *
- * Returns: (transfer none): an #NMSetting8021x if the connection contains one, otherwise %NULL
- **/
-NMSetting8021x *
-nm_connection_get_setting_802_1x (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSetting8021x *) nm_connection_get_setting (connection, NM_TYPE_SETTING_802_1X);
-}
-
-/**
- * nm_connection_get_setting_bluetooth:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSettingBluetooth the connection might contain.
- *
- * Returns: (transfer none): an #NMSettingBluetooth if the connection contains one, otherwise %NULL
- **/
-NMSettingBluetooth *
-nm_connection_get_setting_bluetooth (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSettingBluetooth *) nm_connection_get_setting (connection, NM_TYPE_SETTING_BLUETOOTH);
-}
-
-/**
- * nm_connection_get_setting_bond:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSettingBond the connection might contain.
- *
- * Returns: (transfer none): an #NMSettingBond if the connection contains one, otherwise %NULL
- **/
-NMSettingBond *
-nm_connection_get_setting_bond (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSettingBond *) nm_connection_get_setting (connection, NM_TYPE_SETTING_BOND);
-}
-
-/**
- * nm_connection_get_setting_team:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSettingTeam the connection might contain.
- *
- * Returns: (transfer none): an #NMSettingTeam if the connection contains one, otherwise %NULL
- *
- * Since: 0.9.10
- **/
-NMSettingTeam *
-nm_connection_get_setting_team (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSettingTeam *) nm_connection_get_setting (connection, NM_TYPE_SETTING_TEAM);
-}
-
-/**
- * nm_connection_get_setting_team_port:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSettingTeamPort the connection might contain.
- *
- * Returns: (transfer none): an #NMSettingTeamPort if the connection contains one, otherwise %NULL
- *
- * Since: 0.9.10
- **/
-NMSettingTeamPort *
-nm_connection_get_setting_team_port (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSettingTeamPort *) nm_connection_get_setting (connection, NM_TYPE_SETTING_TEAM_PORT);
-}
-
-/**
- * nm_connection_get_setting_bridge:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSettingBridge the connection might contain.
- *
- * Returns: (transfer none): an #NMSettingBridge if the connection contains one, otherwise %NULL
- **/
-NMSettingBridge *
-nm_connection_get_setting_bridge (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSettingBridge *) nm_connection_get_setting (connection, NM_TYPE_SETTING_BRIDGE);
-}
-
-/**
- * nm_connection_get_setting_cdma:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSettingCdma the connection might contain.
- *
- * Returns: (transfer none): an #NMSettingCdma if the connection contains one, otherwise %NULL
- **/
-NMSettingCdma *
-nm_connection_get_setting_cdma (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSettingCdma *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CDMA);
-}
-
-/**
- * nm_connection_get_setting_connection:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSettingConnection the connection might contain.
- *
- * Returns: (transfer none): an #NMSettingConnection if the connection contains one, otherwise %NULL
- **/
-NMSettingConnection *
-nm_connection_get_setting_connection (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION);
-}
-
-/**
- * nm_connection_get_setting_dcb:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSettingDcb the connection might contain.
- *
- * Returns: (transfer none): an #NMSettingDcb if the connection contains one, otherwise NULL
- *
- * Since: 0.9.10
- **/
-NMSettingDcb *
-nm_connection_get_setting_dcb (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSettingDcb *) nm_connection_get_setting (connection, NM_TYPE_SETTING_DCB);
-}
-
-/**
- * nm_connection_get_setting_generic:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSettingGeneric the connection might contain.
- *
- * Returns: (transfer none): an #NMSettingGeneric if the connection contains one, otherwise NULL
- *
- * Since: 0.9.10
- **/
-NMSettingGeneric *
-nm_connection_get_setting_generic (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSettingGeneric *) nm_connection_get_setting (connection, NM_TYPE_SETTING_GENERIC);
-}
-
-/**
- * nm_connection_get_setting_gsm:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSettingGsm the connection might contain.
- *
- * Returns: (transfer none): an #NMSettingGsm if the connection contains one, otherwise %NULL
- **/
-NMSettingGsm *
-nm_connection_get_setting_gsm (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSettingGsm *) nm_connection_get_setting (connection, NM_TYPE_SETTING_GSM);
-}
-
-/**
- * nm_connection_get_setting_infiniband:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSettingInfiniband the connection might contain.
- *
- * Returns: (transfer none): an #NMSettingInfiniband if the connection contains one, otherwise %NULL
- **/
-NMSettingInfiniband *
-nm_connection_get_setting_infiniband (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSettingInfiniband *) nm_connection_get_setting (connection, NM_TYPE_SETTING_INFINIBAND);
-}
-
-/**
- * nm_connection_get_setting_ip4_config:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSettingIP4Config the connection might contain.
- *
- * Returns: (transfer none): an #NMSettingIP4Config if the connection contains one, otherwise %NULL
- **/
-NMSettingIP4Config *
-nm_connection_get_setting_ip4_config (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSettingIP4Config *) nm_connection_get_setting (connection, NM_TYPE_SETTING_IP4_CONFIG);
-}
-
-/**
- * nm_connection_get_setting_ip6_config:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSettingIP6Config the connection might contain.
- *
- * Returns: (transfer none): an #NMSettingIP6Config if the connection contains one, otherwise %NULL
- **/
-NMSettingIP6Config *
-nm_connection_get_setting_ip6_config (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSettingIP6Config *) nm_connection_get_setting (connection, NM_TYPE_SETTING_IP6_CONFIG);
-}
-
-/**
- * nm_connection_get_setting_olpc_mesh:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSettingOlpcMesh the connection might contain.
- *
- * Returns: (transfer none): an #NMSettingOlpcMesh if the connection contains one, otherwise %NULL
- **/
-NMSettingOlpcMesh *
-nm_connection_get_setting_olpc_mesh (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSettingOlpcMesh *) nm_connection_get_setting (connection, NM_TYPE_SETTING_OLPC_MESH);
-}
-
-/**
- * nm_connection_get_setting_ppp:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSettingPPP the connection might contain.
- *
- * Returns: (transfer none): an #NMSettingPPP if the connection contains one, otherwise %NULL
- **/
-NMSettingPPP *
-nm_connection_get_setting_ppp (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSettingPPP *) nm_connection_get_setting (connection, NM_TYPE_SETTING_PPP);
-}
-
-/**
- * nm_connection_get_setting_pppoe:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSettingPPPOE the connection might contain.
- *
- * Returns: (transfer none): an #NMSettingPPPOE if the connection contains one, otherwise %NULL
- **/
-NMSettingPPPOE *
-nm_connection_get_setting_pppoe (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSettingPPPOE *) nm_connection_get_setting (connection, NM_TYPE_SETTING_PPPOE);
-}
-
-/**
- * nm_connection_get_setting_serial:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSettingSerial the connection might contain.
- *
- * Returns: (transfer none): an #NMSettingSerial if the connection contains one, otherwise %NULL
- **/
-NMSettingSerial *
-nm_connection_get_setting_serial (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSettingSerial *) nm_connection_get_setting (connection, NM_TYPE_SETTING_SERIAL);
-}
-
-/**
- * nm_connection_get_setting_vpn:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSettingVPN the connection might contain.
- *
- * Returns: (transfer none): an #NMSettingVPN if the connection contains one, otherwise %NULL
- **/
-NMSettingVPN *
-nm_connection_get_setting_vpn (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSettingVPN *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN);
-}
-
-/**
- * nm_connection_get_setting_wimax:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSettingWimax the connection might contain.
- *
- * Returns: (transfer none): an #NMSettingWimax if the connection contains one, otherwise %NULL
- **/
-NMSettingWimax *
-nm_connection_get_setting_wimax (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSettingWimax *) nm_connection_get_setting (connection, NM_TYPE_SETTING_WIMAX);
-}
-
-/**
- * nm_connection_get_setting_wired:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSettingWired the connection might contain.
- *
- * Returns: (transfer none): an #NMSettingWired if the connection contains one, otherwise %NULL
- **/
-NMSettingWired *
-nm_connection_get_setting_wired (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSettingWired *) nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRED);
-}
-
-/**
- * nm_connection_get_setting_adsl:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSettingAdsl the connection might contain.
- *
- * Returns: (transfer none): an #NMSettingAdsl if the connection contains one, otherwise %NULL
- **/
-NMSettingAdsl *
-nm_connection_get_setting_adsl (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSettingAdsl *) nm_connection_get_setting (connection, NM_TYPE_SETTING_ADSL);
-}
-
-/**
- * nm_connection_get_setting_wireless:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSettingWireless the connection might contain.
- *
- * Returns: (transfer none): an #NMSettingWireless if the connection contains one, otherwise %NULL
- **/
-NMSettingWireless *
-nm_connection_get_setting_wireless (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSettingWireless *) nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRELESS);
-}
-
-/**
- * nm_connection_get_setting_wireless_security:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSettingWirelessSecurity the connection might contain.
- *
- * Returns: (transfer none): an #NMSettingWirelessSecurity if the connection contains one, otherwise %NULL
- **/
-NMSettingWirelessSecurity *
-nm_connection_get_setting_wireless_security (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSettingWirelessSecurity *) nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRELESS_SECURITY);
-}
-
-/**
- * nm_connection_get_setting_bridge_port:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSettingBridgePort the connection might contain.
- *
- * Returns: (transfer none): an #NMSettingBridgePort if the connection contains one, otherwise %NULL
- **/
-NMSettingBridgePort *
-nm_connection_get_setting_bridge_port (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSettingBridgePort *) nm_connection_get_setting (connection, NM_TYPE_SETTING_BRIDGE_PORT);
-}
-
-/**
- * nm_connection_get_setting_vlan:
- * @connection: the #NMConnection
- *
- * A shortcut to return any #NMSettingVlan the connection might contain.
- *
- * Returns: (transfer none): an #NMSettingVlan if the connection contains one, otherwise %NULL
- **/
-NMSettingVlan *
-nm_connection_get_setting_vlan (NMConnection *connection)
-{
-	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
-
-	return (NMSettingVlan *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VLAN);
-}
-
-/*****************************************************************************/
-
-static void
-nm_connection_init (NMConnection *connection)
-{
-	NMConnectionPrivate *priv = NM_CONNECTION_GET_PRIVATE (connection);
-
-	priv->settings = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_object_unref);
-}
-
-static void
-dispose (GObject *object)
-{
-	NMConnection *self = NM_CONNECTION (object);
-	NMConnectionPrivate *priv = NM_CONNECTION_GET_PRIVATE (self);
-
-	g_hash_table_foreach_remove (priv->settings, _setting_release, self);
-
-	G_OBJECT_CLASS (nm_connection_parent_class)->dispose (object);
-}
-
-static void
-finalize (GObject *object)
-{
-	NMConnection *connection = NM_CONNECTION (object);
-	NMConnectionPrivate *priv = NM_CONNECTION_GET_PRIVATE (connection);
-
-	g_assert (g_hash_table_size (priv->settings) == 0);
-	g_hash_table_destroy (priv->settings);
-	g_free (priv->path);
-
-	G_OBJECT_CLASS (nm_connection_parent_class)->finalize (object);
-}
-
-static void
-set_property (GObject *object, guint prop_id,
-              const GValue *value, GParamSpec *pspec)
-{
-	NMConnection *connection = NM_CONNECTION (object);
-
-	switch (prop_id) {
-	case PROP_PATH:
-		nm_connection_set_path (connection, g_value_get_string (value));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
-{
-	NMConnection *connection = NM_CONNECTION (object);
-
-	switch (prop_id) {
-	case PROP_PATH:
-		g_value_set_string (value, nm_connection_get_path (connection));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-nm_connection_class_init (NMConnectionClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	g_type_class_add_private (klass, sizeof (NMConnectionPrivate));
-
-	/* virtual methods */
-	object_class->set_property = set_property;
-	object_class->get_property = get_property;
-	object_class->dispose = dispose;
-	object_class->finalize = finalize;
-
-	/* Properties */
-
-	/**
-	 * NMConnection:path:
-	 *
-	 * The connection's D-Bus path, used only by the calling process as a record
-	 * of the D-Bus path of the connection as provided by a settings service.
-	 **/
-	g_object_class_install_property
-		(object_class, PROP_PATH,
-		 g_param_spec_string (NM_CONNECTION_PATH, "", "",
-		                      NULL,
-		                      G_PARAM_READWRITE |
-		                      G_PARAM_CONSTRUCT |
-		                      G_PARAM_STATIC_STRINGS));
-
-	/* Signals */
-
-	/**
-	 * NMConnection::secrets-updated:
-	 * @connection: the object on which the signal is emitted
-	 * @setting_name: the setting name of the #NMSetting for which secrets were
-	 * updated
-	 *
-	 * The ::secrets-updated signal is emitted when the secrets of a setting
-	 * have been changed.
-	 */
-	signals[SECRETS_UPDATED] =
-		g_signal_new (NM_CONNECTION_SECRETS_UPDATED,
-		              G_OBJECT_CLASS_TYPE (object_class),
-		              G_SIGNAL_RUN_FIRST,
-		              G_STRUCT_OFFSET (NMConnectionClass, secrets_updated),
-		              NULL, NULL,
-		              g_cclosure_marshal_VOID__STRING,
-		              G_TYPE_NONE, 1,
-		              G_TYPE_STRING);
-
-	/**
-	 * NMConnection::secrets-cleared:
-	 * @connection: the object on which the signal is emitted
-	 *
-	 * The ::secrets-cleared signal is emitted when the secrets of a connection
-	 * are cleared.
-	 */
-	signals[SECRETS_CLEARED] =
-		g_signal_new (NM_CONNECTION_SECRETS_CLEARED,
-		              G_OBJECT_CLASS_TYPE (object_class),
-		              G_SIGNAL_RUN_FIRST,
-		              0, NULL, NULL,
-		              g_cclosure_marshal_VOID__VOID,
-		              G_TYPE_NONE, 0);
-
-	/**
-	 * NMConnection::changed:
-	 * @connection: the object on which the signal is emitted
-	 *
-	 * The ::changed signal is emitted when any property of any property
-	 * (including secrets) of any setting of the connection is modified,
-	 * or when settings are added or removed.
-	 *
-	 * Since: 0.9.10
-	 */
-	signals[CHANGED] =
-		g_signal_new (NM_CONNECTION_CHANGED,
-		              G_OBJECT_CLASS_TYPE (object_class),
-		              G_SIGNAL_RUN_FIRST,
-		              0, NULL, NULL,
-		              g_cclosure_marshal_VOID__VOID,
-		              G_TYPE_NONE, 0);
-}