fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-04 21:30:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: subscribe recheck_assume_connection() early when adding device

Browse source 
It's clearer to (always) subscribe early to the NM_DEVICE_RECHECK_ASSUME signal
instead of during realize. Also, because a device can be realized several times.
Just make sure that recheck_assume_connection() doesn't do anything if it shouldn't
handle the event.
Only downside is some unnecessary work when there is nothing to do.

Also fix the signature of the NM_DEVICE_RECHECK_ASSUME handler recheck_assume_connection().
NM_DEVICE_RECHECK_ASSUME signal returns void. We should not subscribe recheck_assume_connection()
which returns gboolean.
This commit is contained in:
Thomas Haller 2015-12-04 17:17:47 +01:00
parent 0b12a4213b
commit 546272b216
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/nm-manager.c
View file

@ -1627,14 +1627,17 @@ can_start_device (NMManager *self, NMDevice *device)
}
static gboolean
recheck_assume_connection (NMDevice *device, gpointer user_data)
recheck_assume_connection (NMManager *self, NMDevice *device)
{
NMManager *self = NM_MANAGER (user_data);
NMSettingsConnection *connection;
gboolean was_unmanaged = FALSE, success, generated = FALSE;
NMDeviceState state;
g_return_val_if_fail (!nm_device_get_is_nm_owned (device), FALSE);
g_return_val_if_fail (NM_IS_MANAGER (self), FALSE);
g_return_val_if_fail (NM_IS_DEVICE (device), FALSE);
if (nm_device_get_is_nm_owned (device))
return FALSE;
if (!can_start_device (self, device))
return FALSE;
@ -1683,6 +1686,12 @@ recheck_assume_connection (NMDevice *device, gpointer user_data)
return success;
}
static void
recheck_assume_connection_cb (NMDevice *device, gpointer user_data)
{
recheck_assume_connection (user_data, device);
}
static void
device_ip_iface_changed (NMDevice *device,
GParamSpec *pspec,
@ -1714,7 +1723,6 @@ device_realized (NMDevice *device,
NMManager *self)
{
int ifindex;
gboolean assumed = FALSE;
/* Emit D-Bus signals */
g_signal_emit (self, signals[DEVICE_ADDED], 0, device);
@ -1728,13 +1736,8 @@ device_realized (NMDevice *device,
if (!can_start_device (self, device))
return;
if (!nm_device_get_is_nm_owned (device)) {
assumed = recheck_assume_connection (device, self);
g_signal_connect (device, NM_DEVICE_RECHECK_ASSUME,
G_CALLBACK (recheck_assume_connection), self);
}
if (!assumed && nm_device_get_managed (device)) {
if ( !recheck_assume_connection (self, device)
&& nm_device_get_managed (device)) {
nm_device_state_changed (device,
NM_DEVICE_STATE_UNAVAILABLE,
NM_DEVICE_STATE_REASON_NOW_MANAGED);
@ -1801,6 +1804,10 @@ add_device (NMManager *self, NMDevice *device)
G_CALLBACK (device_link_initialized_cb),
self);
g_signal_connect (device, NM_DEVICE_RECHECK_ASSUME,
G_CALLBACK (recheck_assume_connection_cb),
self);
g_signal_connect (device, "notify::" NM_DEVICE_IP_IFACE,
G_CALLBACK (device_ip_iface_changed),
self);