colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2007-09-02 Dan Williams <dcbw@redhat.com>

Browse Source 
* include/NetworkManager.h
	  libnm-glib/nm-settings.c
		- defines for the user settings daemon D-Bus bits

	* src/NetworkManager.c
		- Remove stuff that referred to the old NetworkManagerInfo service

	* src/vpn-manager/nm-dbus-vpn.h
		- Move old NMI defines to the only place they are used still

	* libnm-util/nm-connection.c
	  libnm-util/nm-connection.h
	  src/nm-activation-request.c
		- Make NMConnection a GObject subclass so we can do spiffy stuff with it

	* src/nm-manager.c
	  src/nm-manager.h
		- Get connections and their settings from the user settings daemon
			at the appropriate times



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2763 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2007-09-03 01:12:23 +00:00
parent 074dfc3f56
commit d1ac371963
10 changed files with 482 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ChangeLog
View File

@@ -1,3 +1,25 @@
2007-09-02 Dan Williams <dcbw@redhat.com>
* include/NetworkManager.h
libnm-glib/nm-settings.c
- defines for the user settings daemon D-Bus bits
* src/NetworkManager.c
- Remove stuff that referred to the old NetworkManagerInfo service
* src/vpn-manager/nm-dbus-vpn.h
- Move old NMI defines to the only place they are used still
* libnm-util/nm-connection.c
libnm-util/nm-connection.h
src/nm-activation-request.c
- Make NMConnection a GObject subclass so we can do spiffy stuff with it
* src/nm-manager.c
src/nm-manager.h
- Get connections and their settings from the user settings daemon
at the appropriate times
2007-09-02 Dan Williams <dcbw@redhat.com> 2007-09-02 Dan Williams <dcbw@redhat.com>
* libnm-util/nm-setting.c * libnm-util/nm-setting.c

10
include/NetworkManager.h
View File

@@ -36,12 +36,12 @@
#define NM_DBUS_PATH_ACCESS_POINT "/org/freedesktop/NetworkManager/AccessPoint" #define NM_DBUS_PATH_ACCESS_POINT "/org/freedesktop/NetworkManager/AccessPoint"
#define NM_DBUS_INTERFACE_ACCESS_POINT "org.freedesktop.NetworkManager.AccessPoint" #define NM_DBUS_INTERFACE_ACCESS_POINT "org.freedesktop.NetworkManager.AccessPoint"
#define NM_DBUS_PATH_CONNECTION_SETTINGS "/org/freedesktop/NetworkManagerUserSettings/Connection" #define NM_DBUS_SERVICE_USER_SETTINGS "org.freedesktop.NetworkManagerUserSettings"
#define NM_DBUS_IFACE_USER_SETTINGS "org.freedesktop.NetworkManagerUserSettings"
#define NMI_DBUS_SERVICE "org.freedesktop.NetworkManagerInfo" #define NM_DBUS_PATH_USER_SETTINGS "/org/freedesktop/NetworkManagerUserSettings"
#define NMI_DBUS_PATH "/org/freedesktop/NetworkManagerInfo"
#define NMI_DBUS_INTERFACE "org.freedesktop.NetworkManagerInfo"
#define NM_DBUS_IFACE_USER_SETTINGS_CONNECTION "org.freedesktop.NetworkManagerUserSettings.Connection"
#define NM_DBUS_PATH_USER_SETTINGS_CONNECTION "/org/freedesktop/NetworkManagerUserSettings/Connection"
#define NMI_DBUS_USER_KEY_CANCELED_ERROR "org.freedesktop.NetworkManagerInfo.CanceledError" #define NMI_DBUS_USER_KEY_CANCELED_ERROR "org.freedesktop.NetworkManagerInfo.CanceledError"

2
libnm-glib/nm-settings.c
View File

@@ -196,7 +196,7 @@ nm_connection_settings_init (NMConnectionSettings *connection)
GError *error = NULL; GError *error = NULL;
connection->dbus_path = g_strdup_printf ("%s/%u", connection->dbus_path = g_strdup_printf ("%s/%u",
NM_DBUS_PATH_CONNECTION_SETTINGS, NM_DBUS_PATH_USER_SETTINGS,
cs_counter++); cs_counter++);
} }

145
libnm-util/nm-connection.c
View File

