summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorHenri Bragge <henri.bragge@ixonos.com>2011-02-17 13:51:47 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2011-02-18 00:55:55 +0100
commit6a3e42387013f3c032000cdc4cb7331cefcd487c (patch)
tree02ce4f64c58e100350a646e8a4d91f322a9b6213 /plugins
parenta4c4a4cdc2e85fc791204bc1f1f9e83df56d50be (diff)
downloadconnman-6a3e42387013f3c032000cdc4cb7331cefcd487c.tar.gz
connman-6a3e42387013f3c032000cdc4cb7331cefcd487c.tar.bz2
connman-6a3e42387013f3c032000cdc4cb7331cefcd487c.zip
ofono: Fix infinite recursion in network disconnect
If association takes too long and connection timeout goes off, then connman will try to disconnect and ends up in infinite recursion when __connman_network_disconnect() and connman_network_set_connected() call each other.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/ofono.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/ofono.c b/plugins/ofono.c
index 066e9b71..ed6317bd 100644
--- a/plugins/ofono.c
+++ b/plugins/ofono.c
@@ -489,6 +489,8 @@ static int network_disconnect(struct connman_network *network)
if (connman_network_get_index(network) < 0)
return -ENOTCONN;
+ connman_network_set_associating(network, FALSE);
+
return set_network_active(network, FALSE);
}