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

core: add debug logging for link disconnect action

Browse Source 
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller
2014-03-06 15:09:57 +01:00
parent e7daeeecb4
commit 0553e1b36c
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/devices/nm-device.c
View File

@@ -1069,6 +1069,9 @@ link_disconnect_action_cb (gpointer user_data)
NMDevice *device = NM_DEVICE (user_data); NMDevice *device = NM_DEVICE (user_data);
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (device); 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; priv->carrier_defer_id = 0;
nm_log_info (LOGD_DEVICE, "(%s): link disconnected (calling deferred action)", nm_log_info (LOGD_DEVICE, "(%s): link disconnected (calling deferred action)",
@@ -1079,6 +1082,19 @@ link_disconnect_action_cb (gpointer user_data)
return FALSE; 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 void
nm_device_set_carrier (NMDevice *device, gboolean carrier) nm_device_set_carrier (NMDevice *device, gboolean carrier)
{ {
@@ -1095,10 +1111,7 @@ nm_device_set_carrier (NMDevice *device, gboolean carrier)
if (priv->carrier) { if (priv->carrier) {
nm_log_info (LOGD_DEVICE, "(%s): link connected", iface); nm_log_info (LOGD_DEVICE, "(%s): link connected", iface);
if (priv->carrier_defer_id) { link_disconnect_action_cancel (device);
g_source_remove (priv->carrier_defer_id);
priv->carrier_defer_id = 0;
}
klass->carrier_changed (device, TRUE); klass->carrier_changed (device, TRUE);
if (priv->carrier_wait_id) { if (priv->carrier_wait_id) {
@@ -1114,6 +1127,8 @@ nm_device_set_carrier (NMDevice *device, gboolean carrier)
iface, LINK_DISCONNECT_DELAY); iface, LINK_DISCONNECT_DELAY);
priv->carrier_defer_id = g_timeout_add_seconds (LINK_DISCONNECT_DELAY, priv->carrier_defer_id = g_timeout_add_seconds (LINK_DISCONNECT_DELAY,
link_disconnect_action_cb, device); 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); g_clear_pointer (&priv->ip6_saved_properties, g_hash_table_unref);
if (priv->carrier_defer_id) { link_disconnect_action_cancel (self);
g_source_remove (priv->carrier_defer_id);
priv->carrier_defer_id = 0;
}
if (priv->con_provider) { if (priv->con_provider) {
g_signal_handlers_disconnect_by_func (priv->con_provider, cp_connection_added, self); g_signal_handlers_disconnect_by_func (priv->con_provider, cp_connection_added, self);