NetworkManager/system-settings/plugins/ifcfg-fedora/plugin.c

577 lines
16 KiB
C
Raw Normal View History

/* NetworkManager system settings service
*
* Søren Sandmann <sandmann@daimi.au.dk>
*
* 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.
*
* (C) Copyright 2008 Red Hat, Inc.
*/
#include <config.h>
#include <gmodule.h>
#include <glib-object.h>
#include <glib/gi18n.h>
#include <string.h>
#include <unistd.h>
2008-02-07 Dan Williams <dcbw@redhat.com> * system-settings/src/dbus-settings.c system-settings/src/dbus-settings.h - (add_one_secret_to_hash): copy secrets out of the plugin-returned hash table of secrets - (connection_settings_get_secrets): consolidate error returns into one place; use the new get_secrets() plugin interface function to get secrets from the plugin itself rather than using GObject data magic * system-settings/src/main.c - (connection_added_cb, connection_removed_cb, free_plugin_connections, load_connections): keep a private list of the plugin-returned connections, don't use the plugin's GSList * system-settings/plugins/ifcfg-fedora/plugin.c - (watch_path): watch the path, not the filename (duh) - (reload_all_connections): use the direct hash/equal functions; the ones for int aren't appropriate here - (get_secrets, system_config_interface_init): implement the get_secrets() function - (build_one_connection, find_connection_by_path): ifcfg file path is now in the connection's ConnectionData instead of being a GObject data property - (handle_profile_item_changed): ifcfg file path is now in the connection's ConnectionData instead of being a GObject data property; be sure to copy secrets over from the new connection to the existing connection when updating the connection's settings - (init): sc_plugin_inotify_init() returns success/fail, not the inotify file descriptor * system-settings/plugins/ifcfg-fedora/parser.c system-settings/plugins/ifcfg-fedora/parser.h - (connection_data_get, copy_one_cdata_secret, clear_one_cdata_secret, connection_data_copy_secrets, connection_data_free, connection_data_add): new functions; connection data manipulation - (make_wireless_security_setting): stuff secrets into the connection data, not as GObject data items; make sure to close the keys ifcfg file - (wireless_connection_from_ifcfg, wired_connection_from_ifcfg): add connection data to the connection git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3299 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-02-07 20:11:31 +00:00
#include <errno.h>
2008-04-07 Dan Williams <dcbw@redhat.com> * introspection/nm-settings-system.xml introspection/Makefile.am - Define the unmanaged devices interface for the system settings service * system-settings/src/nm-system-config-hal-manager.c system-settings/src/nm-system-config-hal-manager.h system-settings/src/nm-system-config-hal-manager-private.h system-settings/src/Makefile.am - Add a lightweight HAL manager object for tracking network devices for the purpose of determining unmanaged devices and which devices need the default DHCP connections * system-settings/src/nm-system-config-interface.c system-settings/src/nm-system-config-interface.h - (nm_system_config_interface_init): add the HAL manager as an argument - (nm_system_config_interface_get_unmanaged_devices): implement - Define 'unmanaged-devices-changed' signal * system-settings/src/dbus-settings.c system-settings/src/dbus-settings.h - Implement the unmanaged devices interface; some cleanups * system-settings/plugins/ifcfg-suse/plugin.c - Fixup for plugin interface changes * system-settings/plugins/ifcfg-fedora/plugin.c - (get_ether_device_udi): new function; find the device that has a specified MAC address and return its UDI - (get_udi_for_connection): new function; try to find the specific device a connection is locked to, if any - (device_added_cb, device_removed_cb): update unmanaged device list in response to HAL events - (get_unmanaged_devices): new function; return unmanaged device list - (build_one_connection): set the connection's locked device, if any - (write_auto_wired_connection): remove - (kill_old_auto_wired_file): remove the ifcfg-Auto Wired file if found - (handle_connection_changed): alert listeners that the unmanaged device list has changed - (init): fixup for plugin interface changes, implement unmanaged devices * system-settings/plugins/ifcfg-fedora/parser.c system-settings/plugins/ifcfg-fedora/parser.h - (connection_data_free): clean up connection UDI git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3537 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-04-08 01:36:39 +00:00
#include <net/ethernet.h>
#include <netinet/ether.h>
#include <dbus/dbus-glib.h>
#include <nm-setting-connection.h>
#ifndef NO_GIO
#include <gio/gio.h>
#else
#include <gfilemonitor/gfilemonitor.h>
#endif
#include "common.h"
2008-04-07 Dan Williams <dcbw@redhat.com> * introspection/nm-settings-system.xml introspection/Makefile.am - Define the unmanaged devices interface for the system settings service * system-settings/src/nm-system-config-hal-manager.c system-settings/src/nm-system-config-hal-manager.h system-settings/src/nm-system-config-hal-manager-private.h system-settings/src/Makefile.am - Add a lightweight HAL manager object for tracking network devices for the purpose of determining unmanaged devices and which devices need the default DHCP connections * system-settings/src/nm-system-config-interface.c system-settings/src/nm-system-config-interface.h - (nm_system_config_interface_init): add the HAL manager as an argument - (nm_system_config_interface_get_unmanaged_devices): implement - Define 'unmanaged-devices-changed' signal * system-settings/src/dbus-settings.c system-settings/src/dbus-settings.h - Implement the unmanaged devices interface; some cleanups * system-settings/plugins/ifcfg-suse/plugin.c - Fixup for plugin interface changes * system-settings/plugins/ifcfg-fedora/plugin.c - (get_ether_device_udi): new function; find the device that has a specified MAC address and return its UDI - (get_udi_for_connection): new function; try to find the specific device a connection is locked to, if any - (device_added_cb, device_removed_cb): update unmanaged device list in response to HAL events - (get_unmanaged_devices): new function; return unmanaged device list - (build_one_connection): set the connection's locked device, if any - (write_auto_wired_connection): remove - (kill_old_auto_wired_file): remove the ifcfg-Auto Wired file if found - (handle_connection_changed): alert listeners that the unmanaged device list has changed - (init): fixup for plugin interface changes, implement unmanaged devices * system-settings/plugins/ifcfg-fedora/parser.c system-settings/plugins/ifcfg-fedora/parser.h - (connection_data_free): clean up connection UDI git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3537 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-04-08 01:36:39 +00:00
#include "nm-dbus-glib-types.h"
#include "plugin.h"
#include "nm-system-config-interface.h"
#include "nm-ifcfg-connection.h"
#define IFCFG_DIR SYSCONFDIR"/sysconfig/network-scripts/"
static void system_config_interface_init (NMSystemConfigInterface *system_config_interface_class);
2008-05-13 Dan Williams <dcbw@redhat.com> * marshallers/nm-marshal.list - Add VOID:POINTER,STRING marshaller for ifcfg-fedora plugin * system-settings/plugins/ifcfg-fedora/Makefile.am system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c system-settings/plugins/ifcfg-fedora/nm-inotify-helper.h - Implement a minimal inotify helper for watch paths for IN_CLOSE_WRITE events. Solely for use watching ifcfg files to pick up changes to their hardlinks, since GIO doesn't support this yet (bgo #532815) * system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c - (nm_ifcfg_connection_class_init): new 'ifcfg-changed' signal when the file contents change - (finalize): clean up inotify watches - (nm_ifcfg_connection_new): store keyfile; inotify watch the keyfile and the connection ifcfg for changes on their hardlinks - (files_changed_cb): proxy the changed signal back out to listeners * system-settings/plugins/ifcfg-fedora/plugin.c - (dir_changed): - (connection_ifcfg_changed): re-read the connection when the ifcfg changes - (read_one_connection): connect to change signals on the new connection - (dir_changed, connection_changed_handler, handle_connection_remove_or_new): break out connection change handling and connection new/remove handling so it can be used from both the GFileMonitor callback and the NMIfcfgConnection changed signals * system-settings/plugins/ifcfg-fedora/reader.c system-settings/plugins/ifcfg-fedora/reader.h - (connection_from_file): return the keyfile path the connection would use git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3663 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-05-13 16:53:50 +00:00
static void connection_changed_handler (SCPluginIfcfg *plugin,
const char *path,
NMIfcfgConnection *connection,
gboolean *do_remove,
gboolean *do_new);
static void handle_connection_remove_or_new (SCPluginIfcfg *plugin,
const char *path,
NMIfcfgConnection *connection,
gboolean do_remove,
gboolean do_new);
G_DEFINE_TYPE_EXTENDED (SCPluginIfcfg, sc_plugin_ifcfg, G_TYPE_OBJECT, 0,
G_IMPLEMENT_INTERFACE (NM_TYPE_SYSTEM_CONFIG_INTERFACE,
system_config_interface_init))
#define SC_PLUGIN_IFCFG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SC_TYPE_PLUGIN_IFCFG, SCPluginIfcfgPrivate))
typedef struct {
2008-04-07 Dan Williams <dcbw@redhat.com> * introspection/nm-settings-system.xml introspection/Makefile.am - Define the unmanaged devices interface for the system settings service * system-settings/src/nm-system-config-hal-manager.c system-settings/src/nm-system-config-hal-manager.h system-settings/src/nm-system-config-hal-manager-private.h system-settings/src/Makefile.am - Add a lightweight HAL manager object for tracking network devices for the purpose of determining unmanaged devices and which devices need the default DHCP connections * system-settings/src/nm-system-config-interface.c system-settings/src/nm-system-config-interface.h - (nm_system_config_interface_init): add the HAL manager as an argument - (nm_system_config_interface_get_unmanaged_devices): implement - Define 'unmanaged-devices-changed' signal * system-settings/src/dbus-settings.c system-settings/src/dbus-settings.h - Implement the unmanaged devices interface; some cleanups * system-settings/plugins/ifcfg-suse/plugin.c - Fixup for plugin interface changes * system-settings/plugins/ifcfg-fedora/plugin.c - (get_ether_device_udi): new function; find the device that has a specified MAC address and return its UDI - (get_udi_for_connection): new function; try to find the specific device a connection is locked to, if any - (device_added_cb, device_removed_cb): update unmanaged device list in response to HAL events - (get_unmanaged_devices): new function; return unmanaged device list - (build_one_connection): set the connection's locked device, if any - (write_auto_wired_connection): remove - (kill_old_auto_wired_file): remove the ifcfg-Auto Wired file if found - (handle_connection_changed): alert listeners that the unmanaged device list has changed - (init): fixup for plugin interface changes, implement unmanaged devices * system-settings/plugins/ifcfg-fedora/parser.c system-settings/plugins/ifcfg-fedora/parser.h - (connection_data_free): clean up connection UDI git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3537 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-04-08 01:36:39 +00:00
DBusGConnection *g_connection;
NMSystemConfigHalManager *hal_mgr;
GHashTable *connections;
GFileMonitor *monitor;
guint monitor_id;
} SCPluginIfcfgPrivate;
GQuark
ifcfg_plugin_error_quark (void)
{
static GQuark error_quark = 0;
if (G_UNLIKELY (error_quark == 0))
error_quark = g_quark_from_static_string ("ifcfg-plugin-error-quark");
return error_quark;
}
static void
check_unmanaged (gpointer key, gpointer data, gpointer user_data)
{
GSList **list = (GSList **) user_data;
NMIfcfgConnection *connection = NM_IFCFG_CONNECTION (data);
const char *udi;
2008-04-07 Dan Williams <dcbw@redhat.com> * introspection/nm-settings-system.xml introspection/Makefile.am - Define the unmanaged devices interface for the system settings service * system-settings/src/nm-system-config-hal-manager.c system-settings/src/nm-system-config-hal-manager.h system-settings/src/nm-system-config-hal-manager-private.h system-settings/src/Makefile.am - Add a lightweight HAL manager object for tracking network devices for the purpose of determining unmanaged devices and which devices need the default DHCP connections * system-settings/src/nm-system-config-interface.c system-settings/src/nm-system-config-interface.h - (nm_system_config_interface_init): add the HAL manager as an argument - (nm_system_config_interface_get_unmanaged_devices): implement - Define 'unmanaged-devices-changed' signal * system-settings/src/dbus-settings.c system-settings/src/dbus-settings.h - Implement the unmanaged devices interface; some cleanups * system-settings/plugins/ifcfg-suse/plugin.c - Fixup for plugin interface changes * system-settings/plugins/ifcfg-fedora/plugin.c - (get_ether_device_udi): new function; find the device that has a specified MAC address and return its UDI - (get_udi_for_connection): new function; try to find the specific device a connection is locked to, if any - (device_added_cb, device_removed_cb): update unmanaged device list in response to HAL events - (get_unmanaged_devices): new function; return unmanaged device list - (build_one_connection): set the connection's locked device, if any - (write_auto_wired_connection): remove - (kill_old_auto_wired_file): remove the ifcfg-Auto Wired file if found - (handle_connection_changed): alert listeners that the unmanaged device list has changed - (init): fixup for plugin interface changes, implement unmanaged devices * system-settings/plugins/ifcfg-fedora/parser.c system-settings/plugins/ifcfg-fedora/parser.h - (connection_data_free): clean up connection UDI git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3537 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-04-08 01:36:39 +00:00
GSList *iter;
if (!nm_ifcfg_connection_get_unmanaged (connection))
return;
udi = nm_ifcfg_connection_get_udi (connection);
if (!udi)
return;
2008-04-07 Dan Williams <dcbw@redhat.com> * introspection/nm-settings-system.xml introspection/Makefile.am - Define the unmanaged devices interface for the system settings service * system-settings/src/nm-system-config-hal-manager.c system-settings/src/nm-system-config-hal-manager.h system-settings/src/nm-system-config-hal-manager-private.h system-settings/src/Makefile.am - Add a lightweight HAL manager object for tracking network devices for the purpose of determining unmanaged devices and which devices need the default DHCP connections * system-settings/src/nm-system-config-interface.c system-settings/src/nm-system-config-interface.h - (nm_system_config_interface_init): add the HAL manager as an argument - (nm_system_config_interface_get_unmanaged_devices): implement - Define 'unmanaged-devices-changed' signal * system-settings/src/dbus-settings.c system-settings/src/dbus-settings.h - Implement the unmanaged devices interface; some cleanups * system-settings/plugins/ifcfg-suse/plugin.c - Fixup for plugin interface changes * system-settings/plugins/ifcfg-fedora/plugin.c - (get_ether_device_udi): new function; find the device that has a specified MAC address and return its UDI - (get_udi_for_connection): new function; try to find the specific device a connection is locked to, if any - (device_added_cb, device_removed_cb): update unmanaged device list in response to HAL events - (get_unmanaged_devices): new function; return unmanaged device list - (build_one_connection): set the connection's locked device, if any - (write_auto_wired_connection): remove - (kill_old_auto_wired_file): remove the ifcfg-Auto Wired file if found - (handle_connection_changed): alert listeners that the unmanaged device list has changed - (init): fixup for plugin interface changes, implement unmanaged devices * system-settings/plugins/ifcfg-fedora/parser.c system-settings/plugins/ifcfg-fedora/parser.h - (connection_data_free): clean up connection UDI git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3537 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-04-08 01:36:39 +00:00
/* Just return if the UDI is already in the list */
for (iter = *list; iter; iter = g_slist_next (iter)) {
if (!strcmp ((char *) iter->data, udi))
return;
2008-04-07 Dan Williams <dcbw@redhat.com> * introspection/nm-settings-system.xml introspection/Makefile.am - Define the unmanaged devices interface for the system settings service * system-settings/src/nm-system-config-hal-manager.c system-settings/src/nm-system-config-hal-manager.h system-settings/src/nm-system-config-hal-manager-private.h system-settings/src/Makefile.am - Add a lightweight HAL manager object for tracking network devices for the purpose of determining unmanaged devices and which devices need the default DHCP connections * system-settings/src/nm-system-config-interface.c system-settings/src/nm-system-config-interface.h - (nm_system_config_interface_init): add the HAL manager as an argument - (nm_system_config_interface_get_unmanaged_devices): implement - Define 'unmanaged-devices-changed' signal * system-settings/src/dbus-settings.c system-settings/src/dbus-settings.h - Implement the unmanaged devices interface; some cleanups * system-settings/plugins/ifcfg-suse/plugin.c - Fixup for plugin interface changes * system-settings/plugins/ifcfg-fedora/plugin.c - (get_ether_device_udi): new function; find the device that has a specified MAC address and return its UDI - (get_udi_for_connection): new function; try to find the specific device a connection is locked to, if any - (device_added_cb, device_removed_cb): update unmanaged device list in response to HAL events - (get_unmanaged_devices): new function; return unmanaged device list - (build_one_connection): set the connection's locked device, if any - (write_auto_wired_connection): remove - (kill_old_auto_wired_file): remove the ifcfg-Auto Wired file if found - (handle_connection_changed): alert listeners that the unmanaged device list has changed - (init): fixup for plugin interface changes, implement unmanaged devices * system-settings/plugins/ifcfg-fedora/parser.c system-settings/plugins/ifcfg-fedora/parser.h - (connection_data_free): clean up connection UDI git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3537 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-04-08 01:36:39 +00:00
}
*list = g_slist_prepend (*list, g_strdup (udi));
2008-04-07 Dan Williams <dcbw@redhat.com> * introspection/nm-settings-system.xml introspection/Makefile.am - Define the unmanaged devices interface for the system settings service * system-settings/src/nm-system-config-hal-manager.c system-settings/src/nm-system-config-hal-manager.h system-settings/src/nm-system-config-hal-manager-private.h system-settings/src/Makefile.am - Add a lightweight HAL manager object for tracking network devices for the purpose of determining unmanaged devices and which devices need the default DHCP connections * system-settings/src/nm-system-config-interface.c system-settings/src/nm-system-config-interface.h - (nm_system_config_interface_init): add the HAL manager as an argument - (nm_system_config_interface_get_unmanaged_devices): implement - Define 'unmanaged-devices-changed' signal * system-settings/src/dbus-settings.c system-settings/src/dbus-settings.h - Implement the unmanaged devices interface; some cleanups * system-settings/plugins/ifcfg-suse/plugin.c - Fixup for plugin interface changes * system-settings/plugins/ifcfg-fedora/plugin.c - (get_ether_device_udi): new function; find the device that has a specified MAC address and return its UDI - (get_udi_for_connection): new function; try to find the specific device a connection is locked to, if any - (device_added_cb, device_removed_cb): update unmanaged device list in response to HAL events - (get_unmanaged_devices): new function; return unmanaged device list - (build_one_connection): set the connection's locked device, if any - (write_auto_wired_connection): remove - (kill_old_auto_wired_file): remove the ifcfg-Auto Wired file if found - (handle_connection_changed): alert listeners that the unmanaged device list has changed - (init): fixup for plugin interface changes, implement unmanaged devices * system-settings/plugins/ifcfg-fedora/parser.c system-settings/plugins/ifcfg-fedora/parser.h - (connection_data_free): clean up connection UDI git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3537 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-04-08 01:36:39 +00:00
}
static GSList *
get_unmanaged_devices (NMSystemConfigInterface *config)
{
SCPluginIfcfgPrivate *priv = SC_PLUGIN_IFCFG_GET_PRIVATE (config);
GSList *list = NULL;
g_hash_table_foreach (priv->connections, check_unmanaged, &list);
return list;
}
static void
connection_unmanaged_changed (NMIfcfgConnection *connection,
GParamSpec *pspec,
gpointer user_data)
{
g_signal_emit_by_name (SC_PLUGIN_IFCFG (user_data), "unmanaged-devices-changed");
}
2008-05-13 Dan Williams <dcbw@redhat.com> * marshallers/nm-marshal.list - Add VOID:POINTER,STRING marshaller for ifcfg-fedora plugin * system-settings/plugins/ifcfg-fedora/Makefile.am system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c system-settings/plugins/ifcfg-fedora/nm-inotify-helper.h - Implement a minimal inotify helper for watch paths for IN_CLOSE_WRITE events. Solely for use watching ifcfg files to pick up changes to their hardlinks, since GIO doesn't support this yet (bgo #532815) * system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c - (nm_ifcfg_connection_class_init): new 'ifcfg-changed' signal when the file contents change - (finalize): clean up inotify watches - (nm_ifcfg_connection_new): store keyfile; inotify watch the keyfile and the connection ifcfg for changes on their hardlinks - (files_changed_cb): proxy the changed signal back out to listeners * system-settings/plugins/ifcfg-fedora/plugin.c - (dir_changed): - (connection_ifcfg_changed): re-read the connection when the ifcfg changes - (read_one_connection): connect to change signals on the new connection - (dir_changed, connection_changed_handler, handle_connection_remove_or_new): break out connection change handling and connection new/remove handling so it can be used from both the GFileMonitor callback and the NMIfcfgConnection changed signals * system-settings/plugins/ifcfg-fedora/reader.c system-settings/plugins/ifcfg-fedora/reader.h - (connection_from_file): return the keyfile path the connection would use git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3663 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-05-13 16:53:50 +00:00
static void
connection_ifcfg_changed (NMIfcfgConnection *connection, gpointer user_data)
{
SCPluginIfcfg *plugin = SC_PLUGIN_IFCFG (user_data);
gboolean do_remove = FALSE, do_new = FALSE;
const char *path;
path = nm_ifcfg_connection_get_filename (connection);
g_return_if_fail (path != NULL);
connection_changed_handler (plugin, path, connection, &do_remove, &do_new);
handle_connection_remove_or_new (plugin, path, connection, do_remove, do_new);
}
static NMIfcfgConnection *
read_one_connection (SCPluginIfcfg *plugin, const char *filename)
{
SCPluginIfcfgPrivate *priv = SC_PLUGIN_IFCFG_GET_PRIVATE (plugin);
NMIfcfgConnection *connection;
GError *error = NULL;
PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "parsing %s ... ", filename);
connection = nm_ifcfg_connection_new (filename, priv->g_connection, priv->hal_mgr, &error);
if (connection) {
NMConnection *wrapped;
NMSettingConnection *s_con;
wrapped = nm_exported_connection_get_connection (NM_EXPORTED_CONNECTION (connection));
g_assert (wrapped);
s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (wrapped, NM_TYPE_SETTING_CONNECTION));
g_assert (s_con);
g_assert (s_con->id);
g_hash_table_insert (priv->connections,
(gpointer) nm_ifcfg_connection_get_filename (connection),
g_object_ref (connection));
PLUGIN_PRINT (IFCFG_PLUGIN_NAME, " read connection '%s'", s_con->id);
if (nm_ifcfg_connection_get_unmanaged (connection)) {
PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "Ignoring connection '%s' and its "
"device because NM_CONTROLLED was false.", s_con->id);
g_signal_emit_by_name (plugin, "unmanaged-devices-changed");
} else {
/* Wait for the connection to become unmanaged once it knows the
* UDI of it's device, if/when the device gets plugged in.
*/
g_signal_connect (G_OBJECT (connection), "notify::unmanaged",
G_CALLBACK (connection_unmanaged_changed), plugin);
}
2008-05-13 Dan Williams <dcbw@redhat.com> * marshallers/nm-marshal.list - Add VOID:POINTER,STRING marshaller for ifcfg-fedora plugin * system-settings/plugins/ifcfg-fedora/Makefile.am system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c system-settings/plugins/ifcfg-fedora/nm-inotify-helper.h - Implement a minimal inotify helper for watch paths for IN_CLOSE_WRITE events. Solely for use watching ifcfg files to pick up changes to their hardlinks, since GIO doesn't support this yet (bgo #532815) * system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c - (nm_ifcfg_connection_class_init): new 'ifcfg-changed' signal when the file contents change - (finalize): clean up inotify watches - (nm_ifcfg_connection_new): store keyfile; inotify watch the keyfile and the connection ifcfg for changes on their hardlinks - (files_changed_cb): proxy the changed signal back out to listeners * system-settings/plugins/ifcfg-fedora/plugin.c - (dir_changed): - (connection_ifcfg_changed): re-read the connection when the ifcfg changes - (read_one_connection): connect to change signals on the new connection - (dir_changed, connection_changed_handler, handle_connection_remove_or_new): break out connection change handling and connection new/remove handling so it can be used from both the GFileMonitor callback and the NMIfcfgConnection changed signals * system-settings/plugins/ifcfg-fedora/reader.c system-settings/plugins/ifcfg-fedora/reader.h - (connection_from_file): return the keyfile path the connection would use git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3663 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-05-13 16:53:50 +00:00
/* watch changes of ifcfg hardlinks */
g_signal_connect (G_OBJECT (connection), "ifcfg-changed",
G_CALLBACK (connection_ifcfg_changed), plugin);
} else {
PLUGIN_PRINT (IFCFG_PLUGIN_NAME, " error: %s",
error->message ? error->message : "(unknown)");
g_error_free (error);
}
return connection;
}
static gboolean
2008-05-13 Dan Williams <dcbw@redhat.com> * marshallers/nm-marshal.list - Add VOID:POINTER,STRING marshaller for ifcfg-fedora plugin * system-settings/plugins/ifcfg-fedora/Makefile.am system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c system-settings/plugins/ifcfg-fedora/nm-inotify-helper.h - Implement a minimal inotify helper for watch paths for IN_CLOSE_WRITE events. Solely for use watching ifcfg files to pick up changes to their hardlinks, since GIO doesn't support this yet (bgo #532815) * system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c - (nm_ifcfg_connection_class_init): new 'ifcfg-changed' signal when the file contents change - (finalize): clean up inotify watches - (nm_ifcfg_connection_new): store keyfile; inotify watch the keyfile and the connection ifcfg for changes on their hardlinks - (files_changed_cb): proxy the changed signal back out to listeners * system-settings/plugins/ifcfg-fedora/plugin.c - (dir_changed): - (connection_ifcfg_changed): re-read the connection when the ifcfg changes - (read_one_connection): connect to change signals on the new connection - (dir_changed, connection_changed_handler, handle_connection_remove_or_new): break out connection change handling and connection new/remove handling so it can be used from both the GFileMonitor callback and the NMIfcfgConnection changed signals * system-settings/plugins/ifcfg-fedora/reader.c system-settings/plugins/ifcfg-fedora/reader.h - (connection_from_file): return the keyfile path the connection would use git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3663 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-05-13 16:53:50 +00:00
check_suffix (const char *basename, const char *tag)
2008-04-07 Dan Williams <dcbw@redhat.com> * introspection/nm-settings-system.xml introspection/Makefile.am - Define the unmanaged devices interface for the system settings service * system-settings/src/nm-system-config-hal-manager.c system-settings/src/nm-system-config-hal-manager.h system-settings/src/nm-system-config-hal-manager-private.h system-settings/src/Makefile.am - Add a lightweight HAL manager object for tracking network devices for the purpose of determining unmanaged devices and which devices need the default DHCP connections * system-settings/src/nm-system-config-interface.c system-settings/src/nm-system-config-interface.h - (nm_system_config_interface_init): add the HAL manager as an argument - (nm_system_config_interface_get_unmanaged_devices): implement - Define 'unmanaged-devices-changed' signal * system-settings/src/dbus-settings.c system-settings/src/dbus-settings.h - Implement the unmanaged devices interface; some cleanups * system-settings/plugins/ifcfg-suse/plugin.c - Fixup for plugin interface changes * system-settings/plugins/ifcfg-fedora/plugin.c - (get_ether_device_udi): new function; find the device that has a specified MAC address and return its UDI - (get_udi_for_connection): new function; try to find the specific device a connection is locked to, if any - (device_added_cb, device_removed_cb): update unmanaged device list in response to HAL events - (get_unmanaged_devices): new function; return unmanaged device list - (build_one_connection): set the connection's locked device, if any - (write_auto_wired_connection): remove - (kill_old_auto_wired_file): remove the ifcfg-Auto Wired file if found - (handle_connection_changed): alert listeners that the unmanaged device list has changed - (init): fixup for plugin interface changes, implement unmanaged devices * system-settings/plugins/ifcfg-fedora/parser.c system-settings/plugins/ifcfg-fedora/parser.h - (connection_data_free): clean up connection UDI git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3537 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-04-08 01:36:39 +00:00
{
int len, tag_len;
2008-04-07 Dan Williams <dcbw@redhat.com> * introspection/nm-settings-system.xml introspection/Makefile.am - Define the unmanaged devices interface for the system settings service * system-settings/src/nm-system-config-hal-manager.c system-settings/src/nm-system-config-hal-manager.h system-settings/src/nm-system-config-hal-manager-private.h system-settings/src/Makefile.am - Add a lightweight HAL manager object for tracking network devices for the purpose of determining unmanaged devices and which devices need the default DHCP connections * system-settings/src/nm-system-config-interface.c system-settings/src/nm-system-config-interface.h - (nm_system_config_interface_init): add the HAL manager as an argument - (nm_system_config_interface_get_unmanaged_devices): implement - Define 'unmanaged-devices-changed' signal * system-settings/src/dbus-settings.c system-settings/src/dbus-settings.h - Implement the unmanaged devices interface; some cleanups * system-settings/plugins/ifcfg-suse/plugin.c - Fixup for plugin interface changes * system-settings/plugins/ifcfg-fedora/plugin.c - (get_ether_device_udi): new function; find the device that has a specified MAC address and return its UDI - (get_udi_for_connection): new function; try to find the specific device a connection is locked to, if any - (device_added_cb, device_removed_cb): update unmanaged device list in response to HAL events - (get_unmanaged_devices): new function; return unmanaged device list - (build_one_connection): set the connection's locked device, if any - (write_auto_wired_connection): remove - (kill_old_auto_wired_file): remove the ifcfg-Auto Wired file if found - (handle_connection_changed): alert listeners that the unmanaged device list has changed - (init): fixup for plugin interface changes, implement unmanaged devices * system-settings/plugins/ifcfg-fedora/parser.c system-settings/plugins/ifcfg-fedora/parser.h - (connection_data_free): clean up connection UDI git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3537 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-04-08 01:36:39 +00:00
g_return_val_if_fail (basename != NULL, TRUE);
g_return_val_if_fail (tag != NULL, TRUE);
2008-04-07 Dan Williams <dcbw@redhat.com> * introspection/nm-settings-system.xml introspection/Makefile.am - Define the unmanaged devices interface for the system settings service * system-settings/src/nm-system-config-hal-manager.c system-settings/src/nm-system-config-hal-manager.h system-settings/src/nm-system-config-hal-manager-private.h system-settings/src/Makefile.am - Add a lightweight HAL manager object for tracking network devices for the purpose of determining unmanaged devices and which devices need the default DHCP connections * system-settings/src/nm-system-config-interface.c system-settings/src/nm-system-config-interface.h - (nm_system_config_interface_init): add the HAL manager as an argument - (nm_system_config_interface_get_unmanaged_devices): implement - Define 'unmanaged-devices-changed' signal * system-settings/src/dbus-settings.c system-settings/src/dbus-settings.h - Implement the unmanaged devices interface; some cleanups * system-settings/plugins/ifcfg-suse/plugin.c - Fixup for plugin interface changes * system-settings/plugins/ifcfg-fedora/plugin.c - (get_ether_device_udi): new function; find the device that has a specified MAC address and return its UDI - (get_udi_for_connection): new function; try to find the specific device a connection is locked to, if any - (device_added_cb, device_removed_cb): update unmanaged device list in response to HAL events - (get_unmanaged_devices): new function; return unmanaged device list - (build_one_connection): set the connection's locked device, if any - (write_auto_wired_connection): remove - (kill_old_auto_wired_file): remove the ifcfg-Auto Wired file if found - (handle_connection_changed): alert listeners that the unmanaged device list has changed - (init): fixup for plugin interface changes, implement unmanaged devices * system-settings/plugins/ifcfg-fedora/parser.c system-settings/plugins/ifcfg-fedora/parser.h - (connection_data_free): clean up connection UDI git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3537 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-04-08 01:36:39 +00:00
len = strlen (basename);
tag_len = strlen (tag);
if ((len > tag_len) && !strcasecmp (basename + len - tag_len, tag))
return TRUE;
return FALSE;
2008-04-07 Dan Williams <dcbw@redhat.com> * introspection/nm-settings-system.xml introspection/Makefile.am - Define the unmanaged devices interface for the system settings service * system-settings/src/nm-system-config-hal-manager.c system-settings/src/nm-system-config-hal-manager.h system-settings/src/nm-system-config-hal-manager-private.h system-settings/src/Makefile.am - Add a lightweight HAL manager object for tracking network devices for the purpose of determining unmanaged devices and which devices need the default DHCP connections * system-settings/src/nm-system-config-interface.c system-settings/src/nm-system-config-interface.h - (nm_system_config_interface_init): add the HAL manager as an argument - (nm_system_config_interface_get_unmanaged_devices): implement - Define 'unmanaged-devices-changed' signal * system-settings/src/dbus-settings.c system-settings/src/dbus-settings.h - Implement the unmanaged devices interface; some cleanups * system-settings/plugins/ifcfg-suse/plugin.c - Fixup for plugin interface changes * system-settings/plugins/ifcfg-fedora/plugin.c - (get_ether_device_udi): new function; find the device that has a specified MAC address and return its UDI - (get_udi_for_connection): new function; try to find the specific device a connection is locked to, if any - (device_added_cb, device_removed_cb): update unmanaged device list in response to HAL events - (get_unmanaged_devices): new function; return unmanaged device list - (build_one_connection): set the connection's locked device, if any - (write_auto_wired_connection): remove - (kill_old_auto_wired_file): remove the ifcfg-Auto Wired file if found - (handle_connection_changed): alert listeners that the unmanaged device list has changed - (init): fixup for plugin interface changes, implement unmanaged devices * system-settings/plugins/ifcfg-fedora/parser.c system-settings/plugins/ifcfg-fedora/parser.h - (connection_data_free): clean up connection UDI git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3537 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-04-08 01:36:39 +00:00
}
2008-05-13 Dan Williams <dcbw@redhat.com> * marshallers/nm-marshal.list - Add VOID:POINTER,STRING marshaller for ifcfg-fedora plugin * system-settings/plugins/ifcfg-fedora/Makefile.am system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c system-settings/plugins/ifcfg-fedora/nm-inotify-helper.h - Implement a minimal inotify helper for watch paths for IN_CLOSE_WRITE events. Solely for use watching ifcfg files to pick up changes to their hardlinks, since GIO doesn't support this yet (bgo #532815) * system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c - (nm_ifcfg_connection_class_init): new 'ifcfg-changed' signal when the file contents change - (finalize): clean up inotify watches - (nm_ifcfg_connection_new): store keyfile; inotify watch the keyfile and the connection ifcfg for changes on their hardlinks - (files_changed_cb): proxy the changed signal back out to listeners * system-settings/plugins/ifcfg-fedora/plugin.c - (dir_changed): - (connection_ifcfg_changed): re-read the connection when the ifcfg changes - (read_one_connection): connect to change signals on the new connection - (dir_changed, connection_changed_handler, handle_connection_remove_or_new): break out connection change handling and connection new/remove handling so it can be used from both the GFileMonitor callback and the NMIfcfgConnection changed signals * system-settings/plugins/ifcfg-fedora/reader.c system-settings/plugins/ifcfg-fedora/reader.h - (connection_from_file): return the keyfile path the connection would use git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3663 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-05-13 16:53:50 +00:00
static gboolean
should_ignore_file (const char *filename)
{
char *basename;
gboolean ignore = TRUE;
g_return_val_if_fail (filename != NULL, TRUE);
basename = g_path_get_basename (filename);
g_return_val_if_fail (basename != NULL, TRUE);
if ( !strncmp (basename, IFCFG_TAG, strlen (IFCFG_TAG))
&& !check_suffix (basename, BAK_TAG)
&& !check_suffix (basename, TILDE_TAG)
&& !check_suffix (basename, ORIG_TAG)
&& !check_suffix (basename, REJ_TAG))
ignore = FALSE;
g_free (basename);
return ignore;
}
static void
read_connections (SCPluginIfcfg *plugin)
{
GDir *dir;
GError *err = NULL;
dir = g_dir_open (IFCFG_DIR, 0, &err);
if (dir) {
const char *item;
while ((item = g_dir_read_name (dir))) {
char *full_path;
2008-05-13 Dan Williams <dcbw@redhat.com> * marshallers/nm-marshal.list - Add VOID:POINTER,STRING marshaller for ifcfg-fedora plugin * system-settings/plugins/ifcfg-fedora/Makefile.am system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c system-settings/plugins/ifcfg-fedora/nm-inotify-helper.h - Implement a minimal inotify helper for watch paths for IN_CLOSE_WRITE events. Solely for use watching ifcfg files to pick up changes to their hardlinks, since GIO doesn't support this yet (bgo #532815) * system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c - (nm_ifcfg_connection_class_init): new 'ifcfg-changed' signal when the file contents change - (finalize): clean up inotify watches - (nm_ifcfg_connection_new): store keyfile; inotify watch the keyfile and the connection ifcfg for changes on their hardlinks - (files_changed_cb): proxy the changed signal back out to listeners * system-settings/plugins/ifcfg-fedora/plugin.c - (dir_changed): - (connection_ifcfg_changed): re-read the connection when the ifcfg changes - (read_one_connection): connect to change signals on the new connection - (dir_changed, connection_changed_handler, handle_connection_remove_or_new): break out connection change handling and connection new/remove handling so it can be used from both the GFileMonitor callback and the NMIfcfgConnection changed signals * system-settings/plugins/ifcfg-fedora/reader.c system-settings/plugins/ifcfg-fedora/reader.h - (connection_from_file): return the keyfile path the connection would use git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3663 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-05-13 16:53:50 +00:00
if (should_ignore_file (item))
continue;
full_path = g_build_filename (IFCFG_DIR, item, NULL);
read_one_connection (plugin, full_path);
g_free (full_path);
}
g_dir_close (dir);
} else {
PLUGIN_WARN (IFCFG_PLUGIN_NAME, "Can not read directory '%s': %s", IFCFG_DIR, err->message);
g_error_free (err);
}
2008-02-07 Dan Williams <dcbw@redhat.com> * system-settings/src/dbus-settings.c system-settings/src/dbus-settings.h - (add_one_secret_to_hash): copy secrets out of the plugin-returned hash table of secrets - (connection_settings_get_secrets): consolidate error returns into one place; use the new get_secrets() plugin interface function to get secrets from the plugin itself rather than using GObject data magic * system-settings/src/main.c - (connection_added_cb, connection_removed_cb, free_plugin_connections, load_connections): keep a private list of the plugin-returned connections, don't use the plugin's GSList * system-settings/plugins/ifcfg-fedora/plugin.c - (watch_path): watch the path, not the filename (duh) - (reload_all_connections): use the direct hash/equal functions; the ones for int aren't appropriate here - (get_secrets, system_config_interface_init): implement the get_secrets() function - (build_one_connection, find_connection_by_path): ifcfg file path is now in the connection's ConnectionData instead of being a GObject data property - (handle_profile_item_changed): ifcfg file path is now in the connection's ConnectionData instead of being a GObject data property; be sure to copy secrets over from the new connection to the existing connection when updating the connection's settings - (init): sc_plugin_inotify_init() returns success/fail, not the inotify file descriptor * system-settings/plugins/ifcfg-fedora/parser.c system-settings/plugins/ifcfg-fedora/parser.h - (connection_data_get, copy_one_cdata_secret, clear_one_cdata_secret, connection_data_copy_secrets, connection_data_free, connection_data_add): new functions; connection data manipulation - (make_wireless_security_setting): stuff secrets into the connection data, not as GObject data items; make sure to close the keys ifcfg file - (wireless_connection_from_ifcfg, wired_connection_from_ifcfg): add connection data to the connection git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3299 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-02-07 20:11:31 +00:00
}
/* Monitoring */
static void
2008-05-13 Dan Williams <dcbw@redhat.com> * marshallers/nm-marshal.list - Add VOID:POINTER,STRING marshaller for ifcfg-fedora plugin * system-settings/plugins/ifcfg-fedora/Makefile.am system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c system-settings/plugins/ifcfg-fedora/nm-inotify-helper.h - Implement a minimal inotify helper for watch paths for IN_CLOSE_WRITE events. Solely for use watching ifcfg files to pick up changes to their hardlinks, since GIO doesn't support this yet (bgo #532815) * system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c - (nm_ifcfg_connection_class_init): new 'ifcfg-changed' signal when the file contents change - (finalize): clean up inotify watches - (nm_ifcfg_connection_new): store keyfile; inotify watch the keyfile and the connection ifcfg for changes on their hardlinks - (files_changed_cb): proxy the changed signal back out to listeners * system-settings/plugins/ifcfg-fedora/plugin.c - (dir_changed): - (connection_ifcfg_changed): re-read the connection when the ifcfg changes - (read_one_connection): connect to change signals on the new connection - (dir_changed, connection_changed_handler, handle_connection_remove_or_new): break out connection change handling and connection new/remove handling so it can be used from both the GFileMonitor callback and the NMIfcfgConnection changed signals * system-settings/plugins/ifcfg-fedora/reader.c system-settings/plugins/ifcfg-fedora/reader.h - (connection_from_file): return the keyfile path the connection would use git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3663 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-05-13 16:53:50 +00:00
connection_changed_handler (SCPluginIfcfg *plugin,
const char *path,
NMIfcfgConnection *connection,
gboolean *do_remove,
gboolean *do_new)
{
SCPluginIfcfgPrivate *priv = SC_PLUGIN_IFCFG_GET_PRIVATE (plugin);
2008-05-13 Dan Williams <dcbw@redhat.com> * marshallers/nm-marshal.list - Add VOID:POINTER,STRING marshaller for ifcfg-fedora plugin * system-settings/plugins/ifcfg-fedora/Makefile.am system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c system-settings/plugins/ifcfg-fedora/nm-inotify-helper.h - Implement a minimal inotify helper for watch paths for IN_CLOSE_WRITE events. Solely for use watching ifcfg files to pick up changes to their hardlinks, since GIO doesn't support this yet (bgo #532815) * system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c - (nm_ifcfg_connection_class_init): new 'ifcfg-changed' signal when the file contents change - (finalize): clean up inotify watches - (nm_ifcfg_connection_new): store keyfile; inotify watch the keyfile and the connection ifcfg for changes on their hardlinks - (files_changed_cb): proxy the changed signal back out to listeners * system-settings/plugins/ifcfg-fedora/plugin.c - (dir_changed): - (connection_ifcfg_changed): re-read the connection when the ifcfg changes - (read_one_connection): connect to change signals on the new connection - (dir_changed, connection_changed_handler, handle_connection_remove_or_new): break out connection change handling and connection new/remove handling so it can be used from both the GFileMonitor callback and the NMIfcfgConnection changed signals * system-settings/plugins/ifcfg-fedora/reader.c system-settings/plugins/ifcfg-fedora/reader.h - (connection_from_file): return the keyfile path the connection would use git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3663 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-05-13 16:53:50 +00:00
NMIfcfgConnection *tmp;
GError *error = NULL;
GHashTable *settings;
gboolean new_unmanaged, old_unmanaged;
2008-05-13 Dan Williams <dcbw@redhat.com> * marshallers/nm-marshal.list - Add VOID:POINTER,STRING marshaller for ifcfg-fedora plugin * system-settings/plugins/ifcfg-fedora/Makefile.am system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c system-settings/plugins/ifcfg-fedora/nm-inotify-helper.h - Implement a minimal inotify helper for watch paths for IN_CLOSE_WRITE events. Solely for use watching ifcfg files to pick up changes to their hardlinks, since GIO doesn't support this yet (bgo #532815) * system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c - (nm_ifcfg_connection_class_init): new 'ifcfg-changed' signal when the file contents change - (finalize): clean up inotify watches - (nm_ifcfg_connection_new): store keyfile; inotify watch the keyfile and the connection ifcfg for changes on their hardlinks - (files_changed_cb): proxy the changed signal back out to listeners * system-settings/plugins/ifcfg-fedora/plugin.c - (dir_changed): - (connection_ifcfg_changed): re-read the connection when the ifcfg changes - (read_one_connection): connect to change signals on the new connection - (dir_changed, connection_changed_handler, handle_connection_remove_or_new): break out connection change handling and connection new/remove handling so it can be used from both the GFileMonitor callback and the NMIfcfgConnection changed signals * system-settings/plugins/ifcfg-fedora/reader.c system-settings/plugins/ifcfg-fedora/reader.h - (connection_from_file): return the keyfile path the connection would use git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3663 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-05-13 16:53:50 +00:00
g_return_if_fail (plugin != NULL);
g_return_if_fail (path != NULL);
g_return_if_fail (connection != NULL);
g_return_if_fail (do_remove != NULL);
g_return_if_fail (do_new != NULL);
2008-05-13 Dan Williams <dcbw@redhat.com> * marshallers/nm-marshal.list - Add VOID:POINTER,STRING marshaller for ifcfg-fedora plugin * system-settings/plugins/ifcfg-fedora/Makefile.am system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c system-settings/plugins/ifcfg-fedora/nm-inotify-helper.h - Implement a minimal inotify helper for watch paths for IN_CLOSE_WRITE events. Solely for use watching ifcfg files to pick up changes to their hardlinks, since GIO doesn't support this yet (bgo #532815) * system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c - (nm_ifcfg_connection_class_init): new 'ifcfg-changed' signal when the file contents change - (finalize): clean up inotify watches - (nm_ifcfg_connection_new): store keyfile; inotify watch the keyfile and the connection ifcfg for changes on their hardlinks - (files_changed_cb): proxy the changed signal back out to listeners * system-settings/plugins/ifcfg-fedora/plugin.c - (dir_changed): - (connection_ifcfg_changed): re-read the connection when the ifcfg changes - (read_one_connection): connect to change signals on the new connection - (dir_changed, connection_changed_handler, handle_connection_remove_or_new): break out connection change handling and connection new/remove handling so it can be used from both the GFileMonitor callback and the NMIfcfgConnection changed signals * system-settings/plugins/ifcfg-fedora/reader.c system-settings/plugins/ifcfg-fedora/reader.h - (connection_from_file): return the keyfile path the connection would use git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3663 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-05-13 16:53:50 +00:00
PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "updating %s", path);
tmp = (NMIfcfgConnection *) nm_ifcfg_connection_new (path, priv->g_connection, priv->hal_mgr, &error);
if (!tmp) {
/* couldn't read connection; remove it */
PLUGIN_WARN (IFCFG_PLUGIN_NAME, " error: %s",
error->message ? error->message : "(unknown)");
g_error_free (error);
PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "removed %s.", path);
*do_remove = TRUE;
return;
}
/* Successfully read connection changes */
old_unmanaged = nm_ifcfg_connection_get_unmanaged (NM_IFCFG_CONNECTION (connection));
new_unmanaged = nm_ifcfg_connection_get_unmanaged (NM_IFCFG_CONNECTION (tmp));
if (new_unmanaged) {
if (!old_unmanaged) {
/* Unexport the connection by destroying it, then re-creating it as unmanaged */
*do_remove = *do_new = TRUE;
}
2008-05-13 Dan Williams <dcbw@redhat.com> * marshallers/nm-marshal.list - Add VOID:POINTER,STRING marshaller for ifcfg-fedora plugin * system-settings/plugins/ifcfg-fedora/Makefile.am system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c system-settings/plugins/ifcfg-fedora/nm-inotify-helper.h - Implement a minimal inotify helper for watch paths for IN_CLOSE_WRITE events. Solely for use watching ifcfg files to pick up changes to their hardlinks, since GIO doesn't support this yet (bgo #532815) * system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c - (nm_ifcfg_connection_class_init): new 'ifcfg-changed' signal when the file contents change - (finalize): clean up inotify watches - (nm_ifcfg_connection_new): store keyfile; inotify watch the keyfile and the connection ifcfg for changes on their hardlinks - (files_changed_cb): proxy the changed signal back out to listeners * system-settings/plugins/ifcfg-fedora/plugin.c - (dir_changed): - (connection_ifcfg_changed): re-read the connection when the ifcfg changes - (read_one_connection): connect to change signals on the new connection - (dir_changed, connection_changed_handler, handle_connection_remove_or_new): break out connection change handling and connection new/remove handling so it can be used from both the GFileMonitor callback and the NMIfcfgConnection changed signals * system-settings/plugins/ifcfg-fedora/reader.c system-settings/plugins/ifcfg-fedora/reader.h - (connection_from_file): return the keyfile path the connection would use git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3663 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-05-13 16:53:50 +00:00
} else {
NMConnection *old_wrapped, *new_wrapped;
new_wrapped = nm_exported_connection_get_connection (NM_EXPORTED_CONNECTION (tmp));
old_wrapped = nm_exported_connection_get_connection (NM_EXPORTED_CONNECTION (connection));
if (old_unmanaged) { /* no longer unmanaged */
NMSettingConnection *s_con;
s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (new_wrapped, NM_TYPE_SETTING_CONNECTION));
g_assert (s_con);
g_assert (s_con->id);
PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "Managing connection '%s' and its "
"device because NM_CONTROLLED was true.", s_con->id);
g_signal_emit_by_name (plugin, "connection-added", connection);
}
2008-05-13 Dan Williams <dcbw@redhat.com> * marshallers/nm-marshal.list - Add VOID:POINTER,STRING marshaller for ifcfg-fedora plugin * system-settings/plugins/ifcfg-fedora/Makefile.am system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c system-settings/plugins/ifcfg-fedora/nm-inotify-helper.h - Implement a minimal inotify helper for watch paths for IN_CLOSE_WRITE events. Solely for use watching ifcfg files to pick up changes to their hardlinks, since GIO doesn't support this yet (bgo #532815) * system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c - (nm_ifcfg_connection_class_init): new 'ifcfg-changed' signal when the file contents change - (finalize): clean up inotify watches - (nm_ifcfg_connection_new): store keyfile; inotify watch the keyfile and the connection ifcfg for changes on their hardlinks - (files_changed_cb): proxy the changed signal back out to listeners * system-settings/plugins/ifcfg-fedora/plugin.c - (dir_changed): - (connection_ifcfg_changed): re-read the connection when the ifcfg changes - (read_one_connection): connect to change signals on the new connection - (dir_changed, connection_changed_handler, handle_connection_remove_or_new): break out connection change handling and connection new/remove handling so it can be used from both the GFileMonitor callback and the NMIfcfgConnection changed signals * system-settings/plugins/ifcfg-fedora/reader.c system-settings/plugins/ifcfg-fedora/reader.h - (connection_from_file): return the keyfile path the connection would use git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3663 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-05-13 16:53:50 +00:00
/* Only update if different */
if (!nm_connection_compare (new_wrapped, old_wrapped, COMPARE_FLAGS_EXACT)) {
settings = nm_connection_to_hash (new_wrapped);
nm_exported_connection_update (NM_EXPORTED_CONNECTION (connection), settings, NULL);
g_hash_table_destroy (settings);
}
2008-05-13 Dan Williams <dcbw@redhat.com> * marshallers/nm-marshal.list - Add VOID:POINTER,STRING marshaller for ifcfg-fedora plugin * system-settings/plugins/ifcfg-fedora/Makefile.am system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c system-settings/plugins/ifcfg-fedora/nm-inotify-helper.h - Implement a minimal inotify helper for watch paths for IN_CLOSE_WRITE events. Solely for use watching ifcfg files to pick up changes to their hardlinks, since GIO doesn't support this yet (bgo #532815) * system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c - (nm_ifcfg_connection_class_init): new 'ifcfg-changed' signal when the file contents change - (finalize): clean up inotify watches - (nm_ifcfg_connection_new): store keyfile; inotify watch the keyfile and the connection ifcfg for changes on their hardlinks - (files_changed_cb): proxy the changed signal back out to listeners * system-settings/plugins/ifcfg-fedora/plugin.c - (dir_changed): - (connection_ifcfg_changed): re-read the connection when the ifcfg changes - (read_one_connection): connect to change signals on the new connection - (dir_changed, connection_changed_handler, handle_connection_remove_or_new): break out connection change handling and connection new/remove handling so it can be used from both the GFileMonitor callback and the NMIfcfgConnection changed signals * system-settings/plugins/ifcfg-fedora/reader.c system-settings/plugins/ifcfg-fedora/reader.h - (connection_from_file): return the keyfile path the connection would use git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3663 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-05-13 16:53:50 +00:00
/* Update unmanaged status */
g_object_set (connection, "unmanaged", new_unmanaged, NULL);
g_signal_emit_by_name (plugin, "unmanaged-devices-changed");
}
2008-05-13 Dan Williams <dcbw@redhat.com> * marshallers/nm-marshal.list - Add VOID:POINTER,STRING marshaller for ifcfg-fedora plugin * system-settings/plugins/ifcfg-fedora/Makefile.am system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c system-settings/plugins/ifcfg-fedora/nm-inotify-helper.h - Implement a minimal inotify helper for watch paths for IN_CLOSE_WRITE events. Solely for use watching ifcfg files to pick up changes to their hardlinks, since GIO doesn't support this yet (bgo #532815) * system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c - (nm_ifcfg_connection_class_init): new 'ifcfg-changed' signal when the file contents change - (finalize): clean up inotify watches - (nm_ifcfg_connection_new): store keyfile; inotify watch the keyfile and the connection ifcfg for changes on their hardlinks - (files_changed_cb): proxy the changed signal back out to listeners * system-settings/plugins/ifcfg-fedora/plugin.c - (dir_changed): - (connection_ifcfg_changed): re-read the connection when the ifcfg changes - (read_one_connection): connect to change signals on the new connection - (dir_changed, connection_changed_handler, handle_connection_remove_or_new): break out connection change handling and connection new/remove handling so it can be used from both the GFileMonitor callback and the NMIfcfgConnection changed signals * system-settings/plugins/ifcfg-fedora/reader.c system-settings/plugins/ifcfg-fedora/reader.h - (connection_from_file): return the keyfile path the connection would use git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3663 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-05-13 16:53:50 +00:00
g_object_unref (tmp);
}
static void
handle_connection_remove_or_new (SCPluginIfcfg *plugin,
const char *path,
NMIfcfgConnection *connection,
gboolean do_remove,
gboolean do_new)
{
SCPluginIfcfgPrivate *priv = SC_PLUGIN_IFCFG_GET_PRIVATE (plugin);
g_return_if_fail (plugin != NULL);
g_return_if_fail (path != NULL);
if (do_remove) {
2008-05-13 Dan Williams <dcbw@redhat.com> * marshallers/nm-marshal.list - Add VOID:POINTER,STRING marshaller for ifcfg-fedora plugin * system-settings/plugins/ifcfg-fedora/Makefile.am system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c system-settings/plugins/ifcfg-fedora/nm-inotify-helper.h - Implement a minimal inotify helper for watch paths for IN_CLOSE_WRITE events. Solely for use watching ifcfg files to pick up changes to their hardlinks, since GIO doesn't support this yet (bgo #532815) * system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c - (nm_ifcfg_connection_class_init): new 'ifcfg-changed' signal when the file contents change - (finalize): clean up inotify watches - (nm_ifcfg_connection_new): store keyfile; inotify watch the keyfile and the connection ifcfg for changes on their hardlinks - (files_changed_cb): proxy the changed signal back out to listeners * system-settings/plugins/ifcfg-fedora/plugin.c - (dir_changed): - (connection_ifcfg_changed): re-read the connection when the ifcfg changes - (read_one_connection): connect to change signals on the new connection - (dir_changed, connection_changed_handler, handle_connection_remove_or_new): break out connection change handling and connection new/remove handling so it can be used from both the GFileMonitor callback and the NMIfcfgConnection changed signals * system-settings/plugins/ifcfg-fedora/reader.c system-settings/plugins/ifcfg-fedora/reader.h - (connection_from_file): return the keyfile path the connection would use git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3663 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-05-13 16:53:50 +00:00
gboolean unmanaged;
g_return_if_fail (connection != NULL);
2008-05-13 Dan Williams <dcbw@redhat.com> * marshallers/nm-marshal.list - Add VOID:POINTER,STRING marshaller for ifcfg-fedora plugin * system-settings/plugins/ifcfg-fedora/Makefile.am system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c system-settings/plugins/ifcfg-fedora/nm-inotify-helper.h - Implement a minimal inotify helper for watch paths for IN_CLOSE_WRITE events. Solely for use watching ifcfg files to pick up changes to their hardlinks, since GIO doesn't support this yet (bgo #532815) * system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c - (nm_ifcfg_connection_class_init): new 'ifcfg-changed' signal when the file contents change - (finalize): clean up inotify watches - (nm_ifcfg_connection_new): store keyfile; inotify watch the keyfile and the connection ifcfg for changes on their hardlinks - (files_changed_cb): proxy the changed signal back out to listeners * system-settings/plugins/ifcfg-fedora/plugin.c - (dir_changed): - (connection_ifcfg_changed): re-read the connection when the ifcfg changes - (read_one_connection): connect to change signals on the new connection - (dir_changed, connection_changed_handler, handle_connection_remove_or_new): break out connection change handling and connection new/remove handling so it can be used from both the GFileMonitor callback and the NMIfcfgConnection changed signals * system-settings/plugins/ifcfg-fedora/reader.c system-settings/plugins/ifcfg-fedora/reader.h - (connection_from_file): return the keyfile path the connection would use git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3663 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-05-13 16:53:50 +00:00
unmanaged = nm_ifcfg_connection_get_unmanaged (connection);
g_hash_table_remove (priv->connections, path);
nm_exported_connection_signal_removed (NM_EXPORTED_CONNECTION (connection));
/* Emit unmanaged changes _after_ removing the connection */
if (unmanaged)
g_signal_emit_by_name (plugin, "unmanaged-devices-changed");
}
if (do_new) {
2008-05-13 Dan Williams <dcbw@redhat.com> * marshallers/nm-marshal.list - Add VOID:POINTER,STRING marshaller for ifcfg-fedora plugin * system-settings/plugins/ifcfg-fedora/Makefile.am system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c system-settings/plugins/ifcfg-fedora/nm-inotify-helper.h - Implement a minimal inotify helper for watch paths for IN_CLOSE_WRITE events. Solely for use watching ifcfg files to pick up changes to their hardlinks, since GIO doesn't support this yet (bgo #532815) * system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c - (nm_ifcfg_connection_class_init): new 'ifcfg-changed' signal when the file contents change - (finalize): clean up inotify watches - (nm_ifcfg_connection_new): store keyfile; inotify watch the keyfile and the connection ifcfg for changes on their hardlinks - (files_changed_cb): proxy the changed signal back out to listeners * system-settings/plugins/ifcfg-fedora/plugin.c - (dir_changed): - (connection_ifcfg_changed): re-read the connection when the ifcfg changes - (read_one_connection): connect to change signals on the new connection - (dir_changed, connection_changed_handler, handle_connection_remove_or_new): break out connection change handling and connection new/remove handling so it can be used from both the GFileMonitor callback and the NMIfcfgConnection changed signals * system-settings/plugins/ifcfg-fedora/reader.c system-settings/plugins/ifcfg-fedora/reader.h - (connection_from_file): return the keyfile path the connection would use git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3663 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-05-13 16:53:50 +00:00
connection = read_one_connection (plugin, path);
if (connection) {
if (!nm_ifcfg_connection_get_unmanaged (NM_IFCFG_CONNECTION (connection)))
g_signal_emit_by_name (plugin, "connection-added", connection);
2008-04-07 Dan Williams <dcbw@redhat.com> * introspection/nm-settings-system.xml introspection/Makefile.am - Define the unmanaged devices interface for the system settings service * system-settings/src/nm-system-config-hal-manager.c system-settings/src/nm-system-config-hal-manager.h system-settings/src/nm-system-config-hal-manager-private.h system-settings/src/Makefile.am - Add a lightweight HAL manager object for tracking network devices for the purpose of determining unmanaged devices and which devices need the default DHCP connections * system-settings/src/nm-system-config-interface.c system-settings/src/nm-system-config-interface.h - (nm_system_config_interface_init): add the HAL manager as an argument - (nm_system_config_interface_get_unmanaged_devices): implement - Define 'unmanaged-devices-changed' signal * system-settings/src/dbus-settings.c system-settings/src/dbus-settings.h - Implement the unmanaged devices interface; some cleanups * system-settings/plugins/ifcfg-suse/plugin.c - Fixup for plugin interface changes * system-settings/plugins/ifcfg-fedora/plugin.c - (get_ether_device_udi): new function; find the device that has a specified MAC address and return its UDI - (get_udi_for_connection): new function; try to find the specific device a connection is locked to, if any - (device_added_cb, device_removed_cb): update unmanaged device list in response to HAL events - (get_unmanaged_devices): new function; return unmanaged device list - (build_one_connection): set the connection's locked device, if any - (write_auto_wired_connection): remove - (kill_old_auto_wired_file): remove the ifcfg-Auto Wired file if found - (handle_connection_changed): alert listeners that the unmanaged device list has changed - (init): fixup for plugin interface changes, implement unmanaged devices * system-settings/plugins/ifcfg-fedora/parser.c system-settings/plugins/ifcfg-fedora/parser.h - (connection_data_free): clean up connection UDI git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3537 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-04-08 01:36:39 +00:00
}
}
2008-05-13 Dan Williams <dcbw@redhat.com> * marshallers/nm-marshal.list - Add VOID:POINTER,STRING marshaller for ifcfg-fedora plugin * system-settings/plugins/ifcfg-fedora/Makefile.am system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c system-settings/plugins/ifcfg-fedora/nm-inotify-helper.h - Implement a minimal inotify helper for watch paths for IN_CLOSE_WRITE events. Solely for use watching ifcfg files to pick up changes to their hardlinks, since GIO doesn't support this yet (bgo #532815) * system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c - (nm_ifcfg_connection_class_init): new 'ifcfg-changed' signal when the file contents change - (finalize): clean up inotify watches - (nm_ifcfg_connection_new): store keyfile; inotify watch the keyfile and the connection ifcfg for changes on their hardlinks - (files_changed_cb): proxy the changed signal back out to listeners * system-settings/plugins/ifcfg-fedora/plugin.c - (dir_changed): - (connection_ifcfg_changed): re-read the connection when the ifcfg changes - (read_one_connection): connect to change signals on the new connection - (dir_changed, connection_changed_handler, handle_connection_remove_or_new): break out connection change handling and connection new/remove handling so it can be used from both the GFileMonitor callback and the NMIfcfgConnection changed signals * system-settings/plugins/ifcfg-fedora/reader.c system-settings/plugins/ifcfg-fedora/reader.h - (connection_from_file): return the keyfile path the connection would use git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3663 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-05-13 16:53:50 +00:00
}
static void
dir_changed (GFileMonitor *monitor,
GFile *file,
GFile *other_file,
GFileMonitorEvent event_type,
gpointer user_data)
{
SCPluginIfcfg *plugin = SC_PLUGIN_IFCFG (user_data);
SCPluginIfcfgPrivate *priv = SC_PLUGIN_IFCFG_GET_PRIVATE (plugin);
char *name;
NMIfcfgConnection *connection;
gboolean do_remove = FALSE, do_new = FALSE;
name = g_file_get_path (file);
if (should_ignore_file (name)) {
g_free (name);
return;
}
connection = g_hash_table_lookup (priv->connections, name);
if (!connection) {
do_new = TRUE;
} else {
switch (event_type) {
case G_FILE_MONITOR_EVENT_DELETED:
PLUGIN_PRINT (IFCFG_PLUGIN_NAME, "removed %s.", name);
do_remove = TRUE;
break;
case G_FILE_MONITOR_EVENT_CREATED:
case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
/* Update */
connection_changed_handler (plugin, name, connection, &do_remove, &do_new);
break;
default:
break;
}
}
handle_connection_remove_or_new (plugin, name, connection, do_remove, do_new);
g_free (name);
}
static void
setup_monitoring (SCPluginIfcfg *plugin)
{
SCPluginIfcfgPrivate *priv = SC_PLUGIN_IFCFG_GET_PRIVATE (plugin);
GFile *file;
GFileMonitor *monitor;
priv->connections = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_object_unref);
file = g_file_new_for_path (IFCFG_DIR);
monitor = g_file_monitor_directory (file, G_FILE_MONITOR_NONE, NULL, NULL);
g_object_unref (file);
if (monitor) {
priv->monitor_id = g_signal_connect (monitor, "changed", G_CALLBACK (dir_changed), plugin);
priv->monitor = monitor;
}
}
static void
hash_to_slist (gpointer key, gpointer value, gpointer user_data)
{
NMIfcfgConnection *exported = NM_IFCFG_CONNECTION (value);
GSList **list = (GSList **) user_data;
if (!nm_ifcfg_connection_get_unmanaged (exported))
*list = g_slist_prepend (*list, value);
}
static GSList *
get_connections (NMSystemConfigInterface *config)
{
SCPluginIfcfg *plugin = SC_PLUGIN_IFCFG (config);
SCPluginIfcfgPrivate *priv = SC_PLUGIN_IFCFG_GET_PRIVATE (plugin);
GSList *list = NULL;
if (!priv->connections) {
setup_monitoring (plugin);
read_connections (plugin);
}
g_hash_table_foreach (priv->connections, hash_to_slist, &list);
return list;
}
static void
2008-04-07 Dan Williams <dcbw@redhat.com> * introspection/nm-settings-system.xml introspection/Makefile.am - Define the unmanaged devices interface for the system settings service * system-settings/src/nm-system-config-hal-manager.c system-settings/src/nm-system-config-hal-manager.h system-settings/src/nm-system-config-hal-manager-private.h system-settings/src/Makefile.am - Add a lightweight HAL manager object for tracking network devices for the purpose of determining unmanaged devices and which devices need the default DHCP connections * system-settings/src/nm-system-config-interface.c system-settings/src/nm-system-config-interface.h - (nm_system_config_interface_init): add the HAL manager as an argument - (nm_system_config_interface_get_unmanaged_devices): implement - Define 'unmanaged-devices-changed' signal * system-settings/src/dbus-settings.c system-settings/src/dbus-settings.h - Implement the unmanaged devices interface; some cleanups * system-settings/plugins/ifcfg-suse/plugin.c - Fixup for plugin interface changes * system-settings/plugins/ifcfg-fedora/plugin.c - (get_ether_device_udi): new function; find the device that has a specified MAC address and return its UDI - (get_udi_for_connection): new function; try to find the specific device a connection is locked to, if any - (device_added_cb, device_removed_cb): update unmanaged device list in response to HAL events - (get_unmanaged_devices): new function; return unmanaged device list - (build_one_connection): set the connection's locked device, if any - (write_auto_wired_connection): remove - (kill_old_auto_wired_file): remove the ifcfg-Auto Wired file if found - (handle_connection_changed): alert listeners that the unmanaged device list has changed - (init): fixup for plugin interface changes, implement unmanaged devices * system-settings/plugins/ifcfg-fedora/parser.c system-settings/plugins/ifcfg-fedora/parser.h - (connection_data_free): clean up connection UDI git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3537 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-04-08 01:36:39 +00:00
init (NMSystemConfigInterface *config, NMSystemConfigHalManager *hal_manager)
{
SCPluginIfcfg *plugin = SC_PLUGIN_IFCFG (config);
2008-04-07 Dan Williams <dcbw@redhat.com> * introspection/nm-settings-system.xml introspection/Makefile.am - Define the unmanaged devices interface for the system settings service * system-settings/src/nm-system-config-hal-manager.c system-settings/src/nm-system-config-hal-manager.h system-settings/src/nm-system-config-hal-manager-private.h system-settings/src/Makefile.am - Add a lightweight HAL manager object for tracking network devices for the purpose of determining unmanaged devices and which devices need the default DHCP connections * system-settings/src/nm-system-config-interface.c system-settings/src/nm-system-config-interface.h - (nm_system_config_interface_init): add the HAL manager as an argument - (nm_system_config_interface_get_unmanaged_devices): implement - Define 'unmanaged-devices-changed' signal * system-settings/src/dbus-settings.c system-settings/src/dbus-settings.h - Implement the unmanaged devices interface; some cleanups * system-settings/plugins/ifcfg-suse/plugin.c - Fixup for plugin interface changes * system-settings/plugins/ifcfg-fedora/plugin.c - (get_ether_device_udi): new function; find the device that has a specified MAC address and return its UDI - (get_udi_for_connection): new function; try to find the specific device a connection is locked to, if any - (device_added_cb, device_removed_cb): update unmanaged device list in response to HAL events - (get_unmanaged_devices): new function; return unmanaged device list - (build_one_connection): set the connection's locked device, if any - (write_auto_wired_connection): remove - (kill_old_auto_wired_file): remove the ifcfg-Auto Wired file if found - (handle_connection_changed): alert listeners that the unmanaged device list has changed - (init): fixup for plugin interface changes, implement unmanaged devices * system-settings/plugins/ifcfg-fedora/parser.c system-settings/plugins/ifcfg-fedora/parser.h - (connection_data_free): clean up connection UDI git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3537 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-04-08 01:36:39 +00:00
SCPluginIfcfgPrivate *priv = SC_PLUGIN_IFCFG_GET_PRIVATE (plugin);
priv->hal_mgr = g_object_ref (hal_manager);
}
static void
sc_plugin_ifcfg_init (SCPluginIfcfg *plugin)
{
2008-04-07 Dan Williams <dcbw@redhat.com> * introspection/nm-settings-system.xml introspection/Makefile.am - Define the unmanaged devices interface for the system settings service * system-settings/src/nm-system-config-hal-manager.c system-settings/src/nm-system-config-hal-manager.h system-settings/src/nm-system-config-hal-manager-private.h system-settings/src/Makefile.am - Add a lightweight HAL manager object for tracking network devices for the purpose of determining unmanaged devices and which devices need the default DHCP connections * system-settings/src/nm-system-config-interface.c system-settings/src/nm-system-config-interface.h - (nm_system_config_interface_init): add the HAL manager as an argument - (nm_system_config_interface_get_unmanaged_devices): implement - Define 'unmanaged-devices-changed' signal * system-settings/src/dbus-settings.c system-settings/src/dbus-settings.h - Implement the unmanaged devices interface; some cleanups * system-settings/plugins/ifcfg-suse/plugin.c - Fixup for plugin interface changes * system-settings/plugins/ifcfg-fedora/plugin.c - (get_ether_device_udi): new function; find the device that has a specified MAC address and return its UDI - (get_udi_for_connection): new function; try to find the specific device a connection is locked to, if any - (device_added_cb, device_removed_cb): update unmanaged device list in response to HAL events - (get_unmanaged_devices): new function; return unmanaged device list - (build_one_connection): set the connection's locked device, if any - (write_auto_wired_connection): remove - (kill_old_auto_wired_file): remove the ifcfg-Auto Wired file if found - (handle_connection_changed): alert listeners that the unmanaged device list has changed - (init): fixup for plugin interface changes, implement unmanaged devices * system-settings/plugins/ifcfg-fedora/parser.c system-settings/plugins/ifcfg-fedora/parser.h - (connection_data_free): clean up connection UDI git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3537 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-04-08 01:36:39 +00:00
SCPluginIfcfgPrivate *priv = SC_PLUGIN_IFCFG_GET_PRIVATE (plugin);
GError *error = NULL;
priv->g_connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
if (!priv->g_connection) {
PLUGIN_PRINT (IFCFG_PLUGIN_NAME, " dbus-glib error: %s",
error->message ? error->message : "(unknown)");
g_error_free (error);
2008-04-07 Dan Williams <dcbw@redhat.com> * introspection/nm-settings-system.xml introspection/Makefile.am - Define the unmanaged devices interface for the system settings service * system-settings/src/nm-system-config-hal-manager.c system-settings/src/nm-system-config-hal-manager.h system-settings/src/nm-system-config-hal-manager-private.h system-settings/src/Makefile.am - Add a lightweight HAL manager object for tracking network devices for the purpose of determining unmanaged devices and which devices need the default DHCP connections * system-settings/src/nm-system-config-interface.c system-settings/src/nm-system-config-interface.h - (nm_system_config_interface_init): add the HAL manager as an argument - (nm_system_config_interface_get_unmanaged_devices): implement - Define 'unmanaged-devices-changed' signal * system-settings/src/dbus-settings.c system-settings/src/dbus-settings.h - Implement the unmanaged devices interface; some cleanups * system-settings/plugins/ifcfg-suse/plugin.c - Fixup for plugin interface changes * system-settings/plugins/ifcfg-fedora/plugin.c - (get_ether_device_udi): new function; find the device that has a specified MAC address and return its UDI - (get_udi_for_connection): new function; try to find the specific device a connection is locked to, if any - (device_added_cb, device_removed_cb): update unmanaged device list in response to HAL events - (get_unmanaged_devices): new function; return unmanaged device list - (build_one_connection): set the connection's locked device, if any - (write_auto_wired_connection): remove - (kill_old_auto_wired_file): remove the ifcfg-Auto Wired file if found - (handle_connection_changed): alert listeners that the unmanaged device list has changed - (init): fixup for plugin interface changes, implement unmanaged devices * system-settings/plugins/ifcfg-fedora/parser.c system-settings/plugins/ifcfg-fedora/parser.h - (connection_data_free): clean up connection UDI git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3537 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-04-08 01:36:39 +00:00
}
}
static void
dispose (GObject *object)
{
2008-04-07 Dan Williams <dcbw@redhat.com> * introspection/nm-settings-system.xml introspection/Makefile.am - Define the unmanaged devices interface for the system settings service * system-settings/src/nm-system-config-hal-manager.c system-settings/src/nm-system-config-hal-manager.h system-settings/src/nm-system-config-hal-manager-private.h system-settings/src/Makefile.am - Add a lightweight HAL manager object for tracking network devices for the purpose of determining unmanaged devices and which devices need the default DHCP connections * system-settings/src/nm-system-config-interface.c system-settings/src/nm-system-config-interface.h - (nm_system_config_interface_init): add the HAL manager as an argument - (nm_system_config_interface_get_unmanaged_devices): implement - Define 'unmanaged-devices-changed' signal * system-settings/src/dbus-settings.c system-settings/src/dbus-settings.h - Implement the unmanaged devices interface; some cleanups * system-settings/plugins/ifcfg-suse/plugin.c - Fixup for plugin interface changes * system-settings/plugins/ifcfg-fedora/plugin.c - (get_ether_device_udi): new function; find the device that has a specified MAC address and return its UDI - (get_udi_for_connection): new function; try to find the specific device a connection is locked to, if any - (device_added_cb, device_removed_cb): update unmanaged device list in response to HAL events - (get_unmanaged_devices): new function; return unmanaged device list - (build_one_connection): set the connection's locked device, if any - (write_auto_wired_connection): remove - (kill_old_auto_wired_file): remove the ifcfg-Auto Wired file if found - (handle_connection_changed): alert listeners that the unmanaged device list has changed - (init): fixup for plugin interface changes, implement unmanaged devices * system-settings/plugins/ifcfg-fedora/parser.c system-settings/plugins/ifcfg-fedora/parser.h - (connection_data_free): clean up connection UDI git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3537 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-04-08 01:36:39 +00:00
SCPluginIfcfg *plugin = SC_PLUGIN_IFCFG (object);
SCPluginIfcfgPrivate *priv = SC_PLUGIN_IFCFG_GET_PRIVATE (plugin);
g_object_unref (priv->hal_mgr);
if (priv->g_connection)
dbus_g_connection_unref (priv->g_connection);
if (priv->connections)
g_hash_table_destroy (priv->connections);
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_OBJECT_CLASS (sc_plugin_ifcfg_parent_class)->dispose (object);
}
static void
finalize (GObject *object)
{
G_OBJECT_CLASS (sc_plugin_ifcfg_parent_class)->finalize (object);
}
static void
get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
{
switch (prop_id) {
case NM_SYSTEM_CONFIG_INTERFACE_PROP_NAME:
g_value_set_string (value, IFCFG_PLUGIN_NAME);
break;
case NM_SYSTEM_CONFIG_INTERFACE_PROP_INFO:
g_value_set_string (value, IFCFG_PLUGIN_INFO);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
sc_plugin_ifcfg_class_init (SCPluginIfcfgClass *req_class)
{
GObjectClass *object_class = G_OBJECT_CLASS (req_class);
g_type_class_add_private (req_class, sizeof (SCPluginIfcfgPrivate));
object_class->dispose = dispose;
object_class->finalize = finalize;
object_class->get_property = get_property;
g_object_class_override_property (object_class,
NM_SYSTEM_CONFIG_INTERFACE_PROP_NAME,
NM_SYSTEM_CONFIG_INTERFACE_NAME);
g_object_class_override_property (object_class,
NM_SYSTEM_CONFIG_INTERFACE_PROP_INFO,
NM_SYSTEM_CONFIG_INTERFACE_INFO);
}
static void
system_config_interface_init (NMSystemConfigInterface *system_config_interface_class)
{
/* interface implementation */
system_config_interface_class->get_connections = get_connections;
2008-04-07 Dan Williams <dcbw@redhat.com> * introspection/nm-settings-system.xml introspection/Makefile.am - Define the unmanaged devices interface for the system settings service * system-settings/src/nm-system-config-hal-manager.c system-settings/src/nm-system-config-hal-manager.h system-settings/src/nm-system-config-hal-manager-private.h system-settings/src/Makefile.am - Add a lightweight HAL manager object for tracking network devices for the purpose of determining unmanaged devices and which devices need the default DHCP connections * system-settings/src/nm-system-config-interface.c system-settings/src/nm-system-config-interface.h - (nm_system_config_interface_init): add the HAL manager as an argument - (nm_system_config_interface_get_unmanaged_devices): implement - Define 'unmanaged-devices-changed' signal * system-settings/src/dbus-settings.c system-settings/src/dbus-settings.h - Implement the unmanaged devices interface; some cleanups * system-settings/plugins/ifcfg-suse/plugin.c - Fixup for plugin interface changes * system-settings/plugins/ifcfg-fedora/plugin.c - (get_ether_device_udi): new function; find the device that has a specified MAC address and return its UDI - (get_udi_for_connection): new function; try to find the specific device a connection is locked to, if any - (device_added_cb, device_removed_cb): update unmanaged device list in response to HAL events - (get_unmanaged_devices): new function; return unmanaged device list - (build_one_connection): set the connection's locked device, if any - (write_auto_wired_connection): remove - (kill_old_auto_wired_file): remove the ifcfg-Auto Wired file if found - (handle_connection_changed): alert listeners that the unmanaged device list has changed - (init): fixup for plugin interface changes, implement unmanaged devices * system-settings/plugins/ifcfg-fedora/parser.c system-settings/plugins/ifcfg-fedora/parser.h - (connection_data_free): clean up connection UDI git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3537 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-04-08 01:36:39 +00:00
system_config_interface_class->get_unmanaged_devices = get_unmanaged_devices;
system_config_interface_class->init = init;
}
G_MODULE_EXPORT GObject *
nm_system_config_factory (void)
{
static SCPluginIfcfg *singleton = NULL;
if (!singleton)
singleton = SC_PLUGIN_IFCFG (g_object_new (SC_TYPE_PLUGIN_IFCFG, NULL));
else
g_object_ref (singleton);
return G_OBJECT (singleton);
}