2014-08-13 14:34:29 -04:00
|
|
|
/* -*- 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 - 2008 Novell, Inc.
|
|
|
|
|
* Copyright 2007 - 2014 Red Hat, Inc.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "nm-simple-connection.h"
|
2014-08-22 10:14:38 -04:00
|
|
|
#include "nm-setting-private.h"
|
2014-08-13 14:34:29 -04:00
|
|
|
|
|
|
|
|
static void nm_simple_connection_interface_init (NMConnectionInterface *iface);
|
|
|
|
|
|
|
|
|
|
G_DEFINE_TYPE_WITH_CODE (NMSimpleConnection, nm_simple_connection, G_TYPE_OBJECT,
|
|
|
|
|
G_IMPLEMENT_INTERFACE (NM_TYPE_CONNECTION, nm_simple_connection_interface_init);
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
nm_simple_connection_init (NMSimpleConnection *self)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_simple_connection_new:
|
|
|
|
|
*
|
|
|
|
|
* Creates a new #NMSimpleConnection object with no #NMSetting objects. An
|
|
|
|
|
* #NMSimpleConnection does not directly represent a D-Bus-exported connection,
|
|
|
|
|
* but might be used in the process of creating a new one.
|
|
|
|
|
*
|
|
|
|
|
* Returns: (transfer full): the new empty #NMConnection object
|
|
|
|
|
**/
|
|
|
|
|
NMConnection *
|
|
|
|
|
nm_simple_connection_new (void)
|
|
|
|
|
{
|
|
|
|
|
return (NMConnection *) g_object_new (NM_TYPE_SIMPLE_CONNECTION, NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
2014-08-06 19:35:31 -04:00
|
|
|
* nm_simple_connection_new_from_dbus:
|
2014-08-16 10:09:48 -04:00
|
|
|
* @dict: a #GVariant of type %NM_VARIANT_TYPE_CONNECTION describing the connection
|
2014-08-13 14:34:29 -04:00
|
|
|
* @error: on unsuccessful return, an error
|
|
|
|
|
*
|
|
|
|
|
* Creates a new #NMSimpleConnection from a hash table describing the
|
2014-08-06 19:35:31 -04:00
|
|
|
* connection. See nm_connection_to_dbus() for a description of the expected
|
2014-08-13 14:34:29 -04:00
|
|
|
* hash table.
|
|
|
|
|
*
|
|
|
|
|
* Returns: (transfer full): the new #NMSimpleConnection object, populated with
|
|
|
|
|
* settings created from the values in the hash table, or %NULL if the
|
|
|
|
|
* connection failed to validate
|
|
|
|
|
**/
|
|
|
|
|
NMConnection *
|
2014-08-16 10:09:48 -04:00
|
|
|
nm_simple_connection_new_from_dbus (GVariant *dict, GError **error)
|
2014-08-13 14:34:29 -04:00
|
|
|
{
|
|
|
|
|
NMConnection *connection;
|
|
|
|
|
|
2014-08-16 10:09:48 -04:00
|
|
|
g_return_val_if_fail (dict != NULL, NULL);
|
|
|
|
|
g_return_val_if_fail (g_variant_is_of_type (dict, NM_VARIANT_TYPE_CONNECTION), NULL);
|
2014-08-13 14:34:29 -04:00
|
|
|
|
|
|
|
|
connection = nm_simple_connection_new ();
|
2014-08-16 10:09:48 -04:00
|
|
|
if ( !nm_connection_replace_settings (connection, dict, error)
|
libnm-core: fix up connection deserialize/copy/replace semantics
libnm-util's connection deserializing/copying/replacing functions have
odd semantics where sometimes they both modify a connection AND return
an error. libnm-core tried to improve things by guaranteeing that the
connection would not be modified if the new settings were invalid, but
this ended up breaking a bunch of places that needed to be able to
work with invalid connections. So re-fix the functions by reverting
back to the old semantics, but having return values that clearly
distinguish whether the connection was modified or not.
For comparison:
- nm_connection_new_from_hash() / nm_simple_connection_new_from_dbus():
- libnm-util: returns a valid connection or NULL.
- OLD libnm-core: returned a valid connection or NULL.
- NEW libnm-core: returns a valid connection or NULL.
- nm_connection_duplicate() / nm_simple_connection_new_clone():
- libnm-util: always succeeds, whether or not the connection is
valid.
- OLD libnm-core: returned a valid connection or NULL
- NEW libnm-core: always succeeds, whether or not the connection
is valid.
- nm_connection_replace_settings_from_connection():
- libnm-util: always replaces the settings, but returns FALSE if
the connection is now invalid.
- OLD libnm-core: either replaced the settings and returned TRUE
(if the settings were valid), or else left the connection
unchanged and returned FALSE (if not).
- NEW libnm-core: always replaces the settings, and has no
return value. (The modified connection is valid if and only if
the replaced-from connection was valid; just like with the
libnm-util version.)
- nm_connection_replace_settings():
- libnm-util: returns TRUE if the new settings are valid, or
FALSE if either (a) the new settings could not be deserialized
and the connection is unchanged, or (b) the new settings were
deserialized, and the connection was updated, but is now not
valid.
- OLD libnm-core: either replaced the settings and returned TRUE
(if the settings were valid), or else left the connection
unchanged and returned FALSE (if not).
- NEW libnm-core: returns TRUE if the connection was updated
(whether or not it is valid), or FALSE if the new settings
could not be deserialized and the connection is unchanged.
2014-09-15 14:05:52 -04:00
|
|
|
|| !nm_connection_verify (connection, error))
|
|
|
|
|
g_clear_object (&connection);
|
|
|
|
|
return connection;
|
2014-08-13 14:34:29 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_simple_connection_new_clone:
|
|
|
|
|
* @connection: the #NMConnection to clone
|
|
|
|
|
*
|
|
|
|
|
* Clones an #NMConnection as an #NMSimpleConnection.
|
|
|
|
|
*
|
|
|
|
|
* Returns: (transfer full): a new #NMConnection containing the same settings
|
|
|
|
|
* and properties as the source #NMConnection
|
|
|
|
|
**/
|
|
|
|
|
NMConnection *
|
|
|
|
|
nm_simple_connection_new_clone (NMConnection *connection)
|
|
|
|
|
{
|
|
|
|
|
NMConnection *clone;
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
|
|
|
|
|
|
|
|
|
|
clone = nm_simple_connection_new ();
|
|
|
|
|
nm_connection_set_path (clone, nm_connection_get_path (connection));
|
libnm-core: fix up connection deserialize/copy/replace semantics
libnm-util's connection deserializing/copying/replacing functions have
odd semantics where sometimes they both modify a connection AND return
an error. libnm-core tried to improve things by guaranteeing that the
connection would not be modified if the new settings were invalid, but
this ended up breaking a bunch of places that needed to be able to
work with invalid connections. So re-fix the functions by reverting
back to the old semantics, but having return values that clearly
distinguish whether the connection was modified or not.
For comparison:
- nm_connection_new_from_hash() / nm_simple_connection_new_from_dbus():
- libnm-util: returns a valid connection or NULL.
- OLD libnm-core: returned a valid connection or NULL.
- NEW libnm-core: returns a valid connection or NULL.
- nm_connection_duplicate() / nm_simple_connection_new_clone():
- libnm-util: always succeeds, whether or not the connection is
valid.
- OLD libnm-core: returned a valid connection or NULL
- NEW libnm-core: always succeeds, whether or not the connection
is valid.
- nm_connection_replace_settings_from_connection():
- libnm-util: always replaces the settings, but returns FALSE if
the connection is now invalid.
- OLD libnm-core: either replaced the settings and returned TRUE
(if the settings were valid), or else left the connection
unchanged and returned FALSE (if not).
- NEW libnm-core: always replaces the settings, and has no
return value. (The modified connection is valid if and only if
the replaced-from connection was valid; just like with the
libnm-util version.)
- nm_connection_replace_settings():
- libnm-util: returns TRUE if the new settings are valid, or
FALSE if either (a) the new settings could not be deserialized
and the connection is unchanged, or (b) the new settings were
deserialized, and the connection was updated, but is now not
valid.
- OLD libnm-core: either replaced the settings and returned TRUE
(if the settings were valid), or else left the connection
unchanged and returned FALSE (if not).
- NEW libnm-core: returns TRUE if the connection was updated
(whether or not it is valid), or FALSE if the new settings
could not be deserialized and the connection is unchanged.
2014-09-15 14:05:52 -04:00
|
|
|
nm_connection_replace_settings_from_connection (clone, connection);
|
2014-08-13 14:34:29 -04:00
|
|
|
|
|
|
|
|
return clone;
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-20 10:42:57 -05:00
|
|
|
static void
|
|
|
|
|
dispose (GObject *object)
|
|
|
|
|
{
|
|
|
|
|
nm_connection_clear_secrets (NM_CONNECTION (object));
|
|
|
|
|
|
|
|
|
|
G_OBJECT_CLASS (nm_simple_connection_parent_class)->dispose (object);
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-13 14:34:29 -04:00
|
|
|
static void
|
|
|
|
|
nm_simple_connection_class_init (NMSimpleConnectionClass *simple_class)
|
|
|
|
|
{
|
2014-08-20 10:42:57 -05:00
|
|
|
GObjectClass *object_class = G_OBJECT_CLASS (simple_class);
|
|
|
|
|
|
|
|
|
|
object_class->dispose = dispose;
|
2014-08-13 14:34:29 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
nm_simple_connection_interface_init (NMConnectionInterface *iface)
|
|
|
|
|
{
|
|
|
|
|
}
|