From fb96309899a5ca853e206f52905df540719c7c5b Mon Sep 17 00:00:00 2001 From: Daniel Gnoutcheff Date: Fri, 6 Aug 2010 21:21:24 -0400 Subject: [PATCH] DBus: merge NetworkManger{,SystemSettings} Remove the org.freedesktop.NetworkManagerSystemSettings bus name and have everybody talk to org.freedesktop.NetworkManager. Now that we have a single settings service that's embedded in the main daemon, we don't need separate names anymore. --- callouts/nm-dispatcher-action.h | 1 - examples/python/add-system-connection.py | 2 +- examples/python/nm-state.py | 2 +- examples/python/vpn.py | 10 +++++----- include/NetworkManager.h | 1 - libnm-glib/nm-remote-connection.c | 4 ++-- libnm-glib/nm-remote-settings.c | 8 ++++---- src/NetworkManager.conf | 14 +++++++++----- src/NetworkManagerUtils.c | 7 ------- src/nm-dbus-manager.c | 18 ------------------ test/nm-tool.c | 4 ++-- 11 files changed, 24 insertions(+), 47 deletions(-) diff --git a/callouts/nm-dispatcher-action.h b/callouts/nm-dispatcher-action.h index 39aefd8f83..e4f2fab2f4 100644 --- a/callouts/nm-dispatcher-action.h +++ b/callouts/nm-dispatcher-action.h @@ -22,7 +22,6 @@ #define NM_DISPATCHER_DBUS_IFACE "org.freedesktop.nm_dispatcher" #define NM_DISPATCHER_DBUS_PATH "/org/freedesktop/nm_dispatcher" -#define NMD_CONNECTION_PROPS_SERVICE_NAME "service-name" #define NMD_CONNECTION_PROPS_PATH "path" #define NMD_DEVICE_PROPS_INTERFACE "interface" diff --git a/examples/python/add-system-connection.py b/examples/python/add-system-connection.py index 39eaabee0d..447ffd8294 100755 --- a/examples/python/add-system-connection.py +++ b/examples/python/add-system-connection.py @@ -41,7 +41,7 @@ con = dbus.Dictionary({ bus = dbus.SystemBus() -proxy = bus.get_object("org.freedesktop.NetworkManagerSystemSettings", "/org/freedesktop/NetworkManagerSettings") +proxy = bus.get_object("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManagerSettings") settings = dbus.Interface(proxy, "org.freedesktop.NetworkManagerSettings") settings.AddConnection(con) diff --git a/examples/python/nm-state.py b/examples/python/nm-state.py index 1ee4752814..179143c2f8 100644 --- a/examples/python/nm-state.py +++ b/examples/python/nm-state.py @@ -53,7 +53,7 @@ for a in active: # needed to connect to a specific network. Lets get those details so we # can find the user-readable name of the connection. con_path = prop_iface.Get("org.freedesktop.NetworkManager.ActiveConnection", "Connection") - service_proxy = bus.get_object("org.freedesktop.NetworkManagerSystemSettings", con_path) + service_proxy = bus.get_object("org.freedesktop.NetworkManager", con_path) con_iface = dbus.Interface(service_proxy, "org.freedesktop.NetworkManagerSettings.Connection") con_details = con_iface.GetSettings() con_name = con_details['connection']['id'] diff --git a/examples/python/vpn.py b/examples/python/vpn.py index 7e53f4bd9c..892d4bd559 100644 --- a/examples/python/vpn.py +++ b/examples/python/vpn.py @@ -37,7 +37,7 @@ DBusGMainLoop(set_as_default=True) def get_connections(): bus = dbus.SystemBus() - proxy = bus.get_object('org.freedesktop.NetworkManagerSystemSettings', '/org/freedesktop/NetworkManagerSettings') + proxy = bus.get_object('org.freedesktop.NetworkManager', '/org/freedesktop/NetworkManagerSettings') iface = dbus.Interface(proxy, dbus_interface='org.freedesktop.NetworkManagerSettings') return iface.ListConnections() @@ -45,7 +45,7 @@ def get_connections(): def get_connection_by_uuid(uuid): bus = dbus.SystemBus() for c in get_connections(): - proxy = bus.get_object('org.freedesktop.NetworkManagerSystemSettings', c) + proxy = bus.get_object('org.freedesktop.NetworkManager', c) iface = dbus.Interface(proxy, dbus_interface='org.freedesktop.NetworkManagerSettings.Connection') settings = iface.GetSettings() if settings['connection']['uuid'] == uuid: @@ -57,7 +57,7 @@ def get_connection_by_uuid(uuid): def list_uuids(): bus = dbus.SystemBus() for c in get_connections(): - proxy = bus.get_object('org.freedesktop.NetworkManagerSystemSettings', c) + proxy = bus.get_object('org.freedesktop.NetworkManager', c) iface = dbus.Interface(proxy, dbus_interface='org.freedesktop.NetworkManagerSettings.Connection') settings = iface.GetSettings() conn = settings['connection'] @@ -76,7 +76,7 @@ def get_active_connection_path(uuid): iface = dbus.Interface(proxy, dbus_interface='org.freedesktop.DBus.Properties') path = iface.Get('org.freedesktop.NetworkManager.Connection.Active', 'Connection') - proxy = bus.get_object('org.freedesktop.NetworkManagerSystemSettings', path) + proxy = bus.get_object('org.freedesktop.NetworkManager', path) iface = dbus.Interface(proxy, dbus_interface='org.freedesktop.NetworkManagerSettings.Connection') settings = iface.GetSettings() @@ -112,7 +112,7 @@ def activate_connection(connection_path, device_path): bus = dbus.SystemBus() proxy = bus.get_object('org.freedesktop.NetworkManager', '/org/freedesktop/NetworkManager') iface = dbus.Interface(proxy, dbus_interface='org.freedesktop.NetworkManager') - iface.ActivateConnection('org.freedesktop.NetworkManagerSystemSettings', + iface.ActivateConnection('org.freedesktop.NetworkManager', connection_path, device_path, "/", diff --git a/include/NetworkManager.h b/include/NetworkManager.h index 56fcfa2762..81b6104919 100644 --- a/include/NetworkManager.h +++ b/include/NetworkManager.h @@ -45,7 +45,6 @@ #define NM_DBUS_INTERFACE_DHCP6_CONFIG NM_DBUS_INTERFACE ".DHCP6Config" -#define NM_DBUS_SERVICE_SYSTEM_SETTINGS "org.freedesktop.NetworkManagerSystemSettings" #define NM_DBUS_IFACE_SETTINGS "org.freedesktop.NetworkManagerSettings" #define NM_DBUS_PATH_SETTINGS "/org/freedesktop/NetworkManagerSettings" diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c index 3f716f9438..0307618693 100644 --- a/libnm-glib/nm-remote-connection.c +++ b/libnm-glib/nm-remote-connection.c @@ -343,14 +343,14 @@ constructor (GType type, g_assert (nm_connection_get_path (NM_CONNECTION (object))); priv->proxy = dbus_g_proxy_new_for_name (priv->bus, - NM_DBUS_SERVICE_SYSTEM_SETTINGS, + NM_DBUS_SERVICE, nm_connection_get_path (NM_CONNECTION (object)), NM_DBUS_IFACE_SETTINGS_CONNECTION); g_assert (priv->proxy); dbus_g_proxy_set_default_timeout (priv->proxy, G_MAXINT); priv->secrets_proxy = dbus_g_proxy_new_for_name (priv->bus, - NM_DBUS_SERVICE_SYSTEM_SETTINGS, + NM_DBUS_SERVICE, nm_connection_get_path (NM_CONNECTION (object)), NM_DBUS_IFACE_SETTINGS_CONNECTION_SECRETS); g_assert (priv->secrets_proxy); diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c index 6019e3ba6d..fcf28605eb 100644 --- a/libnm-glib/nm-remote-settings.c +++ b/libnm-glib/nm-remote-settings.c @@ -485,7 +485,7 @@ name_owner_changed (DBusGProxy *proxy, { NMRemoteSettings *self = NM_REMOTE_SETTINGS (user_data); NMRemoteSettingsPrivate *priv = NM_REMOTE_SETTINGS_GET_PRIVATE (self); - const char *sname = NM_DBUS_SERVICE_SYSTEM_SETTINGS; + const char *sname = NM_DBUS_SERVICE; if (!strcmp (name, sname)) { if (priv->fetch_id) @@ -633,7 +633,7 @@ constructor (GType type, object, NULL); if (!dbus_g_proxy_call (priv->dbus_proxy, "NameHasOwner", &error, - G_TYPE_STRING, NM_DBUS_SERVICE_SYSTEM_SETTINGS, + G_TYPE_STRING, NM_DBUS_SERVICE, G_TYPE_INVALID, G_TYPE_BOOLEAN, &priv->service_running, G_TYPE_INVALID)) { @@ -646,7 +646,7 @@ constructor (GType type, } priv->proxy = dbus_g_proxy_new_for_name (priv->bus, - NM_DBUS_SERVICE_SYSTEM_SETTINGS, + NM_DBUS_SERVICE, NM_DBUS_PATH_SETTINGS, NM_DBUS_IFACE_SETTINGS); g_assert (priv->proxy); @@ -665,7 +665,7 @@ constructor (GType type, /* D-Bus properties proxy */ priv->props_proxy = dbus_g_proxy_new_for_name (priv->bus, - NM_DBUS_SERVICE_SYSTEM_SETTINGS, + NM_DBUS_SERVICE, NM_DBUS_PATH_SETTINGS, "org.freedesktop.DBus.Properties"); g_assert (priv->props_proxy); diff --git a/src/NetworkManager.conf b/src/NetworkManager.conf index 8d08314002..8a581cb9be 100644 --- a/src/NetworkManager.conf +++ b/src/NetworkManager.conf @@ -4,10 +4,7 @@ - - - @@ -63,10 +60,17 @@ - - + + + + + + proxy, "RequestName", &err, - G_TYPE_STRING, NM_DBUS_SERVICE_SYSTEM_SETTINGS, - G_TYPE_UINT, DBUS_NAME_FLAG_DO_NOT_QUEUE, - G_TYPE_INVALID, - G_TYPE_UINT, &result, - G_TYPE_INVALID)) { - nm_log_warn (LOGD_CORE, "Could not acquire the NetworkManagerSystemSettings service.\n" - " Message: '%s'", err->message); - g_error_free (err); - return FALSE; - } - - if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { - nm_log_warn (LOGD_CORE, "Could not acquire the NetworkManagerSystemSettings service " - "as it is already taken."); - return FALSE; - } - priv->started = TRUE; return priv->started; } diff --git a/test/nm-tool.c b/test/nm-tool.c index 6682558ff7..922bb63b1e 100644 --- a/test/nm-tool.c +++ b/test/nm-tool.c @@ -568,7 +568,7 @@ get_one_connection (DBusGConnection *bus, g_return_if_fail (path != NULL); g_return_if_fail (table != NULL); - proxy = dbus_g_proxy_new_for_name (bus, NM_DBUS_SERVICE_SYSTEM_SETTINGS, + proxy = dbus_g_proxy_new_for_name (bus, NM_DBUS_SERVICE, path, NM_DBUS_IFACE_SETTINGS_CONNECTION); if (!proxy) return; @@ -619,7 +619,7 @@ get_all_connections (void) } proxy = dbus_g_proxy_new_for_name (bus, - NM_DBUS_SERVICE_SYSTEM_SETTINGS, + NM_DBUS_SERVICE, NM_DBUS_PATH_SETTINGS, NM_DBUS_IFACE_SETTINGS); if (!proxy) {