1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
|
diff --git a/include/iface.h b/include/iface.h
index 3530f23..24f0a9a 100644
--- a/include/iface.h
+++ b/include/iface.h
@@ -161,7 +161,7 @@ extern void connman_iface_indicate_carrier_off(struct connman_iface *iface);
extern void connman_iface_indicate_configured(struct connman_iface *iface);
extern void connman_iface_indicate_station(struct connman_iface *iface,
- const char *name, int strength, int security);
+ const char *bssid, const char *name, int strength, int security);
extern int connman_iface_get_ipv4(struct connman_iface *iface,
struct connman_ipv4 *ipv4);
diff --git a/plugins/supplicant.c b/plugins/supplicant.c
index cba93cd..a8a46ed 100644
--- a/plugins/supplicant.c
+++ b/plugins/supplicant.c
@@ -66,7 +66,9 @@ static GSList *tasks = NULL;
struct supplicant_ap {
gchar *identifier;
+ gchar *bssid;
GByteArray *ssid;
+ guint quality;
guint capabilities;
gboolean has_wep;
gboolean has_wpa;
@@ -618,6 +620,24 @@ static void extract_ssid(struct supplicant_ap *ap, DBusMessageIter *value)
ap->identifier = g_strdup((char *) ssid);
}
+static void extract_bssid(struct supplicant_ap *ap, DBusMessageIter *value)
+{
+ DBusMessageIter array;
+ unsigned char *bssid;
+ int bssid_len;
+ char buf[20];
+
+ dbus_message_iter_recurse(value, &array);
+ dbus_message_iter_get_fixed_array(&array, &bssid, &bssid_len);
+ if (bssid_len >= 6) {
+ g_snprintf((char *)buf, sizeof(buf),
+ "%02x:%02x:%02x:%02x:%02x:%02x",
+ (int)bssid[0], (int)bssid[1], (int)bssid[2],
+ (int)bssid[3], (int)bssid[4], (int)bssid[5]);
+ ap->bssid = g_strdup((char *) buf);
+ }
+}
+
static void extract_wpaie(struct supplicant_ap *ap, DBusMessageIter *value)
{
DBusMessageIter array;
@@ -657,6 +677,16 @@ static void extract_capabilites(struct supplicant_ap *ap,
ap->has_wep = TRUE;
}
+static void extract_quality(struct supplicant_ap *ap,
+ DBusMessageIter *value)
+{
+ guint quality;
+
+ dbus_message_iter_get_basic(value, &quality);
+
+ ap->quality = quality;
+}
+
static int parse_network_properties(struct supplicant_task *task,
DBusMessage *message)
{
@@ -688,12 +718,16 @@ static int parse_network_properties(struct supplicant_task *task,
if (g_str_equal(key, "ssid") == TRUE)
extract_ssid(ap, &value);
+ else if (g_str_equal(key, "bssid") == TRUE)
+ extract_bssid(ap, &value);
else if (g_str_equal(key, "wpaie") == TRUE)
extract_wpaie(ap, &value);
else if (g_str_equal(key, "rsnie") == TRUE)
extract_rsnie(ap, &value);
else if (g_str_equal(key, "capabilities") == TRUE)
extract_capabilites(ap, &value);
+ else if (g_str_equal(key, "quality") == TRUE)
+ extract_quality(ap, &value);
dbus_message_iter_next(&dict);
}
@@ -706,7 +740,8 @@ static int parse_network_properties(struct supplicant_task *task,
security |= 0x04;
connman_iface_indicate_station(task->iface,
- ap->identifier, 25, security);
+ ap->bssid, ap->identifier, ap->quality,
+ security);
g_free(ap);
diff --git a/src/iface-inet.c b/src/iface-inet.c
index 82a1e8c..f780452 100644
--- a/src/iface-inet.c
+++ b/src/iface-inet.c
@@ -275,6 +275,10 @@ int __connman_iface_connect(struct connman_iface *iface,
iface->flags |= CONNMAN_IFACE_FLAG_RUNNING;
+ /* This actually makes it do a dhcp request properly when connections
+ * are estabished - it doesnt seem to otherwise */
+ iface->state = CONNMAN_IFACE_STATE_ENABLED;
+
return 0;
}
diff --git a/src/iface.c b/src/iface.c
index b2fd6d1..c70b25c 100644
--- a/src/iface.c
+++ b/src/iface.c
@@ -332,11 +332,13 @@ void connman_iface_indicate_configured(struct connman_iface *iface)
}
}
-static void append_station(DBusMessage *reply, const char *name,
+static void append_station(DBusMessage *reply, const char *bssid, const char *name,
int signal, int security)
{
DBusMessageIter array, dict;
+ const char *wep = "WEP";
const char *wpa = "WPA";
+ const char *rsn = "RSN";
dbus_message_iter_init_append(reply, &array);
@@ -345,25 +347,36 @@ static void append_station(DBusMessage *reply, const char *name,
DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
- append_entry(&dict, "ESSID", DBUS_TYPE_STRING, &name);
+ if (bssid) append_entry(&dict, "BSSID", DBUS_TYPE_STRING, &bssid);
+ if (name) append_entry(&dict, "ESSID", DBUS_TYPE_STRING, &name);
append_entry(&dict, "Signal", DBUS_TYPE_UINT16, &signal);
- if (security > 0)
- append_entry(&dict, "Security", DBUS_TYPE_STRING, &wpa);
+ if (security > 0) {
+ const char *sec = NULL;
+
+ if (security & 0x4)
+ sec = rsn;
+ else if (security & 0x2)
+ sec = wpa;
+ else if (security & 0x1)
+ sec = wep;
+ if (sec)
+ append_entry(&dict, "Security", DBUS_TYPE_STRING, &sec);
+ }
dbus_message_iter_close_container(&array, &dict);
}
void connman_iface_indicate_station(struct connman_iface *iface,
- const char *name, int strength, int security)
+ const char *bssid, const char *name, int strength, int security)
{
DBusMessage *signal;
- char *ssid, *passphrase;
+ char *ssid = NULL, *passphrase;
int len;
- DBG("iface %p security %d name %s", iface, security, name);
+ DBG("iface %p security %d name %s bssid %s", iface, security, name, bssid);
- if (name == NULL || strlen(name) == 0)
+ if (bssid == NULL || strlen(bssid) == 0)
return;
signal = dbus_message_new_signal(iface->path,
@@ -371,7 +384,7 @@ void connman_iface_indicate_station(struct connman_iface *iface,
if (signal == NULL)
return;
- append_station(signal, name, strength, security);
+ append_station(signal, bssid, name, strength, security);
dbus_connection_send(connection, signal, NULL);
dbus_message_unref(signal);
@@ -386,17 +399,21 @@ void connman_iface_indicate_station(struct connman_iface *iface,
default:
break;
}
-
- len = strlen(name);
- ssid = strdup(name);
- if (ssid == NULL)
+
+ passphrase = __connman_iface_find_passphrase(iface, bssid);
+
+ if (!passphrase && name) {
+ len = strlen(name);
+ ssid = strdup(name);
+ /* The D-Link access points return a 0x05 at the end of the SSID */
+ if (len > 0 && ssid[len - 1] == '\05')
+ ssid[len - 1] = '\0';
+ }
+
+ if (!passphrase && ssid == NULL)
return;
-
- /* The D-Link access points return a 0x05 at the end of the SSID */
- if (ssid[len - 1] == '\05')
- ssid[len - 1] = '\0';
-
- passphrase = __connman_iface_find_passphrase(iface, ssid);
+ if (!passphrase)
+ passphrase = __connman_iface_find_passphrase(iface, ssid);
if (passphrase != NULL) {
DBG("network %s passphrase %s", ssid, passphrase);
@@ -1154,7 +1171,7 @@ static GDBusMethodTable iface_methods[] = {
{ "GetNetwork", "", "a{sv}", get_network },
{ "SetNetwork", "a{sv}", "", set_network },
{ "ListNetworks", "", "ao", list_networks },
- { "CreateNetwork", "a{av}", "o", create_network },
+ { "CreateNetwork", "a{sv}", "o", create_network },
{ "RemoveNetwork", "o", "", remove_network },
{ "SelectNetwork", "o", "", select_network },
{ "GetIPv4", "", "a{sv}", get_ipv4 },
@@ -1301,7 +1318,7 @@ static int probe_device(LibHalContext *ctx,
conn = libhal_ctx_get_dbus_connection(ctx);
- g_dbus_register_object(conn, iface->path, iface, device_free);
+ g_dbus_register_object(conn, iface->path);
interfaces = g_slist_append(interfaces, iface);
@@ -1313,7 +1330,7 @@ static int probe_device(LibHalContext *ctx,
g_dbus_register_interface(conn, iface->path,
CONNMAN_IFACE_INTERFACE,
- iface_methods, iface_signals, NULL);
+ iface_methods, iface_signals, NULL, iface, device_free);
DBG("iface %p identifier %s", iface, iface->identifier);
diff --git a/src/manager.c b/src/manager.c
index 9d14cd7..78b017f 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -218,18 +218,18 @@ int __connman_manager_init(DBusConnection *conn, gboolean compat)
if (connection == NULL)
return -1;
- g_dbus_register_object(connection, CONNMAN_MANAGER_PATH, NULL, NULL);
+ g_dbus_register_object(connection, CONNMAN_MANAGER_PATH);
g_dbus_register_interface(connection, CONNMAN_MANAGER_PATH,
CONNMAN_MANAGER_INTERFACE,
manager_methods,
- manager_signals, NULL);
+ manager_signals, NULL, NULL, NULL);
if (compat == TRUE) {
- g_dbus_register_object(connection, NM_PATH, NULL, NULL);
+ g_dbus_register_object(connection, NM_PATH);
g_dbus_register_interface(connection, NM_PATH, NM_INTERFACE,
- nm_methods, NULL, NULL);
+ nm_methods, NULL, NULL, NULL, NULL);
nm_compat = TRUE;
}
diff --git a/src/network.c b/src/network.c
index 9da8fea..a5ec2b9 100644
--- a/src/network.c
+++ b/src/network.c
@@ -157,10 +157,10 @@ const char *__connman_iface_add_network(struct connman_iface *iface,
networks = g_slist_append(networks, network);
- g_dbus_register_object(connection, path, network, network_free);
+ g_dbus_register_object(connection, path);
g_dbus_register_interface(connection, path, CONNMAN_NETWORK_INTERFACE,
- network_methods, NULL, NULL);
+ network_methods, NULL, NULL, network, network_free);
return path;
}
|
