fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-14 11:00:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

wifi: more supplicant/wifi debug logging

Browse source 
To help debug wifi device availablility.
This commit is contained in:
Dan Williams 2010-04-07 16:42:29 -07:00
parent b0f056d787
commit 7fa8f29aaf
3 changed files with 34 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/nm-device-wifi.c
View file

@ -1208,16 +1208,25 @@ real_is_available (NMDevice *dev)
NMSupplicantInterface *sup_iface;
guint32 state;
if (!priv->enabled)
if (!priv->enabled) {
nm_log_dbg (LOGD_WIFI, "(%s): not available because not enabled",
nm_device_get_iface (dev));
return FALSE;
}
sup_iface = priv->supplicant.iface;
if (!sup_iface)
if (!sup_iface) {
nm_log_dbg (LOGD_WIFI, "(%s): not available because supplicant not running",
nm_device_get_iface (dev));
return FALSE;
}
state = nm_supplicant_interface_get_state (sup_iface);
if (state != NM_SUPPLICANT_INTERFACE_STATE_READY)
if (state != NM_SUPPLICANT_INTERFACE_STATE_READY) {
nm_log_dbg (LOGD_WIFI, "(%s): not available because supplicant interface not ready",
nm_device_get_iface (dev));
return FALSE;
}
return TRUE;
}
@ -3499,9 +3508,16 @@ real_set_enabled (NMDeviceInterface *device, gboolean enabled)
priv->enabled = enabled;
nm_log_dbg (LOGD_WIFI, "(%s): device now %s",
nm_device_get_iface (NM_DEVICE (device)),
enabled ? "enabled" : "disabled");
state = nm_device_interface_get_state (NM_DEVICE_INTERFACE (self));
if (state < NM_DEVICE_STATE_UNAVAILABLE)
if (state < NM_DEVICE_STATE_UNAVAILABLE) {
nm_log_dbg (LOGD_WIFI, "(%s): enable blocked by UNMANAGED state",
nm_device_get_iface (NM_DEVICE (device)));
return;
}
if (enabled) {
gboolean no_firmware = FALSE, success;
@ -3511,6 +3527,9 @@ real_set_enabled (NMDeviceInterface *device, gboolean enabled)
nm_log_warn (LOGD_CORE, "not in expected unavailable state!");
if (!nm_device_hw_bring_up (NM_DEVICE (self), TRUE, &no_firmware)) {
nm_log_dbg (LOGD_WIFI, "(%s): enable blocked by failure to bring device up",
nm_device_get_iface (NM_DEVICE (device)));
/* The device sucks, or HAL was lying to us about the killswitch state */
priv->enabled = FALSE;
return;
@ -3525,6 +3544,8 @@ real_set_enabled (NMDeviceInterface *device, gboolean enabled)
supplicant_interface_release (self);
supplicant_interface_acquire (self);
nm_log_dbg (LOGD_WIFI, "(%s): enable waiting on supplicant state",
nm_device_get_iface (NM_DEVICE (device)));
} else {
nm_device_state_changed (NM_DEVICE (self),
NM_DEVICE_STATE_UNAVAILABLE,

9
src/supplicant-manager/nm-supplicant-interface.c
View file

@ -768,6 +768,7 @@ static void
nm_supplicant_interface_add_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
{
NMSupplicantInfo *info = (NMSupplicantInfo *) user_data;
NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (info->interface);
GError *err = NULL;
char *path = NULL;
@ -782,13 +783,13 @@ nm_supplicant_interface_add_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpoi
/* Interface already added, just try to get the interface */
nm_supplicant_interface_add_to_supplicant (info->interface, TRUE);
} else {
nm_log_warn (LOGD_SUPPLICANT, "Unexpected supplicant error getting interface: %s",
err->message);
nm_log_err (LOGD_SUPPLICANT, "(%s): error getting interface: %s",
priv->dev, err->message);
}
g_error_free (err);
} else {
NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (info->interface);
nm_log_dbg (LOGD_SUPPLICANT, "(%s): interface added to supplicant", priv->dev);
priv->object_path = path;
@ -887,6 +888,8 @@ nm_supplicant_interface_start (NMSupplicantInterface * self)
/* Can only start the interface from INIT state */
g_return_if_fail (priv->state == NM_SUPPLICANT_INTERFACE_STATE_INIT);
nm_log_dbg (LOGD_SUPPLICANT, "(%s): adding interface to supplicant", priv->dev);
state = nm_supplicant_manager_get_state (priv->smgr);
if (state == NM_SUPPLICANT_MANAGER_STATE_IDLE) {
nm_supplicant_interface_set_state (self, NM_SUPPLICANT_INTERFACE_STATE_STARTING);

3
src/supplicant-manager/nm-supplicant-manager.c
View file

@ -288,9 +288,12 @@ nm_supplicant_manager_get_iface (NMSupplicantManager * self,
}
if (!iface) {
nm_log_dbg (LOGD_SUPPLICANT, "(%s): creating new supplicant interface", ifname);
iface = nm_supplicant_interface_new (self, ifname, is_wireless);
if (iface)
priv->ifaces = g_slist_append (priv->ifaces, iface);
} else {
nm_log_dbg (LOGD_SUPPLICANT, "(%s): returning existing supplicant interface", ifname);
}
return iface;