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

keep-alive: minor cleanup of nm_keep_alive_set_dbus_client_watch()

Browse Source 
- always issue a _notify_alive(), just to be sure. At least
  in case where we clear a dbus-client watch, the alive state
  could change.

- avoid the logging in cleanup_dbus_watch(), if there is nothing
  to cleanup.
This commit is contained in:
Thomas Haller
2018-11-17 13:29:40 +01:00
parent 3baf56b474
commit 6b79af28d6
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/nm-keep-alive.c
View File

@@ -179,14 +179,17 @@ cleanup_dbus_watch (NMKeepAlive *self)
{ {
NMKeepAlivePrivate *priv = NM_KEEP_ALIVE_GET_PRIVATE (self); NMKeepAlivePrivate *priv = NM_KEEP_ALIVE_GET_PRIVATE (self);
if (!priv->dbus_client)
return;
_LOGD ("Cleanup DBus client watch"); _LOGD ("Cleanup DBus client watch");
g_clear_pointer (&priv->dbus_client, g_free); nm_clear_g_free (&priv->dbus_client);
if (priv->dbus_connection) {
if (priv->dbus_connection)
g_dbus_connection_signal_unsubscribe (priv->dbus_connection, g_dbus_connection_signal_unsubscribe (priv->dbus_connection,
priv->subscription_id); priv->subscription_id);
g_clear_object (&priv->dbus_connection); g_clear_object (&priv->dbus_connection);
}
} }
static void static void
@@ -221,23 +224,26 @@ nm_keep_alive_set_dbus_client_watch (NMKeepAlive *self,
cleanup_dbus_watch (self); cleanup_dbus_watch (self);
if (client_address == NULL) if (client_address) {
return; _LOGD ("Registering dbus client watch for keep alive");
_LOGD ("Registering dbus client watch for keep alive"); priv->dbus_client = g_strdup (client_address);
priv->dbus_connection = g_object_ref (connection);
priv->subscription_id = g_dbus_connection_signal_subscribe (connection,
"org.freedesktop.DBus",
"org.freedesktop.DBus",
"NameOwnerChanged",
"/org/freedesktop/DBus",
priv->dbus_client,
G_DBUS_SIGNAL_FLAGS_NONE,
name_owner_changed_cb,
self,
NULL);
/* FIXME: is there are race here and is it possible that name-owner is already gone?
* Do we need a GetNameOwner first? */
}
priv->dbus_client = g_strdup (client_address); _notify_alive (self);
priv->dbus_connection = g_object_ref (connection);
priv->subscription_id = g_dbus_connection_signal_subscribe (connection,
"org.freedesktop.DBus",
"org.freedesktop.DBus",
"NameOwnerChanged",
"/org/freedesktop/DBus",
priv->dbus_client,
G_DBUS_SIGNAL_FLAGS_NONE,
name_owner_changed_cb,
self,
NULL);
} }
/*****************************************************************************/ /*****************************************************************************/