@@ -2,6 +2,14 @@
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include "nm-connection.h" #include "nm-connection.h"
typedef struct {
GHashTable *settings;
} NMConnectionPrivate;
#define NM_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_CONNECTION, NMConnectionPrivate))
G_DEFINE_TYPE (NMConnection, nm_connection, G_TYPE_OBJECT)
static GHashTable *registered_setting_creators = NULL; static GHashTable *registered_setting_creators = NULL;
static void static void
@@ -64,63 +72,28 @@ parse_one_setting (gpointer key, gpointer value, gpointer user_data)
g_warning ("Unknown setting '%s'", (char *) key); g_warning ("Unknown setting '%s'", (char *) key);
} }
NMConnection *
nm_connection_new (void)
{
NMConnection *connection;
if (!registered_setting_creators)
register_default_creators ();
connection = g_slice_new0 (NMConnection);
connection->settings = g_hash_table_new (g_str_hash, g_str_equal);
return connection;
}
NMConnection *
nm_connection_new_from_hash (GHashTable *hash)
{
NMConnection *connection;
g_return_val_if_fail (hash != NULL, NULL);
if (!registered_setting_creators)
register_default_creators ();
connection = nm_connection_new ();
g_hash_table_foreach (hash, parse_one_setting, connection);
if (g_hash_table_size (connection->settings) < 1) {
g_warning ("No settings found.");
nm_connection_destroy (connection);
return NULL;
}
if (!nm_settings_verify (connection->settings)) {
nm_connection_destroy (connection);
return NULL;
}
return connection;
}
void void
nm_connection_add_setting (NMConnection *connection, NMSetting *setting) nm_connection_add_setting (NMConnection *connection, NMSetting *setting)
{ {
g_return_if_fail (connection != NULL); NMConnectionPrivate *priv;
g_return_if_fail (NM_IS_CONNECTION (connection));
g_return_if_fail (setting != NULL); g_return_if_fail (setting != NULL);
g_hash_table_insert (connection->settings, setting->name, setting); priv = NM_CONNECTION_GET_PRIVATE (connection);
g_hash_table_insert (priv->settings, setting->name, setting);
} }
NMSetting * NMSetting *
nm_connection_get_setting (NMConnection *connection, const char *setting_name) nm_connection_get_setting (NMConnection *connection, const char *setting_name)
{ {
g_return_val_if_fail (connection != NULL, NULL); NMConnectionPrivate *priv;
g_return_if_fail (NM_IS_CONNECTION (connection));
g_return_val_if_fail (setting_name != NULL, NULL); g_return_val_if_fail (setting_name != NULL, NULL);
return (NMSetting *) g_hash_table_lookup (connection->settings, setting_name); priv = NM_CONNECTION_GET_PRIVATE (connection);
return (NMSetting *) g_hash_table_lookup (priv->settings, setting_name);
} }
gboolean gboolean
@@ -163,15 +136,17 @@ add_one_setting_to_hash (gpointer key, gpointer data, gpointer user_data)
GHashTable * GHashTable *
nm_connection_to_hash (NMConnection *connection) nm_connection_to_hash (NMConnection *connection)
{ {
NMConnectionPrivate *priv;
GHashTable *connection_hash; GHashTable *connection_hash;
g_return_val_if_fail (connection != NULL, NULL); g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
connection_hash = g_hash_table_new_full (g_str_hash, g_str_equal, connection_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
(GDestroyNotify) g_free, (GDestroyNotify) g_free,
(GDestroyNotify) g_hash_table_destroy); (GDestroyNotify) g_hash_table_destroy);
g_hash_table_foreach (connection->settings, add_one_setting_to_hash, connection_hash); priv = NM_CONNECTION_GET_PRIVATE (connection);
g_hash_table_foreach (priv->settings, add_one_setting_to_hash, connection_hash);
/* Don't send empty hashes */ /* Don't send empty hashes */
if (g_hash_table_size (connection_hash) < 1) { if (g_hash_table_size (connection_hash) < 1) {
@@ -302,7 +277,7 @@ nm_connection_dump (NMConnection *connection)
{ {
GHashTable *hash; GHashTable *hash;
g_return_if_fail (connection != NULL); g_return_if_fail (NM_IS_CONNECTION (connection));
/* Convert the connection to hash so that we can introspect it */ /* Convert the connection to hash so that we can introspect it */
hash = nm_connection_to_hash (connection); hash = nm_connection_to_hash (connection);
@@ -310,11 +285,75 @@ nm_connection_dump (NMConnection *connection)
g_hash_table_destroy (hash); g_hash_table_destroy (hash);
} }
void NMConnection *
nm_connection_destroy (NMConnection *connection) nm_connection_new (void)
{ {
g_return_if_fail (connection != NULL); GObject *object;
g_hash_table_destroy (connection->settings); if (!registered_setting_creators)
g_slice_free (NMConnection, connection); register_default_creators ();
object = g_object_new (NM_TYPE_CONNECTION, NULL);
return NM_CONNECTION (object);
} }
NMConnection *
nm_connection_new_from_hash (GHashTable *hash)
{
NMConnection *connection;
NMConnectionPrivate *priv;
g_return_val_if_fail (hash != NULL, NULL);
connection = nm_connection_new ();
g_hash_table_foreach (hash, parse_one_setting, connection);
nm_connection_dump (connection);
priv = NM_CONNECTION_GET_PRIVATE (connection);
if (g_hash_table_size (priv->settings) < 1) {
g_warning ("No settings found.");
g_object_unref (connection);
return NULL;
}
if (!nm_settings_verify (priv->settings)) {
g_object_unref (connection);
return NULL;
}
return connection;
}
static void
nm_connection_init (NMConnection *connection)
{
NMConnectionPrivate *priv = NM_CONNECTION_GET_PRIVATE (connection);
priv->settings = g_hash_table_new (g_str_hash, g_str_equal);
}
static void
finalize (GObject *object)
{
NMConnection *connection = NM_CONNECTION (object);
NMConnectionPrivate *priv = NM_CONNECTION_GET_PRIVATE (connection);
g_hash_table_destroy (priv->settings);
priv->settings = NULL;
G_OBJECT_CLASS (nm_connection_parent_class)->finalize (object);
}
static void
nm_connection_class_init (NMConnectionClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
g_type_class_add_private (klass, sizeof (NMConnectionPrivate));
/* virtual methods */
object_class->finalize = finalize;
}

17
libnm-util/nm-connection.h
View File

@@ -2,14 +2,28 @@
#define NM_CONNECTION_H #define NM_CONNECTION_H
#include <glib.h> #include <glib.h>
#include <glib-object.h>
#include "nm-setting.h" #include "nm-setting.h"
G_BEGIN_DECLS G_BEGIN_DECLS
#define NM_TYPE_CONNECTION (nm_connection_get_type ())
#define NM_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_CONNECTION, NMConnection))
#define NM_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_CONNECTION, NMConnectionClass))
#define NM_IS_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_CONNECTION))
#define NM_IS_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_CONNECTION))
#define NM_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_CONNECTION, NMConnectionClass))
typedef struct { typedef struct {
GHashTable *settings; GObject parent;
} NMConnection; } NMConnection;
typedef struct {
GObjectClass parent;
} NMConnectionClass;
GType nm_connection_get_type (void);
NMConnection *nm_connection_new (void); NMConnection *nm_connection_new (void);
NMConnection *nm_connection_new_from_hash (GHashTable *hash); NMConnection *nm_connection_new_from_hash (GHashTable *hash);
void nm_connection_add_setting (NMConnection *connection, void nm_connection_add_setting (NMConnection *connection,
@@ -25,7 +39,6 @@ gboolean nm_connection_have_secrets (NMConnection *connection);
GHashTable *nm_connection_to_hash (NMConnection *connection); GHashTable *nm_connection_to_hash (NMConnection *connection);
void nm_connection_dump (NMConnection *connection); void nm_connection_dump (NMConnection *connection);
void nm_connection_destroy (NMConnection *connection);
void nm_setting_parser_register (const char *name, void nm_setting_parser_register (const char *name,

30
src/NetworkManager.c
View File

@@ -104,24 +104,6 @@ nm_monitor_setup (void)
return TRUE; return TRUE;
} }
static void
nm_name_owner_changed_handler (NMDBusManager *mgr,
const char *name,
const char *old,
const char *new,
gpointer user_data)
{
gboolean old_owner_good = (old && (strlen (old) > 0));
gboolean new_owner_good = (new && (strlen (new) > 0));
if (strcmp (name, NMI_DBUS_SERVICE) == 0) {
if (!old_owner_good && new_owner_good) {
/* NMI appeared, update stuff */
// FIXME: grab NMConnections from the info-daemon
}
}
}
static void static void
nm_signal_handler (int signo) nm_signal_handler (int signo)
{ {
@@ -343,11 +325,6 @@ main (int argc, char *argv[])
goto done; goto done;
} }
g_signal_connect (dbus_mgr,
"name-owner-changed",
G_CALLBACK (nm_name_owner_changed_handler),
NULL);
manager = nm_manager_new (); manager = nm_manager_new ();
if (manager == NULL) { if (manager == NULL) {
nm_error ("Failed to initialize the network manager."); nm_error ("Failed to initialize the network manager.");
@@ -389,13 +366,6 @@ main (int argc, char *argv[])
if (!hal_manager) if (!hal_manager)
goto done; goto done;
/* If NMI is running, grab allowed wireless network lists from it ASAP */
#if 0
// FIXME: grab NMConnections instead
if (nm_dbus_manager_name_has_owner (dbus_mgr, NMI_DBUS_SERVICE))
nm_policy_schedule_allowed_ap_list_update (nm_data);
#endif
/* Bring up the loopback interface. */ /* Bring up the loopback interface. */
nm_system_enable_loopback (); nm_system_enable_loopback ();

4
src/nm-activation-request.c
View File

@@ -42,7 +42,7 @@ finalize (GObject *object)
{ {
NMActRequestPrivate *priv = NM_ACT_REQUEST_GET_PRIVATE (object); NMActRequestPrivate *priv = NM_ACT_REQUEST_GET_PRIVATE (object);
nm_connection_destroy (priv->connection); g_object_unref (priv->connection);
g_free (priv->specific_object); g_free (priv->specific_object);
@@ -75,7 +75,7 @@ nm_act_request_new (NMConnection *connection,
priv = NM_ACT_REQUEST_GET_PRIVATE (obj); priv = NM_ACT_REQUEST_GET_PRIVATE (obj);
priv->connection = connection; priv->connection = g_object_ref (connection);
priv->user_requested = user_requested; priv->user_requested = user_requested;
if (specific_object) if (specific_object)
priv->specific_object = g_strdup (specific_object); priv->specific_object = g_strdup (specific_object);

341
src/nm-manager.c
View File

@@ -20,13 +20,14 @@ static gboolean impl_manager_legacy_state (NMManager *manager, GError **err);
#include "nm-manager-glue.h" #include "nm-manager-glue.h"
static void nm_manager_connections_destroy (NMManager *manager); static void nm_manager_user_connections_destroy (NMManager *manager);
static void manager_state_changed (NMManager *manager); static void manager_state_changed (NMManager *manager);
static void manager_set_wireless_enabled (NMManager *manager, gboolean enabled); static void manager_set_wireless_enabled (NMManager *manager, gboolean enabled);
typedef struct { typedef struct {
GSList *devices; GSList *devices;
GSList *connections; GHashTable *user_connections;
DBusGProxy *user_proxy;
gboolean wireless_enabled; gboolean wireless_enabled;
gboolean sleeping; gboolean sleeping;
} NMManagerPrivate; } NMManagerPrivate;
@@ -62,6 +63,11 @@ nm_manager_init (NMManager *manager)
priv->wireless_enabled = TRUE; priv->wireless_enabled = TRUE;
priv->sleeping = FALSE; priv->sleeping = FALSE;
priv->user_connections = g_hash_table_new_full (g_str_hash,
g_str_equal,
g_free,
g_object_unref);
} }
static void static void
@@ -70,7 +76,7 @@ finalize (GObject *object)
NMManager *manager = NM_MANAGER (object); NMManager *manager = NM_MANAGER (object);
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager); NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager);
nm_manager_connections_destroy (manager); nm_manager_user_connections_destroy (manager);
while (g_slist_length (priv->devices)) while (g_slist_length (priv->devices))
nm_manager_remove_device (manager, NM_DEVICE (priv->devices->data)); nm_manager_remove_device (manager, NM_DEVICE (priv->devices->data));
@@ -195,30 +201,320 @@ nm_manager_class_init (NMManagerClass *manager_class)
&dbus_glib_nm_manager_object_info); &dbus_glib_nm_manager_object_info);
} }
#define DBUS_TYPE_G_STRING_VARIANT_HASHTABLE (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))
#define DBUS_TYPE_G_DICT_OF_DICTS (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, DBUS_TYPE_G_STRING_VARIANT_HASHTABLE))
typedef struct GetSettingsInfo {
NMManager *manager;
NMConnection *connection;
} GetSettingsInfo;
static void
free_get_settings_info (gpointer data)
{
GetSettingsInfo *info = (GetSettingsInfo *) data;
if (info->manager) {
g_object_unref (info->manager);
info->manager = NULL;
}
if (info->connection) {
g_object_unref (info->connection);
info->connection = NULL;
}
g_slice_free (GetSettingsInfo, data);
}
static void
destroy_connection_proxy (gpointer data, GObject *object)
{
DBusGProxy *proxy = DBUS_G_PROXY (data);
g_object_unref (proxy);
}
static void
connection_get_settings_cb (DBusGProxy *proxy,
DBusGProxyCall *call_id,
gpointer user_data)
{
GetSettingsInfo *info = (GetSettingsInfo *) user_data;
GError *err = NULL;
GHashTable *settings = NULL;
NMConnection *connection;
NMManager *manager;
g_return_if_fail (info != NULL);
if (!dbus_g_proxy_end_call (proxy, call_id, &err,
DBUS_TYPE_G_DICT_OF_DICTS, &settings,
G_TYPE_INVALID)) {
nm_warning ("Couldn't retrieve connection settings: %s.", err->message);
g_error_free (err);
goto out;
}
manager = info->manager;
connection = info->connection;
if (connection == NULL) {
const char *path = dbus_g_proxy_get_path (proxy);
const char *bus_name = dbus_g_proxy_get_bus_name (proxy);
NMManagerPrivate *priv;
connection = nm_connection_new_from_hash (settings);
if (connection == NULL)
goto out;
g_object_set_data (G_OBJECT (connection), "dbus-proxy", proxy);
g_object_weak_ref (G_OBJECT (connection), destroy_connection_proxy, proxy);
priv = NM_MANAGER_GET_PRIVATE (manager);
if (strcmp (bus_name, NM_DBUS_SERVICE_USER_SETTINGS) == 0) {
g_hash_table_insert (priv->user_connections,
g_strdup (path),
connection);
// } else if (strcmp (bus_name, NM_DBUS_SERVICE_SYSTEM_SETTINGS) == 0) {
// g_hash_table_insert (priv->system_connections,
// g_strdup (path),
// connection);
}
} else {
// FIXME: merge settings? or just replace?
nm_warning ("%s (#%d): implement merge settings", __func__, __LINE__);
}
g_hash_table_destroy (settings);
out:
return;
}
static void
connection_removed_cb (DBusGProxy *proxy, gpointer user_data)
{
NMManager * manager = NM_MANAGER (user_data);
const char *path = dbus_g_proxy_get_path (proxy);
const char *bus_name = dbus_g_proxy_get_bus_name (proxy);
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager);
NMConnection *connection = NULL;
GHashTable *hash = NULL;
if (strcmp (bus_name, NM_DBUS_SERVICE_USER_SETTINGS) == 0) {
hash = priv->user_connections;
// } else if (strcmp (bus_name, NM_DBUS_SERVICE_SYSTEM_SETTINGS) == 0) {
// hash = priv->system_connections;
}
if (hash == NULL)
goto out;
connection = g_hash_table_lookup (hash, path);
if (connection != NULL) {
/* Destroys the connection, then associated DBusGProxy due to the
* weak reference notify function placed on the connection when it
* was created.
*/
g_hash_table_remove (hash, path);
}
out:
return;
}
static void
new_connection_cb (DBusGProxy *proxy, const char *path, gpointer user_data)
{
NMManager * manager = NM_MANAGER (user_data);
DBusGProxy *con_proxy;
NMDBusManager * dbus_mgr;
DBusGConnection * g_connection;
NMConnection *connection;
DBusGProxyCall *call;
struct GetSettingsInfo *info;
dbus_mgr = nm_dbus_manager_get ();
g_connection = nm_dbus_manager_get_connection (dbus_mgr);
con_proxy = dbus_g_proxy_new_for_name (g_connection,
NM_DBUS_SERVICE_USER_SETTINGS,
path,
NM_DBUS_IFACE_USER_SETTINGS_CONNECTION);
g_object_unref (dbus_mgr);
if (!con_proxy) {
nm_warning ("Error: could not init user connection proxy");
return;
}
dbus_g_proxy_add_signal (con_proxy, "Updated",
DBUS_TYPE_G_DICT_OF_DICTS,
G_TYPE_INVALID);
// dbus_g_proxy_connect_signal (con_proxy, "Updated",
// G_CALLBACK (connection_updated_cb),
// manager,
// NULL);
dbus_g_proxy_add_signal (con_proxy, "Removed", G_TYPE_INVALID, G_TYPE_INVALID);
dbus_g_proxy_connect_signal (con_proxy, "Removed",
G_CALLBACK (connection_removed_cb),
manager,
NULL);
info = g_slice_new0 (GetSettingsInfo);
info->manager = g_object_ref (manager);
call = dbus_g_proxy_begin_call (con_proxy, "GetSettings",
connection_get_settings_cb,
info,
free_get_settings_info,
G_TYPE_INVALID);
}
#define DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH))
static void
list_connections_cb (DBusGProxy *proxy,
DBusGProxyCall *call_id,
gpointer user_data)
{
NMManager *manager = NM_MANAGER (user_data);
GError *err = NULL;
GPtrArray *ops;
int i;
if (!dbus_g_proxy_end_call (proxy, call_id, &err,
DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH, &ops,
G_TYPE_INVALID)) {
nm_warning ("Couldn't retrieve connections: %s.", err->message);
g_error_free (err);
goto out;
}
for (i = 0; i < ops->len; i++)
new_connection_cb (proxy, g_ptr_array_index (ops, i), manager);
g_ptr_array_free (ops, TRUE);
out:
return;
}
static void
query_user_connections (NMManager *manager)
{
NMManagerPrivate *priv;
DBusGProxyCall *call;
g_return_if_fail (NM_IS_MANAGER (manager));
priv = NM_MANAGER_GET_PRIVATE (manager);
if (!priv->user_proxy) {
NMDBusManager * dbus_mgr;
DBusGConnection * g_connection;
dbus_mgr = nm_dbus_manager_get ();
g_connection = nm_dbus_manager_get_connection (dbus_mgr);
priv->user_proxy = dbus_g_proxy_new_for_name (g_connection,
NM_DBUS_SERVICE_USER_SETTINGS,
NM_DBUS_PATH_USER_SETTINGS,
NM_DBUS_IFACE_USER_SETTINGS);
g_object_unref (dbus_mgr);
if (!priv->user_proxy) {
nm_warning ("Error: could not init user settings proxy");
return;
}
dbus_g_proxy_add_signal (priv->user_proxy,
"NewConnection",
DBUS_TYPE_G_OBJECT_PATH,
G_TYPE_INVALID);
dbus_g_proxy_connect_signal (priv->user_proxy, "NewConnection",
G_CALLBACK (new_connection_cb),
manager,
NULL);
}
/* grab connections */
call = dbus_g_proxy_begin_call (priv->user_proxy, "ListConnections",
list_connections_cb,
manager,
NULL,
G_TYPE_INVALID);
}
static void
nm_manager_name_owner_changed (NMDBusManager *mgr,
const char *name,
const char *old,
const char *new,
gpointer user_data)
{
NMManager * manager = NM_MANAGER (user_data);
gboolean old_owner_good = (old && (strlen (old) > 0));
gboolean new_owner_good = (new && (strlen (new) > 0));
if (strcmp (name, NM_DBUS_SERVICE_USER_SETTINGS) == 0) {
if (!old_owner_good && new_owner_good) {
/* User Settings service appeared, update stuff */
query_user_connections (manager);
} else {
/* User Settings service disappeared, throw them away (?) */
nm_manager_user_connections_destroy (manager);
}
}
}
gboolean
initial_get_connections (gpointer user_data)
{
NMManager * manager = NM_MANAGER (user_data);
if (nm_dbus_manager_name_has_owner (nm_dbus_manager_get (),
NM_DBUS_SERVICE_USER_SETTINGS))
query_user_connections (manager);
return FALSE;
}
NMManager * NMManager *
nm_manager_new (void) nm_manager_new (void)
{ {
GObject *object; GObject *object;
DBusGConnection *connection; DBusGConnection *connection;
NMDBusManager * dbus_mgr;
object = g_object_new (NM_TYPE_MANAGER, NULL); object = g_object_new (NM_TYPE_MANAGER, NULL);
connection = nm_dbus_manager_get_connection (nm_dbus_manager_get ()); dbus_mgr = nm_dbus_manager_get ();
connection = nm_dbus_manager_get_connection (dbus_mgr);
dbus_g_connection_register_g_object (connection, dbus_g_connection_register_g_object (connection,
NM_DBUS_PATH, NM_DBUS_PATH,
object); object);
g_signal_connect (dbus_mgr,
"name-owner-changed",
G_CALLBACK (nm_manager_name_owner_changed),
NM_MANAGER (object));
g_idle_add ((GSourceFunc) initial_get_connections, NM_MANAGER (object));
return NM_MANAGER (object); return NM_MANAGER (object);
} }
static void static void
nm_manager_connections_destroy (NMManager *manager) nm_manager_user_connections_destroy (NMManager *manager)
{ {
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager); NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager);
g_slist_foreach (priv->connections, (GFunc) nm_connection_destroy, NULL); if (priv->user_connections) {
g_slist_free (priv->connections); g_hash_table_destroy (priv->user_connections);
priv->connections = NULL; priv->user_connections = NULL;
}
if (priv->user_proxy) {
g_object_unref (priv->user_proxy);
priv->user_proxy = NULL;
}
} }
static void static void
@@ -529,23 +825,38 @@ impl_manager_legacy_state (NMManager *manager, GError **err)
/* Connections */ /* Connections */
GSList * static void
nm_manager_get_connections (NMManager *manager) connections_to_slist (gpointer key, gpointer value, gpointer user_data)
{ {
GSList **list = (GSList **) user_data;
*list = g_slist_prepend (*list, g_object_ref (value));
}
/* Returns a GSList of referenced NMConnection objects, caller must
* unref the connections in the list and destroy the list.
*/
GSList *
nm_manager_get_user_connections (NMManager *manager)
{
NMManagerPrivate *priv;
GSList *list = NULL;
g_return_val_if_fail (NM_IS_MANAGER (manager), NULL); g_return_val_if_fail (NM_IS_MANAGER (manager), NULL);
return NM_MANAGER_GET_PRIVATE (manager)->connections; priv = NM_MANAGER_GET_PRIVATE (manager);
g_hash_table_foreach (priv->user_connections, connections_to_slist, &list);
return list;
} }
void void
nm_manager_update_connections (NMManager *manager, nm_manager_update_user_connections (NMManager *manager,
GSList *connections, GSList *connections,
gboolean reset) gboolean reset)
{ {
g_return_if_fail (NM_IS_MANAGER (manager)); g_return_if_fail (NM_IS_MANAGER (manager));
if (reset) if (reset)
nm_manager_connections_destroy (manager); nm_manager_user_connections_destroy (manager);
} }

