| OLD | NEW |
| 1 /* | 1 /* |
| 2 * New WiFi - communicate with wpa_supplicant using the "new D-Bus api" | 2 * New WiFi - communicate with wpa_supplicant using the "new D-Bus api" |
| 3 * | 3 * |
| 4 * This file initially created by Google, Inc. | 4 * This file initially created by Google, Inc. |
| 5 * | 5 * |
| 6 * This program is free software; you can redistribute it and/or modify | 6 * This program is free software; you can redistribute it and/or modify |
| 7 * it under the terms of the GNU General Public License version 2 as | 7 * it under the terms of the GNU General Public License version 2 as |
| 8 * published by the Free Software Foundation. | 8 * published by the Free Software Foundation. |
| 9 * | 9 * |
| 10 * This program is distributed in the hope that it will be useful, | 10 * This program is distributed in the hope that it will be useful, |
| (...skipping 1278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1289 { | 1289 { |
| 1290 struct blob *broadcast_ssid; | 1290 struct blob *broadcast_ssid; |
| 1291 int ret; | 1291 int ret; |
| 1292 int ssid_count; | 1292 int ssid_count; |
| 1293 | 1293 |
| 1294 _DBG_WIFI("request %p", request); | 1294 _DBG_WIFI("request %p", request); |
| 1295 | 1295 |
| 1296 request->scan_type = "active"; | 1296 request->scan_type = "active"; |
| 1297 | 1297 |
| 1298 request->ssids = NULL; | 1298 request->ssids = NULL; |
| 1299 » ret = connman_service_append_hidden_ssids(&request->ssids); | 1299 » connman_wifi_append_hidden_ssids(&request->ssids); |
| 1300 » if (ret < 0) | |
| 1301 » » return ret; | |
| 1302 | 1300 |
| 1303 if (request->ssids != NULL) { | 1301 if (request->ssids != NULL) { |
| 1304 /* | 1302 /* |
| 1305 * When scanning for specific Hidden SSIDs, | 1303 * When scanning for specific Hidden SSIDs, |
| 1306 * always send the Broadcast SSID, too. | 1304 * always send the Broadcast SSID, too. |
| 1307 */ | 1305 */ |
| 1308 ret = blob_new(&broadcast_ssid, 0, NULL); | 1306 ret = blob_new(&broadcast_ssid, 0, NULL); |
| 1309 if (ret < 0) | 1307 if (ret < 0) |
| 1310 return ret; | 1308 return ret; |
| 1311 | 1309 |
| (...skipping 1661 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2973 dbus_bus_remove_match(connection, bss_rule, NULL); | 2971 dbus_bus_remove_match(connection, bss_rule, NULL); |
| 2974 dbus_bus_remove_match(connection, interface_rule, NULL); | 2972 dbus_bus_remove_match(connection, interface_rule, NULL); |
| 2975 dbus_connection_flush(connection); | 2973 dbus_connection_flush(connection); |
| 2976 dbus_connection_remove_filter(connection, supplicant_filter, NULL); | 2974 dbus_connection_remove_filter(connection, supplicant_filter, NULL); |
| 2977 dbus_connection_unref(connection); | 2975 dbus_connection_unref(connection); |
| 2978 connection = NULL; | 2976 connection = NULL; |
| 2979 } | 2977 } |
| 2980 | 2978 |
| 2981 CONNMAN_PLUGIN_DEFINE(newwifi, "New WiFi interface", VERSION, | 2979 CONNMAN_PLUGIN_DEFINE(newwifi, "New WiFi interface", VERSION, |
| 2982 CONNMAN_PLUGIN_PRIORITY_DEFAULT, new_wifi_init, new_wifi_finis) | 2980 CONNMAN_PLUGIN_PRIORITY_DEFAULT, new_wifi_init, new_wifi_finis) |
| OLD | NEW |