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

bt: ensure connect timeout is canceled on success (rh #586961)

Browse source
This commit is contained in:
Dan Williams 2010-05-05 12:52:45 -07:00
parent 88e6f25b7e
commit e2f848c2d9
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/nm-device-bt.c
View file

@ -576,13 +576,17 @@ check_connect_continue (NMDeviceBt *self)
nm_device_get_ip_iface (device), nm_device_get_ip_iface (device),
dun ? "DUN" : (pan ? "PAN" : "unknown")); dun ? "DUN" : (pan ? "PAN" : "unknown"));
/* Kill the connect timeout since we're connected now */
if (priv->timeout_id) {
g_source_remove (priv->timeout_id);
priv->timeout_id = 0;
}
if (pan) { if (pan) {
/* Bluez says we're connected now. Start IP config. */ /* Bluez says we're connected now. Start IP config. */
nm_device_activate_schedule_stage3_ip_config_start (device); nm_device_activate_schedule_stage3_ip_config_start (device);
} else if (dun) { } else if (dun) {
/* Wait for ModemManager to find the modem */ /* Wait for ModemManager to find the modem */
if (priv->timeout_id)
g_source_remove (priv->timeout_id);
priv->timeout_id = g_timeout_add_seconds (20, modem_find_timeout, self); priv->timeout_id = g_timeout_add_seconds (20, modem_find_timeout, self);
nm_log_info (LOGD_BT | LOGD_MB, "Activation (%s/bluetooth) Stage 2 of 5 (Device Configure) " nm_log_info (LOGD_BT | LOGD_MB, "Activation (%s/bluetooth) Stage 2 of 5 (Device Configure) "