fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-19 09:00:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: merge branch 'th/client-object-manager-dbus-leak'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/398
This commit is contained in:
Thomas Haller 2020-01-16 12:47:53 +01:00
commit b1b69c1c7b
5 changed files with 124 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
libnm/nm-client.c
View file

@ -2996,9 +2996,12 @@ _dbus_handle_interface_removed (NMClient *self,
}
static void
_dbus_managed_objects_changed_cb (const char *object_path,
GVariant *added_interfaces_and_properties,
const char *const*removed_interfaces,
_dbus_managed_objects_changed_cb (GDBusConnection *connection,
const char *sender_name,
const char *arg_object_path,
const char *interface_name,
const char *signal_name,
GVariant *parameters,
gpointer user_data)
{
NMClient *self = user_data;
@ -3006,19 +3009,50 @@ _dbus_managed_objects_changed_cb (const char *object_path,
const char *log_context;
gboolean changed;
nm_assert (nm_streq0 (interface_name, DBUS_INTERFACE_OBJECT_MANAGER));
if (priv->get_managed_objects_cancellable) {
/* we still wait for the initial GetManagedObjects(). Ignore the event. */
return;
}
if (!added_interfaces_and_properties) {
log_context = "interfaces-removed";
changed = _dbus_handle_interface_removed (self, log_context, object_path, NULL, removed_interfaces);
} else {
if (nm_streq (signal_name, "InterfacesAdded")) {
gs_unref_variant GVariant *interfaces_and_properties = NULL;
const char *object_path;
if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(oa{sa{sv}})")))
return;
g_variant_get (parameters,
"(&o@a{sa{sv}})",
&object_path,
&interfaces_and_properties);
log_context = "interfaces-added";
changed = _dbus_handle_interface_added (self, log_context, object_path, added_interfaces_and_properties);
changed = _dbus_handle_interface_added (self, log_context, object_path, interfaces_and_properties);
goto out;
}
if (nm_streq (signal_name, "InterfacesRemoved")) {
gs_free const char **interfaces = NULL;
const char *object_path;
if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(oas)")))
return;
g_variant_get (parameters,
"(&o^a&s)",
&object_path,
&interfaces);
log_context = "interfaces-removed";
changed = _dbus_handle_interface_removed (self, log_context, object_path, NULL, interfaces);
goto out;
}
return;
out:
if (changed)
_dbus_handle_changes (self, log_context, TRUE);
}
@ -6604,6 +6638,7 @@ _init_fetch_all (NMClient *self)
priv->dbsid_nm_object_manager = nm_dbus_connection_signal_subscribe_object_manager (priv->dbus_connection,
priv->name_owner,
"/org/freedesktop",
NULL,
_dbus_managed_objects_changed_cb,
self,
NULL);
@ -7582,6 +7617,32 @@ dispose (GObject *object)
nm_clear_pointer (&priv->udev, udev_unref);
if ( priv->context_busy_watcher
&& priv->dbus_context) {
GSource *cleanup_source;
/* Technically, we cancelled all pending actions (and these actions keep
* the context_busy_watcher object alive). Also, we passed
* no destroy notify to g_dbus_connection_signal_subscribe().
* That means, there should be no other unaccounted GSource'es left.
*
* However, we really need to be sure that the context_busy_watcher's
* lifetime matches the time that the context is busy. That is especially
* important with synchronous initialization, where the context-busy-watcher
* keeps the inner GMainContext integrated in the caller's.
* We must not g_source_destroy() that integration too early.
*
* So to be really sure all this is given, always schedule one last
* cleanup idle action with low priority. This should be the last
* thing related to this instance that keeps the context busy. */
cleanup_source = nm_g_idle_source_new (G_PRIORITY_LOW + 10,
nm_source_func_unref_gobject,
g_steal_pointer (&priv->context_busy_watcher),
NULL);
g_source_attach (cleanup_source, priv->dbus_context);
g_source_unref (cleanup_source);
}
nm_clear_pointer (&priv->dbus_context, g_main_context_unref);
nm_clear_pointer (&priv->main_context, g_main_context_unref);

92
shared/nm-glib-aux/nm-dbus-aux.c
View file

@ -102,98 +102,6 @@ nm_dbus_connection_call_get_all (GDBusConnection *dbus_connection,
/*****************************************************************************/
typedef struct {
NMDBusConnectionSignalObjectMangerCb callback;
gpointer user_data;
GDestroyNotify user_data_free_func;
} SubscribeObjectManagerData;
static void
_subscribe_object_manager_cb (GDBusConnection *connection,
const char *sender_name,
const char *arg_object_path,
const char *interface_name,
const char *signal_name,
GVariant *parameters,
gpointer user_data)
{
const SubscribeObjectManagerData *d = user_data;
nm_assert (nm_streq0 (interface_name, DBUS_INTERFACE_OBJECT_MANAGER));
if (nm_streq (signal_name, "InterfacesAdded")) {
gs_unref_variant GVariant *interfaces_and_properties = NULL;
const char *object_path;
if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(oa{sa{sv}})")))
return;
g_variant_get (parameters,
"(&o@a{sa{sv}})",
&object_path,
&interfaces_and_properties);
d->callback (object_path, interfaces_and_properties, NULL, d->user_data);
return;
}
if (nm_streq (signal_name, "InterfacesRemoved")) {
gs_free const char **interfaces = NULL;
const char *object_path;
if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(oas)")))
return;
g_variant_get (parameters,
"(&o^a&s)",
&object_path,
&interfaces);
d->callback (object_path, NULL, interfaces, d->user_data);
return;
}
}
static void
_subscribe_object_manager_data_free (gpointer ptr)
{
SubscribeObjectManagerData *d = ptr;
if (d->user_data_free_func)
d->user_data_free_func (d->user_data);
nm_g_slice_free (d);
}
guint
nm_dbus_connection_signal_subscribe_object_manager (GDBusConnection *dbus_connection,
const char *service_name,
const char *object_path,
NMDBusConnectionSignalObjectMangerCb callback,
gpointer user_data,
GDestroyNotify user_data_free_func)
{
SubscribeObjectManagerData *d;
g_return_val_if_fail (callback, 0);
d = g_slice_new (SubscribeObjectManagerData);
*d = (SubscribeObjectManagerData) {
.callback = callback,
.user_data = user_data,
.user_data_free_func = user_data_free_func,
};
return nm_dbus_connection_signal_subscribe_object_manager_plain (dbus_connection,
service_name,
object_path,
NULL,
_subscribe_object_manager_cb,
d,
_subscribe_object_manager_data_free);
}
/*****************************************************************************/
static void
_nm_dbus_connection_call_get_managed_objects_cb (GObject *source,
GAsyncResult *res,

26
shared/nm-glib-aux/nm-dbus-aux.h
View file

@ -131,13 +131,13 @@ void nm_dbus_connection_call_get_all (GDBusConnection *dbus_connection,
/*****************************************************************************/
static inline guint
nm_dbus_connection_signal_subscribe_object_manager_plain (GDBusConnection *dbus_connection,
const char *service_name,
const char *object_path,
const char *signal_name,
GDBusSignalCallback callback,
gpointer user_data,
GDestroyNotify user_data_free_func)
nm_dbus_connection_signal_subscribe_object_manager (GDBusConnection *dbus_connection,
const char *service_name,
const char *object_path,
const char *signal_name,
GDBusSignalCallback callback,
gpointer user_data,
GDestroyNotify user_data_free_func)
{
return g_dbus_connection_signal_subscribe (dbus_connection,
service_name,
@ -151,18 +151,6 @@ nm_dbus_connection_signal_subscribe_object_manager_plain (GDBusConnection *dbus_
user_data_free_func);
}
typedef void (*NMDBusConnectionSignalObjectMangerCb) (const char *object_path,
GVariant *added_interfaces_and_properties,
const char *const*removed_interfaces,
gpointer user_data);
guint nm_dbus_connection_signal_subscribe_object_manager (GDBusConnection *dbus_connection,
const char *service_name,
const char *object_path,
NMDBusConnectionSignalObjectMangerCb callback,
gpointer user_data,
GDestroyNotify user_data_free_func);
void nm_dbus_connection_call_get_managed_objects (GDBusConnection *dbus_connection,
const char *bus_name,
const char *object_path,

8
shared/nm-glib-aux/nm-shared-utils.h
View file

@ -973,6 +973,14 @@ NM_AUTO_DEFINE_FCN0 (GSource *, _nm_auto_destroy_and_unref_gsource, nm_g_source_
NM_AUTO_DEFINE_FCN0 (GMainContext *, _nm_auto_pop_gmaincontext, g_main_context_pop_thread_default)
#define nm_auto_pop_gmaincontext nm_auto (_nm_auto_pop_gmaincontext)
static inline gboolean
nm_source_func_unref_gobject (gpointer user_data)
{
nm_assert (G_IS_OBJECT (user_data));
g_object_unref (user_data);
return G_SOURCE_REMOVE;
}
GSource *nm_g_idle_source_new (int priority,
GSourceFunc func,
gpointer user_data,

47
src/devices/bluetooth/nm-bluez-manager.c
View file

@ -2071,9 +2071,12 @@ _dbus_handle_interface_removed (NMBluezManager *self,
}
static void
_dbus_managed_objects_changed_cb (const char *object_path,
GVariant *added_interfaces_and_properties,
const char *const*removed_interfaces,
_dbus_managed_objects_changed_cb (GDBusConnection *connection,
const char *sender_name,
const char *arg_object_path,
const char *interface_name,
const char *signal_name,
GVariant *parameters,
gpointer user_data)
{
NMBluezManager *self = user_data;
@ -2081,17 +2084,46 @@ _dbus_managed_objects_changed_cb (const char *object_path,
BzDBusObj *bzobj = NULL;
gboolean changed;
nm_assert (nm_streq0 (interface_name, DBUS_INTERFACE_OBJECT_MANAGER));
if (priv->get_managed_objects_cancellable) {
/* we still wait for the initial GetManagedObjects(). Ignore the event. */
return;
}
if (!added_interfaces_and_properties) {
changed = _dbus_handle_interface_removed (self, object_path, &bzobj, removed_interfaces);
if (nm_streq (signal_name, "InterfacesAdded")) {
gs_unref_variant GVariant *interfaces_and_properties = NULL;
const char *object_path;
if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(oa{sa{sv}})")))
return;
g_variant_get (parameters,
"(&o@a{sa{sv}})",
&object_path,
&interfaces_and_properties);
_dbus_handle_interface_added (self, object_path, interfaces_and_properties, FALSE);
return;
}
if (nm_streq (signal_name, "InterfacesRemoved")) {
gs_free const char **interfaces = NULL;
const char *object_path;
if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(oas)")))
return;
g_variant_get (parameters,
"(&o^a&s)",
&object_path,
&interfaces);
changed = _dbus_handle_interface_removed (self, object_path, &bzobj, interfaces);
if (changed)
_dbus_process_changes (self, bzobj, "dbus-iface-removed");
} else
_dbus_handle_interface_added (self, object_path, added_interfaces_and_properties, FALSE);
return;
}
}
static void
@ -2234,6 +2266,7 @@ name_owner_changed (NMBluezManager *self,
priv->managed_objects_changed_id = nm_dbus_connection_signal_subscribe_object_manager (priv->dbus_connection,
priv->name_owner,
NM_BLUEZ_MANAGER_PATH,
NULL,
_dbus_managed_objects_changed_cb,
self,
NULL);