projects
/
connman
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8d025cd
)
Fix group name setting for new networks
author
Marcel Holtmann
<marcel@holtmann.org>
Sat, 4 Apr 2009 02:27:03 +0000
(
04:27
+0200)
committer
Marcel Holtmann
<marcel@holtmann.org>
Sat, 4 Apr 2009 02:27:03 +0000
(
04:27
+0200)
plugins/supplicant.c
patch
|
blob
|
history
diff --git
a/plugins/supplicant.c
b/plugins/supplicant.c
index
2009f7a
..
3c1b0d8
100644
(file)
--- a/
plugins/supplicant.c
+++ b/
plugins/supplicant.c
@@
-1035,6
+1035,10
@@
static void properties_reply(DBusPendingCall *call, void *user_data)
else
security = "none";
else
security = "none";
+ mode = (result.adhoc == TRUE) ? "adhoc" : "managed";
+
+ group = build_group(result.ssid, result.ssid_len, mode, security);
+
network = connman_device_get_network(task->device, result.path);
if (network == NULL) {
int index;
network = connman_device_get_network(task->device, result.path);
if (network == NULL) {
int index;
@@
-1052,28
+1056,29
@@
static void properties_reply(DBusPendingCall *call, void *user_data)
connman_network_set_string(network, "Address", result.addr);
connman_network_set_string(network, "Address", result.addr);
+ connman_network_set_group(network, group);
+
if (connman_device_add_network(task->device, network) < 0) {
connman_network_unref(network);
goto done;
}
}
if (connman_device_add_network(task->device, network) < 0) {
connman_network_unref(network);
goto done;
}
}
+ connman_network_set_group(network, group);
+
+ g_free(group);
+
if (result.name != NULL && result.name[0] != '\0')
connman_network_set_string(network, "Name", result.name);
connman_network_set_blob(network, "WiFi.SSID",
result.ssid, result.ssid_len);
if (result.name != NULL && result.name[0] != '\0')
connman_network_set_string(network, "Name", result.name);
connman_network_set_blob(network, "WiFi.SSID",
result.ssid, result.ssid_len);
- mode = (result.adhoc == TRUE) ? "adhoc" : "managed";
connman_network_set_string(network, "WiFi.Mode", mode);
connman_network_set_string(network, "WiFi.Mode", mode);
- group = build_group(result.ssid, result.ssid_len, mode, security);
- connman_network_set_group(network, group);
- g_free(group);
-
DBG("%s (%s %s) strength %d (%s)",
DBG("%s (%s %s) strength %d (%s)",
- result.name, mode, security, strength,
- (result.has_wps == TRUE) ? "WPS" : "no WPS");
+ result.name, mode, security, strength,
+ (result.has_wps == TRUE) ? "WPS" : "no WPS");
connman_network_set_available(network, TRUE);
connman_network_set_uint8(network, "Strength", strength);
connman_network_set_available(network, TRUE);
connman_network_set_uint8(network, "Strength", strength);