X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gsupplicant%2Fsupplicant.c;h=f56b595ff56ba7480c8974eaae4d59e8be43b72d;hb=refs%2Ftags%2Fupstream%2F1.38;hp=0ae55404c2e9fc2c8e0d58652ce59c1424e9dbcb;hpb=206729685687b1c4309ece1e402b628ba768f675;p=platform%2Fupstream%2Fconnman.git diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c index 0ae5540..f56b595 100644 --- a/gsupplicant/supplicant.c +++ b/gsupplicant/supplicant.c @@ -2,7 +2,7 @@ * * WPA supplicant library with GLib integration * - * Copyright (C) 2012 Intel Corporation. All rights reserved. + * Copyright (C) 2012-2013 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 @@ -30,6 +30,9 @@ #include #include #include +#include +#include +#include #include #include @@ -37,12 +40,12 @@ #include "dbus.h" #include "gsupplicant.h" -#define TIMEOUT 5000 - #define IEEE80211_CAP_ESS 0x0001 #define IEEE80211_CAP_IBSS 0x0002 #define IEEE80211_CAP_PRIVACY 0x0010 +#define BSS_UNKNOWN_STRENGTH -90 + static DBusConnection *connection; static const GSupplicantCallbacks *callbacks_pointer; @@ -131,11 +134,16 @@ static struct strvalmap mode_capa_map[] = { { "infrastructure", G_SUPPLICANT_CAPABILITY_MODE_INFRA }, { "ad-hoc", G_SUPPLICANT_CAPABILITY_MODE_IBSS }, { "ap", G_SUPPLICANT_CAPABILITY_MODE_AP }, + { "p2p", G_SUPPLICANT_CAPABILITY_MODE_P2P }, { } }; static GHashTable *interface_table; static GHashTable *bss_mapping; +static GHashTable *peer_mapping; +static GHashTable *group_mapping; +static GHashTable *pending_peer_connection; +static GHashTable *config_file_table; struct _GSupplicantWpsCredentials { unsigned char ssid[32]; @@ -143,6 +151,13 @@ struct _GSupplicantWpsCredentials { char *key; }; +struct added_network_information { + char * ssid; + GSupplicantSecurity security; + char * passphrase; + char * private_passphrase; +}; + struct _GSupplicantInterface { char *path; char *network_path; @@ -154,6 +169,9 @@ struct _GSupplicantInterface { unsigned int scan_capa; unsigned int mode_capa; unsigned int max_scan_ssids; + bool p2p_support; + bool p2p_finding; + bool ap_create_in_progress; dbus_bool_t ready; GSupplicantState state; dbus_bool_t scanning; @@ -166,9 +184,13 @@ struct _GSupplicantInterface { struct _GSupplicantWpsCredentials wps_cred; GSupplicantWpsState wps_state; GHashTable *network_table; - GHashTable *net_mapping; + GHashTable *peer_table; + GHashTable *group_table; GHashTable *bss_mapping; void *data; + const char *pending_peer_path; + GSupplicantNetwork *current_network; + struct added_network_information network_info; }; struct g_supplicant_bss { @@ -182,9 +204,14 @@ struct g_supplicant_bss { dbus_int16_t signal; GSupplicantMode mode; GSupplicantSecurity security; + dbus_bool_t rsn_selected; + unsigned int wpa_keymgmt; + unsigned int wpa_pairwise; + unsigned int wpa_group; + unsigned int rsn_keymgmt; + unsigned int rsn_pairwise; + unsigned int rsn_group; unsigned int keymgmt; - unsigned int pairwise; - unsigned int group; dbus_bool_t privacy; dbus_bool_t psk; dbus_bool_t ieee8021x; @@ -209,12 +236,76 @@ struct _GSupplicantNetwork { GHashTable *config_table; }; +struct _GSupplicantPeer { + GSupplicantInterface *interface; + char *path; + unsigned char device_address[ETH_ALEN]; + unsigned char iface_address[ETH_ALEN]; + char *name; + unsigned char *widi_ies; + int widi_ies_length; + char *identifier; + unsigned int wps_capabilities; + GSList *groups; + const GSupplicantInterface *current_group_iface; + bool connection_requested; +}; + +struct _GSupplicantGroup { + GSupplicantInterface *interface; + GSupplicantInterface *orig_interface; + char *path; + int role; + GSList *members; +}; + +struct interface_data { + GSupplicantInterface *interface; + char *path; /* Interface path cannot be taken from interface (above) as + * it might have been freed already. + */ + GSupplicantInterfaceCallback callback; + void *user_data; + bool network_remove_in_progress; + GSupplicantSSID *ssid; +}; + +struct interface_create_data { + char *ifname; + char *driver; + char *bridge; + GSupplicantInterface *interface; + GSupplicantInterfaceCallback callback; + void *user_data; +}; + +struct interface_connect_data { + GSupplicantInterface *interface; + char *path; + GSupplicantInterfaceCallback callback; + void *user_data; + union { + GSupplicantSSID *ssid; + GSupplicantPeerParams *peer; + }; +}; + +struct interface_scan_data { + GSupplicantInterface *interface; + char *path; + GSupplicantInterfaceCallback callback; + GSupplicantScanParams *scan_params; + void *user_data; +}; + +static int network_remove(struct interface_data *data); + static inline void debug(const char *format, ...) { char str[256]; va_list ap; - if (callbacks_pointer->debug == NULL) + if (!callbacks_pointer || !callbacks_pointer->debug) return; va_start(ap, format); @@ -230,12 +321,12 @@ static inline void debug(const char *format, ...) static GSupplicantMode string2mode(const char *mode) { - if (mode == NULL) + if (!mode) return G_SUPPLICANT_MODE_UNKNOWN; - if (g_str_equal(mode, "infrastructure") == TRUE) + if (g_str_equal(mode, "infrastructure")) return G_SUPPLICANT_MODE_INFRA; - else if (g_str_equal(mode, "ad-hoc") == TRUE) + else if (g_str_equal(mode, "ad-hoc")) return G_SUPPLICANT_MODE_IBSS; return G_SUPPLICANT_MODE_UNKNOWN; @@ -277,44 +368,110 @@ static const char *security2string(GSupplicantSecurity security) static GSupplicantState string2state(const char *state) { - if (state == NULL) + if (!state) return G_SUPPLICANT_STATE_UNKNOWN; - if (g_str_equal(state, "unknown") == TRUE) + if (g_str_equal(state, "unknown")) return G_SUPPLICANT_STATE_UNKNOWN; - else if (g_str_equal(state, "disconnected") == TRUE) + else if (g_str_equal(state, "interface_disabled")) + return G_SUPPLICANT_STATE_DISABLED; + else if (g_str_equal(state, "disconnected")) return G_SUPPLICANT_STATE_DISCONNECTED; - else if (g_str_equal(state, "inactive") == TRUE) + else if (g_str_equal(state, "inactive")) return G_SUPPLICANT_STATE_INACTIVE; - else if (g_str_equal(state, "scanning") == TRUE) + else if (g_str_equal(state, "scanning")) return G_SUPPLICANT_STATE_SCANNING; - else if (g_str_equal(state, "authenticating") == TRUE) + else if (g_str_equal(state, "authenticating")) return G_SUPPLICANT_STATE_AUTHENTICATING; - else if (g_str_equal(state, "associating") == TRUE) + else if (g_str_equal(state, "associating")) return G_SUPPLICANT_STATE_ASSOCIATING; - else if (g_str_equal(state, "associated") == TRUE) + else if (g_str_equal(state, "associated")) return G_SUPPLICANT_STATE_ASSOCIATED; - else if (g_str_equal(state, "group_handshake") == TRUE) + else if (g_str_equal(state, "group_handshake")) return G_SUPPLICANT_STATE_GROUP_HANDSHAKE; - else if (g_str_equal(state, "4way_handshake") == TRUE) + else if (g_str_equal(state, "4way_handshake")) return G_SUPPLICANT_STATE_4WAY_HANDSHAKE; - else if (g_str_equal(state, "completed") == TRUE) + else if (g_str_equal(state, "completed")) return G_SUPPLICANT_STATE_COMPLETED; return G_SUPPLICANT_STATE_UNKNOWN; } +static bool compare_network_parameters(GSupplicantInterface *interface, + GSupplicantSSID *ssid) +{ + if (memcmp(interface->network_info.ssid, ssid->ssid, ssid->ssid_len)) + return FALSE; + + if (interface->network_info.security != ssid->security) + return FALSE; + + if (interface->network_info.passphrase && + g_strcmp0(interface->network_info.passphrase, + ssid->passphrase) != 0) { + return FALSE; + } + + if (interface->network_info.private_passphrase && + g_strcmp0(interface->network_info.private_passphrase, + ssid->private_key_passphrase) != 0) { + return FALSE; + } + + return TRUE; +} + +static void remove_network_information(GSupplicantInterface * interface) +{ + g_free(interface->network_info.ssid); + g_free(interface->network_info.passphrase); + g_free(interface->network_info.private_passphrase); + interface->network_info.ssid = NULL; + interface->network_info.passphrase = NULL; + interface->network_info.private_passphrase = NULL; +} + +static int store_network_information(GSupplicantInterface * interface, + GSupplicantSSID *ssid) +{ + interface->network_info.ssid = g_malloc(ssid->ssid_len + 1); + if (interface->network_info.ssid != NULL) { + memcpy(interface->network_info.ssid, ssid->ssid, + ssid->ssid_len); + interface->network_info.ssid[ssid->ssid_len] = '\0'; + } else { + return -ENOMEM; + } + + interface->network_info.security = ssid->security; + + if ((ssid->security == G_SUPPLICANT_SECURITY_WEP || + ssid->security == G_SUPPLICANT_SECURITY_PSK || + ssid->security == G_SUPPLICANT_SECURITY_NONE) && + ssid->passphrase) { + interface->network_info.passphrase = g_strdup(ssid->passphrase); + } + + if (ssid->security == G_SUPPLICANT_SECURITY_IEEE8021X && + ssid->private_key_passphrase) { + interface->network_info.private_passphrase = + g_strdup(ssid->private_key_passphrase); + } + + return 0; +} + static void callback_system_ready(void) { - if (system_ready == TRUE) + if (system_ready) return; system_ready = TRUE; - if (callbacks_pointer == NULL) + if (!callbacks_pointer) return; - if (callbacks_pointer->system_ready == NULL) + if (!callbacks_pointer->system_ready) return; callbacks_pointer->system_ready(); @@ -324,10 +481,10 @@ static void callback_system_killed(void) { system_ready = FALSE; - if (callbacks_pointer == NULL) + if (!callbacks_pointer) return; - if (callbacks_pointer->system_killed == NULL) + if (!callbacks_pointer->system_killed) return; callbacks_pointer->system_killed(); @@ -337,10 +494,10 @@ static void callback_interface_added(GSupplicantInterface *interface) { SUPPLICANT_DBG(""); - if (callbacks_pointer == NULL) + if (!callbacks_pointer) return; - if (callbacks_pointer->interface_added == NULL) + if (!callbacks_pointer->interface_added) return; callbacks_pointer->interface_added(interface); @@ -348,10 +505,10 @@ static void callback_interface_added(GSupplicantInterface *interface) static void callback_interface_state(GSupplicantInterface *interface) { - if (callbacks_pointer == NULL) + if (!callbacks_pointer) return; - if (callbacks_pointer->interface_state == NULL) + if (!callbacks_pointer->interface_state) return; callbacks_pointer->interface_state(interface); @@ -359,32 +516,54 @@ static void callback_interface_state(GSupplicantInterface *interface) static void callback_interface_removed(GSupplicantInterface *interface) { - if (callbacks_pointer == NULL) + if (!callbacks_pointer) return; - if (callbacks_pointer->interface_removed == NULL) + if (!callbacks_pointer->interface_removed) return; callbacks_pointer->interface_removed(interface); } +static void callback_p2p_support(GSupplicantInterface *interface) +{ + SUPPLICANT_DBG(""); + + if (!interface->p2p_support) + return; + + if (callbacks_pointer && callbacks_pointer->p2p_support) + callbacks_pointer->p2p_support(interface); +} + static void callback_scan_started(GSupplicantInterface *interface) { - if (callbacks_pointer == NULL) + if (!callbacks_pointer) return; - if (callbacks_pointer->scan_started == NULL) + if (!callbacks_pointer->scan_started) return; callbacks_pointer->scan_started(interface); } +static void callback_ap_create_fail(GSupplicantInterface *interface) +{ + if (!callbacks_pointer) + return; + + if (!callbacks_pointer->ap_create_fail) + return; + + callbacks_pointer->ap_create_fail(interface); +} + static void callback_scan_finished(GSupplicantInterface *interface) { - if (callbacks_pointer == NULL) + if (!callbacks_pointer) return; - if (callbacks_pointer->scan_finished == NULL) + if (!callbacks_pointer->scan_finished) return; callbacks_pointer->scan_finished(interface); @@ -392,10 +571,10 @@ static void callback_scan_finished(GSupplicantInterface *interface) static void callback_network_added(GSupplicantNetwork *network) { - if (callbacks_pointer == NULL) + if (!callbacks_pointer) return; - if (callbacks_pointer->network_added == NULL) + if (!callbacks_pointer->network_added) return; callbacks_pointer->network_added(network); @@ -403,10 +582,10 @@ static void callback_network_added(GSupplicantNetwork *network) static void callback_network_removed(GSupplicantNetwork *network) { - if (callbacks_pointer == NULL) + if (!callbacks_pointer) return; - if (callbacks_pointer->network_removed == NULL) + if (!callbacks_pointer->network_removed) return; callbacks_pointer->network_removed(network); @@ -415,22 +594,158 @@ static void callback_network_removed(GSupplicantNetwork *network) static void callback_network_changed(GSupplicantNetwork *network, const char *property) { - if (callbacks_pointer == NULL) + if (!callbacks_pointer) return; - if (callbacks_pointer->network_changed == NULL) + if (!callbacks_pointer->network_changed) return; callbacks_pointer->network_changed(network, property); } +static void callback_network_associated(GSupplicantNetwork *network) +{ + if (!callbacks_pointer) + return; + + if (!callbacks_pointer->network_associated) + return; + + callbacks_pointer->network_associated(network); +} + +static void callback_sta_authorized(GSupplicantInterface *interface, + const char *addr) +{ + if (!callbacks_pointer) + return; + + if (!callbacks_pointer->sta_authorized) + return; + + callbacks_pointer->sta_authorized(interface, addr); +} + +static void callback_sta_deauthorized(GSupplicantInterface *interface, + const char *addr) +{ + if (!callbacks_pointer) + return; + + if (!callbacks_pointer->sta_deauthorized) + return; + + callbacks_pointer->sta_deauthorized(interface, addr); +} + +static void callback_peer_found(GSupplicantPeer *peer) +{ + if (!callbacks_pointer) + return; + + if (!callbacks_pointer->peer_found) + return; + + callbacks_pointer->peer_found(peer); +} + +static void callback_peer_lost(GSupplicantPeer *peer) +{ + if (!callbacks_pointer) + return; + + if (!callbacks_pointer->peer_lost) + return; + + callbacks_pointer->peer_lost(peer); +} + +static void callback_peer_changed(GSupplicantPeer *peer, + GSupplicantPeerState state) +{ + if (!callbacks_pointer) + return; + + if (!callbacks_pointer->peer_changed) + return; + + callbacks_pointer->peer_changed(peer, state); +} + +static void callback_peer_request(GSupplicantPeer *peer) +{ + if (!callbacks_pointer) + return; + + if (!callbacks_pointer->peer_request) + return; + + peer->connection_requested = true; + + callbacks_pointer->peer_request(peer); +} + +static void callback_disconnect_reason_code(GSupplicantInterface *interface, + int reason_code) +{ + if (!callbacks_pointer) + return; + + if (!callbacks_pointer->disconnect_reasoncode) + return; + + if (reason_code != 0) + callbacks_pointer->disconnect_reasoncode(interface, + reason_code); +} + +static void callback_assoc_status_code(GSupplicantInterface *interface, + int status_code) +{ + if (!callbacks_pointer) + return; + + if (!callbacks_pointer->assoc_status_code) + return; + + callbacks_pointer->assoc_status_code(interface, status_code); + +} + +static void remove_group(gpointer data) +{ + GSupplicantGroup *group = data; + + if (group->members) + g_slist_free_full(group->members, g_free); + + g_free(group->path); + g_free(group); +} + static void remove_interface(gpointer data) { GSupplicantInterface *interface = data; g_hash_table_destroy(interface->bss_mapping); - g_hash_table_destroy(interface->net_mapping); g_hash_table_destroy(interface->network_table); + g_hash_table_destroy(interface->peer_table); + g_hash_table_destroy(interface->group_table); + + if (interface->scan_callback) { + SUPPLICANT_DBG("call interface %p callback %p scanning %d", + interface, interface->scan_callback, + interface->scanning); + + interface->scan_callback(-EIO, interface, interface->scan_data); + interface->scan_callback = NULL; + interface->scan_data = NULL; + + if (interface->scanning) { + interface->scanning = FALSE; + callback_scan_finished(interface); + } + } callback_interface_removed(interface); @@ -440,6 +755,7 @@ static void remove_interface(gpointer data) g_free(interface->ifname); g_free(interface->driver); g_free(interface->bridge); + remove_network_information(interface); g_free(interface); } @@ -463,16 +779,41 @@ static void remove_bss(gpointer data) { struct g_supplicant_bss *bss = data; + supplicant_dbus_property_call_cancel_all(bss); + g_free(bss->path); g_free(bss); } +static void remove_peer(gpointer data) +{ + GSupplicantPeer *peer = data; + + callback_peer_lost(peer); + + if (peer->groups) + g_slist_free_full(peer->groups, g_free); + + if (peer_mapping) + g_hash_table_remove(peer_mapping, peer->path); + + if (pending_peer_connection) + g_hash_table_remove(pending_peer_connection, peer->path); + + g_free(peer->path); + g_free(peer->name); + g_free(peer->identifier); + g_free(peer->widi_ies); + + g_free(peer); +} + static void debug_strvalmap(const char *label, struct strvalmap *map, unsigned int val) { int i; - for (i = 0; map[i].str != NULL; i++) { + for (i = 0; map[i].str; i++) { if (val & map[i].val) SUPPLICANT_DBG("%s: %s", label, map[i].str); } @@ -485,10 +826,10 @@ static void interface_capability_keymgmt(DBusMessageIter *iter, void *user_data) int i; dbus_message_iter_get_basic(iter, &str); - if (str == NULL) + if (!str) return; - for (i = 0; keymgmt_map[i].str != NULL; i++) + for (i = 0; keymgmt_map[i].str; i++) if (strcmp(str, keymgmt_map[i].str) == 0) { interface->keymgmt_capa |= keymgmt_map[i].val; break; @@ -502,10 +843,10 @@ static void interface_capability_authalg(DBusMessageIter *iter, void *user_data) int i; dbus_message_iter_get_basic(iter, &str); - if (str == NULL) + if (!str) return; - for (i = 0; authalg_capa_map[i].str != NULL; i++) + for (i = 0; authalg_capa_map[i].str; i++) if (strcmp(str, authalg_capa_map[i].str) == 0) { interface->authalg_capa |= authalg_capa_map[i].val; break; @@ -519,10 +860,10 @@ static void interface_capability_proto(DBusMessageIter *iter, void *user_data) int i; dbus_message_iter_get_basic(iter, &str); - if (str == NULL) + if (!str) return; - for (i = 0; proto_capa_map[i].str != NULL; i++) + for (i = 0; proto_capa_map[i].str; i++) if (strcmp(str, proto_capa_map[i].str) == 0) { interface->proto_capa |= proto_capa_map[i].val; break; @@ -537,10 +878,10 @@ static void interface_capability_pairwise(DBusMessageIter *iter, int i; dbus_message_iter_get_basic(iter, &str); - if (str == NULL) + if (!str) return; - for (i = 0; pairwise_map[i].str != NULL; i++) + for (i = 0; pairwise_map[i].str; i++) if (strcmp(str, pairwise_map[i].str) == 0) { interface->pairwise_capa |= pairwise_map[i].val; break; @@ -554,10 +895,10 @@ static void interface_capability_group(DBusMessageIter *iter, void *user_data) int i; dbus_message_iter_get_basic(iter, &str); - if (str == NULL) + if (!str) return; - for (i = 0; group_map[i].str != NULL; i++) + for (i = 0; group_map[i].str; i++) if (strcmp(str, group_map[i].str) == 0) { interface->group_capa |= group_map[i].val; break; @@ -571,10 +912,10 @@ static void interface_capability_scan(DBusMessageIter *iter, void *user_data) int i; dbus_message_iter_get_basic(iter, &str); - if (str == NULL) + if (!str) return; - for (i = 0; scan_capa_map[i].str != NULL; i++) + for (i = 0; scan_capa_map[i].str; i++) if (strcmp(str, scan_capa_map[i].str) == 0) { interface->scan_capa |= scan_capa_map[i].val; break; @@ -588,10 +929,10 @@ static void interface_capability_mode(DBusMessageIter *iter, void *user_data) int i; dbus_message_iter_get_basic(iter, &str); - if (str == NULL) + if (!str) return; - for (i = 0; mode_capa_map[i].str != NULL; i++) + for (i = 0; mode_capa_map[i].str; i++) if (strcmp(str, mode_capa_map[i].str) == 0) { interface->mode_capa |= mode_capa_map[i].val; break; @@ -603,7 +944,7 @@ static void interface_capability(const char *key, DBusMessageIter *iter, { GSupplicantInterface *interface = user_data; - if (key == NULL) + if (!key) return; if (g_strcmp0(key, "KeyMgmt") == 0) @@ -631,6 +972,8 @@ static void interface_capability(const char *key, DBusMessageIter *iter, dbus_int32_t max_scan_ssid; dbus_message_iter_get_basic(iter, &max_scan_ssid); + if (max_scan_ssid < 2) + max_scan_ssid = 0; interface->max_scan_ssids = max_scan_ssid; } else @@ -638,34 +981,94 @@ static void interface_capability(const char *key, DBusMessageIter *iter, key, dbus_message_iter_get_arg_type(iter)); } +static void set_bss_expiration_age(DBusMessageIter *iter, void *user_data) +{ + unsigned int bss_expiration_age = GPOINTER_TO_UINT(user_data); + + dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT32, + &bss_expiration_age); +} + +int g_supplicant_interface_set_bss_expiration_age(GSupplicantInterface *interface, + unsigned int bss_expiration_age) +{ + return supplicant_dbus_property_set(interface->path, + SUPPLICANT_INTERFACE ".Interface", + "BSSExpireAge", DBUS_TYPE_UINT32_AS_STRING, + set_bss_expiration_age, NULL, + GUINT_TO_POINTER(bss_expiration_age), NULL); +} + +struct set_apscan_data +{ + unsigned int ap_scan; + GSupplicantInterface *interface; +}; + static void set_apscan(DBusMessageIter *iter, void *user_data) { - unsigned int ap_scan = *(unsigned int *)user_data; + struct set_apscan_data *data = user_data; + unsigned int ap_scan = data->ap_scan; dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT32, &ap_scan); } +static void set_apscan_complete(const char *error, + DBusMessageIter *iter, void *user_data) +{ + struct set_apscan_data *data = user_data; + GSupplicantInterface *interface = data->interface; + + if (error) { + interface->ap_create_in_progress = false; + SUPPLICANT_DBG("Set AP scan error %s", error); + goto error; + } + + interface->ap_create_in_progress = true; +error: + dbus_free(data); +} + int g_supplicant_interface_set_apscan(GSupplicantInterface *interface, unsigned int ap_scan) { - return supplicant_dbus_property_set(interface->path, + struct set_apscan_data *data; + int ret; + + data = dbus_malloc0(sizeof(*data)); + + if (!data) + return -ENOMEM; + + data->ap_scan = ap_scan; + data->interface = interface; + + ret = supplicant_dbus_property_set(interface->path, SUPPLICANT_INTERFACE ".Interface", - "ApScan", DBUS_TYPE_UINT32_AS_STRING, - set_apscan, NULL, &ap_scan); + "ApScan", DBUS_TYPE_UINT32_AS_STRING, + set_apscan, set_apscan_complete, data, NULL); + if (ret < 0) + dbus_free(data); + + return ret; } void g_supplicant_interface_set_data(GSupplicantInterface *interface, void *data) { - if (interface == NULL) + if (!interface) return; interface->data = data; + + if (!data) + interface->scan_callback = NULL; } void *g_supplicant_interface_get_data(GSupplicantInterface *interface) { - if (interface == NULL) + if (!interface) return NULL; return interface->data; @@ -673,7 +1076,7 @@ void *g_supplicant_interface_get_data(GSupplicantInterface *interface) const char *g_supplicant_interface_get_ifname(GSupplicantInterface *interface) { - if (interface == NULL) + if (!interface) return NULL; return interface->ifname; @@ -681,7 +1084,7 @@ const char *g_supplicant_interface_get_ifname(GSupplicantInterface *interface) const char *g_supplicant_interface_get_driver(GSupplicantInterface *interface) { - if (interface == NULL) + if (!interface) return NULL; return interface->driver; @@ -690,7 +1093,7 @@ const char *g_supplicant_interface_get_driver(GSupplicantInterface *interface) GSupplicantState g_supplicant_interface_get_state( GSupplicantInterface *interface) { - if (interface == NULL) + if (!interface) return G_SUPPLICANT_STATE_UNKNOWN; return interface->state; @@ -698,7 +1101,7 @@ GSupplicantState g_supplicant_interface_get_state( const char *g_supplicant_interface_get_wps_key(GSupplicantInterface *interface) { - if (interface == NULL) + if (!interface) return NULL; return (const char *)interface->wps_cred.key; @@ -707,10 +1110,10 @@ const char *g_supplicant_interface_get_wps_key(GSupplicantInterface *interface) const void *g_supplicant_interface_get_wps_ssid(GSupplicantInterface *interface, unsigned int *ssid_len) { - if (ssid_len == NULL) + if (!ssid_len) return NULL; - if (interface == NULL || interface->wps_cred.ssid == NULL) { + if (!interface || interface->wps_cred.ssid_len == 0) { *ssid_len = 0; return NULL; } @@ -722,7 +1125,7 @@ const void *g_supplicant_interface_get_wps_ssid(GSupplicantInterface *interface, GSupplicantWpsState g_supplicant_interface_get_wps_state( GSupplicantInterface *interface) { - if (interface == NULL) + if (!interface) return G_SUPPLICANT_WPS_STATE_UNKNOWN; return interface->wps_state; @@ -730,7 +1133,7 @@ GSupplicantWpsState g_supplicant_interface_get_wps_state( unsigned int g_supplicant_interface_get_mode(GSupplicantInterface *interface) { - if (interface == NULL) + if (!interface) return 0; return interface->mode_capa; @@ -739,12 +1142,9 @@ unsigned int g_supplicant_interface_get_mode(GSupplicantInterface *interface) unsigned int g_supplicant_interface_get_max_scan_ssids( GSupplicantInterface *interface) { - if (interface == NULL) + if (!interface) return 0; - if (interface->max_scan_ssids == 0) - return WPAS_MAX_SCAN_SSIDS; - return interface->max_scan_ssids; } @@ -758,22 +1158,22 @@ static void set_network_enabled(DBusMessageIter *iter, void *user_data) int g_supplicant_interface_enable_selected_network(GSupplicantInterface *interface, dbus_bool_t enable) { - if (interface == NULL) + if (!interface) return -1; - if (interface->network_path == NULL) + if (!interface->network_path) return -1; SUPPLICANT_DBG(" "); return supplicant_dbus_property_set(interface->network_path, SUPPLICANT_INTERFACE ".Network", "Enabled", DBUS_TYPE_BOOLEAN_AS_STRING, - set_network_enabled, NULL, &enable); + set_network_enabled, NULL, &enable, NULL); } dbus_bool_t g_supplicant_interface_get_ready(GSupplicantInterface *interface) { - if (interface == NULL) + if (!interface) return FALSE; return interface->ready; @@ -782,7 +1182,7 @@ dbus_bool_t g_supplicant_interface_get_ready(GSupplicantInterface *interface) GSupplicantInterface *g_supplicant_network_get_interface( GSupplicantNetwork *network) { - if (network == NULL) + if (!network) return NULL; return network->interface; @@ -790,7 +1190,7 @@ GSupplicantInterface *g_supplicant_network_get_interface( const char *g_supplicant_network_get_name(GSupplicantNetwork *network) { - if (network == NULL || network->name == NULL) + if (!network || !network->name) return ""; return network->name; @@ -798,7 +1198,7 @@ const char *g_supplicant_network_get_name(GSupplicantNetwork *network) const char *g_supplicant_network_get_identifier(GSupplicantNetwork *network) { - if (network == NULL || network->group == NULL) + if (!network || !network->group) return ""; return network->group; @@ -806,7 +1206,7 @@ const char *g_supplicant_network_get_identifier(GSupplicantNetwork *network) const char *g_supplicant_network_get_path(GSupplicantNetwork *network) { - if (network == NULL || network->path == NULL) + if (!network || !network->path) return NULL; return network->path; @@ -814,7 +1214,7 @@ const char *g_supplicant_network_get_path(GSupplicantNetwork *network) const char *g_supplicant_network_get_mode(GSupplicantNetwork *network) { - if (network == NULL) + if (!network) return G_SUPPLICANT_MODE_UNKNOWN; return mode2string(network->mode); @@ -822,7 +1222,7 @@ const char *g_supplicant_network_get_mode(GSupplicantNetwork *network) const char *g_supplicant_network_get_security(GSupplicantNetwork *network) { - if (network == NULL) + if (!network) return G_SUPPLICANT_SECURITY_UNKNOWN; return security2string(network->security); @@ -831,7 +1231,7 @@ const char *g_supplicant_network_get_security(GSupplicantNetwork *network) const void *g_supplicant_network_get_ssid(GSupplicantNetwork *network, unsigned int *ssid_len) { - if (network == NULL || network->ssid == NULL) { + if (!network) { *ssid_len = 0; return NULL; } @@ -842,7 +1242,7 @@ const void *g_supplicant_network_get_ssid(GSupplicantNetwork *network, dbus_int16_t g_supplicant_network_get_signal(GSupplicantNetwork *network) { - if (network == NULL) + if (!network) return 0; return network->signal; @@ -850,7 +1250,7 @@ dbus_int16_t g_supplicant_network_get_signal(GSupplicantNetwork *network) dbus_uint16_t g_supplicant_network_get_frequency(GSupplicantNetwork *network) { - if (network == NULL) + if (!network) return 0; return network->frequency; @@ -858,7 +1258,7 @@ dbus_uint16_t g_supplicant_network_get_frequency(GSupplicantNetwork *network) dbus_bool_t g_supplicant_network_get_wps(GSupplicantNetwork *network) { - if (network == NULL) + if (!network) return FALSE; return network->wps; @@ -866,7 +1266,7 @@ dbus_bool_t g_supplicant_network_get_wps(GSupplicantNetwork *network) dbus_bool_t g_supplicant_network_is_wps_active(GSupplicantNetwork *network) { - if (network == NULL) + if (!network) return FALSE; if (network->wps_capabilities & G_SUPPLICANT_WPS_CONFIGURED) @@ -877,7 +1277,7 @@ dbus_bool_t g_supplicant_network_is_wps_active(GSupplicantNetwork *network) dbus_bool_t g_supplicant_network_is_wps_pbc(GSupplicantNetwork *network) { - if (network == NULL) + if (!network) return FALSE; if (network->wps_capabilities & G_SUPPLICANT_WPS_PBC) @@ -888,7 +1288,7 @@ dbus_bool_t g_supplicant_network_is_wps_pbc(GSupplicantNetwork *network) dbus_bool_t g_supplicant_network_is_wps_advertizing(GSupplicantNetwork *network) { - if (network == NULL) + if (!network) return FALSE; if (network->wps_capabilities & G_SUPPLICANT_WPS_REGISTRAR) @@ -897,46 +1297,176 @@ dbus_bool_t g_supplicant_network_is_wps_advertizing(GSupplicantNetwork *network) return FALSE; } -static void merge_network(GSupplicantNetwork *network) +GSupplicantInterface *g_supplicant_peer_get_interface(GSupplicantPeer *peer) { - GString *str; - const char *ssid, *mode, *key_mgmt; - unsigned int i, ssid_len; - char *group; + if (!peer) + return NULL; - 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"); + return peer->interface; +} - SUPPLICANT_DBG("ssid %s mode %s", ssid, mode); +const char *g_supplicant_peer_get_path(GSupplicantPeer *peer) +{ + if (!peer) + return NULL; - if (ssid != NULL) - ssid_len = strlen(ssid); - else - ssid_len = 0; + return peer->path; +} - str = g_string_sized_new((ssid_len * 2) + 24); - if (str == NULL) - return; +const char *g_supplicant_peer_get_identifier(GSupplicantPeer *peer) +{ + if (!peer) + return NULL; - for (i = 0; i < ssid_len; i++) - g_string_append_printf(str, "%02x", ssid[i]); + return peer->identifier; +} - if (g_strcmp0(mode, "0") == 0) - g_string_append_printf(str, "_managed"); - else if (g_strcmp0(mode, "1") == 0) - g_string_append_printf(str, "_adhoc"); +const void *g_supplicant_peer_get_device_address(GSupplicantPeer *peer) +{ + if (!peer) + return NULL; - if (g_strcmp0(key_mgmt, "WPA-PSK") == 0) - g_string_append_printf(str, "_psk"); + return peer->device_address; +} - group = g_string_free(str, FALSE); +const void *g_supplicant_peer_get_iface_address(GSupplicantPeer *peer) +{ + if (!peer) + return NULL; - SUPPLICANT_DBG("%s", group); + return peer->iface_address; +} - g_free(group); +const char *g_supplicant_peer_get_name(GSupplicantPeer *peer) +{ + if (!peer) + return NULL; - g_hash_table_destroy(network->config_table); + return peer->name; +} + +const unsigned char *g_supplicant_peer_get_widi_ies(GSupplicantPeer *peer, + int *length) +{ + if (!peer || !length) + return NULL; + + *length = peer->widi_ies_length; + return peer->widi_ies; +} + +bool g_supplicant_peer_is_wps_pbc(GSupplicantPeer *peer) +{ + if (!peer) + return false; + + if (peer->wps_capabilities & G_SUPPLICANT_WPS_PBC) + return true; + + return false; +} + +bool g_supplicant_peer_is_wps_pin(GSupplicantPeer *peer) +{ + if (!peer) + return false; + + if (peer->wps_capabilities & G_SUPPLICANT_WPS_PIN) + return true; + + return false; +} + +bool g_supplicant_peer_is_in_a_group(GSupplicantPeer *peer) +{ + if (!peer || !peer->groups) + return false; + + return true; +} + +GSupplicantInterface *g_supplicant_peer_get_group_interface(GSupplicantPeer *peer) +{ + if (!peer) + return NULL; + + return (GSupplicantInterface *) peer->current_group_iface; +} + +bool g_supplicant_peer_is_client(GSupplicantPeer *peer) +{ + GSupplicantGroup *group; + GSList *list; + + if (!peer) + return false; + + for (list = peer->groups; list; list = list->next) { + const char *path = list->data; + + group = g_hash_table_lookup(group_mapping, path); + if (!group) + continue; + + if (group->role != G_SUPPLICANT_GROUP_ROLE_CLIENT || + group->orig_interface != peer->interface) + continue; + + if (group->interface == peer->current_group_iface) + return true; + } + + return false; +} + +bool g_supplicant_peer_has_requested_connection(GSupplicantPeer *peer) +{ + if (!peer) + return false; + + return peer->connection_requested; +} + +static void merge_network(GSupplicantNetwork *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"); + + SUPPLICANT_DBG("ssid %s mode %s", ssid, mode); + + if (ssid) + ssid_len = strlen(ssid); + else + ssid_len = 0; + + str = g_string_sized_new((ssid_len * 2) + 24); + if (!str) + 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, "_managed"); + 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); + + SUPPLICANT_DBG("%s", group); + + g_free(group); + + g_hash_table_destroy(network->config_table); g_free(network->path); g_free(network); @@ -947,10 +1477,10 @@ static void network_property(const char *key, DBusMessageIter *iter, { GSupplicantNetwork *network = user_data; - if (network->interface == NULL) + if (!network->interface) return; - if (key == NULL) { + if (!key) { merge_network(network); return; } @@ -963,7 +1493,7 @@ static void network_property(const char *key, DBusMessageIter *iter, const char *str = NULL; dbus_message_iter_get_basic(iter, &str); - if (str != NULL) { + if (str) { g_hash_table_replace(network->config_table, g_strdup(key), g_strdup(str)); } @@ -981,18 +1511,14 @@ static void interface_network_added(DBusMessageIter *iter, void *user_data) SUPPLICANT_DBG(""); dbus_message_iter_get_basic(iter, &path); - if (path == NULL) + if (!path) return; if (g_strcmp0(path, "/") == 0) return; - network = g_hash_table_lookup(interface->net_mapping, path); - if (network != NULL) - return; - network = g_try_new0(GSupplicantNetwork, 1); - if (network == NULL) + if (!network) return; network->interface = interface; @@ -1011,24 +1537,12 @@ static void interface_network_added(DBusMessageIter *iter, void *user_data) supplicant_dbus_property_get_all(path, SUPPLICANT_INTERFACE ".Network", - network_property, network); + network_property, network, NULL); } static void interface_network_removed(DBusMessageIter *iter, void *user_data) { - GSupplicantInterface *interface = user_data; - GSupplicantNetwork *network; - const char *path = NULL; - - dbus_message_iter_get_basic(iter, &path); - if (path == NULL) - return; - - network = g_hash_table_lookup(interface->net_mapping, path); - if (network == NULL) - return; - - g_hash_table_remove(interface->net_mapping, path); + SUPPLICANT_DBG(""); } static char *create_name(unsigned char *ssid, int ssid_len) @@ -1046,13 +1560,13 @@ static char *create_name(unsigned char *ssid, int ssid_len) while (remaining_bytes != 0) { if (g_utf8_validate(remainder, remaining_bytes, - &invalid) == TRUE) { + &invalid)) { break; } valid_bytes = invalid - remainder; - if (string == NULL) + if (!string) string = g_string_sized_new(remaining_bytes); g_string_append_len(string, remainder, valid_bytes); @@ -1064,7 +1578,7 @@ static char *create_name(unsigned char *ssid, int ssid_len) remainder = invalid + 1; } - if (string == NULL) + if (!string) return g_strndup((const gchar *)ssid, ssid_len + 1); g_string_append(string, remainder); @@ -1079,7 +1593,7 @@ static char *create_group(struct g_supplicant_bss *bss) const char *mode, *security; str = g_string_sized_new((bss->ssid_len * 2) + 24); - if (str == NULL) + if (!str) return NULL; if (bss->ssid_len > 0 && bss->ssid[0] != '\0') { @@ -1089,44 +1603,48 @@ static char *create_group(struct g_supplicant_bss *bss) g_string_append_printf(str, "hidden"); mode = mode2string(bss->mode); - if (mode != NULL) + if (mode) g_string_append_printf(str, "_%s", mode); security = security2string(bss->security); - if (security != NULL) + if (security) g_string_append_printf(str, "_%s", security); return g_string_free(str, FALSE); } -static void add_or_replace_bss_to_network(struct g_supplicant_bss *bss) +static int add_or_replace_bss_to_network(struct g_supplicant_bss *bss) { GSupplicantInterface *interface = bss->interface; GSupplicantNetwork *network; char *group; + bool is_new_network; group = create_group(bss); SUPPLICANT_DBG("New group created: %s", group); - if (group == NULL) - return; + if (!group) + return -ENOMEM; network = g_hash_table_lookup(interface->network_table, group); - if (network != NULL) { + if (network) { g_free(group); SUPPLICANT_DBG("Network %s already exist", network->name); + is_new_network = false; goto done; } + is_new_network = true; + network = g_try_new0(GSupplicantNetwork, 1); - if (network == NULL) { + if (!network) { g_free(group); - return; + return -ENOMEM; } network->interface = interface; - if (network->path == NULL) + if (!network->path) network->path = g_strdup(bss->path); network->group = group; network->name = create_name(bss->ssid, bss->ssid_len); @@ -1138,11 +1656,9 @@ static void add_or_replace_bss_to_network(struct g_supplicant_bss *bss) network->frequency = bss->frequency; network->best_bss = bss; - network->wps = FALSE; if ((bss->keymgmt & G_SUPPLICANT_KEYMGMT_WPS) != 0) { network->wps = TRUE; - - network->wps_capabilities |= bss->wps_capabilities; + network->wps_capabilities = bss->wps_capabilities; } SUPPLICANT_DBG("New network %s created", network->name); @@ -1159,7 +1675,21 @@ static void add_or_replace_bss_to_network(struct g_supplicant_bss *bss) callback_network_added(network); done: - if (bss->signal > network->signal) { + /* We update network's WPS properties if only bss provides WPS. */ + if ((bss->keymgmt & G_SUPPLICANT_KEYMGMT_WPS) != 0) { + network->wps = TRUE; + network->wps_capabilities = bss->wps_capabilities; + + if (!is_new_network) + callback_network_changed(network, "WPSCapabilities"); + } + + /* + * Do not change best BSS if we are connected. It will be done through + * CurrentBSS property in case of misalignment with wpa_s or roaming. + */ + if (network != interface->current_network && + bss->signal > network->signal) { network->signal = bss->signal; network->best_bss = bss; callback_network_changed(network, "Signal"); @@ -1169,6 +1699,8 @@ done: g_hash_table_replace(network->bss_table, bss->path, bss); g_hash_table_replace(bss_mapping, bss->path, interface); + + return 0; } static void bss_rates(DBusMessageIter *iter, void *user_data) @@ -1186,51 +1718,54 @@ static void bss_rates(DBusMessageIter *iter, void *user_data) static void bss_keymgmt(DBusMessageIter *iter, void *user_data) { - struct g_supplicant_bss *bss = user_data; + unsigned int *keymgmt = user_data; const char *str = NULL; int i; dbus_message_iter_get_basic(iter, &str); - if (str == NULL) + if (!str) return; - for (i = 0; keymgmt_map[i].str != NULL; i++) + for (i = 0; keymgmt_map[i].str; i++) if (strcmp(str, keymgmt_map[i].str) == 0) { - bss->keymgmt |= keymgmt_map[i].val; + SUPPLICANT_DBG("Keymgmt: %s", str); + *keymgmt |= keymgmt_map[i].val; break; } } static void bss_group(DBusMessageIter *iter, void *user_data) { - struct g_supplicant_bss *bss = user_data; + unsigned int *group = user_data; const char *str = NULL; int i; dbus_message_iter_get_basic(iter, &str); - if (str == NULL) + if (!str) return; - for (i = 0; group_map[i].str != NULL; i++) + for (i = 0; group_map[i].str; i++) if (strcmp(str, group_map[i].str) == 0) { - bss->group |= group_map[i].val; + SUPPLICANT_DBG("Group: %s", str); + *group |= group_map[i].val; break; } } static void bss_pairwise(DBusMessageIter *iter, void *user_data) { - struct g_supplicant_bss *bss = user_data; + unsigned int *pairwise = user_data; const char *str = NULL; int i; dbus_message_iter_get_basic(iter, &str); - if (str == NULL) + if (!str) return; - for (i = 0; pairwise_map[i].str != NULL; i++) + for (i = 0; pairwise_map[i].str; i++) if (strcmp(str, pairwise_map[i].str) == 0) { - bss->pairwise |= pairwise_map[i].val; + SUPPLICANT_DBG("Pairwise: %s", str); + *pairwise |= pairwise_map[i].val; break; } } @@ -1238,13 +1773,33 @@ static void bss_pairwise(DBusMessageIter *iter, void *user_data) static void bss_wpa(const char *key, DBusMessageIter *iter, void *user_data) { - if (g_strcmp0(key, "KeyMgmt") == 0) - supplicant_dbus_array_foreach(iter, bss_keymgmt, user_data); - else if (g_strcmp0(key, "Group") == 0) - supplicant_dbus_array_foreach(iter, bss_group, user_data); - else if (g_strcmp0(key, "Pairwise") == 0) - supplicant_dbus_array_foreach(iter, bss_pairwise, user_data); - + struct g_supplicant_bss *bss = user_data; + unsigned int value = 0; + + SUPPLICANT_DBG("Key: %s", key); + + if (g_strcmp0(key, "KeyMgmt") == 0) { + supplicant_dbus_array_foreach(iter, bss_keymgmt, &value); + + if (bss->rsn_selected) + bss->rsn_keymgmt = value; + else + bss->wpa_keymgmt = value; + } else if (g_strcmp0(key, "Group") == 0) { + supplicant_dbus_array_foreach(iter, bss_group, &value); + + if (bss->rsn_selected) + bss->rsn_group = value; + else + bss->wpa_group = value; + } else if (g_strcmp0(key, "Pairwise") == 0) { + supplicant_dbus_array_foreach(iter, bss_pairwise, &value); + + if (bss->rsn_selected) + bss->rsn_pairwise = value; + else + bss->wpa_pairwise = value; + } } static unsigned int get_tlv(unsigned char *ie, unsigned int ie_size, @@ -1312,9 +1867,12 @@ static void bss_process_ies(DBusMessageIter *iter, void *user_data) dbus_message_iter_recurse(iter, &array); dbus_message_iter_get_fixed_array(&array, &ie, &ie_len); - if (ie == NULL || ie_len < 2) + if (!ie || ie_len < 2) return; + bss->wps_capabilities = 0; + bss->keymgmt = 0; + for (ie_end = ie + ie_len; ie < ie_end && ie + ie[1] + 1 <= ie_end; ie += ie[1] + 2) { @@ -1356,11 +1914,31 @@ static void bss_process_ies(DBusMessageIter *iter, void *user_data) static void bss_compute_security(struct g_supplicant_bss *bss) { - if (bss->ieee8021x == TRUE) + /* + * Combining RSN and WPA keymgmt + * We combine it since parsing IEs might have set something for WPS. */ + bss->keymgmt |= bss->rsn_keymgmt | bss->wpa_keymgmt; + + bss->ieee8021x = FALSE; + bss->psk = FALSE; + + if (bss->keymgmt & + (G_SUPPLICANT_KEYMGMT_WPA_EAP | + G_SUPPLICANT_KEYMGMT_WPA_FT_EAP | + G_SUPPLICANT_KEYMGMT_WPA_EAP_256)) + bss->ieee8021x = TRUE; + + if (bss->keymgmt & + (G_SUPPLICANT_KEYMGMT_WPA_PSK | + G_SUPPLICANT_KEYMGMT_WPA_FT_PSK | + G_SUPPLICANT_KEYMGMT_WPA_PSK_256)) + bss->psk = TRUE; + + if (bss->ieee8021x) bss->security = G_SUPPLICANT_SECURITY_IEEE8021X; - else if (bss->psk == TRUE) + else if (bss->psk) bss->security = G_SUPPLICANT_SECURITY_PSK; - else if (bss->privacy == TRUE) + else if (bss->privacy) bss->security = G_SUPPLICANT_SECURITY_WEP; else bss->security = G_SUPPLICANT_SECURITY_NONE; @@ -1372,12 +1950,12 @@ static void bss_property(const char *key, DBusMessageIter *iter, { struct g_supplicant_bss *bss = user_data; - if (bss->interface == NULL) + if (!bss->interface) return; SUPPLICANT_DBG("key %s", key); - if (key == NULL) + if (!key) return; if (g_strcmp0(key, "BSSID") == 0) { @@ -1433,6 +2011,9 @@ static void bss_property(const char *key, DBusMessageIter *iter, dbus_message_iter_get_basic(iter, &signal); bss->signal = signal; + if (!bss->signal) + bss->signal = BSS_UNKNOWN_STRENGTH; + } else if (g_strcmp0(key, "Level") == 0) { dbus_int32_t level = 0; @@ -1450,21 +2031,14 @@ static void bss_property(const char *key, DBusMessageIter *iter, dbus_message_iter_get_basic(iter, &privacy); bss->privacy = privacy; - } else if ((g_strcmp0(key, "RSN") == 0) || - (g_strcmp0(key, "WPA") == 0)) { - supplicant_dbus_property_foreach(iter, bss_wpa, bss); + } else if (g_strcmp0(key, "RSN") == 0) { + bss->rsn_selected = TRUE; - if (bss->keymgmt & - (G_SUPPLICANT_KEYMGMT_WPA_EAP | - G_SUPPLICANT_KEYMGMT_WPA_FT_EAP | - G_SUPPLICANT_KEYMGMT_WPA_EAP_256)) - bss->ieee8021x = TRUE; + supplicant_dbus_property_foreach(iter, bss_wpa, bss); + } else if (g_strcmp0(key, "WPA") == 0) { + bss->rsn_selected = FALSE; - if (bss->keymgmt & - (G_SUPPLICANT_KEYMGMT_WPA_PSK | - G_SUPPLICANT_KEYMGMT_WPA_FT_PSK | - G_SUPPLICANT_KEYMGMT_WPA_PSK_256)) - bss->psk = TRUE; + supplicant_dbus_property_foreach(iter, bss_wpa, bss); } else if (g_strcmp0(key, "IEs") == 0) bss_process_ies(iter, bss); else @@ -1483,7 +2057,7 @@ static struct g_supplicant_bss *interface_bss_added(DBusMessageIter *iter, SUPPLICANT_DBG(""); dbus_message_iter_get_basic(iter, &path); - if (path == NULL) + if (!path) return NULL; if (g_strcmp0(path, "/") == 0) @@ -1492,18 +2066,19 @@ static struct g_supplicant_bss *interface_bss_added(DBusMessageIter *iter, SUPPLICANT_DBG("%s", path); network = g_hash_table_lookup(interface->bss_mapping, path); - if (network != NULL) { + if (network) { bss = g_hash_table_lookup(network->bss_table, path); - if (bss != NULL) + if (bss) return NULL; } bss = g_try_new0(struct g_supplicant_bss, 1); - if (bss == NULL) + if (!bss) return NULL; bss->interface = interface; bss->path = g_strdup(path); + bss->signal = BSS_UNKNOWN_STRENGTH; return bss; } @@ -1516,7 +2091,7 @@ static void interface_bss_added_with_keys(DBusMessageIter *iter, SUPPLICANT_DBG(""); bss = interface_bss_added(iter, user_data); - if (bss == NULL) + if (!bss) return; dbus_message_iter_next(iter); @@ -1527,7 +2102,8 @@ static void interface_bss_added_with_keys(DBusMessageIter *iter, supplicant_dbus_property_foreach(iter, bss_property, bss); bss_compute_security(bss); - add_or_replace_bss_to_network(bss); + if (add_or_replace_bss_to_network(bss) < 0) + SUPPLICANT_DBG("add_or_replace_bss_to_network failed"); } static void interface_bss_added_without_keys(DBusMessageIter *iter, @@ -1538,15 +2114,16 @@ static void interface_bss_added_without_keys(DBusMessageIter *iter, SUPPLICANT_DBG(""); bss = interface_bss_added(iter, user_data); - if (bss == NULL) + if (!bss) return; supplicant_dbus_property_get_all(bss->path, SUPPLICANT_INTERFACE ".BSS", - bss_property, bss); + bss_property, bss, bss); bss_compute_security(bss); - add_or_replace_bss_to_network(bss); + if (add_or_replace_bss_to_network(bss) < 0) + SUPPLICANT_DBG("add_or_replace_bss_to_network failed"); } static void update_signal(gpointer key, gpointer value, @@ -1563,7 +2140,7 @@ static void update_signal(gpointer key, gpointer value, static void update_network_signal(GSupplicantNetwork *network) { - if (g_hash_table_size(network->bss_table) <= 1) + if (g_hash_table_size(network->bss_table) <= 1 && network->best_bss) return; g_hash_table_foreach(network->bss_table, @@ -1572,20 +2149,98 @@ static void update_network_signal(GSupplicantNetwork *network) SUPPLICANT_DBG("New network signal %d", network->signal); } +static void interface_current_bss(GSupplicantInterface *interface, + DBusMessageIter *iter) +{ + GSupplicantNetwork *network; + struct g_supplicant_bss *bss; + const char *path; + + dbus_message_iter_get_basic(iter, &path); + if (g_strcmp0(path, "/") == 0) { + interface->current_network = NULL; + return; + } + + interface_bss_added_without_keys(iter, interface); + + network = g_hash_table_lookup(interface->bss_mapping, path); + if (!network) + return; + + bss = g_hash_table_lookup(network->bss_table, path); + if (!bss) + return; + + interface->current_network = network; + + if (bss != network->best_bss) { + /* + * This is the case where either wpa_s got associated + * to a BSS different than the one ConnMan considers + * the best, or we are roaming. + */ + SUPPLICANT_DBG("Update best BSS for %s", network->name); + + network->best_bss = bss; + + if (network->signal != bss->signal) { + SUPPLICANT_DBG("New network signal %d dBm", + bss->signal); + + network->signal = bss->signal; + callback_network_changed(network, "Signal"); + } + } + + /* + * wpa_s could notify about CurrentBSS in any state once + * it got associated. It is not sure such notification will + * arrive together with transition to ASSOCIATED state. + * In fact, for networks with security WEP or OPEN, it + * always arrives together with transition to COMPLETED. + */ + switch (interface->state) { + case G_SUPPLICANT_STATE_UNKNOWN: + case G_SUPPLICANT_STATE_DISABLED: + case G_SUPPLICANT_STATE_DISCONNECTED: + case G_SUPPLICANT_STATE_INACTIVE: + case G_SUPPLICANT_STATE_SCANNING: + case G_SUPPLICANT_STATE_AUTHENTICATING: + case G_SUPPLICANT_STATE_ASSOCIATING: + return; + case G_SUPPLICANT_STATE_ASSOCIATED: + case G_SUPPLICANT_STATE_4WAY_HANDSHAKE: + case G_SUPPLICANT_STATE_GROUP_HANDSHAKE: + case G_SUPPLICANT_STATE_COMPLETED: + callback_network_associated(network); + break; + } +} + static void interface_bss_removed(DBusMessageIter *iter, void *user_data) { GSupplicantInterface *interface = user_data; GSupplicantNetwork *network; + struct g_supplicant_bss *bss = NULL; const char *path = NULL; + bool is_current_network_bss = false; dbus_message_iter_get_basic(iter, &path); - if (path == NULL) + if (!path) return; network = g_hash_table_lookup(interface->bss_mapping, path); - if (network == NULL) + if (!network) return; + bss = g_hash_table_lookup(network->bss_table, path); + if (network->best_bss == bss) { + network->best_bss = NULL; + network->signal = BSS_UNKNOWN_STRENGTH; + is_current_network_bss = true; + } + g_hash_table_remove(bss_mapping, path); g_hash_table_remove(interface->bss_mapping, path); @@ -1593,8 +2248,47 @@ static void interface_bss_removed(DBusMessageIter *iter, void *user_data) update_network_signal(network); - if (g_hash_table_size(network->bss_table) == 0) + if (g_hash_table_size(network->bss_table) == 0) { g_hash_table_remove(interface->network_table, network->group); + } else { + if (is_current_network_bss && network->best_bss) + callback_network_changed(network, ""); + } +} + +static void set_config_methods(DBusMessageIter *iter, void *user_data) +{ + dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, user_data); +} + +static void wps_property(const char *key, DBusMessageIter *iter, + void *user_data) +{ + GSupplicantInterface *interface = user_data; + + if (!interface) + return; + + SUPPLICANT_DBG("key: %s", key); + + if (g_strcmp0(key, "ConfigMethods") == 0) { + const char *config_methods = "push_button", *str = NULL; + + dbus_message_iter_get_basic(iter, &str); + if (str && strlen(str) > 0) { + /* It was already set at wpa_s level, don't modify it. */ + SUPPLICANT_DBG("%s", str); + return; + } + + supplicant_dbus_property_set(interface->path, + SUPPLICANT_INTERFACE ".Interface.WPS", + "ConfigMethods", DBUS_TYPE_STRING_AS_STRING, + set_config_methods, NULL, &config_methods, NULL); + + SUPPLICANT_DBG("No value. Set %s", config_methods); + } + } static void interface_property(const char *key, DBusMessageIter *iter, @@ -1602,12 +2296,12 @@ static void interface_property(const char *key, DBusMessageIter *iter, { GSupplicantInterface *interface = user_data; - if (interface == NULL) + if (!interface) return; SUPPLICANT_DBG("%s", key); - if (key == NULL) { + if (!key) { debug_strvalmap("KeyMgmt capability", keymgmt_map, interface->keymgmt_capa); debug_strvalmap("AuthAlg capability", authalg_capa_map, @@ -1623,24 +2317,43 @@ static void interface_property(const char *key, DBusMessageIter *iter, debug_strvalmap("Mode capability", mode_capa_map, interface->mode_capa); - interface->ready = TRUE; - callback_interface_added(interface); + supplicant_dbus_property_get_all(interface->path, + SUPPLICANT_INTERFACE ".Interface.WPS", + wps_property, interface, interface); + + if (interface->ready) + callback_interface_added(interface); + return; } if (g_strcmp0(key, "Capabilities") == 0) { supplicant_dbus_property_foreach(iter, interface_capability, interface); + if (interface->mode_capa & G_SUPPLICANT_CAPABILITY_MODE_P2P) + interface->p2p_support = true; } else if (g_strcmp0(key, "State") == 0) { const char *str = NULL; dbus_message_iter_get_basic(iter, &str); - if (str != NULL) + if (str) if (string2state(str) != interface->state) { interface->state = string2state(str); callback_interface_state(interface); } + if (interface->ap_create_in_progress) { + if (interface->state == G_SUPPLICANT_STATE_DISCONNECTED) + callback_ap_create_fail(interface); + + interface->ap_create_in_progress = false; + } + + if (interface->state == G_SUPPLICANT_STATE_DISABLED) + interface->ready = FALSE; + else + interface->ready = TRUE; + SUPPLICANT_DBG("state %s (%d)", str, interface->state); } else if (g_strcmp0(key, "Scanning") == 0) { dbus_bool_t scanning = FALSE; @@ -1648,8 +2361,8 @@ static void interface_property(const char *key, DBusMessageIter *iter, dbus_message_iter_get_basic(iter, &scanning); interface->scanning = scanning; - if (interface->ready == TRUE) { - if (interface->scanning == TRUE) + if (interface->ready) { + if (interface->scanning) callback_scan_started(interface); else callback_scan_finished(interface); @@ -1663,7 +2376,7 @@ static void interface_property(const char *key, DBusMessageIter *iter, const char *str = NULL; dbus_message_iter_get_basic(iter, &str); - if (str != NULL) { + if (str) { g_free(interface->ifname); interface->ifname = g_strdup(str); } @@ -1671,7 +2384,7 @@ static void interface_property(const char *key, DBusMessageIter *iter, const char *str = NULL; dbus_message_iter_get_basic(iter, &str); - if (str != NULL) { + if (str) { g_free(interface->driver); interface->driver = g_strdup(str); } @@ -1679,25 +2392,48 @@ static void interface_property(const char *key, DBusMessageIter *iter, const char *str = NULL; dbus_message_iter_get_basic(iter, &str); - if (str != NULL) { + if (str) { g_free(interface->bridge); interface->bridge = g_strdup(str); } + } else if (g_strcmp0(key, "ConfigFile") == 0) { + const char *str = NULL; + + dbus_message_iter_get_basic(iter, &str); + if (str && strlen(str) > 0 && interface->ifname) { + SUPPLICANT_DBG("New {%s, %s}", interface->ifname, str); + g_hash_table_replace(config_file_table, + g_strdup(interface->ifname), g_strdup(str)); + } } else if (g_strcmp0(key, "CurrentBSS") == 0) { - interface_bss_added_without_keys(iter, interface); + interface_current_bss(interface, iter); } else if (g_strcmp0(key, "CurrentNetwork") == 0) { interface_network_added(iter, interface); } else if (g_strcmp0(key, "BSSs") == 0) { - supplicant_dbus_array_foreach(iter, interface_bss_added_without_keys, - interface); + supplicant_dbus_array_foreach(iter, + interface_bss_added_without_keys, + interface); } else if (g_strcmp0(key, "Blobs") == 0) { /* Nothing */ } else if (g_strcmp0(key, "Networks") == 0) { supplicant_dbus_array_foreach(iter, interface_network_added, interface); - } else + } else if (g_strcmp0(key, "DisconnectReason") == 0) { + int reason_code; + if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_INVALID) { + dbus_message_iter_get_basic(iter, &reason_code); + callback_disconnect_reason_code(interface, reason_code); + } + } else if (g_strcmp0(key, "AssocStatusCode") == 0) { + int status_code; + if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_INVALID) { + dbus_message_iter_get_basic(iter, &status_code); + callback_assoc_status_code(interface, status_code); + } + } else { SUPPLICANT_DBG("key %s type %c", key, dbus_message_iter_get_arg_type(iter)); + } } static void scan_network_update(DBusMessageIter *iter, void *user_data) @@ -1706,12 +2442,12 @@ static void scan_network_update(DBusMessageIter *iter, void *user_data) GSupplicantNetwork *network; char *path; - if (iter == NULL) + if (!iter) return; dbus_message_iter_get_basic(iter, &path); - if (path == NULL) + if (!path) return; if (g_strcmp0(path, "/") == 0) @@ -1719,7 +2455,7 @@ static void scan_network_update(DBusMessageIter *iter, void *user_data) /* Update the network details based on scan BSS data */ network = g_hash_table_lookup(interface->bss_mapping, path); - if (network != NULL) + if (network) callback_network_added(network); } @@ -1732,7 +2468,7 @@ static void scan_bss_data(const char *key, DBusMessageIter *iter, supplicant_dbus_array_foreach(iter, scan_network_update, interface); - if (interface->scan_callback != NULL) + if (interface->scan_callback) interface->scan_callback(0, interface, interface->scan_data); interface->scan_callback = NULL; @@ -1744,16 +2480,17 @@ static GSupplicantInterface *interface_alloc(const char *path) GSupplicantInterface *interface; interface = g_try_new0(GSupplicantInterface, 1); - if (interface == NULL) + if (!interface) return NULL; interface->path = g_strdup(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->peer_table = g_hash_table_new_full(g_str_hash, + g_str_equal, NULL, remove_peer); + interface->group_table = g_hash_table_new_full(g_str_hash, + g_str_equal, NULL, remove_group); interface->bss_mapping = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL); @@ -1766,45 +2503,53 @@ static void interface_added(DBusMessageIter *iter, void *user_data) { GSupplicantInterface *interface; const char *path = NULL; + bool properties_appended = GPOINTER_TO_UINT(user_data); SUPPLICANT_DBG(""); dbus_message_iter_get_basic(iter, &path); - if (path == NULL) + if (!path) return; if (g_strcmp0(path, "/") == 0) return; interface = g_hash_table_lookup(interface_table, path); - if (interface != NULL) + if (interface) return; interface = interface_alloc(path); - if (interface == NULL) + if (!interface) + return; + + if (!properties_appended) { + supplicant_dbus_property_get_all(path, + SUPPLICANT_INTERFACE ".Interface", + interface_property, interface, + interface); 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); } static void interface_removed(DBusMessageIter *iter, void *user_data) { const char *path = NULL; + GSupplicantInterface *interface = user_data; dbus_message_iter_get_basic(iter, &path); - if (path == NULL) + if (!path) return; + interface = g_hash_table_lookup(interface_table, path); + g_supplicant_interface_cancel(interface); + g_hash_table_remove(interface_table, path); } @@ -1814,10 +2559,10 @@ static void eap_method(DBusMessageIter *iter, void *user_data) int i; dbus_message_iter_get_basic(iter, &str); - if (str == NULL) + if (!str) return; - for (i = 0; eap_method_map[i].str != NULL; i++) + for (i = 0; eap_method_map[i].str; i++) if (strcmp(str, eap_method_map[i].str) == 0) { eap_methods |= eap_method_map[i].val; break; @@ -1827,7 +2572,7 @@ static void eap_method(DBusMessageIter *iter, void *user_data) static void service_property(const char *key, DBusMessageIter *iter, void *user_data) { - if (key == NULL) { + if (!key) { callback_system_ready(); return; } @@ -1837,7 +2582,7 @@ static void service_property(const char *key, DBusMessageIter *iter, int i; dbus_message_iter_get_basic(iter, &str); - for (i = 0; debug_strings[i] != NULL; i++) + for (i = 0; debug_strings[i]; i++) if (g_strcmp0(debug_strings[i], str) == 0) { debug_level = i; break; @@ -1874,7 +2619,7 @@ static void signal_name_owner_changed(const char *path, DBusMessageIter *iter) return; dbus_message_iter_get_basic(iter, &name); - if (name == NULL) + if (!name) return; if (g_strcmp0(name, SUPPLICANT_SERVICE) != 0) @@ -1885,12 +2630,15 @@ static void signal_name_owner_changed(const char *path, DBusMessageIter *iter) dbus_message_iter_next(iter); dbus_message_iter_get_basic(iter, &new); - if (old == NULL || new == NULL) + if (!old || !new) return; if (strlen(old) > 0 && strlen(new) == 0) { system_available = FALSE; g_hash_table_remove_all(bss_mapping); + g_hash_table_remove_all(peer_mapping); + g_hash_table_remove_all(group_mapping); + g_hash_table_remove_all(config_file_table); g_hash_table_remove_all(interface_table); callback_system_killed(); } @@ -1898,8 +2646,8 @@ static void signal_name_owner_changed(const char *path, DBusMessageIter *iter) if (strlen(new) > 0 && strlen(old) == 0) { system_available = TRUE; supplicant_dbus_property_get_all(SUPPLICANT_PATH, - SUPPLICANT_INTERFACE, - service_property, NULL); + SUPPLICANT_INTERFACE, + service_property, NULL, NULL); } } @@ -1918,7 +2666,7 @@ static void signal_interface_added(const char *path, DBusMessageIter *iter) SUPPLICANT_DBG("path %s %s", path, SUPPLICANT_PATH); if (g_strcmp0(path, SUPPLICANT_PATH) == 0) - interface_added(iter, NULL); + interface_added(iter, GUINT_TO_POINTER(true)); } static void signal_interface_removed(const char *path, DBusMessageIter *iter) @@ -1936,7 +2684,7 @@ static void signal_interface_changed(const char *path, DBusMessageIter *iter) SUPPLICANT_DBG(""); interface = g_hash_table_lookup(interface_table, path); - if (interface == NULL) + if (!interface) return; supplicant_dbus_property_foreach(iter, interface_property, interface); @@ -1950,17 +2698,22 @@ static void signal_scan_done(const char *path, DBusMessageIter *iter) SUPPLICANT_DBG(""); interface = g_hash_table_lookup(interface_table, path); - if (interface == NULL) + if (!interface) return; dbus_message_iter_get_basic(iter, &success); + if (interface->scanning) { + callback_scan_finished(interface); + interface->scanning = FALSE; + } + /* * If scan is unsuccessful return -EIO else get the scanned BSSs * and update the network details accordingly */ - if (success == FALSE) { - if (interface->scan_callback != NULL) + if (!success) { + if (interface->scan_callback) interface->scan_callback(-EIO, interface, interface->scan_data); @@ -1971,7 +2724,7 @@ static void signal_scan_done(const char *path, DBusMessageIter *iter) } supplicant_dbus_property_get(path, SUPPLICANT_INTERFACE ".Interface", - "BSSs", scan_bss_data, interface); + "BSSs", scan_bss_data, interface, interface); } static void signal_bss_added(const char *path, DBusMessageIter *iter) @@ -1981,7 +2734,7 @@ static void signal_bss_added(const char *path, DBusMessageIter *iter) SUPPLICANT_DBG(""); interface = g_hash_table_lookup(interface_table, path); - if (interface == NULL) + if (!interface) return; interface_bss_added_with_keys(iter, interface); @@ -1994,7 +2747,7 @@ static void signal_bss_removed(const char *path, DBusMessageIter *iter) SUPPLICANT_DBG(""); interface = g_hash_table_lookup(interface_table, path); - if (interface == NULL) + if (!interface) return; interface_bss_removed(iter, interface); @@ -2007,7 +2760,7 @@ static void signal_network_added(const char *path, DBusMessageIter *iter) SUPPLICANT_DBG(""); interface = g_hash_table_lookup(interface_table, path); - if (interface == NULL) + if (!interface) return; interface_network_added(iter, interface); @@ -2020,68 +2773,139 @@ static void signal_network_removed(const char *path, DBusMessageIter *iter) SUPPLICANT_DBG(""); interface = g_hash_table_lookup(interface_table, path); - if (interface == NULL) + if (!interface) return; interface_network_removed(iter, interface); } -static void signal_bss_changed(const char *path, DBusMessageIter *iter) +static void signal_sta_authorized(const char *path, DBusMessageIter *iter) { GSupplicantInterface *interface; - GSupplicantNetwork *network; - GSupplicantSecurity old_security; - struct g_supplicant_bss *bss; + const char *addr = NULL; SUPPLICANT_DBG(""); - interface = g_hash_table_lookup(bss_mapping, path); - if (interface == NULL) + interface = g_hash_table_lookup(interface_table, path); + if (!interface) return; - network = g_hash_table_lookup(interface->bss_mapping, path); - if (network == NULL) + dbus_message_iter_get_basic(iter, &addr); + if (!addr) return; - bss = g_hash_table_lookup(network->bss_table, path); - if (bss == NULL) - return; + callback_sta_authorized(interface, addr); +} - supplicant_dbus_property_foreach(iter, bss_property, bss); +static void signal_sta_deauthorized(const char *path, DBusMessageIter *iter) +{ + GSupplicantInterface *interface; + const char *addr = NULL; - old_security = network->security; - bss_compute_security(bss); + SUPPLICANT_DBG(""); + + interface = g_hash_table_lookup(interface_table, path); + if (!interface) + return; + + dbus_message_iter_get_basic(iter, &addr); + if (!addr) + return; + + callback_sta_deauthorized(interface, addr); +} + +static void signal_bss_changed(const char *path, DBusMessageIter *iter) +{ + GSupplicantInterface *interface; + GSupplicantNetwork *network; + GSupplicantSecurity old_security; + unsigned int old_wps_capabilities; + struct g_supplicant_bss *bss; + + SUPPLICANT_DBG(""); + + interface = g_hash_table_lookup(bss_mapping, path); + if (!interface) + return; + + network = g_hash_table_lookup(interface->bss_mapping, path); + if (!network) + return; + + bss = g_hash_table_lookup(network->bss_table, path); + if (!bss) + return; + + supplicant_dbus_property_foreach(iter, bss_property, bss); + + old_security = network->security; + bss_compute_security(bss); if (old_security != bss->security) { struct g_supplicant_bss *new_bss; - SUPPLICANT_DBG("New network security for %s", bss->ssid); + SUPPLICANT_DBG("New network security for %s with path %s", + bss->ssid, bss->path); - /* Security change policy: - * - we first copy the current bss into a new one with - * its own pointer (path) - * - we remove the current bss related nework which will - * tell the plugin about such removal. This is done due - * to the fact that a security change means a group change - * so a complete network change. - * (current bss becomes invalid as well) - * - we add the new bss: it adds new network and tell the - * plugin about it. */ + /* + * Security change policy: + * - We first copy the current bss into a new one with + * its own pointer (path) + * - Clear the old bss pointer and remove the network completely + * if there are no more BSSs in the bss table. + * - The new bss will be added either to an existing network + * or an additional network will be created + */ new_bss = g_try_new0(struct g_supplicant_bss, 1); - if (new_bss == NULL) + if (!new_bss) return; memcpy(new_bss, bss, sizeof(struct g_supplicant_bss)); new_bss->path = g_strdup(bss->path); - g_hash_table_remove(interface->network_table, network->group); + if (network->best_bss == bss) { + network->best_bss = NULL; + network->signal = BSS_UNKNOWN_STRENGTH; + } - add_or_replace_bss_to_network(new_bss); + g_hash_table_remove(bss_mapping, path); + + g_hash_table_remove(interface->bss_mapping, path); + g_hash_table_remove(network->bss_table, path); + + update_network_signal(network); + + if (g_hash_table_size(network->bss_table) == 0) + g_hash_table_remove(interface->network_table, + network->group); + + if (add_or_replace_bss_to_network(new_bss) < 0) { + /* + * Prevent a memory leak on failure in + * add_or_replace_bss_to_network + */ + SUPPLICANT_DBG("Failed to add bss %s to network table", + new_bss->path); + g_free(new_bss->path); + g_free(new_bss); + } return; } + old_wps_capabilities = network->wps_capabilities; + + if (old_wps_capabilities != bss->wps_capabilities) { + network->wps_capabilities = bss->wps_capabilities; + callback_network_changed(network, "WPSCapabilities"); + } + + /* Consider only property changes of the connected BSS */ + if (network == interface->current_network && bss != network->best_bss) + return; + if (bss->signal == network->signal) return; @@ -2099,7 +2923,8 @@ static void signal_bss_changed(const char *path, DBusMessageIter *iter) network->best_bss = bss; } - SUPPLICANT_DBG("New network signal for %s %d dBm", network->ssid, network->signal); + SUPPLICANT_DBG("New network signal for %s %d dBm", network->ssid, + network->signal); callback_network_changed(network, "Signal"); } @@ -2109,27 +2934,28 @@ static void wps_credentials(const char *key, DBusMessageIter *iter, { GSupplicantInterface *interface = user_data; - if (key == NULL) + if (!key) return; SUPPLICANT_DBG("key %s", key); if (g_strcmp0(key, "Key") == 0) { DBusMessageIter array; - unsigned char *key; + unsigned char *key_val; int key_len; dbus_message_iter_recurse(iter, &array); - dbus_message_iter_get_fixed_array(&array, &key, &key_len); + dbus_message_iter_get_fixed_array(&array, &key_val, &key_len); g_free(interface->wps_cred.key); interface->wps_cred.key = g_try_malloc0( - sizeof(char) * key_len+1); + sizeof(char) * key_len + 1); - if (interface->wps_cred.key == NULL) + if (!interface->wps_cred.key) return; - memcpy(interface->wps_cred.key, key, sizeof(char) * key_len); + memcpy(interface->wps_cred.key, key_val, + sizeof(char) * key_len); SUPPLICANT_DBG("WPS key present"); } else if (g_strcmp0(key, "SSID") == 0) { @@ -2157,7 +2983,7 @@ static void signal_wps_credentials(const char *path, DBusMessageIter *iter) SUPPLICANT_DBG(""); interface = g_hash_table_lookup(interface_table, path); - if (interface == NULL) + if (!interface) return; supplicant_dbus_property_foreach(iter, wps_credentials, interface); @@ -2168,7 +2994,7 @@ static void wps_event_args(const char *key, DBusMessageIter *iter, { GSupplicantInterface *interface = user_data; - if (key == NULL || interface == NULL) + if (!key || !interface) return; SUPPLICANT_DBG("Arg Key %s", key); @@ -2182,7 +3008,7 @@ static void signal_wps_event(const char *path, DBusMessageIter *iter) SUPPLICANT_DBG(""); interface = g_hash_table_lookup(interface_table, path); - if (interface == NULL) + if (!interface) return; dbus_message_iter_get_basic(iter, &name); @@ -2191,7 +3017,7 @@ static void signal_wps_event(const char *path, DBusMessageIter *iter) if (g_strcmp0(name, "success") == 0) interface->wps_state = G_SUPPLICANT_WPS_STATE_SUCCESS; - else if (g_strcmp0(name, "failed") == 0) + else if (g_strcmp0(name, "fail") == 0) interface->wps_state = G_SUPPLICANT_WPS_STATE_FAIL; else interface->wps_state = G_SUPPLICANT_WPS_STATE_UNKNOWN; @@ -2204,1311 +3030,2734 @@ static void signal_wps_event(const char *path, DBusMessageIter *iter) supplicant_dbus_property_foreach(iter, wps_event_args, interface); } -static struct { - const char *interface; - const char *member; - void (*function) (const char *path, DBusMessageIter *iter); -} signal_map[] = { - { DBUS_INTERFACE_DBUS, "NameOwnerChanged", signal_name_owner_changed }, +static void create_peer_identifier(GSupplicantPeer *peer) +{ + const unsigned char test[ETH_ALEN] = {}; - { SUPPLICANT_INTERFACE, "PropertiesChanged", signal_properties_changed }, - { SUPPLICANT_INTERFACE, "InterfaceAdded", signal_interface_added }, - { SUPPLICANT_INTERFACE, "InterfaceCreated", signal_interface_added }, - { SUPPLICANT_INTERFACE, "InterfaceRemoved", signal_interface_removed }, + if (!peer) + return; - { 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 }, + if (!memcmp(peer->device_address, test, ETH_ALEN)) { + peer->identifier = g_strdup(peer->name); + return; + } - { SUPPLICANT_INTERFACE ".BSS", "PropertiesChanged", signal_bss_changed }, + peer->identifier = g_malloc0(19); + snprintf(peer->identifier, 19, "%02x%02x%02x%02x%02x%02x", + peer->device_address[0], + peer->device_address[1], + peer->device_address[2], + peer->device_address[3], + peer->device_address[4], + peer->device_address[5]); +} + +struct peer_property_data { + GSupplicantPeer *peer; + GSList *old_groups; + bool groups_changed; + bool services_changed; +}; - { SUPPLICANT_INTERFACE ".Interface.WPS", "Credentials", signal_wps_credentials }, - { SUPPLICANT_INTERFACE ".Interface.WPS", "Event", signal_wps_event }, +static void peer_groups_relation(DBusMessageIter *iter, void *user_data) +{ + struct peer_property_data *data = user_data; + GSupplicantPeer *peer = data->peer; + GSupplicantGroup *group; + const char *str = NULL; + GSList *elem; - { } -}; + dbus_message_iter_get_basic(iter, &str); + if (!str) + return; -static DBusHandlerResult g_supplicant_filter(DBusConnection *conn, - DBusMessage *message, void *data) + group = g_hash_table_lookup(group_mapping, str); + if (!group) + return; + + elem = g_slist_find_custom(data->old_groups, str, (GCompareFunc)g_strcmp0); + if (elem) { + data->old_groups = g_slist_remove_link(data->old_groups, elem); + peer->groups = g_slist_concat(elem, peer->groups); + } else { + peer->groups = g_slist_prepend(peer->groups, g_strdup(str)); + data->groups_changed = true; + } +} + +static void peer_property(const char *key, DBusMessageIter *iter, + void *user_data) { - DBusMessageIter iter; - const char *path; - int i; + GSupplicantPeer *pending_peer; + struct peer_property_data *data = user_data; + GSupplicantPeer *peer = data->peer; - path = dbus_message_get_path(message); - if (path == NULL) - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + SUPPLICANT_DBG("key: %s", key); - if (dbus_message_iter_init(message, &iter) == FALSE) - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + if (!peer->interface) + return; - for (i = 0; signal_map[i].interface != NULL; i++) { - if (dbus_message_has_interface(message, - signal_map[i].interface) == FALSE) - continue; + if (!key) { + if (peer->name) { + create_peer_identifier(peer); + callback_peer_found(peer); + pending_peer = g_hash_table_lookup( + pending_peer_connection, peer->path); + + if (pending_peer && pending_peer == peer) { + callback_peer_request(peer); + g_hash_table_remove(pending_peer_connection, + peer->path); + } - if (dbus_message_has_member(message, - signal_map[i].member) == FALSE) - continue; + dbus_free(data); + } - signal_map[i].function(path, &iter); - break; + return; } - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -} + if (g_strcmp0(key, "DeviceAddress") == 0) { + unsigned char *dev_addr; + DBusMessageIter array; + int len; -struct supplicant_regdom { - GSupplicantCountryCallback callback; - const void *user_data; -}; + dbus_message_iter_recurse(iter, &array); + dbus_message_iter_get_fixed_array(&array, &dev_addr, &len); -static void country_result(const char *error, - DBusMessageIter *iter, void *user_data) -{ - struct supplicant_regdom *regdom = user_data; - char *alpha2; + if (len == ETH_ALEN) + memcpy(peer->device_address, dev_addr, len); + } else if (g_strcmp0(key, "DeviceName") == 0) { + const char *str = NULL; - SUPPLICANT_DBG("Country setting result"); + dbus_message_iter_get_basic(iter, &str); + if (str) + peer->name = g_strdup(str); + } else if (g_strcmp0(key, "config_method") == 0) { + uint16_t wps_config; - if (user_data == NULL) - return; + dbus_message_iter_get_basic(iter, &wps_config); - if (error == NULL) { - alpha2 = (char *)regdom->user_data; - } else { - SUPPLICANT_DBG("Country setting failure %s", error); - alpha2 = NULL; - } + if (wps_config & G_SUPPLICANT_WPS_CONFIG_PBC) + peer->wps_capabilities |= G_SUPPLICANT_WPS_PBC; + if (wps_config & ~G_SUPPLICANT_WPS_CONFIG_PBC) + peer->wps_capabilities |= G_SUPPLICANT_WPS_PIN; + } else if (g_strcmp0(key, "Groups") == 0) { + data->old_groups = peer->groups; + peer->groups = NULL; - if (regdom->callback) - regdom->callback(alpha2); + supplicant_dbus_array_foreach(iter, + peer_groups_relation, data); + if (g_slist_length(data->old_groups) > 0) { + g_slist_free_full(data->old_groups, g_free); + data->groups_changed = true; + } + } else if (g_strcmp0(key, "IEs") == 0) { + DBusMessageIter array; + unsigned char *ie; + int ie_len; - g_free(regdom); -} + dbus_message_iter_recurse(iter, &array); + dbus_message_iter_get_fixed_array(&array, &ie, &ie_len); -static void country_params(DBusMessageIter *iter, void *user_data) -{ - struct supplicant_regdom *regdom = user_data; - const char *country; + if (!ie || ie_len < 2) + return; + + if (peer->widi_ies) { + if (memcmp(peer->widi_ies, ie, ie_len) == 0) + return; + + g_free(peer->widi_ies); + peer->widi_ies_length = 0; + } - country = regdom->user_data; + peer->widi_ies = g_malloc0(ie_len * sizeof(unsigned char)); - dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &country); + memcpy(peer->widi_ies, ie, ie_len); + peer->widi_ies_length = ie_len; + data->services_changed = true; + } } -int g_supplicant_set_country(const char *alpha2, - GSupplicantCountryCallback callback, - const void *user_data) +static void signal_peer_found(const char *path, DBusMessageIter *iter) { - struct supplicant_regdom *regdom; + struct peer_property_data *property_data; + GSupplicantInterface *interface; + const char *obj_path = NULL; + GSupplicantPeer *peer; - SUPPLICANT_DBG("Country setting %s", alpha2); + SUPPLICANT_DBG(""); - if (system_available == FALSE) - return -EFAULT; + interface = g_hash_table_lookup(interface_table, path); + if (!interface) + return; - regdom = dbus_malloc0(sizeof(*regdom)); - if (regdom == NULL) - return -ENOMEM; + dbus_message_iter_get_basic(iter, &obj_path); + if (!obj_path || g_strcmp0(obj_path, "/") == 0) + return; - regdom->callback = callback; - regdom->user_data = user_data; + peer = g_hash_table_lookup(interface->peer_table, obj_path); + if (peer) + return; - return supplicant_dbus_property_set(SUPPLICANT_PATH, SUPPLICANT_INTERFACE, - "Country", DBUS_TYPE_STRING_AS_STRING, - country_params, country_result, - regdom); -} + peer = g_try_new0(GSupplicantPeer, 1); + if (!peer) + return; -struct interface_data { - GSupplicantInterface *interface; - GSupplicantInterfaceCallback callback; - void *user_data; -}; + peer->interface = interface; + peer->path = g_strdup(obj_path); + g_hash_table_insert(interface->peer_table, peer->path, peer); + g_hash_table_replace(peer_mapping, peer->path, interface); -struct interface_create_data { - const char *ifname; - const char *driver; - const char *bridge; - GSupplicantInterface *interface; - GSupplicantInterfaceCallback callback; - void *user_data; -}; + property_data = dbus_malloc0(sizeof(struct peer_property_data)); + property_data->peer = peer; -struct interface_connect_data { - GSupplicantInterface *interface; - GSupplicantInterfaceCallback callback; - GSupplicantSSID *ssid; - void *user_data; -}; + dbus_message_iter_next(iter); + if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_INVALID) { + supplicant_dbus_property_foreach(iter, peer_property, + property_data); + peer_property(NULL, NULL, property_data); + return; + } -struct interface_scan_data { - GSupplicantInterface *interface; - GSupplicantInterfaceCallback callback; - GSupplicantScanParams *scan_params; - void *user_data; -}; + supplicant_dbus_property_get_all(obj_path, + SUPPLICANT_INTERFACE ".Peer", + peer_property, property_data, NULL); +} -static void interface_create_property(const char *key, DBusMessageIter *iter, - void *user_data) +static void signal_peer_lost(const char *path, DBusMessageIter *iter) { - struct interface_create_data *data = user_data; - GSupplicantInterface *interface = data->interface; + GSupplicantInterface *interface; + const char *obj_path = NULL; + GSupplicantPeer *peer; - if (key == NULL) { - if (data->callback != NULL) - data->callback(0, data->interface, data->user_data); + SUPPLICANT_DBG(""); - dbus_free(data); - } + interface = g_hash_table_lookup(interface_table, path); + if (!interface) + return; - interface_property(key, iter, interface); + dbus_message_iter_get_basic(iter, &obj_path); + if (!obj_path || g_strcmp0(obj_path, "/") == 0) + return; + + peer = g_hash_table_lookup(interface->peer_table, obj_path); + if (!peer) + return; + + g_hash_table_remove(interface->peer_table, obj_path); } -static void interface_create_result(const char *error, - DBusMessageIter *iter, void *user_data) +static void signal_peer_changed(const char *path, DBusMessageIter *iter) { - struct interface_create_data *data = user_data; - const char *path = NULL; - int err; + struct peer_property_data *property_data; + GSupplicantInterface *interface; + GSupplicantPeer *peer; SUPPLICANT_DBG(""); - if (error != NULL) { - g_warning("error %s", error); - err = -EIO; - goto done; - } + interface = g_hash_table_lookup(peer_mapping, path); + if (!interface) + return; - dbus_message_iter_get_basic(iter, &path); - if (path == NULL) { - err = -EINVAL; - goto done; + peer = g_hash_table_lookup(interface->peer_table, path); + if (!peer) { + g_hash_table_remove(peer_mapping, path); + return; } - if (system_available == FALSE) { - err = -EFAULT; - goto done; - } + property_data = dbus_malloc0(sizeof(struct peer_property_data)); + property_data->peer = peer; - data->interface = g_hash_table_lookup(interface_table, path); - if (data->interface == NULL) { - data->interface = interface_alloc(path); - if (data->interface == NULL) { - err = -ENOMEM; - goto done; - } - } + supplicant_dbus_property_foreach(iter, peer_property, property_data); + if (property_data->services_changed) + callback_peer_changed(peer, + G_SUPPLICANT_PEER_SERVICES_CHANGED); - err = supplicant_dbus_property_get_all(path, - SUPPLICANT_INTERFACE ".Interface", - interface_create_property, data); - if (err == 0) - return; + if (property_data->groups_changed) + callback_peer_changed(peer, G_SUPPLICANT_PEER_GROUP_CHANGED); -done: - if (data->callback != NULL) - data->callback(err, NULL, data->user_data); + dbus_free(property_data); - dbus_free(data); + if (!g_supplicant_peer_is_in_a_group(peer)) + peer->connection_requested = false; } -static void interface_create_params(DBusMessageIter *iter, void *user_data) +struct group_sig_data { + const char *peer_obj_path; + unsigned char iface_address[ETH_ALEN]; + const char *interface_obj_path; + const char *group_obj_path; + int role; +}; + +static void group_sig_property(const char *key, DBusMessageIter *iter, + void *user_data) { - struct interface_create_data *data = user_data; - DBusMessageIter dict; + struct group_sig_data *data = user_data; - SUPPLICANT_DBG(""); + if (!key) + return; - supplicant_dbus_dict_open(iter, &dict); + if (g_strcmp0(key, "peer_interface_addr") == 0) { + unsigned char *dev_addr; + DBusMessageIter array; + int len; - supplicant_dbus_dict_append_basic(&dict, "Ifname", - DBUS_TYPE_STRING, &data->ifname); + dbus_message_iter_recurse(iter, &array); + dbus_message_iter_get_fixed_array(&array, &dev_addr, &len); - if (data->driver != NULL) - supplicant_dbus_dict_append_basic(&dict, "Driver", - DBUS_TYPE_STRING, &data->driver); + if (len == ETH_ALEN) + memcpy(data->iface_address, dev_addr, len); + } else if (g_strcmp0(key, "role") == 0) { + const char *str = NULL; - if (data->bridge != NULL) - supplicant_dbus_dict_append_basic(&dict, "BridgeIfname", - DBUS_TYPE_STRING, &data->bridge); + dbus_message_iter_get_basic(iter, &str); + if (g_strcmp0(str, "GO") == 0) + data->role = G_SUPPLICANT_GROUP_ROLE_GO; + else + data->role = G_SUPPLICANT_GROUP_ROLE_CLIENT; + } else if (g_strcmp0(key, "peer_object") == 0) + dbus_message_iter_get_basic(iter, &data->peer_obj_path); + else if (g_strcmp0(key, "interface_object") == 0) + dbus_message_iter_get_basic(iter, &data->interface_obj_path); + else if (g_strcmp0(key, "group_object") == 0) + dbus_message_iter_get_basic(iter, &data->group_obj_path); - supplicant_dbus_dict_close(iter, &dict); } -static void interface_get_result(const char *error, - DBusMessageIter *iter, void *user_data) +static void signal_group_success(const char *path, DBusMessageIter *iter) { - struct interface_create_data *data = user_data; GSupplicantInterface *interface; - const char *path = NULL; - int err; + struct group_sig_data data = {}; + GSupplicantPeer *peer; SUPPLICANT_DBG(""); - if (error != NULL) { - SUPPLICANT_DBG("Interface not created yet"); - goto create; - } + interface = g_hash_table_lookup(interface_table, path); + if (!interface) + return; - dbus_message_iter_get_basic(iter, &path); - if (path == NULL) { - err = -EINVAL; - goto done; - } - - interface = g_hash_table_lookup(interface_table, path); - if (interface == NULL) { - err = -ENOENT; - goto done; - } + supplicant_dbus_property_foreach(iter, group_sig_property, &data); + if (!data.peer_obj_path) + return; - if (data->callback != NULL) - data->callback(0, interface, data->user_data); + peer = g_hash_table_lookup(interface->peer_table, data.peer_obj_path); + if (!peer) + return; - dbus_free(data); + memcpy(peer->iface_address, data.iface_address, ETH_ALEN); + interface->pending_peer_path = peer->path; +} - return; +static void signal_group_failure(const char *path, DBusMessageIter *iter) +{ + GSupplicantInterface *interface; + struct group_sig_data data = {}; + GSupplicantPeer *peer; -create: - if (system_available == FALSE) { - err = -EFAULT; - goto done; - } + SUPPLICANT_DBG(""); - SUPPLICANT_DBG("Creating interface"); + interface = g_hash_table_lookup(interface_table, path); + if (!interface) + return; - err = supplicant_dbus_method_call(SUPPLICANT_PATH, - SUPPLICANT_INTERFACE, - "CreateInterface", - interface_create_params, - interface_create_result, data); - if (err == 0) + supplicant_dbus_property_foreach(iter, group_sig_property, &data); + if (!data.peer_obj_path) return; -done: - if (data->callback != NULL) - data->callback(err, NULL, data->user_data); + peer = g_hash_table_lookup(interface->peer_table, data.peer_obj_path); + if (!peer) + return; - dbus_free(data); + callback_peer_changed(peer, G_SUPPLICANT_PEER_GROUP_FAILED); + peer->connection_requested = false; } -static void interface_get_params(DBusMessageIter *iter, void *user_data) +static void signal_group_started(const char *path, DBusMessageIter *iter) { - struct interface_create_data *data = user_data; + GSupplicantInterface *interface, *g_interface; + struct group_sig_data data = {}; + GSupplicantGroup *group; + GSupplicantPeer *peer; SUPPLICANT_DBG(""); - dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &data->ifname); -} + interface = g_hash_table_lookup(interface_table, path); + if (!interface) + return; -int g_supplicant_interface_create(const char *ifname, const char *driver, - const char *bridge, - GSupplicantInterfaceCallback callback, - void *user_data) -{ - struct interface_create_data *data; + supplicant_dbus_property_foreach(iter, group_sig_property, &data); + if (!data.interface_obj_path || !data.group_obj_path) + return; - SUPPLICANT_DBG("ifname %s", ifname); + peer = g_hash_table_lookup(interface->peer_table, + interface->pending_peer_path); + interface->pending_peer_path = NULL; + if (!peer) + return; - if (ifname == NULL) - return -EINVAL; + g_interface = g_hash_table_lookup(interface_table, + data.interface_obj_path); + if (!g_interface) + return; - if (system_available == FALSE) - return -EFAULT; + group = g_hash_table_lookup(interface->group_table, + data.group_obj_path); + if (group) + return; - data = dbus_malloc0(sizeof(*data)); - if (data == NULL) - return -ENOMEM; + group = g_try_new0(GSupplicantGroup, 1); + if (!group) + return; - data->ifname = ifname; - data->driver = driver; - data->bridge = bridge; - data->callback = callback; - data->user_data = user_data; + group->interface = g_interface; + group->orig_interface = interface; + group->path = g_strdup(data.group_obj_path); + group->role = data.role; - return supplicant_dbus_method_call(SUPPLICANT_PATH, - SUPPLICANT_INTERFACE, - "GetInterface", - interface_get_params, - interface_get_result, data); + g_hash_table_insert(interface->group_table, group->path, group); + g_hash_table_replace(group_mapping, group->path, group); + + peer->current_group_iface = g_interface; + callback_peer_changed(peer, G_SUPPLICANT_PEER_GROUP_STARTED); } -static void interface_remove_result(const char *error, - DBusMessageIter *iter, void *user_data) +static void remove_peer_group_interface(GHashTable *group_table, + const char* path) { - struct interface_data *data = user_data; - int err; - - if (error != NULL) { - err = -EIO; - goto done; - } - - if (system_available == FALSE) { - err = -EFAULT; - goto done; - } + GSupplicantGroup *group; + GHashTableIter iter; + gpointer value, key; - /* - * The gsupplicant interface is already freed by the InterfaceRemoved - * signal callback. Simply invoke the interface_data callback. - */ - err = 0; + if (!group_table) + return; -done: - if (data->callback != NULL) - data->callback(err, NULL, data->user_data); + group = g_hash_table_lookup(group_table, path); - dbus_free(data); -} + if (!group || !group->orig_interface) + return; + g_hash_table_iter_init(&iter, group->orig_interface->peer_table); -static void interface_remove_params(DBusMessageIter *iter, void *user_data) -{ - struct interface_data *data = user_data; + while (g_hash_table_iter_next(&iter, &key, &value)) { + GSupplicantPeer *peer = value; - dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, - &data->interface->path); + if (peer->current_group_iface == group->interface) + peer->current_group_iface = NULL; + } } - -int g_supplicant_interface_remove(GSupplicantInterface *interface, - GSupplicantInterfaceCallback callback, - void *user_data) +static void signal_group_finished(const char *path, DBusMessageIter *iter) { - struct interface_data *data; + GSupplicantInterface *interface; + struct group_sig_data data = {}; - if (interface == NULL) - return -EINVAL; + SUPPLICANT_DBG(""); - if (system_available == FALSE) - return -EFAULT; + interface = g_hash_table_lookup(interface_table, path); + if (!interface) + return; - data = dbus_malloc0(sizeof(*data)); - if (data == NULL) - return -ENOMEM; + supplicant_dbus_property_foreach(iter, group_sig_property, &data); + if (!data.interface_obj_path || !data.group_obj_path) + return; - data->interface = interface; - data->callback = callback; - data->user_data = user_data; + remove_peer_group_interface(interface->group_table, data.group_obj_path); - return supplicant_dbus_method_call(SUPPLICANT_PATH, - SUPPLICANT_INTERFACE, - "RemoveInterface", - interface_remove_params, - interface_remove_result, data); + g_hash_table_remove(group_mapping, data.group_obj_path); + + g_hash_table_remove(interface->group_table, data.group_obj_path); } -static void interface_scan_result(const char *error, - DBusMessageIter *iter, void *user_data) +static void signal_group_request(const char *path, DBusMessageIter *iter) { - struct interface_scan_data *data = user_data; + GSupplicantInterface *interface; + GSupplicantPeer *peer; + const char *obj_path; - if (error != NULL) { - SUPPLICANT_DBG("error %s", error); + SUPPLICANT_DBG(""); - if (data->callback != NULL) - data->callback(-EIO, data->interface, data->user_data); - } else { - data->interface->scan_callback = data->callback; - data->interface->scan_data = data->user_data; - } + interface = g_hash_table_lookup(interface_table, path); + if (!interface) + return; - if (data != NULL && data->scan_params != NULL) - g_supplicant_free_scan_params(data->scan_params); + dbus_message_iter_get_basic(iter, &obj_path); + if (!obj_path || !g_strcmp0(obj_path, "/")) + return; - dbus_free(data); + peer = g_hash_table_lookup(interface->peer_table, obj_path); + if (!peer) + return; + + /* + * Peer has been previously found and property set, + * otherwise, defer connection to when peer property + * is set. + */ + if (peer->identifier) + callback_peer_request(peer); + else + g_hash_table_replace(pending_peer_connection, peer->path, peer); } -static void add_scan_frequency(DBusMessageIter *iter, unsigned int freq) +static void signal_group_peer_joined(const char *path, DBusMessageIter *iter) { - DBusMessageIter data; - unsigned int width = 0; /* Not used by wpa_supplicant atm */ + const char *peer_path = NULL; + GSupplicantInterface *interface; + GSupplicantGroup *group; + GSupplicantPeer *peer; - dbus_message_iter_open_container(iter, DBUS_TYPE_STRUCT, NULL, &data); + SUPPLICANT_DBG(""); - dbus_message_iter_append_basic(&data, DBUS_TYPE_UINT32, &freq); - dbus_message_iter_append_basic(&data, DBUS_TYPE_UINT32, &width); + group = g_hash_table_lookup(group_mapping, path); + if (!group) + return; - dbus_message_iter_close_container(iter, &data); -} + dbus_message_iter_get_basic(iter, &peer_path); + if (!peer_path) + return; -static void add_scan_frequencies(DBusMessageIter *iter, - void *user_data) -{ - GSupplicantScanParams *scan_data = user_data; - unsigned int freq; - int i; + interface = g_hash_table_lookup(peer_mapping, peer_path); + if (!interface) + return; - for (i = 0; i < scan_data->num_ssids; i++) { - freq = scan_data->freqs[i]; - if (!freq) - break; + peer = g_hash_table_lookup(interface->peer_table, peer_path); + if (!peer) + return; - add_scan_frequency(iter, freq); - } + group->members = g_slist_prepend(group->members, g_strdup(peer_path)); + + callback_peer_changed(peer, G_SUPPLICANT_PEER_GROUP_JOINED); } -static void append_ssid(DBusMessageIter *iter, - const void *ssid, unsigned int len) +static void signal_group_peer_disconnected(const char *path, DBusMessageIter *iter) { - DBusMessageIter array; - - dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, - DBUS_TYPE_BYTE_AS_STRING, &array); + const char *peer_path = NULL; + GSupplicantInterface *interface; + GSupplicantGroup *group; + GSupplicantPeer *peer; + GSList *elem; - dbus_message_iter_append_fixed_array(&array, DBUS_TYPE_BYTE, - &ssid, len); - dbus_message_iter_close_container(iter, &array); -} + SUPPLICANT_DBG(""); -static void append_ssids(DBusMessageIter *iter, void *user_data) -{ - GSupplicantScanParams *scan_data = user_data; - GSList *list; + group = g_hash_table_lookup(group_mapping, path); + if (!group) + return; - for (list = scan_data->ssids; list; list = list->next) { - struct scan_ssid *scan_ssid = list->data; + dbus_message_iter_get_basic(iter, &peer_path); + if (!peer_path) + return; - append_ssid(iter, scan_ssid->ssid, scan_ssid->ssid_len); + for (elem = group->members; elem; elem = elem->next) { + if (!g_strcmp0(elem->data, peer_path)) + break; } -} -static void supplicant_add_scan_frequency(DBusMessageIter *dict, - supplicant_dbus_array_function function, - void *user_data) -{ - GSupplicantScanParams *scan_params = user_data; - DBusMessageIter entry, value, array; - const char *key = "Channels"; + if (!elem) + return; - if (scan_params->freqs && scan_params->freqs[0] != 0) { - dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY, - NULL, &entry); + g_free(elem->data); + group->members = g_slist_delete_link(group->members, elem); - dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key); + interface = g_hash_table_lookup(peer_mapping, peer_path); + if (!interface) + return; - dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT, - DBUS_TYPE_ARRAY_AS_STRING - DBUS_STRUCT_BEGIN_CHAR_AS_STRING - DBUS_TYPE_UINT32_AS_STRING - DBUS_TYPE_UINT32_AS_STRING - DBUS_STRUCT_END_CHAR_AS_STRING, - &value); + peer = g_hash_table_lookup(interface->peer_table, peer_path); + if (!peer) + return; - dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY, - DBUS_STRUCT_BEGIN_CHAR_AS_STRING - DBUS_TYPE_UINT32_AS_STRING - DBUS_TYPE_UINT32_AS_STRING - DBUS_STRUCT_END_CHAR_AS_STRING, - &array); + callback_peer_changed(peer, G_SUPPLICANT_PEER_GROUP_DISCONNECTED); + peer->connection_requested = false; +} - if (function) - function(&array, user_data); +static struct { + const char *interface; + const char *member; + void (*function) (const char *path, DBusMessageIter *iter); +} signal_map[] = { + { DBUS_INTERFACE_DBUS, "NameOwnerChanged", signal_name_owner_changed }, - dbus_message_iter_close_container(&value, &array); - dbus_message_iter_close_container(&entry, &value); - dbus_message_iter_close_container(dict, &entry); - } -} + { SUPPLICANT_INTERFACE, "PropertiesChanged", signal_properties_changed }, + { SUPPLICANT_INTERFACE, "InterfaceAdded", signal_interface_added }, + { SUPPLICANT_INTERFACE, "InterfaceCreated", signal_interface_added }, + { SUPPLICANT_INTERFACE, "InterfaceRemoved", signal_interface_removed }, -static void interface_scan_params(DBusMessageIter *iter, void *user_data) -{ - DBusMessageIter dict; - const char *type = "passive"; - struct interface_scan_data *data = user_data; + { 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", "StaAuthorized", signal_sta_authorized }, + { SUPPLICANT_INTERFACE ".Interface", "StaDeauthorized", signal_sta_deauthorized }, - supplicant_dbus_dict_open(iter, &dict); + { SUPPLICANT_INTERFACE ".BSS", "PropertiesChanged", signal_bss_changed }, - if (data && data->scan_params) { - type = "active"; + { SUPPLICANT_INTERFACE ".Interface.WPS", "Credentials", signal_wps_credentials }, + { SUPPLICANT_INTERFACE ".Interface.WPS", "Event", signal_wps_event }, - supplicant_dbus_dict_append_basic(&dict, "Type", - DBUS_TYPE_STRING, &type); + { SUPPLICANT_INTERFACE ".Interface.P2PDevice", "DeviceFound", signal_peer_found }, + { SUPPLICANT_INTERFACE ".Interface.P2PDevice", "DeviceLost", signal_peer_lost }, - supplicant_dbus_dict_append_array(&dict, "SSIDs", - DBUS_TYPE_STRING, - append_ssids, - data->scan_params); + { SUPPLICANT_INTERFACE ".Peer", "PropertiesChanged", signal_peer_changed }, - supplicant_add_scan_frequency(&dict, add_scan_frequencies, - data->scan_params); - } else - supplicant_dbus_dict_append_basic(&dict, "Type", - DBUS_TYPE_STRING, &type); + { SUPPLICANT_INTERFACE ".Interface.P2PDevice", "GONegotiationSuccess", signal_group_success }, + { SUPPLICANT_INTERFACE ".Interface.P2PDevice", "GONegotiationFailure", signal_group_failure }, + { SUPPLICANT_INTERFACE ".Interface.P2PDevice", "GroupStarted", signal_group_started }, + { SUPPLICANT_INTERFACE ".Interface.P2PDevice", "GroupFinished", signal_group_finished }, + { SUPPLICANT_INTERFACE ".Interface.P2PDevice", "GONegotiationRequest", signal_group_request }, - supplicant_dbus_dict_close(iter, &dict); -} + { SUPPLICANT_INTERFACE ".Group", "PeerJoined", signal_group_peer_joined }, + { SUPPLICANT_INTERFACE ".Group", "PeerDisconnected", signal_group_peer_disconnected }, -int g_supplicant_interface_scan(GSupplicantInterface *interface, - GSupplicantScanParams *scan_data, - GSupplicantInterfaceCallback callback, - void *user_data) -{ - struct interface_scan_data *data; - int ret; + { } +}; - if (interface == NULL) - return -EINVAL; +static DBusHandlerResult g_supplicant_filter(DBusConnection *conn, + DBusMessage *message, void *data) +{ + DBusMessageIter iter; + const char *path; + int i; - if (system_available == FALSE) - return -EFAULT; + path = dbus_message_get_path(message); + if (!path) + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - if (interface->scanning == TRUE) - return -EALREADY; + if (!dbus_message_iter_init(message, &iter)) + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - switch (interface->state) { - case G_SUPPLICANT_STATE_AUTHENTICATING: - case G_SUPPLICANT_STATE_ASSOCIATING: - case G_SUPPLICANT_STATE_ASSOCIATED: - case G_SUPPLICANT_STATE_4WAY_HANDSHAKE: - case G_SUPPLICANT_STATE_GROUP_HANDSHAKE: - return -EBUSY; - case G_SUPPLICANT_STATE_UNKNOWN: - case G_SUPPLICANT_STATE_DISCONNECTED: - case G_SUPPLICANT_STATE_INACTIVE: - case G_SUPPLICANT_STATE_SCANNING: - case G_SUPPLICANT_STATE_COMPLETED: + for (i = 0; signal_map[i].interface; i++) { + if (!dbus_message_has_interface(message, signal_map[i].interface)) + continue; + + if (!dbus_message_has_member(message, signal_map[i].member)) + continue; + + signal_map[i].function(path, &iter); break; } - data = dbus_malloc0(sizeof(*data)); - if (data == NULL) - return -ENOMEM; + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; +} - data->interface = interface; - data->callback = callback; - data->user_data = user_data; - data->scan_params = scan_data; +void g_supplicant_interface_cancel(GSupplicantInterface *interface) +{ + SUPPLICANT_DBG("Cancelling any pending DBus calls"); + supplicant_dbus_method_call_cancel_all(interface); + supplicant_dbus_property_call_cancel_all(interface); +} - ret = supplicant_dbus_method_call(interface->path, - SUPPLICANT_INTERFACE ".Interface", "Scan", - interface_scan_params, interface_scan_result, data); +struct supplicant_regdom { + GSupplicantCountryCallback callback; + const char *alpha2; + const void *user_data; +}; - if (ret < 0) - dbus_free(data); +static void country_result(const char *error, + DBusMessageIter *iter, void *user_data) +{ + struct supplicant_regdom *regdom = user_data; + int result = 0; - return ret; -} + SUPPLICANT_DBG("Country setting result"); -static int parse_supplicant_error(DBusMessageIter *iter) -{ - int err = -ECANCELED; - char *key; + if (!user_data) + return; - /* If the given passphrase is malformed wpa_s returns - * "invalid message format" but this error should be interpreted as - * invalid-key. - */ - while (dbus_message_iter_get_arg_type(iter) == DBUS_TYPE_STRING) { - dbus_message_iter_get_basic(iter, &key); - if (strncmp(key, "psk", 3) == 0 || - strncmp(key, "wep_key", 7) == 0 || - strcmp(key, "invalid message format") == 0) { - err = -ENOKEY; - break; - } - dbus_message_iter_next(iter); + if (error) { + SUPPLICANT_DBG("Country setting failure %s", error); + result = -EINVAL; } - return err; + if (regdom->callback) + regdom->callback(result, regdom->alpha2, + (void *) regdom->user_data); + + g_free(regdom); } -static void interface_select_network_result(const char *error, - DBusMessageIter *iter, void *user_data) +static void country_params(DBusMessageIter *iter, void *user_data) { - struct interface_connect_data *data = user_data; - int err; + struct supplicant_regdom *regdom = user_data; - SUPPLICANT_DBG(""); + dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, + ®dom->alpha2); +} - err = 0; - if (error != NULL) { - SUPPLICANT_DBG("SelectNetwork error %s", error); - err = parse_supplicant_error(iter); - } +int g_supplicant_set_country(const char *alpha2, + GSupplicantCountryCallback callback, + const void *user_data) +{ + struct supplicant_regdom *regdom; + int ret; - if (data->callback != NULL) - data->callback(err, data->interface, data->user_data); + SUPPLICANT_DBG("Country setting %s", alpha2); - g_free(data->ssid); - dbus_free(data); + if (!system_available) + return -EFAULT; + + regdom = dbus_malloc0(sizeof(*regdom)); + if (!regdom) + return -ENOMEM; + + regdom->callback = callback; + regdom->alpha2 = alpha2; + regdom->user_data = user_data; + + ret = supplicant_dbus_property_set(SUPPLICANT_PATH, SUPPLICANT_INTERFACE, + "Country", DBUS_TYPE_STRING_AS_STRING, + country_params, country_result, + regdom, NULL); + if (ret < 0) { + dbus_free(regdom); + SUPPLICANT_DBG("Unable to set Country configuration"); + } + return ret; } -static void interface_select_network_params(DBusMessageIter *iter, +int g_supplicant_interface_set_country(GSupplicantInterface *interface, + GSupplicantCountryCallback callback, + const char *alpha2, void *user_data) { - struct interface_connect_data *data = user_data; - GSupplicantInterface *interface = data->interface; + struct supplicant_regdom *regdom; + int ret; - dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, - &interface->network_path); -} + regdom = dbus_malloc0(sizeof(*regdom)); + if (!regdom) + return -ENOMEM; -static void interface_add_network_result(const char *error, - DBusMessageIter *iter, void *user_data) -{ - struct interface_connect_data *data = user_data; - GSupplicantInterface *interface = data->interface; - const char *path; - int err; + regdom->callback = callback; + regdom->alpha2 = alpha2; + regdom->user_data = user_data; - if (error != NULL) - goto error; + ret = supplicant_dbus_property_set(interface->path, + SUPPLICANT_INTERFACE ".Interface", + "Country", DBUS_TYPE_STRING_AS_STRING, + country_params, country_result, + regdom, NULL); + if (ret < 0) { + dbus_free(regdom); + SUPPLICANT_DBG("Unable to set Country configuration"); + } - dbus_message_iter_get_basic(iter, &path); - if (path == NULL) - goto error; + return ret; +} - SUPPLICANT_DBG("PATH: %s", path); +bool g_supplicant_interface_has_p2p(GSupplicantInterface *interface) +{ + if (!interface) + return false; - g_free(interface->network_path); - interface->network_path = g_strdup(path); + return interface->p2p_support; +} - supplicant_dbus_method_call(data->interface->path, - SUPPLICANT_INTERFACE ".Interface", "SelectNetwork", - interface_select_network_params, - interface_select_network_result, data); +struct supplicant_p2p_dev_config { + char *device_name; + char *dev_type; +}; - return; +static void p2p_device_config_result(const char *error, + DBusMessageIter *iter, void *user_data) +{ + struct supplicant_p2p_dev_config *config = user_data; -error: - SUPPLICANT_DBG("AddNetwork error %s", error); - err = parse_supplicant_error(iter); - if (data->callback != NULL) - data->callback(err, data->interface, data->user_data); + if (error) + SUPPLICANT_DBG("Unable to set P2P Device configuration: %s", + error); - g_free(interface->network_path); - interface->network_path = NULL; - g_free(data->ssid); - g_free(data); + g_free(config->device_name); + g_free(config->dev_type); + dbus_free(config); } -static void add_network_security_wep(DBusMessageIter *dict, - GSupplicantSSID *ssid) +static int dev_type_str2bin(const char *type, unsigned char dev_type[8]) { - const char *auth_alg = "OPEN SHARED"; - const char *key_index = "0"; + int length, pos, end; + char b[3] = {}; + char *e = NULL; - supplicant_dbus_dict_append_basic(dict, "auth_alg", - DBUS_TYPE_STRING, &auth_alg); + end = strlen(type); + for (length = pos = 0; type[pos] != '\0' && length < 8; length++) { + if (pos+2 > end) + return 0; - if (ssid->passphrase) { - int size = strlen(ssid->passphrase); - if (size == 10 || size == 26) { - unsigned char *key = g_try_malloc(13); - char tmp[3]; - int i; + b[0] = type[pos]; + b[1] = type[pos+1]; - memset(tmp, 0, sizeof(tmp)); - if (key == NULL) - size = 0; + dev_type[length] = strtol(b, &e, 16); + if (e && *e != '\0') + return 0; - for (i = 0; i < size / 2; i++) { - memcpy(tmp, ssid->passphrase + (i * 2), 2); - key[i] = (unsigned char) strtol(tmp, NULL, 16); - } + pos += 2; + } - supplicant_dbus_dict_append_fixed_array(dict, - "wep_key0", - DBUS_TYPE_BYTE, - &key, size / 2); - g_free(key); - } else if (size == 5 || size == 13) { - unsigned char *key = g_try_malloc(13); - int i; + return 8; +} - if (key == NULL) - size = 0; +static void p2p_device_config_params(DBusMessageIter *iter, void *user_data) +{ + struct supplicant_p2p_dev_config *config = user_data; + DBusMessageIter dict; - for (i = 0; i < size; i++) - key[i] = (unsigned char) ssid->passphrase[i]; + supplicant_dbus_dict_open(iter, &dict); - supplicant_dbus_dict_append_fixed_array(dict, - "wep_key0", - DBUS_TYPE_BYTE, - &key, size); - g_free(key); - } else - supplicant_dbus_dict_append_basic(dict, - "wep_key0", - DBUS_TYPE_STRING, - &ssid->passphrase); + supplicant_dbus_dict_append_basic(&dict, "DeviceName", + DBUS_TYPE_STRING, &config->device_name); - supplicant_dbus_dict_append_basic(dict, "wep_tx_keyidx", - DBUS_TYPE_STRING, &key_index); + if (config->dev_type) { + unsigned char dev_type[8] = {}, *type; + int len; + + len = dev_type_str2bin(config->dev_type, dev_type); + if (len) { + type = dev_type; + supplicant_dbus_dict_append_fixed_array(&dict, + "PrimaryDeviceType", + DBUS_TYPE_BYTE, &type, len); + } } + + supplicant_dbus_dict_close(iter, &dict); } -static dbus_bool_t is_psk_raw_key(const char *psk) +int g_supplicant_interface_set_p2p_device_config(GSupplicantInterface *interface, + const char *device_name, + const char *primary_dev_type) { - int i; + struct supplicant_p2p_dev_config *config; + int ret; - /* A raw key is always 64 bytes length... */ - if (strlen(psk) != 64) - return FALSE; + SUPPLICANT_DBG("P2P Device settings %s/%s", + device_name, primary_dev_type); - /* ... and its content is in hex representation */ - for (i = 0; i < 64; i++) - if (!isxdigit((unsigned char) psk[i])) - return FALSE; + config = dbus_malloc0(sizeof(*config)); + if (!config) + return -ENOMEM; - return TRUE; + config->device_name = g_strdup(device_name); + config->dev_type = g_strdup(primary_dev_type); + + ret = supplicant_dbus_property_set(interface->path, + SUPPLICANT_INTERFACE ".Interface.P2PDevice", + "P2PDeviceConfig", + DBUS_TYPE_ARRAY_AS_STRING + DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING + DBUS_TYPE_STRING_AS_STRING + DBUS_TYPE_VARIANT_AS_STRING + DBUS_DICT_ENTRY_END_CHAR_AS_STRING, + p2p_device_config_params, + p2p_device_config_result, config, NULL); + if (ret < 0) { + g_free(config->device_name); + g_free(config->dev_type); + dbus_free(config); + SUPPLICANT_DBG("Unable to set P2P Device configuration"); + } + + return ret; } -static unsigned char hexchar2bin(char c) +static gboolean peer_lookup_by_identifier(gpointer key, gpointer value, + gpointer user_data) { - if ((c >= '0') && (c <= '9')) - return c - '0'; - else if ((c >= 'A') && (c <= 'F')) - return c - 'A' + 10; - else if ((c >= 'a') && (c <= 'f')) - return c - 'a' + 10; - else - return c; + const GSupplicantPeer *peer = value; + const char *identifier = user_data; + + if (!g_strcmp0(identifier, peer->identifier)) + return TRUE; + + return FALSE; } -static void hexstring2bin(const char *string, unsigned char *data, size_t data_len) +GSupplicantPeer *g_supplicant_interface_peer_lookup(GSupplicantInterface *interface, + const char *identifier) { - size_t i; + GSupplicantPeer *peer; - for (i = 0; i < data_len; i++) - data[i] = (hexchar2bin(string[i * 2 + 0]) << 4 | - hexchar2bin(string[i * 2 + 1]) << 0); + peer = g_hash_table_find(interface->peer_table, + peer_lookup_by_identifier, + (void *) identifier); + return peer; } -static void add_network_security_psk(DBusMessageIter *dict, - GSupplicantSSID *ssid) +static void interface_create_data_free(struct interface_create_data *data) { - if (ssid->passphrase && strlen(ssid->passphrase) > 0) { - const char *key = "psk"; + g_free(data->ifname); + g_free(data->driver); + g_free(data->bridge); + dbus_free(data); +} - if (is_psk_raw_key(ssid->passphrase) == TRUE) { - unsigned char data[32]; - unsigned char *datap = data; +static bool interface_exists(GSupplicantInterface *interface, + const char *path) +{ + GSupplicantInterface *tmp; - /* The above pointer alias is required by D-Bus because - * with D-Bus and GCC, non-heap-allocated arrays cannot - * be passed directly by their base pointer. */ + tmp = g_hash_table_lookup(interface_table, path); + if (tmp && tmp == interface) + return true; - hexstring2bin(ssid->passphrase, datap, sizeof(data)); + return false; +} - supplicant_dbus_dict_append_fixed_array(dict, - key, DBUS_TYPE_BYTE, - &datap, sizeof(data)); - } else - supplicant_dbus_dict_append_basic(dict, +static void interface_create_property(const char *key, DBusMessageIter *iter, + void *user_data) +{ + struct interface_create_data *data = user_data; + GSupplicantInterface *interface = data->interface; + + if (!key) { + if (data->callback) { + data->callback(0, data->interface, data->user_data); + callback_p2p_support(interface); + } + + interface_create_data_free(data); + } + + interface_property(key, iter, interface); +} + +static void interface_create_result(const char *error, + DBusMessageIter *iter, void *user_data) +{ + struct interface_create_data *data = user_data; + const char *path = NULL; + int err; + + SUPPLICANT_DBG(""); + + if (error) { + g_warning("error %s", error); + err = -EIO; + goto done; + } + + dbus_message_iter_get_basic(iter, &path); + if (!path) { + err = -EINVAL; + goto done; + } + + if (!system_available) { + err = -EFAULT; + goto done; + } + + data->interface = g_hash_table_lookup(interface_table, path); + if (!data->interface) { + data->interface = interface_alloc(path); + if (!data->interface) { + err = -ENOMEM; + goto done; + } + } + + err = supplicant_dbus_property_get_all(path, + SUPPLICANT_INTERFACE ".Interface", + interface_create_property, data, + NULL); + if (err == 0) + return; + +done: + if (data->callback) + data->callback(err, NULL, data->user_data); + + interface_create_data_free(data); +} + +static void interface_create_params(DBusMessageIter *iter, void *user_data) +{ + struct interface_create_data *data = user_data; + DBusMessageIter dict; + char *config_file = NULL; + + SUPPLICANT_DBG(""); + + supplicant_dbus_dict_open(iter, &dict); + + supplicant_dbus_dict_append_basic(&dict, "Ifname", + DBUS_TYPE_STRING, &data->ifname); + + if (data->driver) + supplicant_dbus_dict_append_basic(&dict, "Driver", + DBUS_TYPE_STRING, &data->driver); + + if (data->bridge) + supplicant_dbus_dict_append_basic(&dict, "BridgeIfname", + DBUS_TYPE_STRING, &data->bridge); + + config_file = g_hash_table_lookup(config_file_table, data->ifname); + if (config_file) { + SUPPLICANT_DBG("[%s] ConfigFile %s", data->ifname, config_file); + + supplicant_dbus_dict_append_basic(&dict, "ConfigFile", + DBUS_TYPE_STRING, &config_file); + } + + supplicant_dbus_dict_close(iter, &dict); +} + +static void interface_get_result(const char *error, + DBusMessageIter *iter, void *user_data) +{ + struct interface_create_data *data = user_data; + GSupplicantInterface *interface; + const char *path = NULL; + int err; + + SUPPLICANT_DBG(""); + + if (error) { + SUPPLICANT_DBG("Interface not created yet"); + goto create; + } + + dbus_message_iter_get_basic(iter, &path); + if (!path) { + err = -EINVAL; + goto done; + } + + interface = g_hash_table_lookup(interface_table, path); + if (!interface) { + err = -ENOENT; + goto done; + } + + if (data->callback) { + data->callback(0, interface, data->user_data); + callback_p2p_support(interface); + } + + interface_create_data_free(data); + + return; + +create: + if (!system_available) { + err = -EFAULT; + goto done; + } + + SUPPLICANT_DBG("Creating interface"); + + err = supplicant_dbus_method_call(SUPPLICANT_PATH, + SUPPLICANT_INTERFACE, + "CreateInterface", + interface_create_params, + interface_create_result, data, + NULL); + if (err == 0) + return; + +done: + if (data->callback) + data->callback(err, NULL, data->user_data); + + interface_create_data_free(data); +} + +static void interface_get_params(DBusMessageIter *iter, void *user_data) +{ + struct interface_create_data *data = user_data; + + SUPPLICANT_DBG(""); + + dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &data->ifname); +} + +int g_supplicant_interface_create(const char *ifname, const char *driver, + const char *bridge, + GSupplicantInterfaceCallback callback, + void *user_data) +{ + struct interface_create_data *data; + int ret; + + SUPPLICANT_DBG("ifname %s", ifname); + + if (!ifname) + return -EINVAL; + + if (!system_available) + return -EFAULT; + + data = dbus_malloc0(sizeof(*data)); + if (!data) + return -ENOMEM; + + data->ifname = g_strdup(ifname); + data->driver = g_strdup(driver); + data->bridge = g_strdup(bridge); + data->callback = callback; + data->user_data = user_data; + + ret = supplicant_dbus_method_call(SUPPLICANT_PATH, + SUPPLICANT_INTERFACE, + "GetInterface", + interface_get_params, + interface_get_result, data, + NULL); + if (ret < 0) + interface_create_data_free(data); + + return ret; +} + +static void interface_remove_result(const char *error, + DBusMessageIter *iter, void *user_data) +{ + struct interface_data *data = user_data; + int err; + + if (error) { + err = -EIO; + SUPPLICANT_DBG("error: %s", error); + goto done; + } + + if (!system_available) { + err = -EFAULT; + goto done; + } + + /* + * The gsupplicant interface is already freed by the InterfaceRemoved + * signal callback. Simply invoke the interface_data callback. + */ + err = 0; + +done: + g_free(data->path); + + if (data->callback) + data->callback(err, NULL, data->user_data); + + dbus_free(data); +} + + +static void interface_remove_params(DBusMessageIter *iter, void *user_data) +{ + struct interface_data *data = user_data; + + dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, + &data->interface->path); +} + + +int g_supplicant_interface_remove(GSupplicantInterface *interface, + GSupplicantInterfaceCallback callback, + void *user_data) +{ + struct interface_data *data; + int ret; + + if (!interface) + return -EINVAL; + + if (!system_available) + return -EFAULT; + + g_supplicant_interface_cancel(interface); + + data = dbus_malloc0(sizeof(*data)); + if (!data) + return -ENOMEM; + + data->interface = interface; + data->path = g_strdup(interface->path); + data->callback = callback; + data->user_data = user_data; + + ret = supplicant_dbus_method_call(SUPPLICANT_PATH, + SUPPLICANT_INTERFACE, + "RemoveInterface", + interface_remove_params, + interface_remove_result, data, + NULL); + if (ret < 0) { + g_free(data->path); + dbus_free(data); + } + return ret; +} + +static void interface_scan_result(const char *error, + DBusMessageIter *iter, void *user_data) +{ + struct interface_scan_data *data = user_data; + int err = 0; + + if (error) { + SUPPLICANT_DBG("error %s", error); + err = -EIO; + } + + /* A non ready interface cannot send/receive anything */ + if (interface_exists(data->interface, data->path)) { + if (!data->interface->ready) + err = -ENOLINK; + } + + g_free(data->path); + + if (err != 0) { + if (data->callback) + data->callback(err, data->interface, data->user_data); + } else { + data->interface->scan_callback = data->callback; + data->interface->scan_data = data->user_data; + } + + if (data->scan_params) + g_supplicant_free_scan_params(data->scan_params); + + dbus_free(data); +} + +static void add_scan_frequency(DBusMessageIter *iter, unsigned int freq) +{ + DBusMessageIter data; + unsigned int width = 0; /* Not used by wpa_supplicant atm */ + + dbus_message_iter_open_container(iter, DBUS_TYPE_STRUCT, NULL, &data); + + dbus_message_iter_append_basic(&data, DBUS_TYPE_UINT32, &freq); + dbus_message_iter_append_basic(&data, DBUS_TYPE_UINT32, &width); + + dbus_message_iter_close_container(iter, &data); +} + +static void add_scan_frequencies(DBusMessageIter *iter, + void *user_data) +{ + GSupplicantScanParams *scan_data = user_data; + unsigned int freq; + int i; + + for (i = 0; i < scan_data->num_freqs; i++) { + freq = scan_data->freqs[i]; + if (!freq) + break; + + add_scan_frequency(iter, freq); + } +} + +static void append_ssid(DBusMessageIter *iter, + const void *ssid, unsigned int len) +{ + DBusMessageIter array; + + dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, + DBUS_TYPE_BYTE_AS_STRING, &array); + + dbus_message_iter_append_fixed_array(&array, DBUS_TYPE_BYTE, + &ssid, len); + dbus_message_iter_close_container(iter, &array); +} + +static void append_ssids(DBusMessageIter *iter, void *user_data) +{ + GSupplicantScanParams *scan_data = user_data; + GSList *list; + + for (list = scan_data->ssids; list; list = list->next) { + struct scan_ssid *scan_ssid = list->data; + + append_ssid(iter, scan_ssid->ssid, scan_ssid->ssid_len); + } +} + +static void supplicant_add_scan_frequency(DBusMessageIter *dict, + supplicant_dbus_array_function function, + void *user_data) +{ + GSupplicantScanParams *scan_params = user_data; + DBusMessageIter entry, value, array; + const char *key = "Channels"; + + if (scan_params->freqs && scan_params->freqs[0] != 0) { + dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY, + NULL, &entry); + + dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key); + + dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT, + DBUS_TYPE_ARRAY_AS_STRING + DBUS_STRUCT_BEGIN_CHAR_AS_STRING + DBUS_TYPE_UINT32_AS_STRING + DBUS_TYPE_UINT32_AS_STRING + DBUS_STRUCT_END_CHAR_AS_STRING, + &value); + + dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY, + DBUS_STRUCT_BEGIN_CHAR_AS_STRING + DBUS_TYPE_UINT32_AS_STRING + DBUS_TYPE_UINT32_AS_STRING + DBUS_STRUCT_END_CHAR_AS_STRING, + &array); + + if (function) + function(&array, user_data); + + dbus_message_iter_close_container(&value, &array); + dbus_message_iter_close_container(&entry, &value); + dbus_message_iter_close_container(dict, &entry); + } +} + +static void interface_scan_params(DBusMessageIter *iter, void *user_data) +{ + DBusMessageIter dict; + const char *type = "passive"; + struct interface_scan_data *data = user_data; + + supplicant_dbus_dict_open(iter, &dict); + + if (data && data->scan_params) { + type = "active"; + + supplicant_dbus_dict_append_basic(&dict, "Type", + DBUS_TYPE_STRING, &type); + + + if (data->scan_params->ssids) { + supplicant_dbus_dict_append_array(&dict, "SSIDs", + DBUS_TYPE_STRING, + append_ssids, + data->scan_params); + } + supplicant_add_scan_frequency(&dict, add_scan_frequencies, + data->scan_params); + } else + supplicant_dbus_dict_append_basic(&dict, "Type", + DBUS_TYPE_STRING, &type); + + supplicant_dbus_dict_close(iter, &dict); +} + +static int interface_ready_to_scan(GSupplicantInterface *interface) +{ + if (!interface) + return -EINVAL; + + if (!system_available) + return -EFAULT; + + if (interface->scanning) + return -EALREADY; + + switch (interface->state) { + case G_SUPPLICANT_STATE_AUTHENTICATING: + case G_SUPPLICANT_STATE_ASSOCIATING: + case G_SUPPLICANT_STATE_ASSOCIATED: + case G_SUPPLICANT_STATE_4WAY_HANDSHAKE: + case G_SUPPLICANT_STATE_GROUP_HANDSHAKE: + return -EBUSY; + case G_SUPPLICANT_STATE_UNKNOWN: + case G_SUPPLICANT_STATE_DISABLED: + case G_SUPPLICANT_STATE_DISCONNECTED: + case G_SUPPLICANT_STATE_INACTIVE: + case G_SUPPLICANT_STATE_SCANNING: + case G_SUPPLICANT_STATE_COMPLETED: + break; + } + + return 0; +} + +int g_supplicant_interface_scan(GSupplicantInterface *interface, + GSupplicantScanParams *scan_data, + GSupplicantInterfaceCallback callback, + void *user_data) +{ + struct interface_scan_data *data; + int ret; + + ret = interface_ready_to_scan(interface); + if (ret) + return ret; + + data = dbus_malloc0(sizeof(*data)); + if (!data) + return -ENOMEM; + + data->interface = interface; + data->path = g_strdup(interface->path); + data->callback = callback; + data->user_data = user_data; + data->scan_params = scan_data; + + interface->scan_callback = callback; + interface->scan_data = user_data; + + ret = supplicant_dbus_method_call(interface->path, + SUPPLICANT_INTERFACE ".Interface", "Scan", + interface_scan_params, interface_scan_result, data, + interface); + + if (ret < 0) { + g_free(data->path); + dbus_free(data); + } + + return ret; +} + +static int parse_supplicant_error(DBusMessageIter *iter) +{ + int err = -ECONNABORTED; + char *key; + + if (!iter) + return err; + + /* If the given passphrase is malformed wpa_s returns + * "invalid message format" but this error should be interpreted as + * invalid-key. + */ + while (dbus_message_iter_get_arg_type(iter) == DBUS_TYPE_STRING) { + dbus_message_iter_get_basic(iter, &key); + if (strncmp(key, "psk", 3) == 0 || + strncmp(key, "wep_key", 7) == 0 || + strcmp(key, "invalid message format") == 0) { + err = -ENOKEY; + break; + } + dbus_message_iter_next(iter); + } + + return err; +} + +static void interface_select_network_result(const char *error, + DBusMessageIter *iter, void *user_data) +{ + struct interface_connect_data *data = user_data; + int err; + + SUPPLICANT_DBG(""); + + err = 0; + if (error) { + SUPPLICANT_DBG("SelectNetwork error %s", error); + err = parse_supplicant_error(iter); + } + + g_free(data->path); + + if (data->callback) + data->callback(err, data->interface, data->user_data); + + g_free(data->ssid); + dbus_free(data); +} + +static void interface_select_network_params(DBusMessageIter *iter, + void *user_data) +{ + struct interface_connect_data *data = user_data; + GSupplicantInterface *interface = data->interface; + + dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, + &interface->network_path); +} + +static void interface_add_network_result(const char *error, + DBusMessageIter *iter, void *user_data) +{ + struct interface_connect_data *data = user_data; + GSupplicantInterface *interface = data->interface; + const char *path; + int err; + + if (error) + goto error; + + dbus_message_iter_get_basic(iter, &path); + if (!path) + goto error; + + SUPPLICANT_DBG("PATH: %s", path); + + interface->network_path = g_strdup(path); + + store_network_information(interface, data->ssid); + + supplicant_dbus_method_call(data->interface->path, + SUPPLICANT_INTERFACE ".Interface", "SelectNetwork", + interface_select_network_params, + interface_select_network_result, data, + interface); + + return; + +error: + SUPPLICANT_DBG("AddNetwork error %s", error); + + if (interface_exists(data->interface, data->interface->path)) { + err = parse_supplicant_error(iter); + if (data->callback) + data->callback(err, data->interface, data->user_data); + + g_free(interface->network_path); + interface->network_path = NULL; + } + + g_free(data->path); + g_free(data->ssid); + g_free(data); +} + +static void add_network_security_none(DBusMessageIter *dict) +{ + const char *auth_alg = "OPEN"; + + supplicant_dbus_dict_append_basic(dict, "auth_alg", + DBUS_TYPE_STRING, &auth_alg); +} + +static void add_network_security_wep(DBusMessageIter *dict, + GSupplicantSSID *ssid) +{ + const char *auth_alg = "OPEN SHARED"; + dbus_uint32_t key_index = 0; + + supplicant_dbus_dict_append_basic(dict, "auth_alg", + DBUS_TYPE_STRING, &auth_alg); + + if (ssid->passphrase) { + int size = strlen(ssid->passphrase); + if (size == 10 || size == 26) { + unsigned char *key = g_try_malloc(13); + char tmp[3]; + int i; + + memset(tmp, 0, sizeof(tmp)); + if (!key) + size = 0; + + for (i = 0; i < size / 2; i++) { + memcpy(tmp, ssid->passphrase + (i * 2), 2); + key[i] = (unsigned char) strtol(tmp, NULL, 16); + } + + supplicant_dbus_dict_append_fixed_array(dict, + "wep_key0", + DBUS_TYPE_BYTE, + &key, size / 2); + g_free(key); + } else if (size == 5 || size == 13) { + unsigned char *key = g_try_malloc(13); + int i; + + if (!key) + size = 0; + + for (i = 0; i < size; i++) + key[i] = (unsigned char) ssid->passphrase[i]; + + supplicant_dbus_dict_append_fixed_array(dict, + "wep_key0", + DBUS_TYPE_BYTE, + &key, size); + g_free(key); + } else + supplicant_dbus_dict_append_basic(dict, + "wep_key0", + DBUS_TYPE_STRING, + &ssid->passphrase); + + supplicant_dbus_dict_append_basic(dict, "wep_tx_keyidx", + DBUS_TYPE_UINT32, &key_index); + } +} + +static dbus_bool_t is_psk_raw_key(const char *psk) +{ + int i; + + /* A raw key is always 64 bytes length... */ + if (strlen(psk) != 64) + return FALSE; + + /* ... and its content is in hex representation */ + for (i = 0; i < 64; i++) + if (!isxdigit((unsigned char) psk[i])) + return FALSE; + + return TRUE; +} + +static unsigned char hexchar2bin(char c) +{ + if ((c >= '0') && (c <= '9')) + return c - '0'; + else if ((c >= 'A') && (c <= 'F')) + return c - 'A' + 10; + else if ((c >= 'a') && (c <= 'f')) + return c - 'a' + 10; + else + return c; +} + +static void hexstring2bin(const char *string, unsigned char *data, + size_t data_len) +{ + size_t i; + + for (i = 0; i < data_len; i++) + data[i] = (hexchar2bin(string[i * 2 + 0]) << 4 | + hexchar2bin(string[i * 2 + 1]) << 0); +} + +static void add_network_security_psk(DBusMessageIter *dict, + GSupplicantSSID *ssid) +{ + if (ssid->passphrase && strlen(ssid->passphrase) > 0) { + const char *key = "psk"; + + if (is_psk_raw_key(ssid->passphrase)) { + unsigned char data[32]; + unsigned char *datap = data; + + /* The above pointer alias is required by D-Bus because + * with D-Bus and GCC, non-heap-allocated arrays cannot + * be passed directly by their base pointer. */ + + hexstring2bin(ssid->passphrase, datap, sizeof(data)); + + supplicant_dbus_dict_append_fixed_array(dict, + key, DBUS_TYPE_BYTE, + &datap, sizeof(data)); + } else + supplicant_dbus_dict_append_basic(dict, key, DBUS_TYPE_STRING, &ssid->passphrase); } } -static void add_network_security_tls(DBusMessageIter *dict, +static void add_network_security_tls(DBusMessageIter *dict, + GSupplicantSSID *ssid) +{ + /* + * For TLS, we at least need: + * The client certificate + * The client private key file + * The client private key file password + * + * The Authority certificate is optional. + */ + if (!ssid->client_cert_path) + return; + + if (!ssid->private_key_path) + return; + + if (!ssid->private_key_passphrase) + return; + + if (ssid->ca_cert_path) + supplicant_dbus_dict_append_basic(dict, "ca_cert", + DBUS_TYPE_STRING, &ssid->ca_cert_path); + + supplicant_dbus_dict_append_basic(dict, "private_key", + DBUS_TYPE_STRING, + &ssid->private_key_path); + supplicant_dbus_dict_append_basic(dict, "private_key_passwd", + DBUS_TYPE_STRING, + &ssid->private_key_passphrase); + supplicant_dbus_dict_append_basic(dict, "client_cert", + DBUS_TYPE_STRING, + &ssid->client_cert_path); +} + +static void add_network_security_peap(DBusMessageIter *dict, + GSupplicantSSID *ssid) +{ + char *phase2_auth; + + /* + * For PEAP/TTLS, we at least need + * The authority certificate + * The 2nd phase authentication method + * The 2nd phase passphrase + * + * The Client certificate is optional although strongly recommended + * When setting it, we need in addition + * The Client private key file + * The Client private key file password + */ + if (!ssid->passphrase) + return; + + if (!ssid->phase2_auth) + return; + + if (ssid->client_cert_path) { + if (!ssid->private_key_path) + return; + + if (!ssid->private_key_passphrase) + return; + + supplicant_dbus_dict_append_basic(dict, "client_cert", + DBUS_TYPE_STRING, + &ssid->client_cert_path); + + supplicant_dbus_dict_append_basic(dict, "private_key", + DBUS_TYPE_STRING, + &ssid->private_key_path); + + supplicant_dbus_dict_append_basic(dict, "private_key_passwd", + DBUS_TYPE_STRING, + &ssid->private_key_passphrase); + + } + + if(g_strcmp0(ssid->phase2_auth, "GTC") == 0 && g_strcmp0(ssid->eap, "ttls") == 0) + phase2_auth = g_strdup_printf("autheap=%s", ssid->phase2_auth); + else if (g_str_has_prefix(ssid->phase2_auth, "EAP-")) { + phase2_auth = g_strdup_printf("autheap=%s", + ssid->phase2_auth + strlen("EAP-")); + } else + phase2_auth = g_strdup_printf("auth=%s", ssid->phase2_auth); + + supplicant_dbus_dict_append_basic(dict, "password", + DBUS_TYPE_STRING, + &ssid->passphrase); + + if (ssid->ca_cert_path) + supplicant_dbus_dict_append_basic(dict, "ca_cert", + DBUS_TYPE_STRING, + &ssid->ca_cert_path); + + supplicant_dbus_dict_append_basic(dict, "phase2", + DBUS_TYPE_STRING, + &phase2_auth); + + g_free(phase2_auth); +} + +static void add_network_security_eap(DBusMessageIter *dict, GSupplicantSSID *ssid) { - /* - * For TLS, we at least need: - * The client certificate - * The client private key file - * The client private key file password - * - * The Authority certificate is optional. - */ - if (ssid->client_cert_path == NULL) - return; + char *eap_value; - if (ssid->private_key_path == NULL) + if (!ssid->eap || !ssid->identity) return; - if (ssid->private_key_passphrase == NULL) + if (g_strcmp0(ssid->eap, "tls") == 0) { + add_network_security_tls(dict, ssid); + } else if (g_strcmp0(ssid->eap, "peap") == 0 || + g_strcmp0(ssid->eap, "ttls") == 0) { + add_network_security_peap(dict, ssid); + } else return; - if (ssid->ca_cert_path) - supplicant_dbus_dict_append_basic(dict, "ca_cert", - DBUS_TYPE_STRING, &ssid->ca_cert_path); + eap_value = g_ascii_strup(ssid->eap, -1); - supplicant_dbus_dict_append_basic(dict, "private_key", - DBUS_TYPE_STRING, - &ssid->private_key_path); - supplicant_dbus_dict_append_basic(dict, "private_key_passwd", + supplicant_dbus_dict_append_basic(dict, "eap", DBUS_TYPE_STRING, - &ssid->private_key_passphrase); - supplicant_dbus_dict_append_basic(dict, "client_cert", + &eap_value); + supplicant_dbus_dict_append_basic(dict, "identity", DBUS_TYPE_STRING, - &ssid->client_cert_path); + &ssid->identity); + if(ssid->anonymous_identity) + supplicant_dbus_dict_append_basic(dict, "anonymous_identity", + DBUS_TYPE_STRING, + &ssid->anonymous_identity); + + if(ssid->subject_match) + supplicant_dbus_dict_append_basic(dict, "subject_match", + DBUS_TYPE_STRING, + &ssid->subject_match); + + if(ssid->altsubject_match) + supplicant_dbus_dict_append_basic(dict, "altsubject_match", + DBUS_TYPE_STRING, + &ssid->altsubject_match); + + if(ssid->domain_suffix_match) + supplicant_dbus_dict_append_basic(dict, "domain_suffix_match", + DBUS_TYPE_STRING, + &ssid->domain_suffix_match); + + if(ssid->domain_match) + supplicant_dbus_dict_append_basic(dict, "domain_match", + DBUS_TYPE_STRING, + &ssid->domain_match); + + g_free(eap_value); } -static void add_network_security_peap(DBusMessageIter *dict, - GSupplicantSSID *ssid) +static void add_network_security_ciphers(DBusMessageIter *dict, + GSupplicantSSID *ssid) { - char *phase2_auth; + unsigned int p_cipher, g_cipher, i; + char *pairwise, *group; + char *pair_ciphers[4]; + char *group_ciphers[5]; - /* - * For PEAP/TTLS, we at least need - * The authority certificate - * The 2nd phase authentication method - * The 2nd phase passphrase - * - * The Client certificate is optional although strongly recommended - * When setting it, we need in addition - * The Client private key file - * The Client private key file password - */ - if (ssid->passphrase == NULL) + p_cipher = ssid->pairwise_cipher; + g_cipher = ssid->group_cipher; + + if (p_cipher == 0 && g_cipher == 0) return; - if (ssid->phase2_auth == NULL) + i = 0; + + if (p_cipher & G_SUPPLICANT_PAIRWISE_CCMP) + pair_ciphers[i++] = "CCMP"; + + if (p_cipher & G_SUPPLICANT_PAIRWISE_TKIP) + pair_ciphers[i++] = "TKIP"; + + if (p_cipher & G_SUPPLICANT_PAIRWISE_NONE) + pair_ciphers[i++] = "NONE"; + + pair_ciphers[i] = NULL; + + i = 0; + + if (g_cipher & G_SUPPLICANT_GROUP_CCMP) + group_ciphers[i++] = "CCMP"; + + if (g_cipher & G_SUPPLICANT_GROUP_TKIP) + group_ciphers[i++] = "TKIP"; + + if (g_cipher & G_SUPPLICANT_GROUP_WEP104) + group_ciphers[i++] = "WEP104"; + + if (g_cipher & G_SUPPLICANT_GROUP_WEP40) + group_ciphers[i++] = "WEP40"; + + group_ciphers[i] = NULL; + + pairwise = g_strjoinv(" ", pair_ciphers); + group = g_strjoinv(" ", group_ciphers); + + SUPPLICANT_DBG("cipher %s %s", pairwise, group); + + supplicant_dbus_dict_append_basic(dict, "pairwise", + DBUS_TYPE_STRING, + &pairwise); + supplicant_dbus_dict_append_basic(dict, "group", + DBUS_TYPE_STRING, + &group); + + g_free(pairwise); + g_free(group); +} + +static void add_network_security_proto(DBusMessageIter *dict, + GSupplicantSSID *ssid) +{ + unsigned int protocol, i; + char *proto; + char *protos[3]; + + protocol = ssid->protocol; + + if (protocol == 0) return; - if (ssid->client_cert_path) { - if (ssid->private_key_path == NULL) - return; + i = 0; + + if (protocol & G_SUPPLICANT_PROTO_RSN) + protos[i++] = "RSN"; + + if (protocol & G_SUPPLICANT_PROTO_WPA) + protos[i++] = "WPA"; + + protos[i] = NULL; + + proto = g_strjoinv(" ", protos); + + SUPPLICANT_DBG("proto %s", proto); + + supplicant_dbus_dict_append_basic(dict, "proto", + DBUS_TYPE_STRING, + &proto); + + g_free(proto); +} + +static void add_network_security(DBusMessageIter *dict, GSupplicantSSID *ssid) +{ + char *key_mgmt; + + switch (ssid->security) { + case G_SUPPLICANT_SECURITY_NONE: + key_mgmt = "NONE"; + add_network_security_none(dict); + add_network_security_ciphers(dict, ssid); + break; + case G_SUPPLICANT_SECURITY_UNKNOWN: + case G_SUPPLICANT_SECURITY_WEP: + key_mgmt = "NONE"; + add_network_security_wep(dict, ssid); + add_network_security_ciphers(dict, ssid); + break; + case G_SUPPLICANT_SECURITY_PSK: + key_mgmt = "WPA-PSK"; + add_network_security_psk(dict, ssid); + add_network_security_ciphers(dict, ssid); + add_network_security_proto(dict, ssid); + break; + case G_SUPPLICANT_SECURITY_IEEE8021X: + key_mgmt = "WPA-EAP"; + add_network_security_eap(dict, ssid); + add_network_security_ciphers(dict, ssid); + add_network_security_proto(dict, ssid); + break; + } + + supplicant_dbus_dict_append_basic(dict, "key_mgmt", + DBUS_TYPE_STRING, &key_mgmt); +} + +static void add_network_mode(DBusMessageIter *dict, GSupplicantSSID *ssid) +{ + dbus_uint32_t mode; + + switch (ssid->mode) { + case G_SUPPLICANT_MODE_UNKNOWN: + case G_SUPPLICANT_MODE_INFRA: + mode = 0; + break; + case G_SUPPLICANT_MODE_IBSS: + mode = 1; + break; + case G_SUPPLICANT_MODE_MASTER: + mode = 2; + break; + } + + supplicant_dbus_dict_append_basic(dict, "mode", + DBUS_TYPE_UINT32, &mode); +} + +static void interface_add_network_params(DBusMessageIter *iter, void *user_data) +{ + DBusMessageIter dict; + struct interface_connect_data *data = user_data; + GSupplicantSSID *ssid = data->ssid; + + supplicant_dbus_dict_open(iter, &dict); + + if (ssid->scan_ssid) + supplicant_dbus_dict_append_basic(&dict, "scan_ssid", + DBUS_TYPE_UINT32, &ssid->scan_ssid); + + if (ssid->freq) + supplicant_dbus_dict_append_basic(&dict, "frequency", + DBUS_TYPE_UINT32, &ssid->freq); + + if (ssid->bgscan) + supplicant_dbus_dict_append_basic(&dict, "bgscan", + DBUS_TYPE_STRING, &ssid->bgscan); + + add_network_mode(&dict, ssid); + + add_network_security(&dict, ssid); + + supplicant_dbus_dict_append_fixed_array(&dict, "ssid", + DBUS_TYPE_BYTE, &ssid->ssid, + ssid->ssid_len); + + supplicant_dbus_dict_close(iter, &dict); +} + +static void interface_wps_start_result(const char *error, + DBusMessageIter *iter, void *user_data) +{ + struct interface_connect_data *data = user_data; + int err; + + SUPPLICANT_DBG(""); + + err = 0; + if (error) { + SUPPLICANT_DBG("error: %s", error); + err = parse_supplicant_error(iter); + } + + if(data->callback) + data->callback(err, data->interface, data->user_data); + + g_free(data->path); + g_free(data->ssid); + dbus_free(data); +} + +static void interface_add_wps_params(DBusMessageIter *iter, void *user_data) +{ + struct interface_connect_data *data = user_data; + GSupplicantSSID *ssid = data->ssid; + const char *role = "enrollee", *type; + DBusMessageIter dict; + + SUPPLICANT_DBG(""); + + supplicant_dbus_dict_open(iter, &dict); + + supplicant_dbus_dict_append_basic(&dict, "Role", + DBUS_TYPE_STRING, &role); + + type = "pbc"; + if (ssid->pin_wps) { + type = "pin"; + supplicant_dbus_dict_append_basic(&dict, "Pin", + DBUS_TYPE_STRING, &ssid->pin_wps); + } - if (ssid->private_key_passphrase == NULL) - return; + supplicant_dbus_dict_append_basic(&dict, "Type", + DBUS_TYPE_STRING, &type); - supplicant_dbus_dict_append_basic(dict, "client_cert", - DBUS_TYPE_STRING, - &ssid->client_cert_path); + supplicant_dbus_dict_close(iter, &dict); +} - supplicant_dbus_dict_append_basic(dict, "private_key", - DBUS_TYPE_STRING, - &ssid->private_key_path); +static void wps_start(const char *error, DBusMessageIter *iter, void *user_data) +{ + struct interface_connect_data *data = user_data; - supplicant_dbus_dict_append_basic(dict, "private_key_passwd", - DBUS_TYPE_STRING, - &ssid->private_key_passphrase); + SUPPLICANT_DBG(""); + if (error) { + SUPPLICANT_DBG("error: %s", error); + g_free(data->path); + g_free(data->ssid); + dbus_free(data); + return; } - if (g_str_has_prefix(ssid->phase2_auth, "EAP-") == TRUE) { - phase2_auth = g_strdup_printf("autheap=%s", - ssid->phase2_auth + strlen("EAP-")); - } else - phase2_auth = g_strdup_printf("auth=%s", ssid->phase2_auth); - - supplicant_dbus_dict_append_basic(dict, "password", - DBUS_TYPE_STRING, - &ssid->passphrase); + supplicant_dbus_method_call(data->interface->path, + SUPPLICANT_INTERFACE ".Interface.WPS", "Start", + interface_add_wps_params, + interface_wps_start_result, data, NULL); +} - if (ssid->ca_cert_path) - supplicant_dbus_dict_append_basic(dict, "ca_cert", - DBUS_TYPE_STRING, - &ssid->ca_cert_path); +static void wps_process_credentials(DBusMessageIter *iter, void *user_data) +{ + dbus_bool_t credentials = TRUE; - supplicant_dbus_dict_append_basic(dict, "phase2", - DBUS_TYPE_STRING, - &phase2_auth); + SUPPLICANT_DBG(""); - g_free(phase2_auth); + dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &credentials); } -static void add_network_security_eap(DBusMessageIter *dict, - GSupplicantSSID *ssid) + +int g_supplicant_interface_connect(GSupplicantInterface *interface, + GSupplicantSSID *ssid, + GSupplicantInterfaceCallback callback, + void *user_data) { - char *eap_value; + struct interface_connect_data *data; + struct interface_data *intf_data; + int ret = 0; - if (ssid->eap == NULL || ssid->identity == NULL) - return; + SUPPLICANT_DBG(""); - if (g_strcmp0(ssid->eap, "tls") == 0) { - add_network_security_tls(dict, ssid); - } else if (g_strcmp0(ssid->eap, "peap") == 0 || - g_strcmp0(ssid->eap, "ttls") == 0) { - add_network_security_peap(dict, ssid); - } else - return; + if (!interface) + return -EINVAL; - eap_value = g_ascii_strup(ssid->eap, -1); + if (!system_available) + return -EFAULT; - supplicant_dbus_dict_append_basic(dict, "eap", - DBUS_TYPE_STRING, - &eap_value); - supplicant_dbus_dict_append_basic(dict, "identity", - DBUS_TYPE_STRING, - &ssid->identity); + /* TODO: Check if we're already connected and switch */ - g_free(eap_value); -} + data = dbus_malloc0(sizeof(*data)); + if (!data) + return -ENOMEM; -static void add_network_security_ciphers(DBusMessageIter *dict, - GSupplicantSSID *ssid) -{ - unsigned int p_cipher, g_cipher, i; - char *pairwise, *group; - char *pair_ciphers[4]; - char *group_ciphers[5]; + data->interface = interface; + data->path = g_strdup(interface->path); + data->callback = callback; + data->ssid = ssid; + data->user_data = user_data; - p_cipher = ssid->pairwise_cipher; - g_cipher = ssid->group_cipher; + if (ssid->use_wps) { + g_free(interface->wps_cred.key); + memset(&interface->wps_cred, 0, + sizeof(struct _GSupplicantWpsCredentials)); - if (p_cipher == 0 && g_cipher == 0) - return; + ret = supplicant_dbus_property_set(interface->path, + SUPPLICANT_INTERFACE ".Interface.WPS", + "ProcessCredentials", DBUS_TYPE_BOOLEAN_AS_STRING, + wps_process_credentials, wps_start, data, interface); + } else { + /* By the time there is a request for connect and the network + * path is not NULL it means that connman has not removed the + * previous network pointer. This can happen in the case AP + * deauthenticated client and connman does not remove the + * previously connected network pointer. This causes supplicant + * to reallocate the memory for struct wpa_ssid again even if it + * is the same SSID. This causes memory usage of wpa_supplicnat + * to go high. The idea here is that if the previously connected + * network is not removed at the time of next connection attempt + * check if the network path is not NULL. In case it is non-NULL + * first remove the network and then once removal is successful, add + * the network. + */ + + if (interface->network_path != NULL) { + g_free(data->path); + dbus_free(data); + + /* + * If this add network is for the same network for + * which wpa_supplicant already has a profile then do + * not need to add another profile. Only if the + * profile that needs to get added is different from + * what is there in wpa_s delete the current one. A + * network is identified by its SSID, security_type + * and passphrase (private passphrase in case security + * type is 802.11x). + */ + if (compare_network_parameters(interface, ssid)) { + return -EALREADY; + } - i = 0; + intf_data = dbus_malloc0(sizeof(*intf_data)); + if (!intf_data) + return -ENOMEM; + + intf_data->interface = interface; + intf_data->path = g_strdup(interface->path); + intf_data->callback = callback; + intf_data->ssid = ssid; + intf_data->user_data = user_data; + intf_data->network_remove_in_progress = TRUE; + network_remove(intf_data); + } else { + ret = supplicant_dbus_method_call(interface->path, + SUPPLICANT_INTERFACE ".Interface", "AddNetwork", + interface_add_network_params, + interface_add_network_result, data, + interface); + } + } - if (p_cipher & G_SUPPLICANT_PAIRWISE_CCMP) - pair_ciphers[i++] = "CCMP"; + if (ret < 0) { + g_free(data->path); + dbus_free(data); + return ret; + } - if (p_cipher & G_SUPPLICANT_PAIRWISE_TKIP) - pair_ciphers[i++] = "TKIP"; + return -EINPROGRESS; +} - if (p_cipher & G_SUPPLICANT_PAIRWISE_NONE) - pair_ciphers[i++] = "NONE"; +static void network_remove_result(const char *error, + DBusMessageIter *iter, void *user_data) +{ + struct interface_data *data = user_data; + struct interface_connect_data *connect_data; + int result = 0; - pair_ciphers[i] = NULL; + SUPPLICANT_DBG(""); - i = 0; + if (error) { + result = -EIO; + SUPPLICANT_DBG("error: %s", error); - if (g_cipher & G_SUPPLICANT_GROUP_CCMP) - group_ciphers[i++] = "CCMP"; + if (g_strcmp0("org.freedesktop.DBus.Error.UnknownMethod", + error) == 0) + result = -ECONNABORTED; + } - if (g_cipher & G_SUPPLICANT_GROUP_TKIP) - group_ciphers[i++] = "TKIP"; + g_free(data->interface->network_path); + data->interface->network_path = NULL; - if (g_cipher & G_SUPPLICANT_GROUP_WEP104) - group_ciphers[i++] = "WEP104"; + remove_network_information(data->interface); - if (g_cipher & G_SUPPLICANT_GROUP_WEP40) - group_ciphers[i++] = "WEP40"; + if (data->network_remove_in_progress == TRUE) { + data->network_remove_in_progress = FALSE; + connect_data = dbus_malloc0(sizeof(*connect_data)); + if (!connect_data) + return; - group_ciphers[i] = NULL; + connect_data->interface = data->interface; + connect_data->path = g_strdup(data->path); + connect_data->callback = data->callback; + connect_data->ssid = data->ssid; + connect_data->user_data = data->user_data; - pairwise = g_strjoinv(" ", pair_ciphers); - group = g_strjoinv(" ", group_ciphers); + supplicant_dbus_method_call(data->interface->path, + SUPPLICANT_INTERFACE ".Interface", "AddNetwork", + interface_add_network_params, + interface_add_network_result, connect_data, + connect_data->interface); + } else { + if (data->callback) + data->callback(result, data->interface, data->user_data); + } + g_free(data->path); + dbus_free(data); +} - SUPPLICANT_DBG("cipher %s %s", pairwise, group); +static void network_remove_params(DBusMessageIter *iter, void *user_data) +{ + struct interface_data *data = user_data; + const char *path = data->interface->network_path; - supplicant_dbus_dict_append_basic(dict, "pairwise", - DBUS_TYPE_STRING, - &pairwise); - supplicant_dbus_dict_append_basic(dict, "group", - DBUS_TYPE_STRING, - &group); + SUPPLICANT_DBG("path %s", path); - g_free(pairwise); - g_free(group); + dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, &path); } -static void add_network_security_proto(DBusMessageIter *dict, - GSupplicantSSID *ssid) +static int network_remove(struct interface_data *data) { - unsigned int protocol, i; - char *proto; - char *protos[3]; + GSupplicantInterface *interface = data->interface; - protocol = ssid->protocol; + SUPPLICANT_DBG(""); - if (protocol == 0) - return; + return supplicant_dbus_method_call(interface->path, + SUPPLICANT_INTERFACE ".Interface", "RemoveNetwork", + network_remove_params, network_remove_result, data, + interface); +} - i = 0; +static void interface_disconnect_result(const char *error, + DBusMessageIter *iter, void *user_data) +{ + struct interface_data *data = user_data; + int result = 0; - if (protocol & G_SUPPLICANT_PROTO_RSN) - protos[i++] = "RSN"; + SUPPLICANT_DBG(""); - if (protocol & G_SUPPLICANT_PROTO_WPA) - protos[i++] = "WPA"; + if (error) { + result = -EIO; + SUPPLICANT_DBG("error: %s", error); - protos[i] = NULL; + if (g_strcmp0("org.freedesktop.DBus.Error.UnknownMethod", + error) == 0) + result = -ECONNABORTED; + } - proto = g_strjoinv(" ", protos); + /* If we are disconnecting from previous WPS successful + * association. i.e.: it did not went through AddNetwork, + * and interface->network_path was never set. */ + if (!data->interface->network_path) { + if (data->callback) + data->callback(result, data->interface, + data->user_data); - SUPPLICANT_DBG("proto %s", proto); + g_free(data->path); + dbus_free(data); + return; + } - supplicant_dbus_dict_append_basic(dict, "proto", - DBUS_TYPE_STRING, - &proto); + if (result < 0 && data->callback) { + data->callback(result, data->interface, data->user_data); + data->callback = NULL; + } - g_free(proto); + if (result != -ECONNABORTED) { + if (network_remove(data) < 0) { + g_free(data->path); + dbus_free(data); + } + } else { + g_free(data->path); + dbus_free(data); + } } -static void add_network_security(DBusMessageIter *dict, GSupplicantSSID *ssid) +int g_supplicant_interface_disconnect(GSupplicantInterface *interface, + GSupplicantInterfaceCallback callback, + void *user_data) { - char *key_mgmt; + struct interface_data *data; + int ret; - switch (ssid->security) { - case G_SUPPLICANT_SECURITY_UNKNOWN: - case G_SUPPLICANT_SECURITY_NONE: - case G_SUPPLICANT_SECURITY_WEP: - key_mgmt = "NONE"; - add_network_security_wep(dict, ssid); - add_network_security_ciphers(dict, ssid); - break; - case G_SUPPLICANT_SECURITY_PSK: - key_mgmt = "WPA-PSK"; - add_network_security_psk(dict, ssid); - add_network_security_ciphers(dict, ssid); - add_network_security_proto(dict, ssid); - break; - case G_SUPPLICANT_SECURITY_IEEE8021X: - key_mgmt = "WPA-EAP"; - add_network_security_eap(dict, ssid); - add_network_security_ciphers(dict, ssid); - add_network_security_proto(dict, ssid); - break; + SUPPLICANT_DBG(""); + + if (!interface) + return -EINVAL; + + if (!system_available) + return -EFAULT; + + data = dbus_malloc0(sizeof(*data)); + if (!data) + return -ENOMEM; + + data->interface = interface; + data->path = g_strdup(interface->path); + data->callback = callback; + data->user_data = user_data; + + ret = supplicant_dbus_method_call(interface->path, + SUPPLICANT_INTERFACE ".Interface", "Disconnect", + NULL, interface_disconnect_result, data, + interface); + + if (ret < 0) { + g_free(data->path); + dbus_free(data); } - supplicant_dbus_dict_append_basic(dict, "key_mgmt", - DBUS_TYPE_STRING, &key_mgmt); + return ret; } -static void add_network_mode(DBusMessageIter *dict, GSupplicantSSID *ssid) +static void interface_p2p_find_result(const char *error, + DBusMessageIter *iter, void *user_data) { - dbus_uint32_t mode; + struct interface_scan_data *data = user_data; + int err = 0; - switch (ssid->mode) { - case G_SUPPLICANT_MODE_UNKNOWN: - case G_SUPPLICANT_MODE_INFRA: - mode = 0; - break; - case G_SUPPLICANT_MODE_IBSS: - mode = 1; - break; - case G_SUPPLICANT_MODE_MASTER: - mode = 2; - break; + SUPPLICANT_DBG("error %s", error); + + if (error) + err = -EIO; + + if (interface_exists(data->interface, data->path)) { + if (!data->interface->ready) + err = -ENOLINK; + if (!err) + data->interface->p2p_finding = true; } - supplicant_dbus_dict_append_basic(dict, "mode", - DBUS_TYPE_UINT32, &mode); + if (data->callback) + data->callback(err, data->interface, data->user_data); + + g_free(data->path); + dbus_free(data); } -static void interface_add_network_params(DBusMessageIter *iter, void *user_data) +static void interface_p2p_find_params(DBusMessageIter *iter, void *user_data) { DBusMessageIter dict; - struct interface_connect_data *data = user_data; - GSupplicantSSID *ssid = data->ssid; supplicant_dbus_dict_open(iter, &dict); + supplicant_dbus_dict_close(iter, &dict); +} - if (ssid->scan_ssid) - supplicant_dbus_dict_append_basic(&dict, "scan_ssid", - DBUS_TYPE_UINT32, &ssid->scan_ssid); +int g_supplicant_interface_p2p_find(GSupplicantInterface *interface, + GSupplicantInterfaceCallback callback, + void *user_data) +{ + struct interface_scan_data *data; + int ret; - if (ssid->freq) - supplicant_dbus_dict_append_basic(&dict, "frequency", - DBUS_TYPE_UINT32, &ssid->freq); + if (!interface->p2p_support) + return -ENOTSUP; - if (ssid->bgscan != NULL) - supplicant_dbus_dict_append_basic(&dict, "bgscan", - DBUS_TYPE_STRING, &ssid->bgscan); + ret = interface_ready_to_scan(interface); + if (ret && ret != -EALREADY) + return ret; - add_network_mode(&dict, ssid); + data = dbus_malloc0(sizeof(*data)); + if (!data) + return -ENOMEM; - add_network_security(&dict, ssid); + data->interface = interface; + data->path = g_strdup(interface->path); + data->callback = callback; + data->user_data = user_data; - supplicant_dbus_dict_append_fixed_array(&dict, "ssid", - DBUS_TYPE_BYTE, &ssid->ssid, - ssid->ssid_len); + ret = supplicant_dbus_method_call(interface->path, + SUPPLICANT_INTERFACE ".Interface.P2PDevice", "Find", + interface_p2p_find_params, interface_p2p_find_result, + data, interface); + if (ret < 0) { + g_free(data->path); + dbus_free(data); + } - supplicant_dbus_dict_close(iter, &dict); + return ret; } -static void interface_wps_start_result(const char *error, - DBusMessageIter *iter, void *user_data) +bool g_supplicant_interface_is_p2p_finding(GSupplicantInterface *interface) +{ + if (!interface) + return false; + + return interface->p2p_finding; +} + +int g_supplicant_interface_p2p_stop_find(GSupplicantInterface *interface) +{ + if (!interface->p2p_finding) + return 0; + + SUPPLICANT_DBG(""); + + interface->p2p_finding = false; + + return supplicant_dbus_method_call(interface->path, + SUPPLICANT_INTERFACE ".Interface.P2PDevice", "StopFind", + NULL, NULL, NULL, NULL); +} + +static void interface_p2p_connect_result(const char *error, + DBusMessageIter *iter, void *user_data) { struct interface_connect_data *data = user_data; + int err = 0; SUPPLICANT_DBG(""); - if (error != NULL) + + if (error) { SUPPLICANT_DBG("error: %s", error); + err = parse_supplicant_error(iter); + } - g_free(data->ssid); - dbus_free(data); + if (data->callback) + data->callback(err, data->interface, data->user_data); + + g_free(data->path); + g_free(data->peer->wps_pin); + g_free(data->peer->path); + g_free(data->peer); + g_free(data); } -static void interface_add_wps_params(DBusMessageIter *iter, void *user_data) +static void interface_p2p_connect_params(DBusMessageIter *iter, void *user_data) { struct interface_connect_data *data = user_data; - GSupplicantSSID *ssid = data->ssid; - const char *role = "enrollee", *type; + const char *wps = "pbc"; DBusMessageIter dict; + int go_intent = 7; SUPPLICANT_DBG(""); supplicant_dbus_dict_open(iter, &dict); - supplicant_dbus_dict_append_basic(&dict, "Role", - DBUS_TYPE_STRING, &role); + if (data->peer->master) + go_intent = 15; - type = "pbc"; - if (ssid->pin_wps != NULL) { - type = "pin"; - supplicant_dbus_dict_append_basic(&dict, "Pin", - DBUS_TYPE_STRING, &ssid->pin_wps); + if (data->peer->wps_pin) + wps = "pin"; + + supplicant_dbus_dict_append_basic(&dict, "peer", + DBUS_TYPE_OBJECT_PATH, &data->peer->path); + supplicant_dbus_dict_append_basic(&dict, "wps_method", + DBUS_TYPE_STRING, &wps); + if (data->peer->wps_pin) { + supplicant_dbus_dict_append_basic(&dict, "pin", + DBUS_TYPE_STRING, &data->peer->wps_pin); } - supplicant_dbus_dict_append_basic(&dict, "Type", - DBUS_TYPE_STRING, &type); + supplicant_dbus_dict_append_basic(&dict, "go_intent", + DBUS_TYPE_INT32, &go_intent); supplicant_dbus_dict_close(iter, &dict); } -static void wps_start(const char *error, DBusMessageIter *iter, void *user_data) +int g_supplicant_interface_p2p_connect(GSupplicantInterface *interface, + GSupplicantPeerParams *peer_params, + GSupplicantInterfaceCallback callback, + void *user_data) { - struct interface_connect_data *data = user_data; + struct interface_connect_data *data; + int ret; SUPPLICANT_DBG(""); - if (error != NULL) { - SUPPLICANT_DBG("error: %s", error); - g_free(data->ssid); + if (!interface->p2p_support) + return -ENOTSUP; + + data = dbus_malloc0(sizeof(*data)); + if (!data) + return -ENOMEM; + + data->interface = interface; + data->path = g_strdup(interface->path); + data->peer = peer_params; + data->callback = callback; + data->user_data = user_data; + + ret = supplicant_dbus_method_call(interface->path, + SUPPLICANT_INTERFACE ".Interface.P2PDevice", "Connect", + interface_p2p_connect_params, interface_p2p_connect_result, + data, interface); + if (ret < 0) { + g_free(data->path); dbus_free(data); - return; + return ret; } - supplicant_dbus_method_call(data->interface->path, - SUPPLICANT_INTERFACE ".Interface.WPS", "Start", - interface_add_wps_params, - interface_wps_start_result, data); + return -EINPROGRESS; } -static void wps_process_credentials(DBusMessageIter *iter, void *user_data) +int g_supplicant_interface_p2p_disconnect(GSupplicantInterface *interface, + GSupplicantPeerParams *peer_params) { - dbus_bool_t credentials = TRUE; + GSupplicantPeer *peer; + int count = 0; + GSList *list; SUPPLICANT_DBG(""); - dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &credentials); + if (!interface->p2p_support) + return -ENOTSUP; + + peer = g_hash_table_lookup(interface->peer_table, peer_params->path); + if (!peer) + return -ENODEV; + + for (list = peer->groups; list; list = list->next, count++) { + const char *group_obj_path = list->data; + GSupplicantInterface *g_interface; + GSupplicantGroup *group; + + group = g_hash_table_lookup(group_mapping, group_obj_path); + if (!group || !group->interface) + continue; + + g_interface = group->interface; + supplicant_dbus_method_call(g_interface->path, + SUPPLICANT_INTERFACE ".Interface.P2PDevice", + "Disconnect", NULL, NULL, NULL, g_interface); + } + + if (count == 0 && peer->current_group_iface) { + supplicant_dbus_method_call(peer->current_group_iface->path, + SUPPLICANT_INTERFACE ".Interface.P2PDevice", + "Disconnect", NULL, NULL, NULL, + peer->current_group_iface->path); + } + + peer->current_group_iface = NULL; + + return -EINPROGRESS; } +struct p2p_service_data { + bool registration; + GSupplicantInterface *interface; + GSupplicantP2PServiceParams *service; + GSupplicantInterfaceCallback callback; + void *user_data; +}; -int g_supplicant_interface_connect(GSupplicantInterface *interface, - GSupplicantSSID *ssid, - GSupplicantInterfaceCallback callback, +static void interface_p2p_service_result(const char *error, + DBusMessageIter *iter, void *user_data) +{ + struct p2p_service_data *data = user_data; + int result = 0; + + SUPPLICANT_DBG("%s result - %s", data->registration ? + "Registration" : "Deletion", + error ? error : "Success"); + if (error) + result = -EINVAL; + + if (data->callback) + data->callback(result, data->interface, data->user_data); + + g_free(data->service->query); + g_free(data->service->response); + g_free(data->service->service); + g_free(data->service->wfd_ies); + g_free(data->service); + dbus_free(data); +} + +static void interface_p2p_service_params(DBusMessageIter *iter, void *user_data) { - struct interface_connect_data *data; - int ret; + struct p2p_service_data *data = user_data; + GSupplicantP2PServiceParams *service; + DBusMessageIter dict; + const char *type; - if (interface == NULL) - return -EINVAL; + SUPPLICANT_DBG(""); - if (system_available == FALSE) - return -EFAULT; + service = data->service; - /* TODO: Check if we're already connected and switch */ + supplicant_dbus_dict_open(iter, &dict); + + if (service->query && service->response) { + type = "bonjour"; + supplicant_dbus_dict_append_basic(&dict, "service_type", + DBUS_TYPE_STRING, &type); + supplicant_dbus_dict_append_fixed_array(&dict, "query", + DBUS_TYPE_BYTE, &service->query, + service->query_length); + supplicant_dbus_dict_append_fixed_array(&dict, "response", + DBUS_TYPE_BYTE, &service->response, + service->response_length); + } else if (service->version && service->service) { + type = "upnp"; + supplicant_dbus_dict_append_basic(&dict, "service_type", + DBUS_TYPE_STRING, &type); + supplicant_dbus_dict_append_basic(&dict, "version", + DBUS_TYPE_INT32, &service->version); + supplicant_dbus_dict_append_basic(&dict, "service", + DBUS_TYPE_STRING, &service->service); + } + + supplicant_dbus_dict_close(iter, &dict); +} + +int g_supplicant_interface_p2p_add_service(GSupplicantInterface *interface, + GSupplicantInterfaceCallback callback, + GSupplicantP2PServiceParams *p2p_service_params, + void *user_data) +{ + struct p2p_service_data *data; + int ret; + + SUPPLICANT_DBG(""); + + if (!interface->p2p_support) + return -ENOTSUP; data = dbus_malloc0(sizeof(*data)); - if (data == NULL) + if (!data) return -ENOMEM; + data->registration = true; data->interface = interface; + data->service = p2p_service_params; data->callback = callback; - data->ssid = ssid; data->user_data = user_data; - if (ssid->use_wps == TRUE) { - g_free(interface->wps_cred.key); - memset(&interface->wps_cred, 0, - sizeof(struct _GSupplicantWpsCredentials)); - - ret = supplicant_dbus_property_set(interface->path, - SUPPLICANT_INTERFACE ".Interface.WPS", - "ProcessCredentials", DBUS_TYPE_BOOLEAN_AS_STRING, - wps_process_credentials, wps_start, data); - } else - ret = supplicant_dbus_method_call(interface->path, - SUPPLICANT_INTERFACE ".Interface", "AddNetwork", - interface_add_network_params, - interface_add_network_result, data); - - if (ret < 0) + ret = supplicant_dbus_method_call(interface->path, + SUPPLICANT_INTERFACE ".Interface.P2PDevice", "AddService", + interface_p2p_service_params, interface_p2p_service_result, + data, interface); + if (ret < 0) { + dbus_free(data); return ret; + } return -EINPROGRESS; } -static void network_remove_result(const char *error, - DBusMessageIter *iter, void *user_data) +int g_supplicant_interface_p2p_del_service(GSupplicantInterface *interface, + GSupplicantP2PServiceParams *p2p_service_params) { - struct interface_data *data = user_data; - int result = 0; + struct p2p_service_data *data; + int ret; SUPPLICANT_DBG(""); - if (error != NULL) - result = -EIO; + if (!interface->p2p_support) + return -ENOTSUP; - if (data->callback != NULL) - data->callback(result, data->interface, data->user_data); + data = dbus_malloc0(sizeof(*data)); + if (!data) + return -ENOMEM; - dbus_free(data); + data->interface = interface; + data->service = p2p_service_params; + + ret = supplicant_dbus_method_call(interface->path, + SUPPLICANT_INTERFACE ".Interface.P2PDevice", "DeleteService", + interface_p2p_service_params, interface_p2p_service_result, + data, interface); + if (ret < 0) { + dbus_free(data); + return ret; + } + + return -EINPROGRESS; } -static void network_remove_params(DBusMessageIter *iter, void *user_data) +struct p2p_listen_data { + int period; + int interval; +}; + +static void interface_p2p_listen_params(DBusMessageIter *iter, void *user_data) { - struct interface_data *data = user_data; - const char *path = data->interface->network_path; + struct p2p_listen_data *params = user_data; + DBusMessageIter dict; - SUPPLICANT_DBG("path %s", path); + supplicant_dbus_dict_open(iter, &dict); - dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, &path); + supplicant_dbus_dict_append_basic(&dict, "period", + DBUS_TYPE_INT32, ¶ms->period); + supplicant_dbus_dict_append_basic(&dict, "interval", + DBUS_TYPE_INT32, ¶ms->interval); + supplicant_dbus_dict_close(iter, &dict); } -static int network_remove(struct interface_data *data) +int g_supplicant_interface_p2p_listen(GSupplicantInterface *interface, + int period, int interval) { - GSupplicantInterface *interface = data->interface; + struct p2p_listen_data params; SUPPLICANT_DBG(""); + if (!interface->p2p_support) + return -ENOTSUP; + + params.period = period; + params.interval = interval; + return supplicant_dbus_method_call(interface->path, - SUPPLICANT_INTERFACE ".Interface", "RemoveNetwork", - network_remove_params, network_remove_result, data); + SUPPLICANT_INTERFACE ".Interface.P2PDevice", + "ExtendedListen", interface_p2p_listen_params, + NULL, ¶ms, NULL); } -static void interface_disconnect_result(const char *error, - DBusMessageIter *iter, void *user_data) +static void widi_ies_params(DBusMessageIter *iter, void *user_data) { - struct interface_data *data = user_data; + struct p2p_service_data *data = user_data; + GSupplicantP2PServiceParams *service = data->service; + DBusMessageIter array; - SUPPLICANT_DBG(""); + SUPPLICANT_DBG("%p - %d", service->wfd_ies, service->wfd_ies_length); - if (error != NULL && data->callback != NULL) - data->callback(-EIO, data->interface, data->user_data); + dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, + DBUS_TYPE_BYTE_AS_STRING, &array); - /* If we are disconnecting from previous WPS successful - * association. i.e.: it did not went through AddNetwork, - * and interface->network_path was never set. */ - if (data->interface->network_path == NULL) { - dbus_free(data); - return; + if (service->wfd_ies && service->wfd_ies_length > 0) { + dbus_message_iter_append_fixed_array(&array, DBUS_TYPE_BYTE, + &service->wfd_ies, service->wfd_ies_length); } - network_remove(data); + dbus_message_iter_close_container(iter, &array); } -int g_supplicant_interface_disconnect(GSupplicantInterface *interface, +int g_supplicant_set_widi_ies(GSupplicantP2PServiceParams *p2p_service_params, GSupplicantInterfaceCallback callback, - void *user_data) + void *user_data) { - struct interface_data *data; + struct p2p_service_data *data; + int ret; SUPPLICANT_DBG(""); - if (interface == NULL) - return -EINVAL; - - if (system_available == FALSE) + if (!system_available) return -EFAULT; data = dbus_malloc0(sizeof(*data)); - if (data == NULL) + if (!data) return -ENOMEM; - data->interface = interface; + data->service = p2p_service_params; data->callback = callback; data->user_data = user_data; - return supplicant_dbus_method_call(interface->path, - SUPPLICANT_INTERFACE ".Interface", "Disconnect", - NULL, interface_disconnect_result, data); + if (p2p_service_params->wfd_ies) + data->registration = true; + + ret = supplicant_dbus_property_set(SUPPLICANT_PATH, + SUPPLICANT_INTERFACE, "WFDIEs", + DBUS_TYPE_ARRAY_AS_STRING + DBUS_TYPE_BYTE_AS_STRING, + widi_ies_params, + interface_p2p_service_result, + data, NULL); + if (ret < 0 && ret != -EINPROGRESS) { + dbus_free(data); + return ret; + } + + return -EINPROGRESS; } @@ -3528,6 +5777,12 @@ static const char *g_supplicant_rule4 = "type=signal," "interface=" SUPPLICANT_INTERFACE ".BSS"; static const char *g_supplicant_rule5 = "type=signal," "interface=" SUPPLICANT_INTERFACE ".Network"; +static const char *g_supplicant_rule6 = "type=signal," + "interface=" SUPPLICANT_INTERFACE ".Interface.P2PDevice"; +static const char *g_supplicant_rule7 = "type=signal," + "interface=" SUPPLICANT_INTERFACE ".Peer"; +static const char *g_supplicant_rule8 = "type=signal," + "interface=" SUPPLICANT_INTERFACE ".Group"; static void invoke_introspect_method(void) { @@ -3538,7 +5793,7 @@ static void invoke_introspect_method(void) DBUS_INTERFACE_INTROSPECTABLE, "Introspect"); - if (message == NULL) + if (!message) return; dbus_message_set_no_reply(message, TRUE); @@ -3549,11 +5804,11 @@ static void invoke_introspect_method(void) int g_supplicant_register(const GSupplicantCallbacks *callbacks) { connection = dbus_bus_get(DBUS_BUS_SYSTEM, NULL); - if (connection == NULL) + if (!connection) return -EIO; - if (dbus_connection_add_filter(connection, - g_supplicant_filter, NULL, NULL) == FALSE) { + if (!dbus_connection_add_filter(connection, g_supplicant_filter, + NULL, NULL)) { dbus_connection_unref(connection); connection = NULL; return -EIO; @@ -3567,6 +5822,14 @@ int g_supplicant_register(const GSupplicantCallbacks *callbacks) bss_mapping = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL); + peer_mapping = g_hash_table_new_full(g_str_hash, g_str_equal, + NULL, NULL); + group_mapping = g_hash_table_new_full(g_str_hash, g_str_equal, + NULL, NULL); + pending_peer_connection = g_hash_table_new_full(g_str_hash, g_str_equal, + NULL, NULL); + config_file_table = g_hash_table_new_full(g_str_hash, g_str_equal, + g_free, g_free); supplicant_dbus_setup(connection); @@ -3576,14 +5839,17 @@ int g_supplicant_register(const GSupplicantCallbacks *callbacks) dbus_bus_add_match(connection, g_supplicant_rule3, NULL); dbus_bus_add_match(connection, g_supplicant_rule4, NULL); dbus_bus_add_match(connection, g_supplicant_rule5, NULL); + dbus_bus_add_match(connection, g_supplicant_rule6, NULL); + dbus_bus_add_match(connection, g_supplicant_rule7, NULL); + dbus_bus_add_match(connection, g_supplicant_rule8, NULL); dbus_connection_flush(connection); if (dbus_bus_name_has_owner(connection, - SUPPLICANT_SERVICE, NULL) == TRUE) { + SUPPLICANT_SERVICE, NULL)) { system_available = TRUE; supplicant_dbus_property_get_all(SUPPLICANT_PATH, SUPPLICANT_INTERFACE, - service_property, NULL); + service_property, NULL, NULL); } else invoke_introspect_method(); @@ -3609,14 +5875,17 @@ static void unregister_remove_interface(gpointer key, gpointer value, SUPPLICANT_INTERFACE, "RemoveInterface", unregister_interface_remove_params, - NULL, interface->path); + NULL, interface->path, NULL); } void g_supplicant_unregister(const GSupplicantCallbacks *callbacks) { SUPPLICANT_DBG(""); - if (connection != NULL) { + if (connection) { + dbus_bus_remove_match(connection, g_supplicant_rule8, NULL); + dbus_bus_remove_match(connection, g_supplicant_rule7, NULL); + dbus_bus_remove_match(connection, g_supplicant_rule6, NULL); dbus_bus_remove_match(connection, g_supplicant_rule5, NULL); dbus_bus_remove_match(connection, g_supplicant_rule4, NULL); dbus_bus_remove_match(connection, g_supplicant_rule3, NULL); @@ -3629,22 +5898,37 @@ void g_supplicant_unregister(const GSupplicantCallbacks *callbacks) g_supplicant_filter, NULL); } - if (bss_mapping != NULL) { + if (config_file_table) { + g_hash_table_destroy(config_file_table); + config_file_table = NULL; + } + + if (bss_mapping) { g_hash_table_destroy(bss_mapping); bss_mapping = NULL; } - if (system_available == TRUE) - callback_system_killed(); + if (peer_mapping) { + g_hash_table_destroy(peer_mapping); + peer_mapping = NULL; + } - if (interface_table != NULL) { + if (group_mapping) { + g_hash_table_destroy(group_mapping); + group_mapping = NULL; + } + + if (interface_table) { g_hash_table_foreach(interface_table, unregister_remove_interface, NULL); g_hash_table_destroy(interface_table); interface_table = NULL; } - if (connection != NULL) { + if (system_available) + callback_system_killed(); + + if (connection) { dbus_connection_unref(connection); connection = NULL; }