From: Marcel Holtmann <marcel@holtmann.org>
Date: Tue, 19 May 2009 07:24:51 +0000 (-0700)
Subject: Don't auto-connect to network without a name
X-Git-Tag: maemo-0.19~47
X-Git-Url: http://vcs.maemo.org/git/?p=connman;a=commitdiff_plain;h=8d49445e0e145d3642019b437941e871d7f18c88

Don't auto-connect to network without a name
---

diff --git a/src/device.c b/src/device.c
index 374bc67..848c6f9 100644
--- a/src/device.c
+++ b/src/device.c
@@ -1361,6 +1361,7 @@ static void connect_known_network(struct connman_device *device)
 	struct connman_network *network = NULL;
 	GHashTableIter iter;
 	gpointer key, value;
+	const char *name;
 	unsigned int count = 0;
 
 	DBG("device %p", device);
@@ -1369,7 +1370,6 @@ static void connect_known_network(struct connman_device *device)
 
 	while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) {
 		connman_uint8_t old_strength, new_strength;
-		const char *name;
 
 		count++;
 
@@ -1402,9 +1402,13 @@ static void connect_known_network(struct connman_device *device)
 	if (network != NULL) {
 		int err;
 
-		err = connman_network_connect(network);
-		if (err == 0 || err == -EINPROGRESS)
-			return;
+		name = connman_network_get_string(value,
+						CONNMAN_PROPERTY_ID_NAME);
+		if (name != NULL) {
+			err = connman_network_connect(network);
+			if (err == 0 || err == -EINPROGRESS)
+				return;
+		}
 	}
 
 	if (count > 0)