X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=tools%2Fsupplicant.c;h=2717fe90e5e931db4885a7cf1e81046898d8f2e2;hb=1ae45cd1749e69b6d3ae6d5def23b316eebae6db;hp=c5757afc3b9384658ba28685da5d885cb843f64e;hpb=2b1e2d01d040dceac55aa3efca707a7ce8521f9c;p=framework%2Fconnectivity%2Fconnman.git diff --git a/tools/supplicant.c b/tools/supplicant.c index c5757af..2717fe9 100644 --- a/tools/supplicant.c +++ b/tools/supplicant.c @@ -2,7 +2,7 @@ * * Connection Manager * - * Copyright (C) 2007-2009 Intel Corporation. All rights reserved. + * Copyright (C) 2007-2010 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -52,8 +52,12 @@ static dbus_bool_t system_available = FALSE; static dbus_bool_t system_ready = FALSE; static dbus_int32_t debug_level = 0; -static dbus_bool_t debug_show_timestamps = FALSE; -static dbus_bool_t debug_show_keys = FALSE; +static dbus_bool_t debug_timestamp = FALSE; +static dbus_bool_t debug_showkeys = FALSE; + +static const char *debug_strings[] = { + "msgdump", "debug", "info", "warning", "error", NULL +}; static unsigned int eap_methods; @@ -71,6 +75,7 @@ static struct strvalmap eap_method_map[] = { { "GTC", SUPPLICANT_EAP_METHOD_GTC }, { "OTP", SUPPLICANT_EAP_METHOD_OTP }, { "LEAP", SUPPLICANT_EAP_METHOD_LEAP }, + { "WSC", SUPPLICANT_EAP_METHOD_WSC }, { } }; @@ -97,6 +102,21 @@ static struct strvalmap proto_capa_map[] = { { } }; +static struct strvalmap group_capa_map[] = { + { "wep40", SUPPLICANT_CAPABILITY_GROUP_WEP40 }, + { "wep104", SUPPLICANT_CAPABILITY_GROUP_WEP104 }, + { "tkip", SUPPLICANT_CAPABILITY_GROUP_TKIP }, + { "ccmp", SUPPLICANT_CAPABILITY_GROUP_CCMP }, + { } +}; + +static struct strvalmap pairwise_capa_map[] = { + { "none", SUPPLICANT_CAPABILITY_PAIRWISE_NONE }, + { "tkip", SUPPLICANT_CAPABILITY_PAIRWISE_TKIP }, + { "ccmp", SUPPLICANT_CAPABILITY_PAIRWISE_CCMP }, + { } +}; + static struct strvalmap scan_capa_map[] = { { "active", SUPPLICANT_CAPABILITY_SCAN_ACTIVE }, { "passive", SUPPLICANT_CAPABILITY_SCAN_PASSIVE }, @@ -112,30 +132,39 @@ static struct strvalmap mode_capa_map[] = { }; static GHashTable *interface_table; +static GHashTable *bss_mapping; struct supplicant_interface { char *path; unsigned int keymgmt_capa; unsigned int authalg_capa; unsigned int proto_capa; + unsigned int group_capa; + unsigned int pairwise_capa; unsigned int scan_capa; unsigned int mode_capa; + dbus_bool_t ready; enum supplicant_state state; dbus_bool_t scanning; + supplicant_interface_scan_callback scan_callback; + void *scan_data; int apscan; char *ifname; char *driver; char *bridge; GHashTable *network_table; + GHashTable *net_mapping; GHashTable *bss_mapping; }; struct supplicant_network { struct supplicant_interface *interface; + char *path; char *group; char *name; enum supplicant_mode mode; GHashTable *bss_table; + GHashTable *config_table; }; struct supplicant_bss { @@ -144,7 +173,8 @@ struct supplicant_bss { unsigned char bssid[6]; unsigned char ssid[32]; unsigned int ssid_len; - unsigned int frequency; + dbus_uint16_t frequency; + dbus_uint32_t maxrate; enum supplicant_mode mode; enum supplicant_security security; dbus_bool_t privacy; @@ -152,13 +182,26 @@ struct supplicant_bss { dbus_bool_t ieee8021x; }; +static enum supplicant_mode string2mode(const char *mode) +{ + if (mode == NULL) + return SUPPLICANT_MODE_UNKNOWN; + + if (g_str_equal(mode, "infrastructure") == TRUE) + return SUPPLICANT_MODE_INFRA; + else if (g_str_equal(mode, "ad-hoc") == TRUE) + return SUPPLICANT_MODE_IBSS; + + return SUPPLICANT_MODE_UNKNOWN; +} + static const char *mode2string(enum supplicant_mode mode) { switch (mode) { case SUPPLICANT_MODE_UNKNOWN: break; case SUPPLICANT_MODE_INFRA: - return "managed"; + return "infra"; case SUPPLICANT_MODE_IBSS: return "adhoc"; } @@ -264,6 +307,28 @@ static void callback_interface_removed(struct supplicant_interface *interface) callbacks_pointer->interface_removed(interface); } +static void callback_scan_started(struct supplicant_interface *interface) +{ + if (callbacks_pointer == NULL) + return; + + if (callbacks_pointer->scan_started == NULL) + return; + + callbacks_pointer->scan_started(interface); +} + +static void callback_scan_finished(struct supplicant_interface *interface) +{ + if (callbacks_pointer == NULL) + return; + + if (callbacks_pointer->scan_finished == NULL) + return; + + callbacks_pointer->scan_finished(interface); +} + static void callback_network_added(struct supplicant_network *network) { if (callbacks_pointer == NULL) @@ -291,6 +356,7 @@ static void remove_interface(gpointer data) struct supplicant_interface *interface = data; g_hash_table_destroy(interface->bss_mapping); + g_hash_table_destroy(interface->net_mapping); g_hash_table_destroy(interface->network_table); callback_interface_removed(interface); @@ -306,8 +372,12 @@ static void remove_network(gpointer data) { struct supplicant_network *network = data; + g_hash_table_destroy(network->bss_table); + callback_network_removed(network); + g_hash_table_destroy(network->config_table); + g_free(network->group); g_free(network->name); g_free(network); @@ -383,6 +453,40 @@ static void interface_capability_proto(DBusMessageIter *iter, void *user_data) } } +static void interface_capability_pairwise(DBusMessageIter *iter, void *user_data) +{ + struct supplicant_interface *interface = user_data; + const char *str = NULL; + int i; + + dbus_message_iter_get_basic(iter, &str); + if (str == NULL) + return; + + for (i = 0; pairwise_capa_map[i].str != NULL; i++) + if (strcmp(str, pairwise_capa_map[i].str) == 0) { + interface->pairwise_capa |= pairwise_capa_map[i].val; + break; + } +} + +static void interface_capability_group(DBusMessageIter *iter, void *user_data) +{ + struct supplicant_interface *interface = user_data; + const char *str = NULL; + int i; + + dbus_message_iter_get_basic(iter, &str); + if (str == NULL) + return; + + for (i = 0; group_capa_map[i].str != NULL; i++) + if (strcmp(str, group_capa_map[i].str) == 0) { + interface->group_capa |= group_capa_map[i].val; + break; + } +} + static void interface_capability_scan(DBusMessageIter *iter, void *user_data) { struct supplicant_interface *interface = user_data; @@ -432,14 +536,20 @@ static void interface_capability(const char *key, DBusMessageIter *iter, supplicant_dbus_array_foreach(iter, interface_capability_authalg, interface); else if (g_strcmp0(key, "Protocol") == 0) - supplicant_dbus_array_foreach(iter, interface_capability_proto, - interface); + supplicant_dbus_array_foreach(iter, + interface_capability_proto, interface); + else if (g_strcmp0(key, "Pairwise") == 0) + supplicant_dbus_array_foreach(iter, + interface_capability_pairwise, interface); + else if (g_strcmp0(key, "Group") == 0) + supplicant_dbus_array_foreach(iter, + interface_capability_group, interface); else if (g_strcmp0(key, "Scan") == 0) - supplicant_dbus_array_foreach(iter, interface_capability_scan, - interface); + supplicant_dbus_array_foreach(iter, + interface_capability_scan, interface); else if (g_strcmp0(key, "Modes") == 0) - supplicant_dbus_array_foreach(iter, interface_capability_mode, - interface); + supplicant_dbus_array_foreach(iter, + interface_capability_mode, interface); else DBG("key %s type %c", key, dbus_message_iter_get_arg_type(iter)); @@ -453,6 +563,14 @@ const char *supplicant_interface_get_ifname(struct supplicant_interface *interfa return interface->ifname; } +const char *supplicant_interface_get_driver(struct supplicant_interface *interface) +{ + if (interface == NULL) + return NULL; + + return interface->driver; +} + struct supplicant_interface *supplicant_network_get_interface(struct supplicant_network *network) { if (network == NULL) @@ -485,17 +603,84 @@ enum supplicant_mode supplicant_network_get_mode(struct supplicant_network *netw return network->mode; } +static void merge_network(struct supplicant_network *network) +{ + GString *str; + const char *ssid, *mode, *key_mgmt; + unsigned int i, ssid_len; + char *group; + + ssid = g_hash_table_lookup(network->config_table, "ssid"); + mode = g_hash_table_lookup(network->config_table, "mode"); + key_mgmt = g_hash_table_lookup(network->config_table, "key_mgmt"); + + DBG("ssid %s mode %s", ssid, mode); + + if (ssid != NULL) + ssid_len = strlen(ssid); + else + ssid_len = 0; + + str = g_string_sized_new((ssid_len * 2) + 24); + if (str == NULL) + return; + + for (i = 0; i < ssid_len; i++) + g_string_append_printf(str, "%02x", ssid[i]); + + if (g_strcmp0(mode, "0") == 0) + g_string_append_printf(str, "_infra"); + else if (g_strcmp0(mode, "1") == 0) + g_string_append_printf(str, "_adhoc"); + + if (g_strcmp0(key_mgmt, "WPA-PSK") == 0) + g_string_append_printf(str, "_psk"); + + group = g_string_free(str, FALSE); + + DBG("%s", group); + + g_free(group); + + g_hash_table_destroy(network->config_table); + + g_free(network->path); + g_free(network); +} + static void network_property(const char *key, DBusMessageIter *iter, void *user_data) { - if (key == NULL) + struct supplicant_network *network = user_data; + + if (network->interface == NULL) + return; + + if (key == NULL) { + merge_network(network); return; + } + + if (g_strcmp0(key, "Enabled") == 0) { + dbus_bool_t enabled = FALSE; + + dbus_message_iter_get_basic(iter, &enabled); + } else if (dbus_message_iter_get_arg_type(iter) == DBUS_TYPE_STRING) { + const char *str = NULL; - DBG("key %s type %c", key, dbus_message_iter_get_arg_type(iter)); + dbus_message_iter_get_basic(iter, &str); + if (str != NULL) + g_hash_table_replace(network->config_table, + g_strdup(key), g_strdup(str)); + } else + DBG("key %s type %c", + key, dbus_message_iter_get_arg_type(iter)); } static void interface_network_added(DBusMessageIter *iter, void *user_data) { + struct supplicant_interface *interface = user_data; + struct supplicant_network *network; const char *path = NULL; dbus_message_iter_get_basic(iter, &path); @@ -505,22 +690,48 @@ static void interface_network_added(DBusMessageIter *iter, void *user_data) if (g_strcmp0(path, "/") == 0) return; - DBG("path %s", path); + network = g_hash_table_lookup(interface->net_mapping, path); + if (network != NULL) + return; + + network = g_try_new0(struct supplicant_network, 1); + if (network == NULL) + return; + + network->interface = interface; + network->path = g_strdup(path); + + network->config_table = g_hash_table_new_full(g_str_hash, g_str_equal, + g_free, g_free); + + dbus_message_iter_next(iter); + if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_INVALID) { + supplicant_dbus_property_foreach(iter, network_property, + network); + network_property(NULL, NULL, network); + return; + } supplicant_dbus_property_get_all(path, SUPPLICANT_INTERFACE ".Interface.Network", - network_property, NULL); + network_property, network); } static void interface_network_removed(DBusMessageIter *iter, void *user_data) { + struct supplicant_interface *interface = user_data; + struct supplicant_network *network; const char *path = NULL; dbus_message_iter_get_basic(iter, &path); if (path == NULL) return; - DBG("path %s", path); + network = g_hash_table_lookup(interface->net_mapping, path); + if (network == NULL) + return; + + g_hash_table_remove(interface->net_mapping, path); } static char *create_name(unsigned char *ssid, int ssid_len) @@ -602,6 +813,9 @@ static void add_bss_to_network(struct supplicant_bss *bss) network->bss_table = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, remove_bss); + network->config_table = g_hash_table_new_full(g_str_hash, g_str_equal, + g_free, g_free); + g_hash_table_replace(interface->network_table, network->group, network); @@ -610,6 +824,8 @@ static void add_bss_to_network(struct supplicant_bss *bss) done: g_hash_table_replace(interface->bss_mapping, bss->path, network); g_hash_table_replace(network->bss_table, bss->path, bss); + + g_hash_table_replace(bss_mapping, bss->path, interface); } static unsigned char wifi_oui[3] = { 0x00, 0x50, 0xf2 }; @@ -682,6 +898,19 @@ static void extract_rsn(struct supplicant_bss *bss, len -= 2 + (count * 4); } +static void bss_rates(DBusMessageIter *iter, void *user_data) +{ + struct supplicant_bss *bss = user_data; + dbus_uint32_t rate = 0; + + dbus_message_iter_get_basic(iter, &rate); + if (rate == 0) + return; + + if (rate > bss->maxrate) + bss->maxrate = rate; +} + static void bss_property(const char *key, DBusMessageIter *iter, void *user_data) { @@ -741,19 +970,37 @@ static void bss_property(const char *key, DBusMessageIter *iter, if (capabilities & IEEE80211_CAP_PRIVACY) bss->privacy = TRUE; + } else if (g_strcmp0(key, "Mode") == 0) { + const char *mode = NULL; + + dbus_message_iter_get_basic(iter, &mode); + bss->mode = string2mode(mode); } else if (g_strcmp0(key, "Frequency") == 0) { - dbus_int32_t frequency = 0; + dbus_uint16_t frequency = 0; dbus_message_iter_get_basic(iter, &frequency); bss->frequency = frequency; + } else if (g_strcmp0(key, "Signal") == 0) { + dbus_int16_t signal = 0; + + dbus_message_iter_get_basic(iter, &signal); } else if (g_strcmp0(key, "Level") == 0) { dbus_int32_t level = 0; dbus_message_iter_get_basic(iter, &level); + } else if (g_strcmp0(key, "Rates") == 0) { + supplicant_dbus_array_foreach(iter, bss_rates, bss); } else if (g_strcmp0(key, "MaxRate") == 0) { - dbus_int32_t maxrate = 0; + dbus_uint32_t maxrate = 0; dbus_message_iter_get_basic(iter, &maxrate); + if (maxrate != 0) + bss->maxrate =maxrate; + } else if (g_strcmp0(key, "Privacy") == 0) { + dbus_bool_t privacy = FALSE; + + dbus_message_iter_get_basic(iter, &privacy); + bss->privacy = privacy; } else if (g_strcmp0(key, "RSNIE") == 0) { DBusMessageIter array; unsigned char *ie; @@ -814,6 +1061,13 @@ static void interface_bss_added(DBusMessageIter *iter, void *user_data) bss->interface = interface; bss->path = g_strdup(path); + dbus_message_iter_next(iter); + if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_INVALID) { + supplicant_dbus_property_foreach(iter, bss_property, bss); + bss_property(NULL, NULL, bss); + return; + } + supplicant_dbus_property_get_all(path, SUPPLICANT_INTERFACE ".Interface.BSS", bss_property, bss); @@ -833,6 +1087,8 @@ static void interface_bss_removed(DBusMessageIter *iter, void *user_data) if (network == NULL) return; + g_hash_table_remove(bss_mapping, path); + g_hash_table_remove(interface->bss_mapping, path); g_hash_table_remove(network->bss_table, path); @@ -854,12 +1110,17 @@ static void interface_property(const char *key, DBusMessageIter *iter, debug_strvalmap("AuthAlg capability", authalg_capa_map, interface->authalg_capa); debug_strvalmap("Protocol capability", proto_capa_map, - interface->proto_capa); + interface->proto_capa); + debug_strvalmap("Pairwise capability", pairwise_capa_map, + interface->pairwise_capa); + debug_strvalmap("Group capability", group_capa_map, + interface->group_capa); debug_strvalmap("Scan capability", scan_capa_map, - interface->scan_capa); + interface->scan_capa); debug_strvalmap("Mode capability", mode_capa_map, - interface->mode_capa); + interface->mode_capa); + interface->ready = TRUE; callback_interface_added(interface); return; } @@ -873,13 +1134,22 @@ static void interface_property(const char *key, DBusMessageIter *iter, dbus_message_iter_get_basic(iter, &str); if (str != NULL) interface->state = string2state(str); + + DBG("state %s (%d)", str, interface->state); } else if (g_strcmp0(key, "Scanning") == 0) { dbus_bool_t scanning = FALSE; dbus_message_iter_get_basic(iter, &scanning); interface->scanning = scanning; + + if (interface->ready == TRUE) { + if (interface->scanning == TRUE) + callback_scan_started(interface); + else + callback_scan_finished(interface); + } } else if (g_strcmp0(key, "ApScan") == 0) { - int apscan; + int apscan = 1; dbus_message_iter_get_basic(iter, &apscan); interface->apscan = apscan; @@ -930,6 +1200,8 @@ static struct supplicant_interface *interface_alloc(const char *path) interface->network_table = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, remove_network); + interface->net_mapping = g_hash_table_new_full(g_str_hash, g_str_equal, + NULL, NULL); interface->bss_mapping = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL); @@ -958,6 +1230,14 @@ static void interface_added(DBusMessageIter *iter, void *user_data) if (interface == NULL) return; + dbus_message_iter_next(iter); + if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_INVALID) { + supplicant_dbus_property_foreach(iter, interface_property, + interface); + interface_property(NULL, NULL, interface); + return; + } + supplicant_dbus_property_get_all(path, SUPPLICANT_INTERFACE ".Interface", interface_property, interface); @@ -998,26 +1278,31 @@ static void service_property(const char *key, DBusMessageIter *iter, return; } - if (g_strcmp0(key, "DebugParams") == 0) { - DBusMessageIter list; - - dbus_message_iter_recurse(iter, &list); - dbus_message_iter_get_basic(&list, &debug_level); - - dbus_message_iter_next(&list); - dbus_message_iter_get_basic(&list, &debug_show_timestamps); - - dbus_message_iter_next(&list); - dbus_message_iter_get_basic(&list, &debug_show_keys); + if (g_strcmp0(key, "DebugLevel") == 0) { + const char *str = NULL; + int i; - DBG("Debug level %d (timestamps %u keys %u)", debug_level, - debug_show_timestamps, debug_show_keys); + dbus_message_iter_get_basic(iter, &str); + for (i = 0; debug_strings[i] != NULL; i++) + if (g_strcmp0(debug_strings[i], str) == 0) { + debug_level = i; + break; + } + DBG("Debug level %d", debug_level); + } else if (g_strcmp0(key, "DebugTimestamp") == 0) { + dbus_message_iter_get_basic(iter, &debug_timestamp); + DBG("Debug timestamp %u", debug_timestamp); + } else if (g_strcmp0(key, "DebugShowKeys") == 0) { + dbus_message_iter_get_basic(iter, &debug_showkeys); + DBG("Debug show keys %u", debug_showkeys); } else if (g_strcmp0(key, "Interfaces") == 0) { supplicant_dbus_array_foreach(iter, interface_added, NULL); } else if (g_strcmp0(key, "EapMethods") == 0) { supplicant_dbus_array_foreach(iter, eap_method, NULL); debug_strvalmap("EAP method", eap_method_map, eap_methods); - } + } else + DBG("key %s type %c", + key, dbus_message_iter_get_arg_type(iter)); } static void supplicant_bootstrap(void) @@ -1051,6 +1336,7 @@ static void signal_name_owner_changed(const char *path, DBusMessageIter *iter) if (strlen(old) > 0 && strlen(new) == 0) { system_available = FALSE; + g_hash_table_remove_all(bss_mapping); g_hash_table_remove_all(interface_table); callback_system_killed(); } @@ -1081,6 +1367,41 @@ static void signal_interface_removed(const char *path, DBusMessageIter *iter) interface_removed(iter, NULL); } +static void signal_interface_changed(const char *path, DBusMessageIter *iter) +{ + struct supplicant_interface *interface; + + interface = g_hash_table_lookup(interface_table, path); + if (interface == NULL) + return; + + supplicant_dbus_property_foreach(iter, interface_property, interface); +} + +static void signal_scan_done(const char *path, DBusMessageIter *iter) +{ + struct supplicant_interface *interface; + dbus_bool_t success = FALSE; + + interface = g_hash_table_lookup(interface_table, path); + if (interface == NULL) + return; + + dbus_message_iter_get_basic(iter, &success); + + if (interface->scan_callback != NULL) { + int result = 0; + + if (success == FALSE) + result = -EIO; + + interface->scan_callback(result, interface->scan_data); + } + + interface->scan_callback = NULL; + interface->scan_data = NULL; +} + static void signal_bss_added(const char *path, DBusMessageIter *iter) { struct supplicant_interface *interface; @@ -1125,6 +1446,27 @@ static void signal_network_removed(const char *path, DBusMessageIter *iter) interface_network_removed(iter, interface); } +static void signal_bss_changed(const char *path, DBusMessageIter *iter) +{ + struct supplicant_interface *interface; + struct supplicant_network *network; + struct supplicant_bss *bss; + + interface = g_hash_table_lookup(bss_mapping, path); + if (interface == NULL) + return; + + network = g_hash_table_lookup(interface->bss_mapping, path); + if (network == NULL) + return; + + bss = g_hash_table_lookup(network->bss_table, path); + if (bss == NULL) + return; + + supplicant_dbus_property_foreach(iter, bss_property, bss); +} + static struct { const char *interface; const char *member; @@ -1137,10 +1479,14 @@ static struct { { SUPPLICANT_INTERFACE, "InterfaceCreated", signal_interface_added }, { SUPPLICANT_INTERFACE, "InterfaceRemoved", signal_interface_removed }, - { SUPPLICANT_INTERFACE ".Interface", "BSSAdded", signal_bss_added }, - { SUPPLICANT_INTERFACE ".Interface", "BSSRemoved", signal_bss_removed }, - { SUPPLICANT_INTERFACE ".Interface", "NetworkAdded", signal_network_added }, - { SUPPLICANT_INTERFACE ".Interface", "NetworkRemoved", signal_network_removed }, + { SUPPLICANT_INTERFACE ".Interface", "PropertiesChanged", signal_interface_changed }, + { SUPPLICANT_INTERFACE ".Interface", "ScanDone", signal_scan_done }, + { SUPPLICANT_INTERFACE ".Interface", "BSSAdded", signal_bss_added }, + { SUPPLICANT_INTERFACE ".Interface", "BSSRemoved", signal_bss_removed }, + { SUPPLICANT_INTERFACE ".Interface", "NetworkAdded", signal_network_added }, + { SUPPLICANT_INTERFACE ".Interface", "NetworkRemoved", signal_network_removed }, + + { SUPPLICANT_INTERFACE ".Interface.BSS", "PropertiesChanged", signal_bss_changed }, { } }; @@ -1213,6 +1559,9 @@ int supplicant_register(const struct supplicant_callbacks *callbacks) interface_table = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, remove_interface); + bss_mapping = g_hash_table_new_full(g_str_hash, g_str_equal, + NULL, NULL); + supplicant_dbus_setup(connection); dbus_bus_add_match(connection, supplicant_rule0, NULL); @@ -1249,6 +1598,11 @@ void supplicant_unregister(const struct supplicant_callbacks *callbacks) supplicant_filter, NULL); } + if (bss_mapping != NULL) { + g_hash_table_destroy(bss_mapping); + bss_mapping = NULL; + } + if (interface_table != NULL) { g_hash_table_destroy(interface_table); interface_table = NULL; @@ -1273,21 +1627,17 @@ static void debug_level_result(const char *error, DBG("debug level failure: %s", error); } -static void add_debug_level(DBusMessageIter *iter, void *user_data) +static void debug_level_params(DBusMessageIter *iter, void *user_data) { - dbus_int32_t level = GPOINTER_TO_UINT(user_data); - DBusMessageIter entry; + guint level = GPOINTER_TO_UINT(user_data); + const char *str; - dbus_message_iter_open_container(iter, DBUS_TYPE_STRUCT, - NULL, &entry); + if (level > 4) + level = 4; - dbus_message_iter_append_basic(&entry, DBUS_TYPE_INT32, &level); - dbus_message_iter_append_basic(&entry, DBUS_TYPE_BOOLEAN, - &debug_show_timestamps); - dbus_message_iter_append_basic(&entry, DBUS_TYPE_BOOLEAN, - &debug_show_keys); + str = debug_strings[level]; - dbus_message_iter_close_container(iter, &entry); + dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &str); } void supplicant_set_debug_level(unsigned int level) @@ -1296,35 +1646,9 @@ void supplicant_set_debug_level(unsigned int level) return; supplicant_dbus_property_set(SUPPLICANT_PATH, SUPPLICANT_INTERFACE, - "DebugParams", "(ibb)", add_debug_level, - debug_level_result, GUINT_TO_POINTER(level)); -} - -static void add_show_timestamps(DBusMessageIter *iter, void *user_data) -{ - dbus_bool_t show_timestamps = GPOINTER_TO_UINT(user_data); - DBusMessageIter entry; - - dbus_message_iter_open_container(iter, DBUS_TYPE_STRUCT, - NULL, &entry); - - dbus_message_iter_append_basic(&entry, DBUS_TYPE_INT32, &debug_level); - dbus_message_iter_append_basic(&entry, DBUS_TYPE_BOOLEAN, - &show_timestamps); - dbus_message_iter_append_basic(&entry, DBUS_TYPE_BOOLEAN, - &debug_show_keys); - - dbus_message_iter_close_container(iter, &entry); -} - -void supplicant_set_debug_show_timestamps(dbus_bool_t enabled) -{ - if (system_available == FALSE) - return; - - supplicant_dbus_property_set(SUPPLICANT_PATH, SUPPLICANT_INTERFACE, - "DebugParams", "(ibb)", add_show_timestamps, - NULL, GUINT_TO_POINTER(enabled)); + "DebugLevel", DBUS_TYPE_STRING_AS_STRING, + debug_level_params, debug_level_result, + GUINT_TO_POINTER(level)); } struct interface_create_data { @@ -1405,7 +1729,9 @@ static void interface_create_params(DBusMessageIter *iter, void *user_data) supplicant_dbus_dict_append_basic(&dict, "Ifname", DBUS_TYPE_STRING, &data->ifname); - supplicant_dbus_dict_append_basic(&dict, "Driver", + + if (data->driver != NULL) + supplicant_dbus_dict_append_basic(&dict, "Driver", DBUS_TYPE_STRING, &data->driver); supplicant_dbus_dict_close(iter, &dict); @@ -1477,6 +1803,9 @@ int supplicant_interface_create(const char *ifname, const char *driver, { struct interface_create_data *data; + if (ifname == NULL) + return -EINVAL; + if (system_available == FALSE) return -EFAULT; @@ -1500,8 +1829,118 @@ int supplicant_interface_remove(struct supplicant_interface *interface, supplicant_interface_remove_callback callback, void *user_data) { + if (interface == NULL) + return -EINVAL; + if (system_available == FALSE) return -EFAULT; return 0; } + +struct interface_scan_data { + struct supplicant_interface *interface; + supplicant_interface_scan_callback callback; + void *user_data; +}; + +static void interface_scan_result(const char *error, + DBusMessageIter *iter, void *user_data) +{ + struct interface_scan_data *data = user_data; + + if (error != NULL) { + if (data->callback != NULL) + data->callback(-EIO, data->user_data); + } else { + data->interface->scan_callback = data->callback; + data->interface->scan_data = data->user_data; + } + + dbus_free(data); +} + +static void interface_scan_params(DBusMessageIter *iter, void *user_data) +{ + DBusMessageIter dict; + const char *type = "passive"; + + supplicant_dbus_dict_open(iter, &dict); + + supplicant_dbus_dict_append_basic(&dict, "Type", + DBUS_TYPE_STRING, &type); + + supplicant_dbus_dict_close(iter, &dict); +} + +int supplicant_interface_scan(struct supplicant_interface *interface, + supplicant_interface_scan_callback callback, + void *user_data) +{ + struct interface_scan_data *data; + + if (interface == NULL) + return -EINVAL; + + if (system_available == FALSE) + return -EFAULT; + + if (interface->scanning == TRUE) + return -EALREADY; + + data = dbus_malloc0(sizeof(*data)); + if (data == NULL) + return -ENOMEM; + + data->interface = interface; + data->callback = callback; + data->user_data = user_data; + + return supplicant_dbus_method_call(interface->path, + SUPPLICANT_INTERFACE ".Interface", "Scan", + interface_scan_params, interface_scan_result, data); +} + +struct interface_disconnect_data { + supplicant_interface_disconnect_callback callback; + void *user_data; +}; + +static void interface_disconnect_result(const char *error, + DBusMessageIter *iter, void *user_data) +{ + struct interface_disconnect_data *data = user_data; + int result = 0; + + if (error != NULL) + result = -EIO; + + if (data->callback != NULL) + data->callback(result, data->user_data); + + dbus_free(data); +} + +int supplicant_interface_disconnect(struct supplicant_interface *interface, + supplicant_interface_disconnect_callback callback, + void *user_data) +{ + struct interface_disconnect_data *data; + + if (interface == NULL) + return -EINVAL; + + if (system_available == FALSE) + return -EFAULT; + + data = dbus_malloc0(sizeof(*data)); + if (data == NULL) + return -ENOMEM; + + data->callback = callback; + data->user_data = user_data; + + return supplicant_dbus_method_call(interface->path, + SUPPLICANT_INTERFACE ".Interface", "Disconnect", + NULL, interface_disconnect_result, data); +}