9
src/nm-manager.h
View File

@@ -55,8 +55,13 @@ void nm_manager_sleep (NMManager *manager, gboolean sleep);
/* Connections */ /* Connections */
GSList *nm_manager_get_connections (NMManager *manager); GSList *nm_manager_get_user_connections (NMManager *manager);
void nm_manager_update_connections (NMManager *manager, void nm_manager_update_user_connections (NMManager *manager,
GSList *connections,
gboolean reset);
GSList *nm_manager_get_system_connections (NMManager *manager);
void nm_manager_update_system_connections (NMManager *manager,
GSList *connections, GSList *connections,
gboolean reset); gboolean reset);

4
src/vpn-manager/nm-dbus-vpn.h
View File

@@ -26,6 +26,10 @@
#include "nm-vpn-manager.h" #include "nm-vpn-manager.h"
#include "nm-vpn-connection.h" #include "nm-vpn-connection.h"
#define NMI_DBUS_SERVICE "org.freedesktop.NetworkManagerInfo"
#define NMI_DBUS_PATH "/org/freedesktop/NetworkManagerInfo"
#define NMI_DBUS_INTERFACE "org.freedesktop.NetworkManagerInfo"
void nm_dbus_vpn_schedule_vpn_connections_update (NMVPNManager *manager); void nm_dbus_vpn_schedule_vpn_connections_update (NMVPNManager *manager);
void nm_dbus_vpn_update_one_vpn_connection (DBusConnection *connection, void nm_dbus_vpn_update_one_vpn_connection (DBusConnection *connection,