mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-24 06:40:16 +01:00
Add connection UUIDs, since connection names can be changed, and since old-style connection IDs could change over the life of the connection. The UUID should be assigned at connection creation time, be stable for a given connection, and should be unique among all connections for a given settings service. * configure.in libnm-util/Makefile.am - Require libuuid * introspection/nm-exported-connection.xml - Remove "GetID" method * libnm-glib/nm-dbus-connection.c libnm-glib/nm-settings.c libnm-glib/nm-settings.h - Remove id-related stuff * libnm-util/nm-utils.c libnm-util/nm-utils.h libnm-util/libnm-util.ver - (nm_utils_uuid_generate, nm_utils_uuid_generate_from_string): Add utility functions to generate UUIDs * libnm-util/nm-setting-connection.c libnm-util/nm-setting-connection.h - Add 'uuid' member to the connection setting - (verify): require valid 'uuid' for a valid connection * system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c system-settings/plugins/ifcfg-fedora/reader.c system-settings/plugins/ifcfg-suse/nm-suse-connection.c system-settings/plugins/ifcfg-suse/parser.c system-settings/plugins/keyfile/nm-keyfile-connection.c system-settings/src/main.c - Remove id-related stuff - Give connections UUIDs where needed git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4013 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
164 lines
4.3 KiB
C
164 lines
4.3 KiB
C
/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */
|
|
|
|
#include <string.h>
|
|
#include <glib/gstdio.h>
|
|
#include <gio/gio.h>
|
|
#include <NetworkManager.h>
|
|
#include "nm-suse-connection.h"
|
|
#include "parser.h"
|
|
#include "nm-system-config-error.h"
|
|
|
|
G_DEFINE_TYPE (NMSuseConnection, nm_suse_connection, NM_TYPE_SYSCONFIG_CONNECTION)
|
|
|
|
#define NM_SUSE_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SUSE_CONNECTION, NMSuseConnectionPrivate))
|
|
|
|
typedef struct {
|
|
GFileMonitor *monitor;
|
|
guint monitor_id;
|
|
|
|
const char *iface;
|
|
NMDeviceType dev_type;
|
|
char *filename;
|
|
} NMSuseConnectionPrivate;
|
|
|
|
static void
|
|
file_changed (GFileMonitor *monitor,
|
|
GFile *file,
|
|
GFile *other_file,
|
|
GFileMonitorEvent event_type,
|
|
gpointer user_data)
|
|
{
|
|
NMExportedConnection *exported = NM_EXPORTED_CONNECTION (user_data);
|
|
NMSuseConnectionPrivate *priv = NM_SUSE_CONNECTION_GET_PRIVATE (exported);
|
|
NMConnection *new_connection;
|
|
GHashTable *new_settings;
|
|
|
|
switch (event_type) {
|
|
case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
|
|
new_connection = parse_ifcfg (priv->iface, priv->dev_type);
|
|
if (new_connection) {
|
|
new_settings = nm_connection_to_hash (new_connection);
|
|
nm_connection_replace_settings (nm_exported_connection_get_connection (exported), new_settings);
|
|
nm_exported_connection_signal_updated (exported, new_settings);
|
|
|
|
g_hash_table_destroy (new_settings);
|
|
g_object_unref (new_connection);
|
|
} else
|
|
nm_exported_connection_signal_removed (exported);
|
|
break;
|
|
case G_FILE_MONITOR_EVENT_DELETED:
|
|
nm_exported_connection_signal_removed (exported);
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
NMSuseConnection *
|
|
nm_suse_connection_new (const char *iface, NMDeviceType dev_type)
|
|
{
|
|
NMConnection *connection;
|
|
GFile *file;
|
|
GFileMonitor *monitor;
|
|
NMSuseConnection *exported;
|
|
NMSuseConnectionPrivate *priv;
|
|
|
|
g_return_val_if_fail (iface != NULL, NULL);
|
|
|
|
connection = parse_ifcfg (iface, dev_type);
|
|
if (!connection)
|
|
return NULL;
|
|
|
|
exported = (NMSuseConnection *) g_object_new (NM_TYPE_SUSE_CONNECTION,
|
|
NM_EXPORTED_CONNECTION_CONNECTION, connection,
|
|
NULL);
|
|
g_object_unref (connection);
|
|
if (!exported)
|
|
return NULL;
|
|
|
|
priv = NM_SUSE_CONNECTION_GET_PRIVATE (exported);
|
|
|
|
priv->iface = g_strdup (iface);
|
|
priv->dev_type = dev_type;
|
|
priv->filename = g_strdup_printf (SYSCONFDIR "/sysconfig/network/ifcfg-%s", iface);
|
|
|
|
file = g_file_new_for_path (priv->filename);
|
|
monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, NULL);
|
|
g_object_unref (file);
|
|
|
|
if (monitor) {
|
|
priv->monitor_id = g_signal_connect (monitor, "changed", G_CALLBACK (file_changed), exported);
|
|
priv->monitor = monitor;
|
|
}
|
|
|
|
return exported;
|
|
}
|
|
|
|
static GHashTable *
|
|
get_settings (NMExportedConnection *exported)
|
|
{
|
|
return nm_connection_to_hash (nm_exported_connection_get_connection (exported));
|
|
}
|
|
|
|
static gboolean
|
|
update (NMExportedConnection *exported,
|
|
GHashTable *new_settings,
|
|
GError **err)
|
|
{
|
|
g_set_error (err, NM_SYSCONFIG_SETTINGS_ERROR,
|
|
NM_SYSCONFIG_SETTINGS_ERROR_UPDATE_NOT_SUPPORTED,
|
|
"%s", "Please use YaST to change this connection.");
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
static gboolean
|
|
delete (NMExportedConnection *exported, GError **err)
|
|
{
|
|
g_set_error (err, NM_SYSCONFIG_SETTINGS_ERROR,
|
|
NM_SYSCONFIG_SETTINGS_ERROR_DELETE_NOT_SUPPORTED,
|
|
"%s", "Please use YaST to remove this connection.");
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
/* GObject */
|
|
|
|
static void
|
|
nm_suse_connection_init (NMSuseConnection *connection)
|
|
{
|
|
}
|
|
|
|
static void
|
|
finalize (GObject *object)
|
|
{
|
|
NMSuseConnectionPrivate *priv = NM_SUSE_CONNECTION_GET_PRIVATE (object);
|
|
|
|
if (priv->monitor) {
|
|
if (priv->monitor_id)
|
|
g_signal_handler_disconnect (priv->monitor, priv->monitor_id);
|
|
|
|
g_file_monitor_cancel (priv->monitor);
|
|
g_object_unref (priv->monitor);
|
|
}
|
|
|
|
g_free (priv->filename);
|
|
|
|
G_OBJECT_CLASS (nm_suse_connection_parent_class)->finalize (object);
|
|
}
|
|
|
|
static void
|
|
nm_suse_connection_class_init (NMSuseConnectionClass *suse_connection_class)
|
|
{
|
|
GObjectClass *object_class = G_OBJECT_CLASS (suse_connection_class);
|
|
NMExportedConnectionClass *connection_class = NM_EXPORTED_CONNECTION_CLASS (suse_connection_class);
|
|
|
|
g_type_class_add_private (suse_connection_class, sizeof (NMSuseConnectionPrivate));
|
|
|
|
/* Virtual methods */
|
|
object_class->finalize = finalize;
|
|
|
|
connection_class->get_settings = get_settings;
|
|
connection_class->update = update;
|
|
connection_class->delete = delete;
|
|
}
|