diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-03-06 15:09:57 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-03-13 21:40:42 +0100 |
| commit | 0553e1b36c4520595a6ac7b206ac976c54b19ed0 (patch) | |
| tree | 4effa4b25de21475c00f45f0a15784a96468e264 | |
| parent | e7daeeecb48f25bf7f623e3f1b20e6709c2de83a (diff) | |
| download | NetworkManager-0553e1b36c4520595a6ac7b206ac976c54b19ed0.tar.gz | |
core: add debug logging for link disconnect action
Signed-off-by: Thomas Haller <thaller@redhat.com>
| -rw-r--r-- | src/devices/nm-device.c | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index b3cccc7ad2..d5c4386c5e 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -1069,6 +1069,9 @@ link_disconnect_action_cb (gpointer user_data) NMDevice *device = NM_DEVICE (user_data); NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (device); + nm_log_dbg (LOGD_DEVICE, "(%s): link disconnected (calling deferred action) (id=%u)", + nm_device_get_iface (device), priv->carrier_defer_id); + priv->carrier_defer_id = 0; nm_log_info (LOGD_DEVICE, "(%s): link disconnected (calling deferred action)", @@ -1079,6 +1082,19 @@ link_disconnect_action_cb (gpointer user_data) return FALSE; } +static void +link_disconnect_action_cancel (NMDevice *self) +{ + NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); + + if (priv->carrier_defer_id) { + g_source_remove (priv->carrier_defer_id); + nm_log_dbg (LOGD_DEVICE, "(%s): link disconnected (canceling deferred action) (id=%u)", + nm_device_get_iface (self), priv->carrier_defer_id); + priv->carrier_defer_id = 0; + } +} + void nm_device_set_carrier (NMDevice *device, gboolean carrier) { @@ -1095,10 +1111,7 @@ nm_device_set_carrier (NMDevice *device, gboolean carrier) if (priv->carrier) { nm_log_info (LOGD_DEVICE, "(%s): link connected", iface); - if (priv->carrier_defer_id) { - g_source_remove (priv->carrier_defer_id); - priv->carrier_defer_id = 0; - } + link_disconnect_action_cancel (device); klass->carrier_changed (device, TRUE); if (priv->carrier_wait_id) { @@ -1114,6 +1127,8 @@ nm_device_set_carrier (NMDevice *device, gboolean carrier) iface, LINK_DISCONNECT_DELAY); priv->carrier_defer_id = g_timeout_add_seconds (LINK_DISCONNECT_DELAY, link_disconnect_action_cb, device); + nm_log_dbg (LOGD_DEVICE, "(%s): link disconnected (deferring action for %d seconds) (id=%u)", + iface, LINK_DISCONNECT_DELAY, priv->carrier_defer_id); } } @@ -5580,10 +5595,7 @@ dispose (GObject *object) g_clear_pointer (&priv->ip6_saved_properties, g_hash_table_unref); - if (priv->carrier_defer_id) { - g_source_remove (priv->carrier_defer_id); - priv->carrier_defer_id = 0; - } + link_disconnect_action_cancel (self); if (priv->con_provider) { g_signal_handlers_disconnect_by_func (priv->con_provider, cp_connection_added, self); |