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 2776 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2787 network_disable(task, handle); | 2787 network_disable(task, handle); |
2788 /* | 2788 /* |
2789 * Clear our state in case of an error. Should not happen. | 2789 * Clear our state in case of an error. Should not happen. |
2790 * TODO(sleffler) add diagnostic | 2790 * TODO(sleffler) add diagnostic |
2791 */ | 2791 */ |
2792 if (task->current_bss == network) { | 2792 if (task->current_bss == network) { |
2793 connman_network_unref(task->current_bss); | 2793 connman_network_unref(task->current_bss); |
2794 task->current_bss = NULL; | 2794 task->current_bss = NULL; |
2795 } | 2795 } |
2796 } | 2796 } |
| 2797 /* NB: caller marks network disconnected on 0 return */ |
2797 return 0; | 2798 return 0; |
2798 } | 2799 } |
2799 | 2800 |
2800 static struct connman_network_driver supplicant_network_driver = { | 2801 static struct connman_network_driver supplicant_network_driver = { |
2801 .name = "wifi", | 2802 .name = "wifi", |
2802 .type = CONNMAN_NETWORK_TYPE_WIFI, | 2803 .type = CONNMAN_NETWORK_TYPE_WIFI, |
2803 .probe = supplicant_network_probe, | 2804 .probe = supplicant_network_probe, |
2804 .remove = supplicant_network_remove, | 2805 .remove = supplicant_network_remove, |
2805 .connect = supplicant_network_connect, | 2806 .connect = supplicant_network_connect, |
2806 .disconnect = supplicant_network_disconnect, | 2807 .disconnect = supplicant_network_disconnect, |
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2958 dbus_bus_remove_match(connection, bss_rule, NULL); | 2959 dbus_bus_remove_match(connection, bss_rule, NULL); |
2959 dbus_bus_remove_match(connection, interface_rule, NULL); | 2960 dbus_bus_remove_match(connection, interface_rule, NULL); |
2960 dbus_connection_flush(connection); | 2961 dbus_connection_flush(connection); |
2961 dbus_connection_remove_filter(connection, supplicant_filter, NULL); | 2962 dbus_connection_remove_filter(connection, supplicant_filter, NULL); |
2962 dbus_connection_unref(connection); | 2963 dbus_connection_unref(connection); |
2963 connection = NULL; | 2964 connection = NULL; |
2964 } | 2965 } |
2965 | 2966 |
2966 CONNMAN_PLUGIN_DEFINE(newwifi, "New WiFi interface", VERSION, | 2967 CONNMAN_PLUGIN_DEFINE(newwifi, "New WiFi interface", VERSION, |
2967 CONNMAN_PLUGIN_PRIORITY_DEFAULT, new_wifi_init, new_wifi_finis) | 2968 CONNMAN_PLUGIN_PRIORITY_DEFAULT, new_wifi_init, new_wifi_finis) |
OLD | NEW |