mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-20 16:08:19 +02:00
Chain up to parent's commit_changes() even if in-memory and on-disk data are the
same; they are the same when another process changes the on-disk file. Just make
sure not to write out the data needlessly when same.
This fixes a regression caused by 9cba854fa0.
It exhibits e.g. by not auto-activating connection when ONBOOT is changed from
"no" to "yes". Connection "updated" signal was not emitted and listeners like
NMPolicy was not prodded.
355 lines
9.9 KiB
C
355 lines
9.9 KiB
C
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
|
/* NetworkManager system settings service
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program 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 General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*
|
|
* Copyright (C) 2008 - 2011 Red Hat, Inc.
|
|
*/
|
|
|
|
#include <string.h>
|
|
#include <net/ethernet.h>
|
|
#include <netinet/ether.h>
|
|
|
|
#include <glib/gstdio.h>
|
|
|
|
#include <NetworkManager.h>
|
|
#include <nm-setting-connection.h>
|
|
#include <nm-setting-wired.h>
|
|
#include <nm-setting-wireless.h>
|
|
#include <nm-setting-gsm.h>
|
|
#include <nm-setting-cdma.h>
|
|
#include <nm-setting-pppoe.h>
|
|
#include <nm-setting-wireless-security.h>
|
|
#include <nm-setting-8021x.h>
|
|
|
|
#include "common.h"
|
|
#include "nm-ifcfg-connection.h"
|
|
#include "reader.h"
|
|
#include "writer.h"
|
|
#include "nm-inotify-helper.h"
|
|
|
|
G_DEFINE_TYPE (NMIfcfgConnection, nm_ifcfg_connection, NM_TYPE_SETTINGS_CONNECTION)
|
|
|
|
#define NM_IFCFG_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_IFCFG_CONNECTION, NMIfcfgConnectionPrivate))
|
|
|
|
typedef struct {
|
|
gulong ih_event_id;
|
|
|
|
char *path;
|
|
int file_wd;
|
|
|
|
char *keyfile;
|
|
int keyfile_wd;
|
|
|
|
char *routefile;
|
|
int routefile_wd;
|
|
|
|
char *route6file;
|
|
int route6file_wd;
|
|
|
|
char *unmanaged;
|
|
} NMIfcfgConnectionPrivate;
|
|
|
|
enum {
|
|
PROP_0,
|
|
PROP_UNMANAGED,
|
|
LAST_PROP
|
|
};
|
|
|
|
/* Signals */
|
|
enum {
|
|
IFCFG_CHANGED,
|
|
LAST_SIGNAL
|
|
};
|
|
|
|
static guint signals[LAST_SIGNAL] = { 0 };
|
|
|
|
static void
|
|
files_changed_cb (NMInotifyHelper *ih,
|
|
struct inotify_event *evt,
|
|
const char *path,
|
|
gpointer user_data)
|
|
{
|
|
NMIfcfgConnection *self = NM_IFCFG_CONNECTION (user_data);
|
|
NMIfcfgConnectionPrivate *priv = NM_IFCFG_CONNECTION_GET_PRIVATE (self);
|
|
|
|
if ( (evt->wd != priv->file_wd)
|
|
&& (evt->wd != priv->keyfile_wd)
|
|
&& (evt->wd != priv->routefile_wd)
|
|
&& (evt->wd != priv->route6file_wd))
|
|
return;
|
|
|
|
/* push the event up to the plugin */
|
|
g_signal_emit (self, signals[IFCFG_CHANGED], 0);
|
|
}
|
|
|
|
NMIfcfgConnection *
|
|
nm_ifcfg_connection_new (const char *full_path,
|
|
NMConnection *source,
|
|
GError **error,
|
|
gboolean *ignore_error)
|
|
{
|
|
GObject *object;
|
|
NMIfcfgConnectionPrivate *priv;
|
|
NMConnection *tmp;
|
|
char *unmanaged = NULL;
|
|
char *keyfile = NULL;
|
|
char *routefile = NULL;
|
|
char *route6file = NULL;
|
|
NMInotifyHelper *ih;
|
|
|
|
g_return_val_if_fail (full_path != NULL, NULL);
|
|
|
|
/* If we're given a connection already, prefer that instead of re-reading */
|
|
if (source)
|
|
tmp = g_object_ref (source);
|
|
else {
|
|
tmp = connection_from_file (full_path, NULL, NULL, NULL,
|
|
&unmanaged,
|
|
&keyfile,
|
|
&routefile,
|
|
&route6file,
|
|
error,
|
|
ignore_error);
|
|
if (!tmp)
|
|
return NULL;
|
|
}
|
|
|
|
object = (GObject *) g_object_new (NM_TYPE_IFCFG_CONNECTION,
|
|
NM_IFCFG_CONNECTION_UNMANAGED, unmanaged,
|
|
NULL);
|
|
if (!object)
|
|
goto out;
|
|
|
|
/* Update our settings with what was read from the file */
|
|
if (!nm_settings_connection_replace_settings (NM_SETTINGS_CONNECTION (object), tmp, error)) {
|
|
g_object_unref (object);
|
|
object = NULL;
|
|
goto out;
|
|
}
|
|
|
|
priv = NM_IFCFG_CONNECTION_GET_PRIVATE (object);
|
|
priv->path = g_strdup (full_path);
|
|
|
|
ih = nm_inotify_helper_get ();
|
|
priv->ih_event_id = g_signal_connect (ih, "event", G_CALLBACK (files_changed_cb), object);
|
|
|
|
priv->file_wd = nm_inotify_helper_add_watch (ih, full_path);
|
|
|
|
priv->keyfile = keyfile;
|
|
priv->keyfile_wd = nm_inotify_helper_add_watch (ih, keyfile);
|
|
|
|
priv->routefile = routefile;
|
|
priv->routefile_wd = nm_inotify_helper_add_watch (ih, routefile);
|
|
|
|
priv->route6file = route6file;
|
|
priv->route6file_wd = nm_inotify_helper_add_watch (ih, route6file);
|
|
|
|
out:
|
|
g_object_unref (tmp);
|
|
return (NMIfcfgConnection *) object;
|
|
}
|
|
|
|
const char *
|
|
nm_ifcfg_connection_get_path (NMIfcfgConnection *self)
|
|
{
|
|
g_return_val_if_fail (NM_IS_IFCFG_CONNECTION (self), NULL);
|
|
|
|
return NM_IFCFG_CONNECTION_GET_PRIVATE (self)->path;
|
|
}
|
|
|
|
const char *
|
|
nm_ifcfg_connection_get_unmanaged_spec (NMIfcfgConnection *self)
|
|
{
|
|
g_return_val_if_fail (NM_IS_IFCFG_CONNECTION (self), NULL);
|
|
|
|
return NM_IFCFG_CONNECTION_GET_PRIVATE (self)->unmanaged;
|
|
}
|
|
|
|
static void
|
|
commit_changes (NMSettingsConnection *connection,
|
|
NMSettingsConnectionCommitFunc callback,
|
|
gpointer user_data)
|
|
{
|
|
NMIfcfgConnectionPrivate *priv = NM_IFCFG_CONNECTION_GET_PRIVATE (connection);
|
|
GError *error = NULL;
|
|
NMConnection *reread;
|
|
char *unmanaged = NULL, *keyfile = NULL, *routefile = NULL, *route6file = NULL;
|
|
gboolean same = FALSE;
|
|
|
|
/* To ensure we don't rewrite files that are only changed from other
|
|
* processes on-disk, read the existing connection back in and only rewrite
|
|
* it if it's really changed.
|
|
*/
|
|
reread = connection_from_file (priv->path, NULL, NULL, NULL,
|
|
&unmanaged, &keyfile, &routefile, &route6file,
|
|
NULL, NULL);
|
|
g_free (unmanaged);
|
|
g_free (keyfile);
|
|
g_free (routefile);
|
|
g_free (route6file);
|
|
|
|
if (reread) {
|
|
same = nm_connection_compare (NM_CONNECTION (connection),
|
|
reread,
|
|
NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS |
|
|
NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS);
|
|
g_object_unref (reread);
|
|
|
|
/* Don't bother writing anything out if in-memory and on-disk data are the same */
|
|
if (same) {
|
|
/* But chain up to parent to handle success - emits updated signal */
|
|
NM_SETTINGS_CONNECTION_CLASS (nm_ifcfg_connection_parent_class)->commit_changes (connection, callback, user_data);
|
|
return;
|
|
}
|
|
}
|
|
|
|
if (writer_update_connection (NM_CONNECTION (connection),
|
|
IFCFG_DIR,
|
|
priv->path,
|
|
priv->keyfile,
|
|
&error)) {
|
|
/* Chain up to parent to handle success */
|
|
NM_SETTINGS_CONNECTION_CLASS (nm_ifcfg_connection_parent_class)->commit_changes (connection, callback, user_data);
|
|
} else {
|
|
/* Otherwise immediate error */
|
|
callback (connection, error, user_data);
|
|
g_error_free (error);
|
|
}
|
|
}
|
|
|
|
static void
|
|
do_delete (NMSettingsConnection *connection,
|
|
NMSettingsConnectionDeleteFunc callback,
|
|
gpointer user_data)
|
|
{
|
|
NMIfcfgConnectionPrivate *priv = NM_IFCFG_CONNECTION_GET_PRIVATE (connection);
|
|
|
|
g_unlink (priv->path);
|
|
if (priv->keyfile)
|
|
g_unlink (priv->keyfile);
|
|
if (priv->routefile)
|
|
g_unlink (priv->routefile);
|
|
|
|
if (priv->route6file)
|
|
g_unlink (priv->route6file);
|
|
|
|
NM_SETTINGS_CONNECTION_CLASS (nm_ifcfg_connection_parent_class)->delete (connection, callback, user_data);
|
|
}
|
|
|
|
/* GObject */
|
|
|
|
static void
|
|
nm_ifcfg_connection_init (NMIfcfgConnection *connection)
|
|
{
|
|
}
|
|
|
|
static void
|
|
finalize (GObject *object)
|
|
{
|
|
NMIfcfgConnectionPrivate *priv = NM_IFCFG_CONNECTION_GET_PRIVATE (object);
|
|
NMInotifyHelper *ih;
|
|
|
|
nm_connection_clear_secrets (NM_CONNECTION (object));
|
|
|
|
ih = nm_inotify_helper_get ();
|
|
|
|
if (priv->ih_event_id)
|
|
g_signal_handler_disconnect (ih, priv->ih_event_id);
|
|
|
|
g_free (priv->path);
|
|
if (priv->file_wd >= 0)
|
|
nm_inotify_helper_remove_watch (ih, priv->file_wd);
|
|
|
|
g_free (priv->keyfile);
|
|
if (priv->keyfile_wd >= 0)
|
|
nm_inotify_helper_remove_watch (ih, priv->keyfile_wd);
|
|
|
|
g_free (priv->routefile);
|
|
if (priv->routefile_wd >= 0)
|
|
nm_inotify_helper_remove_watch (ih, priv->routefile_wd);
|
|
|
|
g_free (priv->route6file);
|
|
if (priv->route6file_wd >= 0)
|
|
nm_inotify_helper_remove_watch (ih, priv->route6file_wd);
|
|
|
|
G_OBJECT_CLASS (nm_ifcfg_connection_parent_class)->finalize (object);
|
|
}
|
|
|
|
static void
|
|
set_property (GObject *object, guint prop_id,
|
|
const GValue *value, GParamSpec *pspec)
|
|
{
|
|
NMIfcfgConnectionPrivate *priv = NM_IFCFG_CONNECTION_GET_PRIVATE (object);
|
|
|
|
switch (prop_id) {
|
|
case PROP_UNMANAGED:
|
|
priv->unmanaged = g_value_dup_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)
|
|
{
|
|
NMIfcfgConnectionPrivate *priv = NM_IFCFG_CONNECTION_GET_PRIVATE (object);
|
|
|
|
switch (prop_id) {
|
|
case PROP_UNMANAGED:
|
|
g_value_set_string (value, priv->unmanaged);
|
|
break;
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
nm_ifcfg_connection_class_init (NMIfcfgConnectionClass *ifcfg_connection_class)
|
|
{
|
|
GObjectClass *object_class = G_OBJECT_CLASS (ifcfg_connection_class);
|
|
NMSettingsConnectionClass *settings_class = NM_SETTINGS_CONNECTION_CLASS (ifcfg_connection_class);
|
|
|
|
g_type_class_add_private (ifcfg_connection_class, sizeof (NMIfcfgConnectionPrivate));
|
|
|
|
/* Virtual methods */
|
|
object_class->set_property = set_property;
|
|
object_class->get_property = get_property;
|
|
object_class->finalize = finalize;
|
|
settings_class->delete = do_delete;
|
|
settings_class->commit_changes = commit_changes;
|
|
|
|
/* Properties */
|
|
g_object_class_install_property
|
|
(object_class, PROP_UNMANAGED,
|
|
g_param_spec_string (NM_IFCFG_CONNECTION_UNMANAGED,
|
|
"Unmanaged",
|
|
"Unmanaged",
|
|
NULL,
|
|
G_PARAM_READWRITE));
|
|
|
|
signals[IFCFG_CHANGED] =
|
|
g_signal_new ("ifcfg-changed",
|
|
G_OBJECT_CLASS_TYPE (object_class),
|
|
G_SIGNAL_RUN_LAST,
|
|
0, NULL, NULL,
|
|
g_cclosure_marshal_VOID__VOID,
|
|
G_TYPE_NONE, 0);
|
|
}
|
|
|