2009-11-09 16:51:59 -05:00
|
|
|
/*
|
|
|
|
* WPA Supplicant / dbus-based control interface
|
|
|
|
* Copyright (c) 2006, Dan Williams <dcbw@redhat.com> and Red Hat, Inc.
|
2010-01-16 09:37:37 -05:00
|
|
|
* Copyright (c) 2009-2010, Witold Sowa <witold.sowa@gmail.com>
|
2015-01-25 16:32:01 -05:00
|
|
|
* Copyright (c) 2009-2015, Jouni Malinen <j@w1.fi>
|
2009-11-09 16:51:59 -05:00
|
|
|
*
|
2012-07-02 05:04:38 -04:00
|
|
|
* This software may be distributed under the terms of the BSD license.
|
|
|
|
* See README for more details.
|
2009-11-09 16:51:59 -05:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include "includes.h"
|
|
|
|
|
|
|
|
#include "common.h"
|
2009-12-20 14:11:35 -05:00
|
|
|
#include "common/ieee802_11_defs.h"
|
|
|
|
#include "eap_peer/eap_methods.h"
|
|
|
|
#include "eapol_supp/eapol_supp_sm.h"
|
2010-01-16 09:37:37 -05:00
|
|
|
#include "rsn_supp/wpa.h"
|
2009-12-20 13:11:14 -05:00
|
|
|
#include "../config.h"
|
|
|
|
#include "../wpa_supplicant_i.h"
|
|
|
|
#include "../driver_i.h"
|
|
|
|
#include "../notify.h"
|
2009-12-27 18:10:07 -05:00
|
|
|
#include "../bss.h"
|
2010-01-03 11:48:11 -05:00
|
|
|
#include "../scan.h"
|
2012-06-26 11:55:41 -04:00
|
|
|
#include "../autoscan.h"
|
2009-12-20 14:11:35 -05:00
|
|
|
#include "dbus_new_helpers.h"
|
|
|
|
#include "dbus_new.h"
|
|
|
|
#include "dbus_new_handlers.h"
|
|
|
|
#include "dbus_dict_helpers.h"
|
2012-04-01 14:13:38 -04:00
|
|
|
#include "dbus_common_i.h"
|
2014-09-10 13:34:56 -04:00
|
|
|
#include "drivers/driver.h"
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2014-12-31 16:21:10 -05:00
|
|
|
static const char * const debug_strings[] = {
|
2011-03-31 10:38:08 -04:00
|
|
|
"excessive", "msgdump", "debug", "info", "warning", "error", NULL
|
2010-01-04 09:22:26 -05:00
|
|
|
};
|
|
|
|
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
/**
|
2015-01-01 15:16:34 -05:00
|
|
|
* wpas_dbus_error_unknown_error - Return a new UnknownError error message
|
2009-11-09 16:51:59 -05:00
|
|
|
* @message: Pointer to incoming dbus message this error refers to
|
|
|
|
* @arg: Optional string appended to error message
|
|
|
|
* Returns: a dbus error message
|
|
|
|
*
|
|
|
|
* Convenience function to create and return an UnknownError
|
|
|
|
*/
|
2009-12-20 14:04:40 -05:00
|
|
|
DBusMessage * wpas_dbus_error_unknown_error(DBusMessage *message,
|
|
|
|
const char *arg)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
2009-11-10 10:51:59 -05:00
|
|
|
return dbus_message_new_error(message, WPAS_DBUS_ERROR_UNKNOWN_ERROR,
|
|
|
|
arg);
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_error_iface_unknown - Return a new invalid interface error message
|
|
|
|
* @message: Pointer to incoming dbus message this error refers to
|
|
|
|
* Returns: A dbus error message
|
|
|
|
*
|
|
|
|
* Convenience function to create and return an invalid interface error
|
|
|
|
*/
|
|
|
|
static DBusMessage * wpas_dbus_error_iface_unknown(DBusMessage *message)
|
|
|
|
{
|
2014-12-31 16:21:10 -05:00
|
|
|
return dbus_message_new_error(
|
|
|
|
message, WPAS_DBUS_ERROR_IFACE_UNKNOWN,
|
|
|
|
"wpa_supplicant knows nothing about this interface.");
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_error_network_unknown - Return a new NetworkUnknown error message
|
|
|
|
* @message: Pointer to incoming dbus message this error refers to
|
|
|
|
* Returns: a dbus error message
|
|
|
|
*
|
|
|
|
* Convenience function to create and return an invalid network error
|
|
|
|
*/
|
|
|
|
static DBusMessage * wpas_dbus_error_network_unknown(DBusMessage *message)
|
|
|
|
{
|
2014-12-31 16:21:10 -05:00
|
|
|
return dbus_message_new_error(
|
|
|
|
message, WPAS_DBUS_ERROR_NETWORK_UNKNOWN,
|
|
|
|
"There is no such a network in this interface.");
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
2010-01-01 14:52:29 -05:00
|
|
|
* wpas_dbus_error_invalid_args - Return a new InvalidArgs error message
|
2009-11-09 16:51:59 -05:00
|
|
|
* @message: Pointer to incoming dbus message this error refers to
|
|
|
|
* Returns: a dbus error message
|
|
|
|
*
|
|
|
|
* Convenience function to create and return an invalid options error
|
|
|
|
*/
|
2010-01-01 14:52:29 -05:00
|
|
|
DBusMessage * wpas_dbus_error_invalid_args(DBusMessage *message,
|
2009-12-20 14:04:40 -05:00
|
|
|
const char *arg)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
|
|
|
DBusMessage *reply;
|
|
|
|
|
2014-12-31 16:21:10 -05:00
|
|
|
reply = dbus_message_new_error(
|
|
|
|
message, WPAS_DBUS_ERROR_INVALID_ARGS,
|
|
|
|
"Did not receive correct message arguments.");
|
2009-11-09 16:51:59 -05:00
|
|
|
if (arg != NULL)
|
|
|
|
dbus_message_append_args(reply, DBUS_TYPE_STRING, &arg,
|
|
|
|
DBUS_TYPE_INVALID);
|
|
|
|
|
|
|
|
return reply;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-04-09 18:10:29 -04:00
|
|
|
/**
|
|
|
|
* wpas_dbus_error_scan_error - Return a new ScanError error message
|
|
|
|
* @message: Pointer to incoming dbus message this error refers to
|
|
|
|
* @error: Optional string to be used as the error message
|
|
|
|
* Returns: a dbus error message
|
|
|
|
*
|
|
|
|
* Convenience function to create and return a scan error
|
|
|
|
*/
|
2014-12-31 04:00:31 -05:00
|
|
|
static DBusMessage * wpas_dbus_error_scan_error(DBusMessage *message,
|
|
|
|
const char *error)
|
2014-04-09 18:10:29 -04:00
|
|
|
{
|
2014-12-31 04:00:31 -05:00
|
|
|
return dbus_message_new_error(message,
|
|
|
|
WPAS_DBUS_ERROR_IFACE_SCAN_ERROR,
|
|
|
|
error);
|
2014-04-09 18:10:29 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-01-01 15:36:52 -05:00
|
|
|
DBusMessage * wpas_dbus_error_no_memory(DBusMessage *message)
|
|
|
|
{
|
|
|
|
wpa_printf(MSG_DEBUG, "dbus: Failed to allocate memory");
|
|
|
|
return dbus_message_new_error(message, DBUS_ERROR_NO_MEMORY, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-12-31 16:21:10 -05:00
|
|
|
static const char * const dont_quote[] = {
|
2009-11-09 16:51:59 -05:00
|
|
|
"key_mgmt", "proto", "pairwise", "auth_alg", "group", "eap",
|
|
|
|
"opensc_engine_path", "pkcs11_engine_path", "pkcs11_module_path",
|
2012-11-11 09:21:16 -05:00
|
|
|
"bssid", "scan_freq", "freq_list", NULL
|
2009-11-09 16:51:59 -05:00
|
|
|
};
|
|
|
|
|
|
|
|
static dbus_bool_t should_quote_opt(const char *key)
|
|
|
|
{
|
|
|
|
int i = 0;
|
2014-12-31 16:21:10 -05:00
|
|
|
|
2009-11-09 16:51:59 -05:00
|
|
|
while (dont_quote[i] != NULL) {
|
2009-11-10 10:51:59 -05:00
|
|
|
if (os_strcmp(key, dont_quote[i]) == 0)
|
2009-11-09 16:51:59 -05:00
|
|
|
return FALSE;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* get_iface_by_dbus_path - Get a new network interface
|
|
|
|
* @global: Pointer to global data from wpa_supplicant_init()
|
|
|
|
* @path: Pointer to a dbus object path representing an interface
|
|
|
|
* Returns: Pointer to the interface or %NULL if not found
|
|
|
|
*/
|
|
|
|
static struct wpa_supplicant * get_iface_by_dbus_path(
|
|
|
|
struct wpa_global *global, const char *path)
|
|
|
|
{
|
|
|
|
struct wpa_supplicant *wpa_s;
|
|
|
|
|
|
|
|
for (wpa_s = global->ifaces; wpa_s; wpa_s = wpa_s->next) {
|
2015-04-29 06:13:34 -04:00
|
|
|
if (wpa_s->dbus_new_path &&
|
|
|
|
os_strcmp(wpa_s->dbus_new_path, path) == 0)
|
2009-11-09 16:51:59 -05:00
|
|
|
return wpa_s;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* set_network_properties - Set properties of a configured network
|
2010-03-06 04:13:50 -05:00
|
|
|
* @wpa_s: wpa_supplicant structure for a network interface
|
2009-11-09 16:51:59 -05:00
|
|
|
* @ssid: wpa_ssid structure for a configured network
|
|
|
|
* @iter: DBus message iterator containing dictionary of network
|
|
|
|
* properties to set.
|
2011-07-29 14:25:39 -04:00
|
|
|
* @error: On failure, an error describing the failure
|
|
|
|
* Returns: TRUE if the request succeeds, FALSE if it failed
|
2009-11-09 16:51:59 -05:00
|
|
|
*
|
|
|
|
* Sets network configuration with parameters given id DBus dictionary
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t set_network_properties(struct wpa_supplicant *wpa_s,
|
|
|
|
struct wpa_ssid *ssid,
|
|
|
|
DBusMessageIter *iter,
|
|
|
|
DBusError *error)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
|
|
|
struct wpa_dbus_dict_entry entry = { .type = DBUS_TYPE_STRING };
|
|
|
|
DBusMessageIter iter_dict;
|
2011-07-29 14:25:39 -04:00
|
|
|
char *value = NULL;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
if (!wpa_dbus_dict_open_read(iter, &iter_dict, error))
|
|
|
|
return FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
while (wpa_dbus_dict_has_dict_entry(&iter_dict)) {
|
|
|
|
size_t size = 50;
|
|
|
|
int ret;
|
2011-07-29 14:25:39 -04:00
|
|
|
|
|
|
|
if (!wpa_dbus_dict_get_entry(&iter_dict, &entry))
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
value = NULL;
|
2009-11-09 16:51:59 -05:00
|
|
|
if (entry.type == DBUS_TYPE_ARRAY &&
|
2009-11-10 10:51:59 -05:00
|
|
|
entry.array_type == DBUS_TYPE_BYTE) {
|
2009-11-09 16:51:59 -05:00
|
|
|
if (entry.array_len <= 0)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
size = entry.array_len * 2 + 1;
|
|
|
|
value = os_zalloc(size);
|
|
|
|
if (value == NULL)
|
|
|
|
goto error;
|
|
|
|
|
2009-11-10 10:51:59 -05:00
|
|
|
ret = wpa_snprintf_hex(value, size,
|
|
|
|
(u8 *) entry.bytearray_value,
|
|
|
|
entry.array_len);
|
2009-11-09 16:51:59 -05:00
|
|
|
if (ret <= 0)
|
|
|
|
goto error;
|
2009-12-26 10:28:19 -05:00
|
|
|
} else if (entry.type == DBUS_TYPE_STRING) {
|
|
|
|
if (should_quote_opt(entry.key)) {
|
|
|
|
size = os_strlen(entry.str_value);
|
2015-06-23 14:12:29 -04:00
|
|
|
if (size == 0)
|
2009-12-26 10:28:19 -05:00
|
|
|
goto error;
|
|
|
|
|
|
|
|
size += 3;
|
|
|
|
value = os_zalloc(size);
|
|
|
|
if (value == NULL)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
ret = os_snprintf(value, size, "\"%s\"",
|
|
|
|
entry.str_value);
|
2014-12-07 05:52:59 -05:00
|
|
|
if (os_snprintf_error(size, ret))
|
2009-12-26 10:28:19 -05:00
|
|
|
goto error;
|
2009-11-10 10:51:59 -05:00
|
|
|
} else {
|
2009-12-26 10:28:19 -05:00
|
|
|
value = os_strdup(entry.str_value);
|
|
|
|
if (value == NULL)
|
|
|
|
goto error;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
2009-12-26 10:28:19 -05:00
|
|
|
} else if (entry.type == DBUS_TYPE_UINT32) {
|
|
|
|
value = os_zalloc(size);
|
|
|
|
if (value == NULL)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
ret = os_snprintf(value, size, "%u",
|
|
|
|
entry.uint32_value);
|
2014-12-07 05:11:13 -05:00
|
|
|
if (os_snprintf_error(size, ret))
|
2009-12-26 10:28:19 -05:00
|
|
|
goto error;
|
|
|
|
} else if (entry.type == DBUS_TYPE_INT32) {
|
|
|
|
value = os_zalloc(size);
|
|
|
|
if (value == NULL)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
ret = os_snprintf(value, size, "%d",
|
|
|
|
entry.int32_value);
|
2014-12-07 05:11:13 -05:00
|
|
|
if (os_snprintf_error(size, ret))
|
2009-12-26 10:28:19 -05:00
|
|
|
goto error;
|
|
|
|
} else
|
|
|
|
goto error;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
if (wpa_config_set(ssid, entry.key, value, 0) < 0)
|
|
|
|
goto error;
|
|
|
|
|
2015-01-14 06:24:09 -05:00
|
|
|
if (os_strcmp(entry.key, "bssid") != 0 &&
|
|
|
|
os_strcmp(entry.key, "priority") != 0)
|
|
|
|
wpa_sm_pmksa_cache_flush(wpa_s->wpa, ssid);
|
|
|
|
|
|
|
|
if (wpa_s->current_ssid == ssid ||
|
|
|
|
wpa_s->current_ssid == NULL) {
|
|
|
|
/*
|
|
|
|
* Invalidate the EAP session cache if anything in the
|
|
|
|
* current or previously used configuration changes.
|
|
|
|
*/
|
|
|
|
eapol_sm_invalidate_cached_session(wpa_s->eapol);
|
|
|
|
}
|
|
|
|
|
2009-11-10 10:51:59 -05:00
|
|
|
if ((os_strcmp(entry.key, "psk") == 0 &&
|
|
|
|
value[0] == '"' && ssid->ssid_len) ||
|
2012-03-31 14:13:53 -04:00
|
|
|
(os_strcmp(entry.key, "ssid") == 0 && ssid->passphrase))
|
2009-11-09 16:51:59 -05:00
|
|
|
wpa_config_update_psk(ssid);
|
2010-03-06 04:13:50 -05:00
|
|
|
else if (os_strcmp(entry.key, "priority") == 0)
|
|
|
|
wpa_config_update_prio_list(wpa_s->conf);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
os_free(value);
|
2014-06-12 10:26:58 -04:00
|
|
|
value = NULL;
|
2009-11-09 16:51:59 -05:00
|
|
|
wpa_dbus_dict_entry_clear(&entry);
|
|
|
|
}
|
2009-12-26 10:28:19 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
error:
|
|
|
|
os_free(value);
|
|
|
|
wpa_dbus_dict_entry_clear(&entry);
|
|
|
|
dbus_set_error_const(error, DBUS_ERROR_INVALID_ARGS,
|
|
|
|
"invalid message format");
|
|
|
|
return FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-01-01 04:56:56 -05:00
|
|
|
/**
|
|
|
|
* wpas_dbus_simple_property_getter - Get basic type property
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Message iter to use when appending arguments
|
2010-01-01 04:56:56 -05:00
|
|
|
* @type: DBus type of property (must be basic type)
|
|
|
|
* @val: pointer to place holding property value
|
2011-07-29 14:25:39 -04:00
|
|
|
* @error: On failure an error describing the failure
|
|
|
|
* Returns: TRUE if the request was successful, FALSE if it failed
|
2010-01-01 04:56:56 -05:00
|
|
|
*
|
|
|
|
* Generic getter for basic type properties. Type is required to be basic.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_simple_property_getter(DBusMessageIter *iter,
|
|
|
|
const int type,
|
|
|
|
const void *val,
|
|
|
|
DBusError *error)
|
2010-01-01 04:56:56 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
DBusMessageIter variant_iter;
|
2010-01-01 04:56:56 -05:00
|
|
|
|
|
|
|
if (!dbus_type_is_basic(type)) {
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error(error, DBUS_ERROR_FAILED,
|
2014-12-31 16:21:10 -05:00
|
|
|
"%s: given type is not basic", __func__);
|
2011-07-29 14:25:39 -04:00
|
|
|
return FALSE;
|
2010-01-01 04:56:56 -05:00
|
|
|
}
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
if (!dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT,
|
2014-12-31 16:21:10 -05:00
|
|
|
wpa_dbus_type_as_string(type),
|
|
|
|
&variant_iter) ||
|
2014-12-31 06:57:48 -05:00
|
|
|
!dbus_message_iter_append_basic(&variant_iter, type, val) ||
|
|
|
|
!dbus_message_iter_close_container(iter, &variant_iter)) {
|
|
|
|
dbus_set_error(error, DBUS_ERROR_FAILED,
|
|
|
|
"%s: error constructing reply", __func__);
|
|
|
|
return FALSE;
|
|
|
|
}
|
2011-07-29 14:25:39 -04:00
|
|
|
|
|
|
|
return TRUE;
|
2010-01-01 04:56:56 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_simple_property_setter - Set basic type property
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @type: DBus type of property (must be basic type)
|
|
|
|
* @val: pointer to place where value being set will be stored
|
2011-07-29 14:25:39 -04:00
|
|
|
* Returns: TRUE if the request was successful, FALSE if it failed
|
2010-01-01 04:56:56 -05:00
|
|
|
*
|
|
|
|
* Generic setter for basic type properties. Type is required to be basic.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_simple_property_setter(DBusMessageIter *iter,
|
|
|
|
DBusError *error,
|
|
|
|
const int type, void *val)
|
2010-01-01 04:56:56 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
DBusMessageIter variant_iter;
|
2010-01-01 04:56:56 -05:00
|
|
|
|
|
|
|
if (!dbus_type_is_basic(type)) {
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error(error, DBUS_ERROR_FAILED,
|
|
|
|
"%s: given type is not basic", __func__);
|
|
|
|
return FALSE;
|
2010-01-01 04:56:56 -05:00
|
|
|
}
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
/* Look at the new value */
|
|
|
|
dbus_message_iter_recurse(iter, &variant_iter);
|
2010-01-01 04:56:56 -05:00
|
|
|
if (dbus_message_iter_get_arg_type(&variant_iter) != type) {
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error_const(error, DBUS_ERROR_FAILED,
|
|
|
|
"wrong property type");
|
|
|
|
return FALSE;
|
2010-01-01 04:56:56 -05:00
|
|
|
}
|
|
|
|
dbus_message_iter_get_basic(&variant_iter, val);
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
return TRUE;
|
2010-01-01 04:56:56 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_simple_array_property_getter - Get array type property
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iterator
|
2010-01-01 04:56:56 -05:00
|
|
|
* @type: DBus type of property array elements (must be basic type)
|
|
|
|
* @array: pointer to array of elements to put into response message
|
|
|
|
* @array_len: length of above array
|
2011-07-29 14:25:39 -04:00
|
|
|
* @error: a pointer to an error to fill on failure
|
|
|
|
* Returns: TRUE if the request succeeded, FALSE if it failed
|
2010-01-01 04:56:56 -05:00
|
|
|
*
|
|
|
|
* Generic getter for array type properties. Array elements type is
|
|
|
|
* required to be basic.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_simple_array_property_getter(DBusMessageIter *iter,
|
|
|
|
const int type,
|
|
|
|
const void *array,
|
|
|
|
size_t array_len,
|
|
|
|
DBusError *error)
|
2010-01-01 04:56:56 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
DBusMessageIter variant_iter, array_iter;
|
2010-01-01 04:56:56 -05:00
|
|
|
char type_str[] = "a?"; /* ? will be replaced with subtype letter; */
|
|
|
|
const char *sub_type_str;
|
|
|
|
size_t element_size, i;
|
|
|
|
|
|
|
|
if (!dbus_type_is_basic(type)) {
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error(error, DBUS_ERROR_FAILED,
|
2014-12-31 16:21:10 -05:00
|
|
|
"%s: given type is not basic", __func__);
|
2011-07-29 14:25:39 -04:00
|
|
|
return FALSE;
|
2010-01-01 04:56:56 -05:00
|
|
|
}
|
|
|
|
|
2010-01-02 03:45:03 -05:00
|
|
|
sub_type_str = wpa_dbus_type_as_string(type);
|
2010-01-01 04:56:56 -05:00
|
|
|
type_str[1] = sub_type_str[0];
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
if (!dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT,
|
2014-12-31 06:57:48 -05:00
|
|
|
type_str, &variant_iter) ||
|
|
|
|
!dbus_message_iter_open_container(&variant_iter, DBUS_TYPE_ARRAY,
|
2010-01-01 04:56:56 -05:00
|
|
|
sub_type_str, &array_iter)) {
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error(error, DBUS_ERROR_FAILED,
|
2014-12-31 06:57:48 -05:00
|
|
|
"%s: failed to construct message", __func__);
|
2011-07-29 14:25:39 -04:00
|
|
|
return FALSE;
|
2010-01-01 04:56:56 -05:00
|
|
|
}
|
|
|
|
|
2014-12-31 16:21:10 -05:00
|
|
|
switch (type) {
|
2010-01-01 04:56:56 -05:00
|
|
|
case DBUS_TYPE_BYTE:
|
|
|
|
case DBUS_TYPE_BOOLEAN:
|
|
|
|
element_size = 1;
|
|
|
|
break;
|
|
|
|
case DBUS_TYPE_INT16:
|
|
|
|
case DBUS_TYPE_UINT16:
|
|
|
|
element_size = sizeof(uint16_t);
|
|
|
|
break;
|
|
|
|
case DBUS_TYPE_INT32:
|
|
|
|
case DBUS_TYPE_UINT32:
|
|
|
|
element_size = sizeof(uint32_t);
|
|
|
|
break;
|
|
|
|
case DBUS_TYPE_INT64:
|
|
|
|
case DBUS_TYPE_UINT64:
|
|
|
|
element_size = sizeof(uint64_t);
|
|
|
|
break;
|
|
|
|
case DBUS_TYPE_DOUBLE:
|
|
|
|
element_size = sizeof(double);
|
|
|
|
break;
|
|
|
|
case DBUS_TYPE_STRING:
|
|
|
|
case DBUS_TYPE_OBJECT_PATH:
|
|
|
|
element_size = sizeof(char *);
|
|
|
|
break;
|
|
|
|
default:
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error(error, DBUS_ERROR_FAILED,
|
2014-12-31 16:21:10 -05:00
|
|
|
"%s: unknown element type %d", __func__, type);
|
2011-07-29 14:25:39 -04:00
|
|
|
return FALSE;
|
2010-01-01 04:56:56 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < array_len; i++) {
|
2014-06-13 18:29:42 -04:00
|
|
|
if (!dbus_message_iter_append_basic(&array_iter, type,
|
|
|
|
array + i * element_size)) {
|
|
|
|
dbus_set_error(error, DBUS_ERROR_FAILED,
|
|
|
|
"%s: failed to construct message 2.5",
|
|
|
|
__func__);
|
|
|
|
return FALSE;
|
|
|
|
}
|
2010-01-01 04:56:56 -05:00
|
|
|
}
|
|
|
|
|
2014-12-31 06:57:48 -05:00
|
|
|
if (!dbus_message_iter_close_container(&variant_iter, &array_iter) ||
|
|
|
|
!dbus_message_iter_close_container(iter, &variant_iter)) {
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error(error, DBUS_ERROR_FAILED,
|
2014-12-31 16:21:10 -05:00
|
|
|
"%s: failed to construct message 3", __func__);
|
2011-07-29 14:25:39 -04:00
|
|
|
return FALSE;
|
2010-01-01 04:56:56 -05:00
|
|
|
}
|
|
|
|
|
2012-02-25 03:45:17 -05:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_simple_array_array_property_getter - Get array array type property
|
|
|
|
* @iter: Pointer to incoming dbus message iterator
|
|
|
|
* @type: DBus type of property array elements (must be basic type)
|
|
|
|
* @array: pointer to array of elements to put into response message
|
|
|
|
* @array_len: length of above array
|
|
|
|
* @error: a pointer to an error to fill on failure
|
|
|
|
* Returns: TRUE if the request succeeded, FALSE if it failed
|
|
|
|
*
|
|
|
|
* Generic getter for array type properties. Array elements type is
|
|
|
|
* required to be basic.
|
|
|
|
*/
|
|
|
|
dbus_bool_t wpas_dbus_simple_array_array_property_getter(DBusMessageIter *iter,
|
|
|
|
const int type,
|
|
|
|
struct wpabuf **array,
|
|
|
|
size_t array_len,
|
|
|
|
DBusError *error)
|
|
|
|
{
|
|
|
|
DBusMessageIter variant_iter, array_iter;
|
|
|
|
char type_str[] = "aa?";
|
|
|
|
char inner_type_str[] = "a?";
|
|
|
|
const char *sub_type_str;
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
if (!dbus_type_is_basic(type)) {
|
|
|
|
dbus_set_error(error, DBUS_ERROR_FAILED,
|
|
|
|
"%s: given type is not basic", __func__);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
sub_type_str = wpa_dbus_type_as_string(type);
|
|
|
|
type_str[2] = sub_type_str[0];
|
|
|
|
inner_type_str[1] = sub_type_str[0];
|
|
|
|
|
|
|
|
if (!dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT,
|
2014-12-31 06:57:48 -05:00
|
|
|
type_str, &variant_iter) ||
|
|
|
|
!dbus_message_iter_open_container(&variant_iter, DBUS_TYPE_ARRAY,
|
2012-02-25 03:45:17 -05:00
|
|
|
inner_type_str, &array_iter)) {
|
|
|
|
dbus_set_error(error, DBUS_ERROR_FAILED,
|
2014-12-31 06:57:48 -05:00
|
|
|
"%s: failed to construct message", __func__);
|
2012-02-25 03:45:17 -05:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2014-06-29 11:20:13 -04:00
|
|
|
for (i = 0; i < array_len && array[i]; i++) {
|
2012-02-25 03:45:17 -05:00
|
|
|
wpa_dbus_dict_bin_array_add_element(&array_iter,
|
|
|
|
wpabuf_head(array[i]),
|
|
|
|
wpabuf_len(array[i]));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2014-12-31 06:57:48 -05:00
|
|
|
if (!dbus_message_iter_close_container(&variant_iter, &array_iter) ||
|
|
|
|
!dbus_message_iter_close_container(iter, &variant_iter)) {
|
2012-02-25 03:45:17 -05:00
|
|
|
dbus_set_error(error, DBUS_ERROR_FAILED,
|
2014-12-31 06:57:48 -05:00
|
|
|
"%s: failed to close message", __func__);
|
2011-07-29 14:25:39 -04:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
2010-01-01 04:56:56 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-11-09 16:51:59 -05:00
|
|
|
/**
|
|
|
|
* wpas_dbus_handler_create_interface - Request registration of a network iface
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @global: %wpa_supplicant global data structure
|
|
|
|
* Returns: The object path of the new interface object,
|
|
|
|
* or a dbus error message with more information
|
|
|
|
*
|
2009-12-26 06:36:05 -05:00
|
|
|
* Handler function for "CreateInterface" method call. Handles requests
|
2009-11-09 16:51:59 -05:00
|
|
|
* by dbus clients to register a network interface that wpa_supplicant
|
|
|
|
* will manage.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_create_interface(DBusMessage *message,
|
2009-11-10 10:51:59 -05:00
|
|
|
struct wpa_global *global)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
|
|
|
DBusMessageIter iter_dict;
|
|
|
|
DBusMessage *reply = NULL;
|
|
|
|
DBusMessageIter iter;
|
|
|
|
struct wpa_dbus_dict_entry entry;
|
2009-12-26 06:36:05 -05:00
|
|
|
char *driver = NULL;
|
|
|
|
char *ifname = NULL;
|
2011-03-20 05:52:57 -04:00
|
|
|
char *confname = NULL;
|
2009-12-26 06:36:05 -05:00
|
|
|
char *bridge_ifname = NULL;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
dbus_message_iter_init(message, &iter);
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
if (!wpa_dbus_dict_open_read(&iter, &iter_dict, NULL))
|
2009-11-09 16:51:59 -05:00
|
|
|
goto error;
|
|
|
|
while (wpa_dbus_dict_has_dict_entry(&iter_dict)) {
|
|
|
|
if (!wpa_dbus_dict_get_entry(&iter_dict, &entry))
|
|
|
|
goto error;
|
2014-12-31 16:21:10 -05:00
|
|
|
if (os_strcmp(entry.key, "Driver") == 0 &&
|
|
|
|
entry.type == DBUS_TYPE_STRING) {
|
2014-06-12 10:36:56 -04:00
|
|
|
os_free(driver);
|
2009-12-26 06:36:05 -05:00
|
|
|
driver = os_strdup(entry.str_value);
|
|
|
|
wpa_dbus_dict_entry_clear(&entry);
|
|
|
|
if (driver == NULL)
|
2015-01-08 19:31:23 -05:00
|
|
|
goto oom;
|
2014-12-31 16:21:10 -05:00
|
|
|
} else if (os_strcmp(entry.key, "Ifname") == 0 &&
|
|
|
|
entry.type == DBUS_TYPE_STRING) {
|
2014-06-12 10:36:56 -04:00
|
|
|
os_free(ifname);
|
2009-12-26 06:36:05 -05:00
|
|
|
ifname = os_strdup(entry.str_value);
|
|
|
|
wpa_dbus_dict_entry_clear(&entry);
|
|
|
|
if (ifname == NULL)
|
2015-01-08 19:31:23 -05:00
|
|
|
goto oom;
|
2014-12-31 16:21:10 -05:00
|
|
|
} else if (os_strcmp(entry.key, "ConfigFile") == 0 &&
|
|
|
|
entry.type == DBUS_TYPE_STRING) {
|
2014-06-12 10:36:56 -04:00
|
|
|
os_free(confname);
|
2011-03-20 05:52:57 -04:00
|
|
|
confname = os_strdup(entry.str_value);
|
|
|
|
wpa_dbus_dict_entry_clear(&entry);
|
|
|
|
if (confname == NULL)
|
2015-01-08 19:31:23 -05:00
|
|
|
goto oom;
|
2014-12-31 16:21:10 -05:00
|
|
|
} else if (os_strcmp(entry.key, "BridgeIfname") == 0 &&
|
|
|
|
entry.type == DBUS_TYPE_STRING) {
|
2014-06-12 10:36:56 -04:00
|
|
|
os_free(bridge_ifname);
|
2009-12-26 06:36:05 -05:00
|
|
|
bridge_ifname = os_strdup(entry.str_value);
|
|
|
|
wpa_dbus_dict_entry_clear(&entry);
|
|
|
|
if (bridge_ifname == NULL)
|
2015-01-08 19:31:23 -05:00
|
|
|
goto oom;
|
2009-11-10 10:51:59 -05:00
|
|
|
} else {
|
2009-11-09 16:51:59 -05:00
|
|
|
wpa_dbus_dict_entry_clear(&entry);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-12-26 06:36:05 -05:00
|
|
|
if (ifname == NULL)
|
|
|
|
goto error; /* Required Ifname argument missing */
|
|
|
|
|
2009-11-09 16:51:59 -05:00
|
|
|
/*
|
|
|
|
* Try to get the wpa_supplicant record for this iface, return
|
|
|
|
* an error if we already control it.
|
|
|
|
*/
|
2009-12-26 06:36:05 -05:00
|
|
|
if (wpa_supplicant_get_iface(global, ifname) != NULL) {
|
2014-12-31 16:21:10 -05:00
|
|
|
reply = dbus_message_new_error(
|
|
|
|
message, WPAS_DBUS_ERROR_IFACE_EXISTS,
|
|
|
|
"wpa_supplicant already controls this interface.");
|
2009-11-09 16:51:59 -05:00
|
|
|
} else {
|
|
|
|
struct wpa_supplicant *wpa_s;
|
2009-12-26 06:36:05 -05:00
|
|
|
struct wpa_interface iface;
|
2014-12-31 16:21:10 -05:00
|
|
|
|
2009-12-26 06:36:05 -05:00
|
|
|
os_memset(&iface, 0, sizeof(iface));
|
|
|
|
iface.driver = driver;
|
|
|
|
iface.ifname = ifname;
|
2011-03-20 05:52:57 -04:00
|
|
|
iface.confname = confname;
|
2009-12-26 06:36:05 -05:00
|
|
|
iface.bridge_ifname = bridge_ifname;
|
2009-11-09 16:51:59 -05:00
|
|
|
/* Otherwise, have wpa_supplicant attach to it. */
|
2015-03-01 14:50:34 -05:00
|
|
|
wpa_s = wpa_supplicant_add_iface(global, &iface, NULL);
|
2015-04-29 06:13:34 -04:00
|
|
|
if (wpa_s && wpa_s->dbus_new_path) {
|
2010-01-01 12:12:31 -05:00
|
|
|
const char *path = wpa_s->dbus_new_path;
|
2014-12-31 16:21:10 -05:00
|
|
|
|
2009-11-09 16:51:59 -05:00
|
|
|
reply = dbus_message_new_method_return(message);
|
|
|
|
dbus_message_append_args(reply, DBUS_TYPE_OBJECT_PATH,
|
2014-12-31 16:21:10 -05:00
|
|
|
&path, DBUS_TYPE_INVALID);
|
2009-11-09 16:51:59 -05:00
|
|
|
} else {
|
2009-11-10 10:51:59 -05:00
|
|
|
reply = wpas_dbus_error_unknown_error(
|
2014-12-31 16:21:10 -05:00
|
|
|
message,
|
|
|
|
"wpa_supplicant couldn't grab this interface.");
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
}
|
2009-12-26 06:36:05 -05:00
|
|
|
|
|
|
|
out:
|
|
|
|
os_free(driver);
|
|
|
|
os_free(ifname);
|
2012-08-04 13:10:08 -04:00
|
|
|
os_free(confname);
|
2009-12-26 06:36:05 -05:00
|
|
|
os_free(bridge_ifname);
|
2009-11-09 16:51:59 -05:00
|
|
|
return reply;
|
|
|
|
|
|
|
|
error:
|
2010-01-01 14:52:29 -05:00
|
|
|
reply = wpas_dbus_error_invalid_args(message, NULL);
|
2009-12-26 06:36:05 -05:00
|
|
|
goto out;
|
2015-01-08 19:31:23 -05:00
|
|
|
oom:
|
|
|
|
reply = wpas_dbus_error_no_memory(message);
|
|
|
|
goto out;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_handler_remove_interface - Request deregistration of an interface
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @global: wpa_supplicant global data structure
|
|
|
|
* Returns: a dbus message containing a UINT32 indicating success (1) or
|
|
|
|
* failure (0), or returns a dbus error message with more information
|
|
|
|
*
|
|
|
|
* Handler function for "removeInterface" method call. Handles requests
|
|
|
|
* by dbus clients to deregister a network interface that wpa_supplicant
|
|
|
|
* currently manages.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_remove_interface(DBusMessage *message,
|
2009-11-10 10:51:59 -05:00
|
|
|
struct wpa_global *global)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
|
|
|
struct wpa_supplicant *wpa_s;
|
|
|
|
char *path;
|
|
|
|
DBusMessage *reply = NULL;
|
|
|
|
|
|
|
|
dbus_message_get_args(message, NULL, DBUS_TYPE_OBJECT_PATH, &path,
|
2009-11-10 10:51:59 -05:00
|
|
|
DBUS_TYPE_INVALID);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
wpa_s = get_iface_by_dbus_path(global, path);
|
2009-11-10 10:51:59 -05:00
|
|
|
if (wpa_s == NULL)
|
2009-11-09 16:51:59 -05:00
|
|
|
reply = wpas_dbus_error_iface_unknown(message);
|
2012-01-29 13:15:48 -05:00
|
|
|
else if (wpa_supplicant_remove_iface(global, wpa_s, 0)) {
|
2009-11-10 10:51:59 -05:00
|
|
|
reply = wpas_dbus_error_unknown_error(
|
2014-12-31 16:21:10 -05:00
|
|
|
message,
|
|
|
|
"wpa_supplicant couldn't remove this interface.");
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
return reply;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_handler_get_interface - Get the object path for an interface name
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @global: %wpa_supplicant global data structure
|
|
|
|
* Returns: The object path of the interface object,
|
|
|
|
* or a dbus error message with more information
|
|
|
|
*
|
|
|
|
* Handler function for "getInterface" method call.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_get_interface(DBusMessage *message,
|
2009-11-10 10:51:59 -05:00
|
|
|
struct wpa_global *global)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
|
|
|
DBusMessage *reply = NULL;
|
|
|
|
const char *ifname;
|
|
|
|
const char *path;
|
|
|
|
struct wpa_supplicant *wpa_s;
|
|
|
|
|
|
|
|
dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &ifname,
|
2009-11-10 10:51:59 -05:00
|
|
|
DBUS_TYPE_INVALID);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
wpa_s = wpa_supplicant_get_iface(global, ifname);
|
2015-04-29 06:13:34 -04:00
|
|
|
if (wpa_s == NULL || wpa_s->dbus_new_path == NULL)
|
2009-11-10 10:51:59 -05:00
|
|
|
return wpas_dbus_error_iface_unknown(message);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2010-01-01 12:12:31 -05:00
|
|
|
path = wpa_s->dbus_new_path;
|
2009-11-09 16:51:59 -05:00
|
|
|
reply = dbus_message_new_method_return(message);
|
2010-01-01 13:50:12 -05:00
|
|
|
if (reply == NULL)
|
2015-01-01 15:36:52 -05:00
|
|
|
return wpas_dbus_error_no_memory(message);
|
2009-11-09 16:51:59 -05:00
|
|
|
if (!dbus_message_append_args(reply, DBUS_TYPE_OBJECT_PATH, &path,
|
2009-11-10 10:51:59 -05:00
|
|
|
DBUS_TYPE_INVALID)) {
|
2009-11-09 16:51:59 -05:00
|
|
|
dbus_message_unref(reply);
|
2015-01-01 15:36:52 -05:00
|
|
|
return wpas_dbus_error_no_memory(message);
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
return reply;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
2010-01-01 06:00:22 -05:00
|
|
|
* wpas_dbus_getter_debug_level - Get debug level
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2009-11-09 16:51:59 -05:00
|
|
|
*
|
2010-01-01 06:00:22 -05:00
|
|
|
* Getter for "DebugLevel" property.
|
2009-11-09 16:51:59 -05:00
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_debug_level(DBusMessageIter *iter,
|
|
|
|
DBusError *error,
|
|
|
|
void *user_data)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
2010-01-04 09:22:26 -05:00
|
|
|
const char *str;
|
|
|
|
int idx = wpa_debug_level;
|
2011-07-29 14:25:39 -04:00
|
|
|
|
2010-01-04 09:22:26 -05:00
|
|
|
if (idx < 0)
|
|
|
|
idx = 0;
|
2011-03-31 10:38:08 -04:00
|
|
|
if (idx > 5)
|
|
|
|
idx = 5;
|
2010-01-04 09:22:26 -05:00
|
|
|
str = debug_strings[idx];
|
2011-07-29 14:25:39 -04:00
|
|
|
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_STRING,
|
|
|
|
&str, error);
|
2010-01-01 06:00:22 -05:00
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
|
2010-01-01 06:00:22 -05:00
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_debug_timestamp - Get debug timestamp
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2010-01-01 06:00:22 -05:00
|
|
|
*
|
|
|
|
* Getter for "DebugTimestamp" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_debug_timestamp(DBusMessageIter *iter,
|
2014-12-31 16:21:10 -05:00
|
|
|
DBusError *error,
|
|
|
|
void *user_data)
|
2010-01-01 06:00:22 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_BOOLEAN,
|
|
|
|
&wpa_debug_timestamp, error);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2010-01-01 06:00:22 -05:00
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
|
2010-01-01 06:00:22 -05:00
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_debug_show_keys - Get debug show keys
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2010-01-01 06:00:22 -05:00
|
|
|
*
|
|
|
|
* Getter for "DebugShowKeys" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_debug_show_keys(DBusMessageIter *iter,
|
|
|
|
DBusError *error,
|
|
|
|
void *user_data)
|
2010-01-01 06:00:22 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_BOOLEAN,
|
|
|
|
&wpa_debug_show_keys, error);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2010-01-01 06:00:22 -05:00
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2010-01-01 06:00:22 -05:00
|
|
|
/**
|
|
|
|
* wpas_dbus_setter_debug_level - Set debug level
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2010-01-01 06:00:22 -05:00
|
|
|
*
|
|
|
|
* Setter for "DebugLevel" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_setter_debug_level(DBusMessageIter *iter,
|
|
|
|
DBusError *error, void *user_data)
|
2010-01-01 06:00:22 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct wpa_global *global = user_data;
|
2010-01-04 09:22:26 -05:00
|
|
|
const char *str = NULL;
|
|
|
|
int i, val = -1;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
if (!wpas_dbus_simple_property_setter(iter, error, DBUS_TYPE_STRING,
|
|
|
|
&str))
|
|
|
|
return FALSE;
|
2010-01-01 06:00:22 -05:00
|
|
|
|
2010-01-04 09:22:26 -05:00
|
|
|
for (i = 0; debug_strings[i]; i++)
|
|
|
|
if (os_strcmp(debug_strings[i], str) == 0) {
|
|
|
|
val = i;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (val < 0 ||
|
|
|
|
wpa_supplicant_set_debug_params(global, val, wpa_debug_timestamp,
|
2010-01-01 06:00:22 -05:00
|
|
|
wpa_debug_show_keys)) {
|
2014-12-31 16:21:10 -05:00
|
|
|
dbus_set_error_const(error, DBUS_ERROR_FAILED,
|
|
|
|
"wrong debug level value");
|
2011-07-29 14:25:39 -04:00
|
|
|
return FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
return TRUE;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
2010-01-01 06:00:22 -05:00
|
|
|
* wpas_dbus_setter_debug_timestamp - Set debug timestamp
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2009-11-09 16:51:59 -05:00
|
|
|
*
|
2010-01-01 06:00:22 -05:00
|
|
|
* Setter for "DebugTimestamp" property.
|
2009-11-09 16:51:59 -05:00
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_setter_debug_timestamp(DBusMessageIter *iter,
|
|
|
|
DBusError *error,
|
|
|
|
void *user_data)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct wpa_global *global = user_data;
|
2010-01-01 06:00:22 -05:00
|
|
|
dbus_bool_t val;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
if (!wpas_dbus_simple_property_setter(iter, error, DBUS_TYPE_BOOLEAN,
|
|
|
|
&val))
|
|
|
|
return FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2010-01-01 06:00:22 -05:00
|
|
|
wpa_supplicant_set_debug_params(global, wpa_debug_level, val ? 1 : 0,
|
|
|
|
wpa_debug_show_keys);
|
2011-07-29 14:25:39 -04:00
|
|
|
return TRUE;
|
2010-01-01 06:00:22 -05:00
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
|
2010-01-01 06:00:22 -05:00
|
|
|
/**
|
|
|
|
* wpas_dbus_setter_debug_show_keys - Set debug show keys
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2010-01-01 06:00:22 -05:00
|
|
|
*
|
|
|
|
* Setter for "DebugShowKeys" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_setter_debug_show_keys(DBusMessageIter *iter,
|
|
|
|
DBusError *error,
|
|
|
|
void *user_data)
|
2010-01-01 06:00:22 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct wpa_global *global = user_data;
|
2010-01-01 06:00:22 -05:00
|
|
|
dbus_bool_t val;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
if (!wpas_dbus_simple_property_setter(iter, error, DBUS_TYPE_BOOLEAN,
|
|
|
|
&val))
|
|
|
|
return FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2010-01-01 06:00:22 -05:00
|
|
|
wpa_supplicant_set_debug_params(global, wpa_debug_level,
|
|
|
|
wpa_debug_timestamp,
|
|
|
|
val ? 1 : 0);
|
2011-07-29 14:25:39 -04:00
|
|
|
return TRUE;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_interfaces - Request registered interfaces list
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2009-11-09 16:51:59 -05:00
|
|
|
*
|
|
|
|
* Getter for "Interfaces" property. Handles requests
|
|
|
|
* by dbus clients to return list of registered interfaces objects
|
|
|
|
* paths
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_interfaces(DBusMessageIter *iter,
|
|
|
|
DBusError *error,
|
|
|
|
void *user_data)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct wpa_global *global = user_data;
|
2009-11-09 16:51:59 -05:00
|
|
|
struct wpa_supplicant *wpa_s;
|
2010-01-01 04:56:56 -05:00
|
|
|
const char **paths;
|
|
|
|
unsigned int i = 0, num = 0;
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t success;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2015-04-29 06:13:34 -04:00
|
|
|
for (wpa_s = global->ifaces; wpa_s; wpa_s = wpa_s->next) {
|
|
|
|
if (wpa_s->dbus_new_path)
|
|
|
|
num++;
|
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2012-08-13 13:44:21 -04:00
|
|
|
paths = os_calloc(num, sizeof(char *));
|
2010-01-01 04:56:56 -05:00
|
|
|
if (!paths) {
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
|
|
|
|
return FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
2015-04-29 06:13:34 -04:00
|
|
|
for (wpa_s = global->ifaces; wpa_s; wpa_s = wpa_s->next) {
|
|
|
|
if (wpa_s->dbus_new_path)
|
|
|
|
paths[i++] = wpa_s->dbus_new_path;
|
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
success = wpas_dbus_simple_array_property_getter(iter,
|
|
|
|
DBUS_TYPE_OBJECT_PATH,
|
|
|
|
paths, num, error);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2010-01-01 04:56:56 -05:00
|
|
|
os_free(paths);
|
2011-07-29 14:25:39 -04:00
|
|
|
return success;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_eap_methods - Request supported EAP methods list
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2009-11-09 16:51:59 -05:00
|
|
|
*
|
|
|
|
* Getter for "EapMethods" property. Handles requests
|
|
|
|
* by dbus clients to return list of strings with supported EAP methods
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_eap_methods(DBusMessageIter *iter,
|
|
|
|
DBusError *error, void *user_data)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
|
|
|
char **eap_methods;
|
2010-01-01 04:56:56 -05:00
|
|
|
size_t num_items = 0;
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t success;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
eap_methods = eap_get_names_as_string_array(&num_items);
|
2010-01-01 04:56:56 -05:00
|
|
|
if (!eap_methods) {
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
|
|
|
|
return FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
success = wpas_dbus_simple_array_property_getter(iter,
|
|
|
|
DBUS_TYPE_STRING,
|
|
|
|
eap_methods,
|
|
|
|
num_items, error);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2010-01-01 04:56:56 -05:00
|
|
|
while (num_items)
|
|
|
|
os_free(eap_methods[--num_items]);
|
|
|
|
os_free(eap_methods);
|
2011-07-29 14:25:39 -04:00
|
|
|
return success;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-09-29 12:06:30 -04:00
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_global_capabilities - Request supported global capabilities
|
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
|
|
|
*
|
|
|
|
* Getter for "Capabilities" property. Handles requests by dbus clients to
|
|
|
|
* return a list of strings with supported capabilities like AP, RSN IBSS,
|
|
|
|
* and P2P that are determined at compile time.
|
|
|
|
*/
|
|
|
|
dbus_bool_t wpas_dbus_getter_global_capabilities(DBusMessageIter *iter,
|
2014-12-31 16:21:10 -05:00
|
|
|
DBusError *error,
|
|
|
|
void *user_data)
|
2012-09-29 12:06:30 -04:00
|
|
|
{
|
|
|
|
const char *capabilities[5] = { NULL, NULL, NULL, NULL, NULL };
|
|
|
|
size_t num_items = 0;
|
|
|
|
|
|
|
|
#ifdef CONFIG_AP
|
|
|
|
capabilities[num_items++] = "ap";
|
|
|
|
#endif /* CONFIG_AP */
|
|
|
|
#ifdef CONFIG_IBSS_RSN
|
|
|
|
capabilities[num_items++] = "ibss-rsn";
|
|
|
|
#endif /* CONFIG_IBSS_RSN */
|
|
|
|
#ifdef CONFIG_P2P
|
|
|
|
capabilities[num_items++] = "p2p";
|
|
|
|
#endif /* CONFIG_P2P */
|
|
|
|
#ifdef CONFIG_INTERWORKING
|
|
|
|
capabilities[num_items++] = "interworking";
|
|
|
|
#endif /* CONFIG_INTERWORKING */
|
|
|
|
|
|
|
|
return wpas_dbus_simple_array_property_getter(iter,
|
|
|
|
DBUS_TYPE_STRING,
|
|
|
|
capabilities,
|
|
|
|
num_items, error);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
static int wpas_dbus_get_scan_type(DBusMessage *message, DBusMessageIter *var,
|
|
|
|
char **type, DBusMessage **reply)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
2009-12-26 10:06:28 -05:00
|
|
|
if (dbus_message_iter_get_arg_type(var) != DBUS_TYPE_STRING) {
|
2014-12-31 16:21:10 -05:00
|
|
|
wpa_printf(MSG_DEBUG, "%s[dbus]: Type must be a string",
|
|
|
|
__func__);
|
2010-01-01 14:52:29 -05:00
|
|
|
*reply = wpas_dbus_error_invalid_args(
|
2009-12-26 10:06:28 -05:00
|
|
|
message, "Wrong Type value type. String required");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
dbus_message_iter_get_basic(var, type);
|
|
|
|
return 0;
|
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
static int wpas_dbus_get_scan_ssids(DBusMessage *message, DBusMessageIter *var,
|
|
|
|
struct wpa_driver_scan_params *params,
|
|
|
|
DBusMessage **reply)
|
|
|
|
{
|
|
|
|
struct wpa_driver_scan_ssid *ssids = params->ssids;
|
|
|
|
size_t ssids_num = 0;
|
|
|
|
u8 *ssid;
|
|
|
|
DBusMessageIter array_iter, sub_array_iter;
|
|
|
|
char *val;
|
|
|
|
int len;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
if (dbus_message_iter_get_arg_type(var) != DBUS_TYPE_ARRAY) {
|
2014-12-31 16:21:10 -05:00
|
|
|
wpa_printf(MSG_DEBUG,
|
|
|
|
"%s[dbus]: ssids must be an array of arrays of bytes",
|
|
|
|
__func__);
|
2010-01-01 14:52:29 -05:00
|
|
|
*reply = wpas_dbus_error_invalid_args(
|
2014-12-31 16:21:10 -05:00
|
|
|
message,
|
|
|
|
"Wrong SSIDs value type. Array of arrays of bytes required");
|
2009-12-26 10:06:28 -05:00
|
|
|
return -1;
|
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
dbus_message_iter_recurse(var, &array_iter);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
if (dbus_message_iter_get_arg_type(&array_iter) != DBUS_TYPE_ARRAY ||
|
2014-12-31 16:21:10 -05:00
|
|
|
dbus_message_iter_get_element_type(&array_iter) != DBUS_TYPE_BYTE) {
|
|
|
|
wpa_printf(MSG_DEBUG,
|
|
|
|
"%s[dbus]: ssids must be an array of arrays of bytes",
|
|
|
|
__func__);
|
2010-01-01 14:52:29 -05:00
|
|
|
*reply = wpas_dbus_error_invalid_args(
|
2014-12-31 16:21:10 -05:00
|
|
|
message,
|
|
|
|
"Wrong SSIDs value type. Array of arrays of bytes required");
|
2009-12-26 10:06:28 -05:00
|
|
|
return -1;
|
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2014-12-31 16:21:10 -05:00
|
|
|
while (dbus_message_iter_get_arg_type(&array_iter) == DBUS_TYPE_ARRAY) {
|
2009-12-26 10:06:28 -05:00
|
|
|
if (ssids_num >= WPAS_MAX_SCAN_SSIDS) {
|
2014-12-31 16:21:10 -05:00
|
|
|
wpa_printf(MSG_DEBUG,
|
|
|
|
"%s[dbus]: Too many ssids specified on scan dbus call",
|
|
|
|
__func__);
|
2010-01-01 14:52:29 -05:00
|
|
|
*reply = wpas_dbus_error_invalid_args(
|
2014-12-31 16:21:10 -05:00
|
|
|
message,
|
|
|
|
"Too many ssids specified. Specify at most four");
|
2009-12-26 10:06:28 -05:00
|
|
|
return -1;
|
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
dbus_message_iter_recurse(&array_iter, &sub_array_iter);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
dbus_message_iter_get_fixed_array(&sub_array_iter, &val, &len);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2015-04-07 05:44:39 -04:00
|
|
|
if (len > SSID_MAX_LEN) {
|
2012-01-22 05:00:44 -05:00
|
|
|
wpa_printf(MSG_DEBUG,
|
2014-12-31 16:21:10 -05:00
|
|
|
"%s[dbus]: SSID too long (len=%d max_len=%d)",
|
2015-04-07 05:44:39 -04:00
|
|
|
__func__, len, SSID_MAX_LEN);
|
2012-01-22 05:00:44 -05:00
|
|
|
*reply = wpas_dbus_error_invalid_args(
|
|
|
|
message, "Invalid SSID: too long");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
dbus: Treat '' in SSIDs of Interface.Scan as a request for broadcast scan
This patch changes wpa_supplicant policy for handling '' in SSIDs field of
Interface.SSID DBus message. It treats '' (zero-length) SSID as a request
for a broadcast scan, instead of ignoring it.
This patch updates DBus API .Scan() logic per the test cases listed below:
1) Interface.Scan({'Type':'active', 'Channel':(2412, 20)})
Request: Active scan with only '' SSID (1 channel)
Should be: 1 broadcast ProbeRequest on specified channel
Previous: 1 broadcast ProbeRequest on specified channel
This Patch: 1 broadcast ProbeRequest on specified channel
2) Interface.Scan({'Type':'active', 'Channel':(2412, 20), 'SSIDs':['']})
Request: Active scan with only '' SSID (1 channel)
Should be: 1 broadcast ProbeRequest on specified channel
Previous: No ProbeRequests; passive scan results for specified channel
This Patch: FIXED: 1 broadcast ProbeRequest on specified channel
3) Interface.Scan({'Type':'active', 'Channel':(2412, 20), 'SSIDs':['MySSID']})
Request: Active scan with only non-'' SSIDs (1 channel)
Should be: 1 directed ProbeRequest for each SSID on specified channel,
no broadcast ProbeRequest
Previous: 1 directed ProbeRequest for each SSID on specified channel,
no broadcast ProbeRequest
This Patch: 1 directed ProbeRequest for each SSID on specified channel,
no broadcast ProbeRequest
4) Interface.Scan({'Type':'active', 'Channel':(2412, 20), 'SSIDs':['',
'MySSID']})
Request: Active scan with SSIDs, including 1 '' SSID (1 channel)
Should be: 1 broadcast ProbeRequest, 1 directed ProbeRequest for each
non-'' SSID on specified channel
Previous: 1 directed ProbeRequest for each non-'' SSID on specified
channel
This Patch: FIXED: 1 broadcast ProbeRequest, 1 directed ProbeRequest for
each non-'' SSID on specified channel
2010-10-09 09:27:53 -04:00
|
|
|
if (len != 0) {
|
|
|
|
ssid = os_malloc(len);
|
|
|
|
if (ssid == NULL) {
|
2015-01-01 15:36:52 -05:00
|
|
|
*reply = wpas_dbus_error_no_memory(message);
|
dbus: Treat '' in SSIDs of Interface.Scan as a request for broadcast scan
This patch changes wpa_supplicant policy for handling '' in SSIDs field of
Interface.SSID DBus message. It treats '' (zero-length) SSID as a request
for a broadcast scan, instead of ignoring it.
This patch updates DBus API .Scan() logic per the test cases listed below:
1) Interface.Scan({'Type':'active', 'Channel':(2412, 20)})
Request: Active scan with only '' SSID (1 channel)
Should be: 1 broadcast ProbeRequest on specified channel
Previous: 1 broadcast ProbeRequest on specified channel
This Patch: 1 broadcast ProbeRequest on specified channel
2) Interface.Scan({'Type':'active', 'Channel':(2412, 20), 'SSIDs':['']})
Request: Active scan with only '' SSID (1 channel)
Should be: 1 broadcast ProbeRequest on specified channel
Previous: No ProbeRequests; passive scan results for specified channel
This Patch: FIXED: 1 broadcast ProbeRequest on specified channel
3) Interface.Scan({'Type':'active', 'Channel':(2412, 20), 'SSIDs':['MySSID']})
Request: Active scan with only non-'' SSIDs (1 channel)
Should be: 1 directed ProbeRequest for each SSID on specified channel,
no broadcast ProbeRequest
Previous: 1 directed ProbeRequest for each SSID on specified channel,
no broadcast ProbeRequest
This Patch: 1 directed ProbeRequest for each SSID on specified channel,
no broadcast ProbeRequest
4) Interface.Scan({'Type':'active', 'Channel':(2412, 20), 'SSIDs':['',
'MySSID']})
Request: Active scan with SSIDs, including 1 '' SSID (1 channel)
Should be: 1 broadcast ProbeRequest, 1 directed ProbeRequest for each
non-'' SSID on specified channel
Previous: 1 directed ProbeRequest for each non-'' SSID on specified
channel
This Patch: FIXED: 1 broadcast ProbeRequest, 1 directed ProbeRequest for
each non-'' SSID on specified channel
2010-10-09 09:27:53 -04:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
os_memcpy(ssid, val, len);
|
|
|
|
} else {
|
|
|
|
/* Allow zero-length SSIDs */
|
|
|
|
ssid = NULL;
|
2009-12-26 10:06:28 -05:00
|
|
|
}
|
dbus: Treat '' in SSIDs of Interface.Scan as a request for broadcast scan
This patch changes wpa_supplicant policy for handling '' in SSIDs field of
Interface.SSID DBus message. It treats '' (zero-length) SSID as a request
for a broadcast scan, instead of ignoring it.
This patch updates DBus API .Scan() logic per the test cases listed below:
1) Interface.Scan({'Type':'active', 'Channel':(2412, 20)})
Request: Active scan with only '' SSID (1 channel)
Should be: 1 broadcast ProbeRequest on specified channel
Previous: 1 broadcast ProbeRequest on specified channel
This Patch: 1 broadcast ProbeRequest on specified channel
2) Interface.Scan({'Type':'active', 'Channel':(2412, 20), 'SSIDs':['']})
Request: Active scan with only '' SSID (1 channel)
Should be: 1 broadcast ProbeRequest on specified channel
Previous: No ProbeRequests; passive scan results for specified channel
This Patch: FIXED: 1 broadcast ProbeRequest on specified channel
3) Interface.Scan({'Type':'active', 'Channel':(2412, 20), 'SSIDs':['MySSID']})
Request: Active scan with only non-'' SSIDs (1 channel)
Should be: 1 directed ProbeRequest for each SSID on specified channel,
no broadcast ProbeRequest
Previous: 1 directed ProbeRequest for each SSID on specified channel,
no broadcast ProbeRequest
This Patch: 1 directed ProbeRequest for each SSID on specified channel,
no broadcast ProbeRequest
4) Interface.Scan({'Type':'active', 'Channel':(2412, 20), 'SSIDs':['',
'MySSID']})
Request: Active scan with SSIDs, including 1 '' SSID (1 channel)
Should be: 1 broadcast ProbeRequest, 1 directed ProbeRequest for each
non-'' SSID on specified channel
Previous: 1 directed ProbeRequest for each non-'' SSID on specified
channel
This Patch: FIXED: 1 broadcast ProbeRequest, 1 directed ProbeRequest for
each non-'' SSID on specified channel
2010-10-09 09:27:53 -04:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
ssids[ssids_num].ssid = ssid;
|
|
|
|
ssids[ssids_num].ssid_len = len;
|
2009-11-10 10:51:59 -05:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
dbus_message_iter_next(&array_iter);
|
|
|
|
ssids_num++;
|
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
params->num_ssids = ssids_num;
|
|
|
|
return 0;
|
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
static int wpas_dbus_get_scan_ies(DBusMessage *message, DBusMessageIter *var,
|
|
|
|
struct wpa_driver_scan_params *params,
|
|
|
|
DBusMessage **reply)
|
|
|
|
{
|
|
|
|
u8 *ies = NULL, *nies;
|
|
|
|
int ies_len = 0;
|
|
|
|
DBusMessageIter array_iter, sub_array_iter;
|
|
|
|
char *val;
|
|
|
|
int len;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
if (dbus_message_iter_get_arg_type(var) != DBUS_TYPE_ARRAY) {
|
2014-12-31 16:21:10 -05:00
|
|
|
wpa_printf(MSG_DEBUG,
|
|
|
|
"%s[dbus]: ies must be an array of arrays of bytes",
|
|
|
|
__func__);
|
2010-01-01 14:52:29 -05:00
|
|
|
*reply = wpas_dbus_error_invalid_args(
|
2014-12-31 16:21:10 -05:00
|
|
|
message,
|
|
|
|
"Wrong IEs value type. Array of arrays of bytes required");
|
2009-12-26 10:06:28 -05:00
|
|
|
return -1;
|
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
dbus_message_iter_recurse(var, &array_iter);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
if (dbus_message_iter_get_arg_type(&array_iter) != DBUS_TYPE_ARRAY ||
|
2014-12-31 16:21:10 -05:00
|
|
|
dbus_message_iter_get_element_type(&array_iter) != DBUS_TYPE_BYTE) {
|
|
|
|
wpa_printf(MSG_DEBUG,
|
|
|
|
"%s[dbus]: ies must be an array of arrays of bytes",
|
|
|
|
__func__);
|
2010-01-01 14:52:29 -05:00
|
|
|
*reply = wpas_dbus_error_invalid_args(
|
2009-12-26 10:06:28 -05:00
|
|
|
message, "Wrong IEs value type. Array required");
|
|
|
|
return -1;
|
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2014-12-31 16:21:10 -05:00
|
|
|
while (dbus_message_iter_get_arg_type(&array_iter) == DBUS_TYPE_ARRAY) {
|
2009-12-26 10:06:28 -05:00
|
|
|
dbus_message_iter_recurse(&array_iter, &sub_array_iter);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
dbus_message_iter_get_fixed_array(&sub_array_iter, &val, &len);
|
|
|
|
if (len == 0) {
|
|
|
|
dbus_message_iter_next(&array_iter);
|
|
|
|
continue;
|
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
nies = os_realloc(ies, ies_len + len);
|
|
|
|
if (nies == NULL) {
|
|
|
|
os_free(ies);
|
2015-01-01 15:36:52 -05:00
|
|
|
*reply = wpas_dbus_error_no_memory(message);
|
2009-12-26 10:06:28 -05:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
ies = nies;
|
|
|
|
os_memcpy(ies + ies_len, val, len);
|
|
|
|
ies_len += len;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
dbus_message_iter_next(&array_iter);
|
|
|
|
}
|
2009-11-10 10:51:59 -05:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
params->extra_ies = ies;
|
|
|
|
params->extra_ies_len = ies_len;
|
|
|
|
return 0;
|
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
static int wpas_dbus_get_scan_channels(DBusMessage *message,
|
|
|
|
DBusMessageIter *var,
|
|
|
|
struct wpa_driver_scan_params *params,
|
|
|
|
DBusMessage **reply)
|
|
|
|
{
|
|
|
|
DBusMessageIter array_iter, sub_array_iter;
|
|
|
|
int *freqs = NULL, *nfreqs;
|
|
|
|
int freqs_num = 0;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
if (dbus_message_iter_get_arg_type(var) != DBUS_TYPE_ARRAY) {
|
2014-12-31 16:21:10 -05:00
|
|
|
wpa_printf(MSG_DEBUG,
|
|
|
|
"%s[dbus]: Channels must be an array of structs",
|
|
|
|
__func__);
|
2010-01-01 14:52:29 -05:00
|
|
|
*reply = wpas_dbus_error_invalid_args(
|
2014-12-31 16:21:10 -05:00
|
|
|
message,
|
|
|
|
"Wrong Channels value type. Array of structs required");
|
2009-12-26 10:06:28 -05:00
|
|
|
return -1;
|
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
dbus_message_iter_recurse(var, &array_iter);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
if (dbus_message_iter_get_arg_type(&array_iter) != DBUS_TYPE_STRUCT) {
|
|
|
|
wpa_printf(MSG_DEBUG,
|
2014-12-31 16:21:10 -05:00
|
|
|
"%s[dbus]: Channels must be an array of structs",
|
|
|
|
__func__);
|
2010-01-01 14:52:29 -05:00
|
|
|
*reply = wpas_dbus_error_invalid_args(
|
2014-12-31 16:21:10 -05:00
|
|
|
message,
|
|
|
|
"Wrong Channels value type. Array of structs required");
|
2009-12-26 10:06:28 -05:00
|
|
|
return -1;
|
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
while (dbus_message_iter_get_arg_type(&array_iter) == DBUS_TYPE_STRUCT)
|
|
|
|
{
|
|
|
|
int freq, width;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
dbus_message_iter_recurse(&array_iter, &sub_array_iter);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
if (dbus_message_iter_get_arg_type(&sub_array_iter) !=
|
|
|
|
DBUS_TYPE_UINT32) {
|
2014-12-31 16:21:10 -05:00
|
|
|
wpa_printf(MSG_DEBUG,
|
|
|
|
"%s[dbus]: Channel must by specified by struct of two UINT32s %c",
|
|
|
|
__func__,
|
2009-12-26 10:06:28 -05:00
|
|
|
dbus_message_iter_get_arg_type(
|
|
|
|
&sub_array_iter));
|
2010-01-01 14:52:29 -05:00
|
|
|
*reply = wpas_dbus_error_invalid_args(
|
2014-12-31 16:21:10 -05:00
|
|
|
message,
|
|
|
|
"Wrong Channel struct. Two UINT32s required");
|
2009-12-26 10:06:28 -05:00
|
|
|
os_free(freqs);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
dbus_message_iter_get_basic(&sub_array_iter, &freq);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
if (!dbus_message_iter_next(&sub_array_iter) ||
|
|
|
|
dbus_message_iter_get_arg_type(&sub_array_iter) !=
|
|
|
|
DBUS_TYPE_UINT32) {
|
2014-12-31 16:21:10 -05:00
|
|
|
wpa_printf(MSG_DEBUG,
|
|
|
|
"%s[dbus]: Channel must by specified by struct of two UINT32s",
|
|
|
|
__func__);
|
2010-01-01 14:52:29 -05:00
|
|
|
*reply = wpas_dbus_error_invalid_args(
|
2009-12-26 10:06:28 -05:00
|
|
|
message,
|
|
|
|
"Wrong Channel struct. Two UINT32s required");
|
|
|
|
os_free(freqs);
|
|
|
|
return -1;
|
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
dbus_message_iter_get_basic(&sub_array_iter, &width);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2009-11-10 10:51:59 -05:00
|
|
|
#define FREQS_ALLOC_CHUNK 32
|
2009-12-26 10:06:28 -05:00
|
|
|
if (freqs_num % FREQS_ALLOC_CHUNK == 0) {
|
2012-08-13 14:21:23 -04:00
|
|
|
nfreqs = os_realloc_array(
|
|
|
|
freqs, freqs_num + FREQS_ALLOC_CHUNK,
|
|
|
|
sizeof(int));
|
2009-12-26 10:06:28 -05:00
|
|
|
if (nfreqs == NULL)
|
|
|
|
os_free(freqs);
|
|
|
|
freqs = nfreqs;
|
|
|
|
}
|
|
|
|
if (freqs == NULL) {
|
2015-01-01 15:36:52 -05:00
|
|
|
*reply = wpas_dbus_error_no_memory(message);
|
2009-12-26 10:06:28 -05:00
|
|
|
return -1;
|
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
freqs[freqs_num] = freq;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
freqs_num++;
|
|
|
|
dbus_message_iter_next(&array_iter);
|
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2012-08-13 14:21:23 -04:00
|
|
|
nfreqs = os_realloc_array(freqs, freqs_num + 1, sizeof(int));
|
2009-12-26 10:06:28 -05:00
|
|
|
if (nfreqs == NULL)
|
|
|
|
os_free(freqs);
|
|
|
|
freqs = nfreqs;
|
|
|
|
if (freqs == NULL) {
|
2015-01-01 15:36:52 -05:00
|
|
|
*reply = wpas_dbus_error_no_memory(message);
|
2009-12-26 10:06:28 -05:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
freqs[freqs_num] = 0;
|
|
|
|
|
|
|
|
params->freqs = freqs;
|
|
|
|
return 0;
|
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
|
2013-10-22 09:09:46 -04:00
|
|
|
static int wpas_dbus_get_scan_allow_roam(DBusMessage *message,
|
|
|
|
DBusMessageIter *var,
|
|
|
|
dbus_bool_t *allow,
|
|
|
|
DBusMessage **reply)
|
|
|
|
{
|
|
|
|
if (dbus_message_iter_get_arg_type(var) != DBUS_TYPE_BOOLEAN) {
|
2014-12-31 16:21:10 -05:00
|
|
|
wpa_printf(MSG_DEBUG, "%s[dbus]: Type must be a boolean",
|
|
|
|
__func__);
|
2013-10-22 09:09:46 -04:00
|
|
|
*reply = wpas_dbus_error_invalid_args(
|
|
|
|
message, "Wrong Type value type. Boolean required");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
dbus_message_iter_get_basic(var, allow);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-12-26 10:06:28 -05:00
|
|
|
/**
|
|
|
|
* wpas_dbus_handler_scan - Request a wireless scan on an interface
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @wpa_s: wpa_supplicant structure for a network interface
|
|
|
|
* Returns: NULL indicating success or DBus error message on failure
|
|
|
|
*
|
|
|
|
* Handler function for "Scan" method call of a network device. Requests
|
|
|
|
* that wpa_supplicant perform a wireless scan as soon as possible
|
|
|
|
* on a particular wireless interface.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_scan(DBusMessage *message,
|
|
|
|
struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
DBusMessage *reply = NULL;
|
|
|
|
DBusMessageIter iter, dict_iter, entry_iter, variant_iter;
|
|
|
|
char *key = NULL, *type = NULL;
|
|
|
|
struct wpa_driver_scan_params params;
|
|
|
|
size_t i;
|
2013-10-22 09:09:46 -04:00
|
|
|
dbus_bool_t allow_roam = 1;
|
2009-12-26 10:06:28 -05:00
|
|
|
|
|
|
|
os_memset(¶ms, 0, sizeof(params));
|
|
|
|
|
|
|
|
dbus_message_iter_init(message, &iter);
|
|
|
|
|
|
|
|
dbus_message_iter_recurse(&iter, &dict_iter);
|
|
|
|
|
|
|
|
while (dbus_message_iter_get_arg_type(&dict_iter) ==
|
2014-12-31 16:21:10 -05:00
|
|
|
DBUS_TYPE_DICT_ENTRY) {
|
2009-12-26 10:06:28 -05:00
|
|
|
dbus_message_iter_recurse(&dict_iter, &entry_iter);
|
|
|
|
dbus_message_iter_get_basic(&entry_iter, &key);
|
|
|
|
dbus_message_iter_next(&entry_iter);
|
|
|
|
dbus_message_iter_recurse(&entry_iter, &variant_iter);
|
|
|
|
|
|
|
|
if (os_strcmp(key, "Type") == 0) {
|
|
|
|
if (wpas_dbus_get_scan_type(message, &variant_iter,
|
|
|
|
&type, &reply) < 0)
|
|
|
|
goto out;
|
|
|
|
} else if (os_strcmp(key, "SSIDs") == 0) {
|
|
|
|
if (wpas_dbus_get_scan_ssids(message, &variant_iter,
|
|
|
|
¶ms, &reply) < 0)
|
|
|
|
goto out;
|
|
|
|
} else if (os_strcmp(key, "IEs") == 0) {
|
|
|
|
if (wpas_dbus_get_scan_ies(message, &variant_iter,
|
|
|
|
¶ms, &reply) < 0)
|
|
|
|
goto out;
|
|
|
|
} else if (os_strcmp(key, "Channels") == 0) {
|
|
|
|
if (wpas_dbus_get_scan_channels(message, &variant_iter,
|
|
|
|
¶ms, &reply) < 0)
|
|
|
|
goto out;
|
2013-10-22 09:09:46 -04:00
|
|
|
} else if (os_strcmp(key, "AllowRoam") == 0) {
|
|
|
|
if (wpas_dbus_get_scan_allow_roam(message,
|
|
|
|
&variant_iter,
|
|
|
|
&allow_roam,
|
|
|
|
&reply) < 0)
|
|
|
|
goto out;
|
2009-11-10 10:51:59 -05:00
|
|
|
} else {
|
2014-12-31 16:21:10 -05:00
|
|
|
wpa_printf(MSG_DEBUG, "%s[dbus]: Unknown argument %s",
|
|
|
|
__func__, key);
|
2010-01-01 14:52:29 -05:00
|
|
|
reply = wpas_dbus_error_invalid_args(message, key);
|
2009-11-09 16:51:59 -05:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
dbus_message_iter_next(&dict_iter);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!type) {
|
2014-12-31 16:21:10 -05:00
|
|
|
wpa_printf(MSG_DEBUG, "%s[dbus]: Scan type not specified",
|
|
|
|
__func__);
|
2010-01-01 14:52:29 -05:00
|
|
|
reply = wpas_dbus_error_invalid_args(message, key);
|
2009-11-09 16:51:59 -05:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2014-12-31 16:21:10 -05:00
|
|
|
if (os_strcmp(type, "passive") == 0) {
|
2009-12-26 10:06:28 -05:00
|
|
|
if (params.num_ssids || params.extra_ies_len) {
|
2014-12-31 16:21:10 -05:00
|
|
|
wpa_printf(MSG_DEBUG,
|
|
|
|
"%s[dbus]: SSIDs or IEs specified for passive scan.",
|
|
|
|
__func__);
|
2010-01-01 14:52:29 -05:00
|
|
|
reply = wpas_dbus_error_invalid_args(
|
2014-12-31 16:21:10 -05:00
|
|
|
message,
|
|
|
|
"You can specify only Channels in passive scan");
|
2009-11-09 16:51:59 -05:00
|
|
|
goto out;
|
2009-11-10 10:51:59 -05:00
|
|
|
} else {
|
2015-04-28 07:01:03 -04:00
|
|
|
if (wpa_s->sched_scanning) {
|
|
|
|
wpa_printf(MSG_DEBUG,
|
|
|
|
"%s[dbus]: Stop ongoing sched_scan to allow requested scan to proceed",
|
|
|
|
__func__);
|
|
|
|
wpa_supplicant_cancel_sched_scan(wpa_s);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (params.freqs && params.freqs[0]) {
|
|
|
|
if (wpa_supplicant_trigger_scan(wpa_s,
|
|
|
|
¶ms)) {
|
|
|
|
reply = wpas_dbus_error_scan_error(
|
|
|
|
message,
|
|
|
|
"Scan request rejected");
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
wpa_s->scan_req = MANUAL_SCAN_REQ;
|
|
|
|
wpa_supplicant_req_scan(wpa_s, 0, 0);
|
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
2014-12-31 16:21:10 -05:00
|
|
|
} else if (os_strcmp(type, "active") == 0) {
|
2010-10-09 09:22:39 -04:00
|
|
|
if (!params.num_ssids) {
|
|
|
|
/* Add wildcard ssid */
|
|
|
|
params.num_ssids++;
|
|
|
|
}
|
2012-06-26 11:55:41 -04:00
|
|
|
#ifdef CONFIG_AUTOSCAN
|
|
|
|
autoscan_deinit(wpa_s);
|
|
|
|
#endif /* CONFIG_AUTOSCAN */
|
2015-04-28 07:01:03 -04:00
|
|
|
if (wpa_s->sched_scanning) {
|
|
|
|
wpa_printf(MSG_DEBUG,
|
|
|
|
"%s[dbus]: Stop ongoing sched_scan to allow requested scan to proceed",
|
|
|
|
__func__);
|
|
|
|
wpa_supplicant_cancel_sched_scan(wpa_s);
|
|
|
|
}
|
|
|
|
|
2014-04-09 18:10:29 -04:00
|
|
|
if (wpa_supplicant_trigger_scan(wpa_s, ¶ms)) {
|
|
|
|
reply = wpas_dbus_error_scan_error(
|
|
|
|
message, "Scan request rejected");
|
|
|
|
}
|
2009-11-10 10:51:59 -05:00
|
|
|
} else {
|
2014-12-31 16:21:10 -05:00
|
|
|
wpa_printf(MSG_DEBUG, "%s[dbus]: Unknown scan type: %s",
|
|
|
|
__func__, type);
|
2010-01-01 14:52:29 -05:00
|
|
|
reply = wpas_dbus_error_invalid_args(message,
|
|
|
|
"Wrong scan type");
|
2009-11-09 16:51:59 -05:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2013-10-22 09:09:46 -04:00
|
|
|
if (!allow_roam)
|
|
|
|
wpa_s->scan_res_handler = scan_only_handler;
|
|
|
|
|
2009-11-09 16:51:59 -05:00
|
|
|
out:
|
2009-12-26 10:06:28 -05:00
|
|
|
for (i = 0; i < WPAS_MAX_SCAN_SSIDS; i++)
|
|
|
|
os_free((u8 *) params.ssids[i].ssid);
|
2009-11-10 10:51:59 -05:00
|
|
|
os_free((u8 *) params.extra_ies);
|
2009-11-09 16:51:59 -05:00
|
|
|
os_free(params.freqs);
|
|
|
|
return reply;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-09-10 13:34:56 -04:00
|
|
|
/**
|
|
|
|
* wpas_dbus_handler_signal_poll - Request immediate signal properties
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @wpa_s: wpa_supplicant structure for a network interface
|
|
|
|
* Returns: NULL indicating success or DBus error message on failure
|
|
|
|
*
|
|
|
|
* Handler function for "SignalPoll" method call of a network device. Requests
|
|
|
|
* that wpa_supplicant read signal properties like RSSI, noise, and link
|
|
|
|
* speed and return them.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_signal_poll(DBusMessage *message,
|
|
|
|
struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
struct wpa_signal_info si;
|
|
|
|
DBusMessage *reply = NULL;
|
|
|
|
DBusMessageIter iter, iter_dict, variant_iter;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = wpa_drv_signal_poll(wpa_s, &si);
|
|
|
|
if (ret) {
|
|
|
|
return dbus_message_new_error(message, DBUS_ERROR_FAILED,
|
|
|
|
"Failed to read signal");
|
|
|
|
}
|
|
|
|
|
|
|
|
reply = dbus_message_new_method_return(message);
|
|
|
|
if (reply == NULL)
|
|
|
|
goto nomem;
|
|
|
|
|
|
|
|
dbus_message_iter_init_append(reply, &iter);
|
|
|
|
|
|
|
|
if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT,
|
2014-12-31 06:57:48 -05:00
|
|
|
"a{sv}", &variant_iter) ||
|
|
|
|
!wpa_dbus_dict_open_write(&variant_iter, &iter_dict) ||
|
|
|
|
!wpa_dbus_dict_append_int32(&iter_dict, "rssi",
|
|
|
|
si.current_signal) ||
|
|
|
|
!wpa_dbus_dict_append_int32(&iter_dict, "linkspeed",
|
|
|
|
si.current_txrate / 1000) ||
|
|
|
|
!wpa_dbus_dict_append_int32(&iter_dict, "noise",
|
|
|
|
si.current_noise) ||
|
|
|
|
!wpa_dbus_dict_append_uint32(&iter_dict, "frequency",
|
|
|
|
si.frequency) ||
|
|
|
|
(si.chanwidth != CHAN_WIDTH_UNKNOWN &&
|
|
|
|
!wpa_dbus_dict_append_string(
|
|
|
|
&iter_dict, "width",
|
|
|
|
channel_width_to_string(si.chanwidth))) ||
|
|
|
|
(si.center_frq1 > 0 && si.center_frq2 > 0 &&
|
|
|
|
(!wpa_dbus_dict_append_int32(&iter_dict, "center-frq1",
|
|
|
|
si.center_frq1) ||
|
|
|
|
!wpa_dbus_dict_append_int32(&iter_dict, "center-frq2",
|
|
|
|
si.center_frq2))) ||
|
|
|
|
(si.avg_signal &&
|
|
|
|
!wpa_dbus_dict_append_int32(&iter_dict, "avg-rssi",
|
|
|
|
si.avg_signal)) ||
|
|
|
|
!wpa_dbus_dict_close_write(&variant_iter, &iter_dict) ||
|
|
|
|
!dbus_message_iter_close_container(&iter, &variant_iter))
|
2014-09-10 13:34:56 -04:00
|
|
|
goto nomem;
|
|
|
|
|
|
|
|
return reply;
|
|
|
|
|
|
|
|
nomem:
|
|
|
|
if (reply)
|
|
|
|
dbus_message_unref(reply);
|
2015-01-01 15:36:52 -05:00
|
|
|
return wpas_dbus_error_no_memory(message);
|
2014-09-10 13:34:56 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-11-09 16:51:59 -05:00
|
|
|
/*
|
|
|
|
* wpas_dbus_handler_disconnect - Terminate the current connection
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @wpa_s: wpa_supplicant structure for a network interface
|
|
|
|
* Returns: NotConnected DBus error message if already not connected
|
|
|
|
* or NULL otherwise.
|
|
|
|
*
|
|
|
|
* Handler function for "Disconnect" method call of network interface.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_disconnect(DBusMessage *message,
|
2009-11-10 10:51:59 -05:00
|
|
|
struct wpa_supplicant *wpa_s)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
|
|
|
if (wpa_s->current_ssid != NULL) {
|
|
|
|
wpa_s->disconnected = 1;
|
2010-08-18 14:27:30 -04:00
|
|
|
wpa_supplicant_deauthenticate(wpa_s,
|
|
|
|
WLAN_REASON_DEAUTH_LEAVING);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
2009-11-10 10:51:59 -05:00
|
|
|
|
|
|
|
return dbus_message_new_error(message, WPAS_DBUS_ERROR_NOT_CONNECTED,
|
|
|
|
"This interface is not connected");
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_new_iface_add_network - Add a new configured network
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @wpa_s: wpa_supplicant structure for a network interface
|
|
|
|
* Returns: A dbus message containing the object path of the new network
|
|
|
|
*
|
|
|
|
* Handler function for "AddNetwork" method call of a network interface.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_add_network(DBusMessage *message,
|
2009-11-10 10:51:59 -05:00
|
|
|
struct wpa_supplicant *wpa_s)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
|
|
|
DBusMessage *reply = NULL;
|
|
|
|
DBusMessageIter iter;
|
|
|
|
struct wpa_ssid *ssid = NULL;
|
2010-01-02 10:17:00 -05:00
|
|
|
char path_buf[WPAS_DBUS_OBJECT_PATH_MAX], *path = path_buf;
|
2011-07-29 14:25:39 -04:00
|
|
|
DBusError error;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
dbus_message_iter_init(message, &iter);
|
|
|
|
|
2015-04-29 06:13:34 -04:00
|
|
|
if (wpa_s->dbus_new_path)
|
|
|
|
ssid = wpa_config_add_network(wpa_s->conf);
|
2009-11-09 16:51:59 -05:00
|
|
|
if (ssid == NULL) {
|
2014-12-31 16:21:10 -05:00
|
|
|
wpa_printf(MSG_ERROR, "%s[dbus]: can't add new interface.",
|
|
|
|
__func__);
|
2009-11-10 10:51:59 -05:00
|
|
|
reply = wpas_dbus_error_unknown_error(
|
|
|
|
message,
|
2014-12-31 16:21:10 -05:00
|
|
|
"wpa_supplicant could not add a network on this interface.");
|
2009-11-09 16:51:59 -05:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
wpas_notify_network_added(wpa_s, ssid);
|
|
|
|
ssid->disabled = 1;
|
|
|
|
wpa_config_set_network_defaults(ssid);
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_error_init(&error);
|
|
|
|
if (!set_network_properties(wpa_s, ssid, &iter, &error)) {
|
2014-12-31 16:21:10 -05:00
|
|
|
wpa_printf(MSG_DEBUG,
|
|
|
|
"%s[dbus]: control interface couldn't set network properties",
|
|
|
|
__func__);
|
2011-07-29 14:25:39 -04:00
|
|
|
reply = wpas_dbus_reply_new_from_error(message, &error,
|
|
|
|
DBUS_ERROR_INVALID_ARGS,
|
|
|
|
"Failed to add network");
|
|
|
|
dbus_error_free(&error);
|
2009-11-09 16:51:59 -05:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Construct the object path for this network. */
|
2009-11-10 10:51:59 -05:00
|
|
|
os_snprintf(path, WPAS_DBUS_OBJECT_PATH_MAX,
|
|
|
|
"%s/" WPAS_DBUS_NEW_NETWORKS_PART "/%d",
|
2010-01-01 12:12:31 -05:00
|
|
|
wpa_s->dbus_new_path, ssid->id);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
reply = dbus_message_new_method_return(message);
|
|
|
|
if (reply == NULL) {
|
2015-01-01 15:36:52 -05:00
|
|
|
reply = wpas_dbus_error_no_memory(message);
|
2009-11-09 16:51:59 -05:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (!dbus_message_append_args(reply, DBUS_TYPE_OBJECT_PATH, &path,
|
2009-11-10 10:51:59 -05:00
|
|
|
DBUS_TYPE_INVALID)) {
|
2009-11-09 16:51:59 -05:00
|
|
|
dbus_message_unref(reply);
|
2015-01-01 15:36:52 -05:00
|
|
|
reply = wpas_dbus_error_no_memory(message);
|
2009-11-09 16:51:59 -05:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
return reply;
|
|
|
|
|
|
|
|
err:
|
|
|
|
if (ssid) {
|
|
|
|
wpas_notify_network_removed(wpa_s, ssid);
|
|
|
|
wpa_config_remove_network(wpa_s->conf, ssid->id);
|
|
|
|
}
|
|
|
|
return reply;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-08-09 06:54:36 -04:00
|
|
|
/**
|
2014-04-04 09:45:26 -04:00
|
|
|
* wpas_dbus_handler_reassociate - Reassociate
|
2012-08-09 06:54:36 -04:00
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @wpa_s: wpa_supplicant structure for a network interface
|
2014-04-04 09:45:26 -04:00
|
|
|
* Returns: InterfaceDisabled DBus error message if disabled
|
2012-08-09 06:54:36 -04:00
|
|
|
* or NULL otherwise.
|
|
|
|
*
|
|
|
|
* Handler function for "Reassociate" method call of network interface.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_reassociate(DBusMessage *message,
|
|
|
|
struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
2014-04-04 09:45:26 -04:00
|
|
|
if (wpa_s->wpa_state != WPA_INTERFACE_DISABLED) {
|
2012-11-25 09:30:30 -05:00
|
|
|
wpas_request_connection(wpa_s);
|
2012-08-09 06:54:36 -04:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2014-04-04 09:45:26 -04:00
|
|
|
return dbus_message_new_error(message, WPAS_DBUS_ERROR_IFACE_DISABLED,
|
|
|
|
"This interface is disabled");
|
2012-08-09 06:54:36 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-03-06 13:06:04 -05:00
|
|
|
/**
|
|
|
|
* wpas_dbus_handler_reattach - Reattach to current AP
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @wpa_s: wpa_supplicant structure for a network interface
|
|
|
|
* Returns: NotConnected DBus error message if not connected
|
|
|
|
* or NULL otherwise.
|
|
|
|
*
|
|
|
|
* Handler function for "Reattach" method call of network interface.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_reattach(DBusMessage *message,
|
|
|
|
struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
if (wpa_s->current_ssid != NULL) {
|
|
|
|
wpa_s->reattach = 1;
|
|
|
|
wpas_request_connection(wpa_s);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return dbus_message_new_error(message, WPAS_DBUS_ERROR_NOT_CONNECTED,
|
|
|
|
"This interface is not connected");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-06-12 07:27:19 -04:00
|
|
|
/**
|
|
|
|
* wpas_dbus_handler_reconnect - Reconnect if disconnected
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @wpa_s: wpa_supplicant structure for a network interface
|
|
|
|
* Returns: InterfaceDisabled DBus error message if disabled
|
|
|
|
* or NULL otherwise.
|
|
|
|
*
|
|
|
|
* Handler function for "Reconnect" method call of network interface.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_reconnect(DBusMessage *message,
|
|
|
|
struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
if (wpa_s->wpa_state == WPA_INTERFACE_DISABLED) {
|
|
|
|
return dbus_message_new_error(message,
|
|
|
|
WPAS_DBUS_ERROR_IFACE_DISABLED,
|
|
|
|
"This interface is disabled");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (wpa_s->disconnected)
|
|
|
|
wpas_request_connection(wpa_s);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-11-09 16:51:59 -05:00
|
|
|
/**
|
|
|
|
* wpas_dbus_handler_remove_network - Remove a configured network
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @wpa_s: wpa_supplicant structure for a network interface
|
|
|
|
* Returns: NULL on success or dbus error on failure
|
|
|
|
*
|
|
|
|
* Handler function for "RemoveNetwork" method call of a network interface.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_remove_network(DBusMessage *message,
|
2009-11-10 10:51:59 -05:00
|
|
|
struct wpa_supplicant *wpa_s)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
|
|
|
DBusMessage *reply = NULL;
|
|
|
|
const char *op;
|
2015-01-01 04:42:32 -05:00
|
|
|
char *iface, *net_id;
|
2009-11-09 16:51:59 -05:00
|
|
|
int id;
|
|
|
|
struct wpa_ssid *ssid;
|
2013-03-10 11:51:13 -04:00
|
|
|
int was_disabled;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
dbus_message_get_args(message, NULL, DBUS_TYPE_OBJECT_PATH, &op,
|
2009-11-10 10:51:59 -05:00
|
|
|
DBUS_TYPE_INVALID);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
/* Extract the network ID and ensure the network */
|
|
|
|
/* is actually a child of this interface */
|
2015-01-01 04:42:32 -05:00
|
|
|
iface = wpas_dbus_new_decompose_object_path(op,
|
|
|
|
WPAS_DBUS_NEW_NETWORKS_PART,
|
|
|
|
&net_id);
|
2015-04-29 06:13:34 -04:00
|
|
|
if (iface == NULL || net_id == NULL || !wpa_s->dbus_new_path ||
|
2012-11-11 04:18:31 -05:00
|
|
|
os_strcmp(iface, wpa_s->dbus_new_path) != 0) {
|
2010-01-01 14:52:29 -05:00
|
|
|
reply = wpas_dbus_error_invalid_args(message, op);
|
2009-11-09 16:51:59 -05:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2012-11-11 04:18:31 -05:00
|
|
|
errno = 0;
|
2009-11-09 16:51:59 -05:00
|
|
|
id = strtoul(net_id, NULL, 10);
|
2012-11-11 04:18:31 -05:00
|
|
|
if (errno != 0) {
|
2010-01-01 14:52:29 -05:00
|
|
|
reply = wpas_dbus_error_invalid_args(message, op);
|
2009-11-09 16:51:59 -05:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
ssid = wpa_config_get_network(wpa_s->conf, id);
|
|
|
|
if (ssid == NULL) {
|
|
|
|
reply = wpas_dbus_error_network_unknown(message);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2013-03-10 11:51:13 -04:00
|
|
|
was_disabled = ssid->disabled;
|
|
|
|
|
2009-11-09 16:51:59 -05:00
|
|
|
wpas_notify_network_removed(wpa_s, ssid);
|
|
|
|
|
|
|
|
if (ssid == wpa_s->current_ssid)
|
2010-08-18 14:27:30 -04:00
|
|
|
wpa_supplicant_deauthenticate(wpa_s,
|
|
|
|
WLAN_REASON_DEAUTH_LEAVING);
|
2013-03-10 11:51:13 -04:00
|
|
|
else if (!was_disabled && wpa_s->sched_scanning) {
|
2014-12-31 16:21:10 -05:00
|
|
|
wpa_printf(MSG_DEBUG,
|
|
|
|
"Stop ongoing sched_scan to remove network from filters");
|
2013-03-10 11:51:13 -04:00
|
|
|
wpa_supplicant_cancel_sched_scan(wpa_s);
|
|
|
|
wpa_supplicant_req_scan(wpa_s, 0, 0);
|
|
|
|
}
|
|
|
|
|
2014-05-12 07:33:12 -04:00
|
|
|
if (wpa_config_remove_network(wpa_s->conf, id) < 0) {
|
|
|
|
wpa_printf(MSG_ERROR,
|
2014-12-31 16:21:10 -05:00
|
|
|
"%s[dbus]: error occurred when removing network %d",
|
|
|
|
__func__, id);
|
2014-05-12 07:33:12 -04:00
|
|
|
reply = wpas_dbus_error_unknown_error(
|
2014-12-31 16:21:10 -05:00
|
|
|
message,
|
|
|
|
"error removing the specified network on is interface.");
|
2014-05-12 07:33:12 -04:00
|
|
|
goto out;
|
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
out:
|
|
|
|
os_free(iface);
|
|
|
|
return reply;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-03-20 06:12:12 -04:00
|
|
|
static void remove_network(void *arg, struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
struct wpa_supplicant *wpa_s = arg;
|
|
|
|
|
|
|
|
wpas_notify_network_removed(wpa_s, ssid);
|
|
|
|
|
|
|
|
if (wpa_config_remove_network(wpa_s->conf, ssid->id) < 0) {
|
|
|
|
wpa_printf(MSG_ERROR,
|
2014-12-31 16:21:10 -05:00
|
|
|
"%s[dbus]: error occurred when removing network %d",
|
|
|
|
__func__, ssid->id);
|
2011-03-20 06:12:12 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ssid == wpa_s->current_ssid)
|
2012-11-05 09:55:30 -05:00
|
|
|
wpa_supplicant_deauthenticate(wpa_s,
|
|
|
|
WLAN_REASON_DEAUTH_LEAVING);
|
2011-03-20 06:12:12 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_handler_remove_all_networks - Remove all configured networks
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @wpa_s: wpa_supplicant structure for a network interface
|
|
|
|
* Returns: NULL on success or dbus error on failure
|
|
|
|
*
|
|
|
|
* Handler function for "RemoveAllNetworks" method call of a network interface.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_remove_all_networks(
|
|
|
|
DBusMessage *message, struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
2013-03-10 11:51:13 -04:00
|
|
|
if (wpa_s->sched_scanning)
|
|
|
|
wpa_supplicant_cancel_sched_scan(wpa_s);
|
|
|
|
|
2011-03-20 06:12:12 -04:00
|
|
|
/* NB: could check for failure and return an error */
|
|
|
|
wpa_config_foreach_network(wpa_s->conf, remove_network, wpa_s);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-11-09 16:51:59 -05:00
|
|
|
/**
|
|
|
|
* wpas_dbus_handler_select_network - Attempt association with a network
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @wpa_s: wpa_supplicant structure for a network interface
|
|
|
|
* Returns: NULL on success or dbus error on failure
|
|
|
|
*
|
|
|
|
* Handler function for "SelectNetwork" method call of network interface.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_select_network(DBusMessage *message,
|
2009-11-10 10:51:59 -05:00
|
|
|
struct wpa_supplicant *wpa_s)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
|
|
|
DBusMessage *reply = NULL;
|
|
|
|
const char *op;
|
2015-01-01 04:42:32 -05:00
|
|
|
char *iface, *net_id;
|
2009-11-09 16:51:59 -05:00
|
|
|
int id;
|
|
|
|
struct wpa_ssid *ssid;
|
|
|
|
|
|
|
|
dbus_message_get_args(message, NULL, DBUS_TYPE_OBJECT_PATH, &op,
|
2009-11-10 10:51:59 -05:00
|
|
|
DBUS_TYPE_INVALID);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
/* Extract the network ID and ensure the network */
|
|
|
|
/* is actually a child of this interface */
|
2015-01-01 04:42:32 -05:00
|
|
|
iface = wpas_dbus_new_decompose_object_path(op,
|
|
|
|
WPAS_DBUS_NEW_NETWORKS_PART,
|
|
|
|
&net_id);
|
2015-04-29 06:13:34 -04:00
|
|
|
if (iface == NULL || net_id == NULL || !wpa_s->dbus_new_path ||
|
2012-11-11 04:18:31 -05:00
|
|
|
os_strcmp(iface, wpa_s->dbus_new_path) != 0) {
|
2010-01-01 14:52:29 -05:00
|
|
|
reply = wpas_dbus_error_invalid_args(message, op);
|
2009-11-09 16:51:59 -05:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2012-11-11 04:18:31 -05:00
|
|
|
errno = 0;
|
2009-11-09 16:51:59 -05:00
|
|
|
id = strtoul(net_id, NULL, 10);
|
2012-11-11 04:18:31 -05:00
|
|
|
if (errno != 0) {
|
2010-01-01 14:52:29 -05:00
|
|
|
reply = wpas_dbus_error_invalid_args(message, op);
|
2009-11-09 16:51:59 -05:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
ssid = wpa_config_get_network(wpa_s->conf, id);
|
|
|
|
if (ssid == NULL) {
|
|
|
|
reply = wpas_dbus_error_network_unknown(message);
|
|
|
|
goto out;
|
|
|
|
}
|
2009-11-10 10:51:59 -05:00
|
|
|
|
2009-11-09 16:51:59 -05:00
|
|
|
/* Finally, associate with the network */
|
|
|
|
wpa_supplicant_select_network(wpa_s, ssid);
|
|
|
|
|
|
|
|
out:
|
|
|
|
os_free(iface);
|
|
|
|
return reply;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-10-24 12:09:06 -04:00
|
|
|
/**
|
|
|
|
* wpas_dbus_handler_network_reply - Reply to a NetworkRequest signal
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @wpa_s: wpa_supplicant structure for a network interface
|
|
|
|
* Returns: NULL on success or dbus error on failure
|
|
|
|
*
|
|
|
|
* Handler function for "NetworkReply" method call of network interface.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_network_reply(DBusMessage *message,
|
|
|
|
struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
#ifdef IEEE8021X_EAPOL
|
|
|
|
DBusMessage *reply = NULL;
|
|
|
|
const char *op, *field, *value;
|
2015-01-01 04:42:32 -05:00
|
|
|
char *iface, *net_id;
|
2011-10-24 12:09:06 -04:00
|
|
|
int id;
|
|
|
|
struct wpa_ssid *ssid;
|
|
|
|
|
|
|
|
if (!dbus_message_get_args(message, NULL,
|
2014-12-31 16:21:10 -05:00
|
|
|
DBUS_TYPE_OBJECT_PATH, &op,
|
|
|
|
DBUS_TYPE_STRING, &field,
|
|
|
|
DBUS_TYPE_STRING, &value,
|
|
|
|
DBUS_TYPE_INVALID))
|
2011-10-24 12:09:06 -04:00
|
|
|
return wpas_dbus_error_invalid_args(message, NULL);
|
|
|
|
|
|
|
|
/* Extract the network ID and ensure the network */
|
|
|
|
/* is actually a child of this interface */
|
2015-01-01 04:42:32 -05:00
|
|
|
iface = wpas_dbus_new_decompose_object_path(op,
|
|
|
|
WPAS_DBUS_NEW_NETWORKS_PART,
|
|
|
|
&net_id);
|
2015-04-29 06:13:34 -04:00
|
|
|
if (iface == NULL || net_id == NULL || !wpa_s->dbus_new_path ||
|
2012-11-11 04:18:31 -05:00
|
|
|
os_strcmp(iface, wpa_s->dbus_new_path) != 0) {
|
2011-10-24 12:09:06 -04:00
|
|
|
reply = wpas_dbus_error_invalid_args(message, op);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2012-11-11 04:18:31 -05:00
|
|
|
errno = 0;
|
2011-10-24 12:09:06 -04:00
|
|
|
id = strtoul(net_id, NULL, 10);
|
2012-11-11 04:18:31 -05:00
|
|
|
if (errno != 0) {
|
2011-10-24 12:09:06 -04:00
|
|
|
reply = wpas_dbus_error_invalid_args(message, net_id);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
ssid = wpa_config_get_network(wpa_s->conf, id);
|
|
|
|
if (ssid == NULL) {
|
|
|
|
reply = wpas_dbus_error_network_unknown(message);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (wpa_supplicant_ctrl_iface_ctrl_rsp_handle(wpa_s, ssid,
|
|
|
|
field, value) < 0)
|
|
|
|
reply = wpas_dbus_error_invalid_args(message, field);
|
|
|
|
else {
|
|
|
|
/* Tell EAP to retry immediately */
|
|
|
|
eapol_sm_notify_ctrl_response(wpa_s->eapol);
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
os_free(iface);
|
|
|
|
return reply;
|
|
|
|
#else /* IEEE8021X_EAPOL */
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: 802.1X not included");
|
|
|
|
return wpas_dbus_error_unknown_error(message, "802.1X not included");
|
|
|
|
#endif /* IEEE8021X_EAPOL */
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-03-16 06:20:21 -04:00
|
|
|
#ifndef CONFIG_NO_CONFIG_BLOBS
|
|
|
|
|
2009-11-09 16:51:59 -05:00
|
|
|
/**
|
|
|
|
* wpas_dbus_handler_add_blob - Store named binary blob (ie, for certificates)
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @wpa_s: %wpa_supplicant data structure
|
|
|
|
* Returns: A dbus message containing an error on failure or NULL on success
|
|
|
|
*
|
|
|
|
* Asks wpa_supplicant to internally store a binary blobs.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_add_blob(DBusMessage *message,
|
2009-11-10 10:51:59 -05:00
|
|
|
struct wpa_supplicant *wpa_s)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
|
|
|
DBusMessage *reply = NULL;
|
|
|
|
DBusMessageIter iter, array_iter;
|
|
|
|
|
|
|
|
char *blob_name;
|
|
|
|
u8 *blob_data;
|
|
|
|
int blob_len;
|
|
|
|
struct wpa_config_blob *blob = NULL;
|
|
|
|
|
|
|
|
dbus_message_iter_init(message, &iter);
|
|
|
|
dbus_message_iter_get_basic(&iter, &blob_name);
|
|
|
|
|
|
|
|
if (wpa_config_get_blob(wpa_s->conf, blob_name)) {
|
2009-11-10 10:51:59 -05:00
|
|
|
return dbus_message_new_error(message,
|
|
|
|
WPAS_DBUS_ERROR_BLOB_EXISTS,
|
|
|
|
NULL);
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
dbus_message_iter_next(&iter);
|
|
|
|
dbus_message_iter_recurse(&iter, &array_iter);
|
|
|
|
|
|
|
|
dbus_message_iter_get_fixed_array(&array_iter, &blob_data, &blob_len);
|
|
|
|
|
|
|
|
blob = os_zalloc(sizeof(*blob));
|
|
|
|
if (!blob) {
|
2015-01-01 15:36:52 -05:00
|
|
|
reply = wpas_dbus_error_no_memory(message);
|
2009-11-09 16:51:59 -05:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
blob->data = os_malloc(blob_len);
|
2015-01-01 15:36:52 -05:00
|
|
|
blob->name = os_strdup(blob_name);
|
|
|
|
if (!blob->data || !blob->name) {
|
|
|
|
reply = wpas_dbus_error_no_memory(message);
|
2009-11-09 16:51:59 -05:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
os_memcpy(blob->data, blob_data, blob_len);
|
|
|
|
blob->len = blob_len;
|
|
|
|
|
|
|
|
wpa_config_set_blob(wpa_s->conf, blob);
|
|
|
|
wpas_notify_blob_added(wpa_s, blob->name);
|
|
|
|
|
|
|
|
return reply;
|
|
|
|
|
|
|
|
err:
|
|
|
|
if (blob) {
|
|
|
|
os_free(blob->name);
|
|
|
|
os_free(blob->data);
|
|
|
|
os_free(blob);
|
|
|
|
}
|
|
|
|
return reply;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_handler_get_blob - Get named binary blob (ie, for certificates)
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @wpa_s: %wpa_supplicant data structure
|
|
|
|
* Returns: A dbus message containing array of bytes (blob)
|
|
|
|
*
|
|
|
|
* Gets one wpa_supplicant's binary blobs.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_get_blob(DBusMessage *message,
|
2009-11-10 10:51:59 -05:00
|
|
|
struct wpa_supplicant *wpa_s)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
|
|
|
DBusMessage *reply = NULL;
|
|
|
|
DBusMessageIter iter, array_iter;
|
|
|
|
|
|
|
|
char *blob_name;
|
|
|
|
const struct wpa_config_blob *blob;
|
|
|
|
|
|
|
|
dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &blob_name,
|
2009-11-10 10:51:59 -05:00
|
|
|
DBUS_TYPE_INVALID);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
blob = wpa_config_get_blob(wpa_s->conf, blob_name);
|
|
|
|
if (!blob) {
|
2009-11-10 10:51:59 -05:00
|
|
|
return dbus_message_new_error(message,
|
|
|
|
WPAS_DBUS_ERROR_BLOB_UNKNOWN,
|
|
|
|
"Blob id not set");
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
reply = dbus_message_new_method_return(message);
|
2015-01-01 15:36:52 -05:00
|
|
|
if (!reply)
|
|
|
|
return wpas_dbus_error_no_memory(message);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
dbus_message_iter_init_append(reply, &iter);
|
|
|
|
|
|
|
|
if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
|
2009-11-10 10:51:59 -05:00
|
|
|
DBUS_TYPE_BYTE_AS_STRING,
|
2015-01-01 15:36:52 -05:00
|
|
|
&array_iter) ||
|
|
|
|
!dbus_message_iter_append_fixed_array(&array_iter, DBUS_TYPE_BYTE,
|
|
|
|
&(blob->data), blob->len) ||
|
|
|
|
!dbus_message_iter_close_container(&iter, &array_iter)) {
|
2009-11-09 16:51:59 -05:00
|
|
|
dbus_message_unref(reply);
|
2015-01-01 15:36:52 -05:00
|
|
|
reply = wpas_dbus_error_no_memory(message);
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
return reply;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_remove_handler_remove_blob - Remove named binary blob
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @wpa_s: %wpa_supplicant data structure
|
|
|
|
* Returns: NULL on success or dbus error
|
|
|
|
*
|
|
|
|
* Asks wpa_supplicant to internally remove a binary blobs.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_remove_blob(DBusMessage *message,
|
2009-11-10 10:51:59 -05:00
|
|
|
struct wpa_supplicant *wpa_s)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
|
|
|
DBusMessage *reply = NULL;
|
|
|
|
char *blob_name;
|
|
|
|
|
|
|
|
dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &blob_name,
|
2009-11-10 10:51:59 -05:00
|
|
|
DBUS_TYPE_INVALID);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
if (wpa_config_remove_blob(wpa_s->conf, blob_name)) {
|
2009-11-10 10:51:59 -05:00
|
|
|
return dbus_message_new_error(message,
|
|
|
|
WPAS_DBUS_ERROR_BLOB_UNKNOWN,
|
|
|
|
"Blob id not set");
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
wpas_notify_blob_removed(wpa_s, blob_name);
|
|
|
|
|
|
|
|
return reply;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2013-03-16 06:20:21 -04:00
|
|
|
#endif /* CONFIG_NO_CONFIG_BLOBS */
|
|
|
|
|
|
|
|
|
2011-03-20 06:02:33 -04:00
|
|
|
/*
|
|
|
|
* wpas_dbus_handler_flush_bss - Flush the BSS cache
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @wpa_s: wpa_supplicant structure for a network interface
|
|
|
|
* Returns: NULL
|
|
|
|
*
|
|
|
|
* Handler function for "FlushBSS" method call of network interface.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_flush_bss(DBusMessage *message,
|
|
|
|
struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
dbus_uint32_t age;
|
|
|
|
|
|
|
|
dbus_message_get_args(message, NULL, DBUS_TYPE_UINT32, &age,
|
|
|
|
DBUS_TYPE_INVALID);
|
|
|
|
|
|
|
|
if (age == 0)
|
|
|
|
wpa_bss_flush(wpa_s);
|
|
|
|
else
|
|
|
|
wpa_bss_flush_by_age(wpa_s, age);
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2012-06-26 12:05:09 -04:00
|
|
|
#ifdef CONFIG_AUTOSCAN
|
|
|
|
/**
|
|
|
|
* wpas_dbus_handler_autoscan - Set autoscan parameters for the interface
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @wpa_s: wpa_supplicant structure for a network interface
|
|
|
|
* Returns: NULL
|
|
|
|
*
|
|
|
|
* Handler function for "AutoScan" method call of network interface.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_autoscan(DBusMessage *message,
|
|
|
|
struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
DBusMessage *reply = NULL;
|
|
|
|
enum wpa_states state = wpa_s->wpa_state;
|
|
|
|
char *arg;
|
|
|
|
|
|
|
|
dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &arg,
|
|
|
|
DBUS_TYPE_INVALID);
|
|
|
|
|
|
|
|
if (arg != NULL && os_strlen(arg) > 0) {
|
|
|
|
char *tmp;
|
2014-12-31 16:21:10 -05:00
|
|
|
|
2012-06-26 12:05:09 -04:00
|
|
|
tmp = os_strdup(arg);
|
|
|
|
if (tmp == NULL) {
|
2015-01-01 15:36:52 -05:00
|
|
|
reply = wpas_dbus_error_no_memory(message);
|
2012-06-26 12:05:09 -04:00
|
|
|
} else {
|
|
|
|
os_free(wpa_s->conf->autoscan);
|
|
|
|
wpa_s->conf->autoscan = tmp;
|
|
|
|
if (state == WPA_DISCONNECTED || state == WPA_INACTIVE)
|
2012-06-26 12:52:46 -04:00
|
|
|
autoscan_init(wpa_s, 1);
|
2012-06-26 13:11:25 -04:00
|
|
|
else if (state == WPA_SCANNING)
|
|
|
|
wpa_supplicant_reinit_autoscan(wpa_s);
|
2012-06-26 12:05:09 -04:00
|
|
|
}
|
|
|
|
} else if (arg != NULL && os_strlen(arg) == 0) {
|
|
|
|
os_free(wpa_s->conf->autoscan);
|
|
|
|
wpa_s->conf->autoscan = NULL;
|
|
|
|
autoscan_deinit(wpa_s);
|
|
|
|
} else
|
|
|
|
reply = dbus_message_new_error(message,
|
|
|
|
DBUS_ERROR_INVALID_ARGS,
|
|
|
|
NULL);
|
|
|
|
|
|
|
|
return reply;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_AUTOSCAN */
|
|
|
|
|
|
|
|
|
2013-04-23 10:57:55 -04:00
|
|
|
/*
|
|
|
|
* wpas_dbus_handler_eap_logoff - IEEE 802.1X EAPOL state machine logoff
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @wpa_s: wpa_supplicant structure for a network interface
|
|
|
|
* Returns: NULL
|
|
|
|
*
|
|
|
|
* Handler function for "EAPLogoff" method call of network interface.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_eap_logoff(DBusMessage *message,
|
|
|
|
struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
eapol_sm_notify_logoff(wpa_s->eapol, TRUE);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* wpas_dbus_handler_eap_logon - IEEE 802.1X EAPOL state machine logon
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @wpa_s: wpa_supplicant structure for a network interface
|
|
|
|
* Returns: NULL
|
|
|
|
*
|
|
|
|
* Handler function for "EAPLogin" method call of network interface.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_eap_logon(DBusMessage *message,
|
|
|
|
struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
eapol_sm_notify_logoff(wpa_s->eapol, FALSE);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-11-11 15:13:55 -05:00
|
|
|
#ifdef CONFIG_TDLS
|
|
|
|
|
2014-03-02 09:44:18 -05:00
|
|
|
static int get_peer_hwaddr_helper(DBusMessage *message, const char *func_name,
|
|
|
|
u8 *peer_address, DBusMessage **error)
|
2013-11-11 15:13:55 -05:00
|
|
|
{
|
|
|
|
const char *peer_string;
|
|
|
|
|
2014-03-02 09:44:18 -05:00
|
|
|
*error = NULL;
|
|
|
|
|
2013-11-11 15:13:55 -05:00
|
|
|
if (!dbus_message_get_args(message, NULL,
|
|
|
|
DBUS_TYPE_STRING, &peer_string,
|
2014-03-02 09:44:18 -05:00
|
|
|
DBUS_TYPE_INVALID)) {
|
|
|
|
*error = wpas_dbus_error_invalid_args(message, NULL);
|
|
|
|
return -1;
|
|
|
|
}
|
2013-11-11 15:13:55 -05:00
|
|
|
|
|
|
|
if (hwaddr_aton(peer_string, peer_address)) {
|
|
|
|
wpa_printf(MSG_DEBUG, "%s: invalid address '%s'",
|
|
|
|
func_name, peer_string);
|
2014-03-02 09:44:18 -05:00
|
|
|
*error = wpas_dbus_error_invalid_args(
|
2013-11-11 15:13:55 -05:00
|
|
|
message, "Invalid hardware address format");
|
2014-03-02 09:44:18 -05:00
|
|
|
return -1;
|
2013-11-11 15:13:55 -05:00
|
|
|
}
|
|
|
|
|
2014-03-02 09:44:18 -05:00
|
|
|
return 0;
|
2013-11-11 15:13:55 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* wpas_dbus_handler_tdls_discover - Discover TDLS peer
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @wpa_s: wpa_supplicant structure for a network interface
|
|
|
|
* Returns: NULL indicating success or DBus error message on failure
|
|
|
|
*
|
|
|
|
* Handler function for "TDLSDiscover" method call of network interface.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_tdls_discover(DBusMessage *message,
|
|
|
|
struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
u8 peer[ETH_ALEN];
|
|
|
|
DBusMessage *error_reply;
|
|
|
|
int ret;
|
|
|
|
|
2014-03-02 09:44:18 -05:00
|
|
|
if (get_peer_hwaddr_helper(message, __func__, peer, &error_reply) < 0)
|
2013-11-11 15:13:55 -05:00
|
|
|
return error_reply;
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "DBUS TDLS_DISCOVER " MACSTR, MAC2STR(peer));
|
|
|
|
|
|
|
|
if (wpa_tdls_is_external_setup(wpa_s->wpa))
|
|
|
|
ret = wpa_tdls_send_discovery_request(wpa_s->wpa, peer);
|
|
|
|
else
|
|
|
|
ret = wpa_drv_tdls_oper(wpa_s, TDLS_DISCOVERY_REQ, peer);
|
|
|
|
|
|
|
|
if (ret) {
|
|
|
|
return wpas_dbus_error_unknown_error(
|
|
|
|
message, "error performing TDLS discovery");
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* wpas_dbus_handler_tdls_setup - Setup TDLS session
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @wpa_s: wpa_supplicant structure for a network interface
|
|
|
|
* Returns: NULL indicating success or DBus error message on failure
|
|
|
|
*
|
|
|
|
* Handler function for "TDLSSetup" method call of network interface.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_tdls_setup(DBusMessage *message,
|
|
|
|
struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
u8 peer[ETH_ALEN];
|
|
|
|
DBusMessage *error_reply;
|
|
|
|
int ret;
|
|
|
|
|
2014-03-02 09:44:18 -05:00
|
|
|
if (get_peer_hwaddr_helper(message, __func__, peer, &error_reply) < 0)
|
2013-11-11 15:13:55 -05:00
|
|
|
return error_reply;
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "DBUS TDLS_SETUP " MACSTR, MAC2STR(peer));
|
|
|
|
|
|
|
|
wpa_tdls_remove(wpa_s->wpa, peer);
|
|
|
|
if (wpa_tdls_is_external_setup(wpa_s->wpa))
|
|
|
|
ret = wpa_tdls_start(wpa_s->wpa, peer);
|
|
|
|
else
|
|
|
|
ret = wpa_drv_tdls_oper(wpa_s, TDLS_SETUP, peer);
|
|
|
|
|
|
|
|
if (ret) {
|
|
|
|
return wpas_dbus_error_unknown_error(
|
|
|
|
message, "error performing TDLS setup");
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* wpas_dbus_handler_tdls_status - Return TDLS session status
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @wpa_s: wpa_supplicant structure for a network interface
|
|
|
|
* Returns: A string representing the state of the link to this TDLS peer
|
|
|
|
*
|
|
|
|
* Handler function for "TDLSStatus" method call of network interface.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_tdls_status(DBusMessage *message,
|
|
|
|
struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
u8 peer[ETH_ALEN];
|
|
|
|
DBusMessage *reply;
|
|
|
|
const char *tdls_status;
|
|
|
|
|
2014-03-02 09:44:18 -05:00
|
|
|
if (get_peer_hwaddr_helper(message, __func__, peer, &reply) < 0)
|
2013-11-11 15:13:55 -05:00
|
|
|
return reply;
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "DBUS TDLS_STATUS " MACSTR, MAC2STR(peer));
|
|
|
|
|
|
|
|
tdls_status = wpa_tdls_get_link_status(wpa_s->wpa, peer);
|
|
|
|
|
|
|
|
reply = dbus_message_new_method_return(message);
|
|
|
|
dbus_message_append_args(reply, DBUS_TYPE_STRING,
|
|
|
|
&tdls_status, DBUS_TYPE_INVALID);
|
|
|
|
return reply;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* wpas_dbus_handler_tdls_teardown - Teardown TDLS session
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @wpa_s: wpa_supplicant structure for a network interface
|
|
|
|
* Returns: NULL indicating success or DBus error message on failure
|
|
|
|
*
|
|
|
|
* Handler function for "TDLSTeardown" method call of network interface.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_tdls_teardown(DBusMessage *message,
|
|
|
|
struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
u8 peer[ETH_ALEN];
|
|
|
|
DBusMessage *error_reply;
|
|
|
|
int ret;
|
|
|
|
|
2014-03-02 09:44:18 -05:00
|
|
|
if (get_peer_hwaddr_helper(message, __func__, peer, &error_reply) < 0)
|
2013-11-11 15:13:55 -05:00
|
|
|
return error_reply;
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "DBUS TDLS_TEARDOWN " MACSTR, MAC2STR(peer));
|
|
|
|
|
|
|
|
if (wpa_tdls_is_external_setup(wpa_s->wpa))
|
|
|
|
ret = wpa_tdls_teardown_link(
|
|
|
|
wpa_s->wpa, peer,
|
|
|
|
WLAN_REASON_TDLS_TEARDOWN_UNSPECIFIED);
|
|
|
|
else
|
|
|
|
ret = wpa_drv_tdls_oper(wpa_s, TDLS_TEARDOWN, peer);
|
|
|
|
|
|
|
|
if (ret) {
|
|
|
|
return wpas_dbus_error_unknown_error(
|
|
|
|
message, "error performing TDLS teardown");
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* CONFIG_TDLS */
|
|
|
|
|
|
|
|
|
2013-11-23 03:38:07 -05:00
|
|
|
/**
|
|
|
|
* wpas_dbus_handler_set_pkcs11_engine_and_module_path - Set PKCS #11 engine and module path
|
|
|
|
* @message: Pointer to incoming dbus message
|
|
|
|
* @wpa_s: %wpa_supplicant data structure
|
|
|
|
* Returns: A dbus message containing an error on failure or NULL on success
|
|
|
|
*
|
|
|
|
* Sets the PKCS #11 engine and module path.
|
|
|
|
*/
|
|
|
|
DBusMessage * wpas_dbus_handler_set_pkcs11_engine_and_module_path(
|
|
|
|
DBusMessage *message, struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
DBusMessageIter iter;
|
|
|
|
char *value = NULL;
|
|
|
|
char *pkcs11_engine_path = NULL;
|
|
|
|
char *pkcs11_module_path = NULL;
|
|
|
|
|
|
|
|
dbus_message_iter_init(message, &iter);
|
|
|
|
dbus_message_iter_get_basic(&iter, &value);
|
|
|
|
if (value == NULL) {
|
|
|
|
return dbus_message_new_error(
|
|
|
|
message, DBUS_ERROR_INVALID_ARGS,
|
|
|
|
"Invalid pkcs11_engine_path argument");
|
|
|
|
}
|
|
|
|
/* Empty path defaults to NULL */
|
|
|
|
if (os_strlen(value))
|
|
|
|
pkcs11_engine_path = value;
|
|
|
|
|
|
|
|
dbus_message_iter_next(&iter);
|
|
|
|
dbus_message_iter_get_basic(&iter, &value);
|
|
|
|
if (value == NULL) {
|
|
|
|
os_free(pkcs11_engine_path);
|
|
|
|
return dbus_message_new_error(
|
|
|
|
message, DBUS_ERROR_INVALID_ARGS,
|
|
|
|
"Invalid pkcs11_module_path argument");
|
|
|
|
}
|
|
|
|
/* Empty path defaults to NULL */
|
|
|
|
if (os_strlen(value))
|
|
|
|
pkcs11_module_path = value;
|
|
|
|
|
|
|
|
if (wpas_set_pkcs11_engine_and_module_path(wpa_s, pkcs11_engine_path,
|
|
|
|
pkcs11_module_path))
|
|
|
|
return dbus_message_new_error(
|
|
|
|
message, DBUS_ERROR_FAILED,
|
2014-12-31 16:21:10 -05:00
|
|
|
"Reinit of the EAPOL state machine with the new PKCS #11 engine and module path failed.");
|
2013-11-23 03:38:07 -05:00
|
|
|
|
2015-04-29 06:13:34 -04:00
|
|
|
if (wpa_s->dbus_new_path) {
|
|
|
|
wpa_dbus_mark_property_changed(
|
|
|
|
wpa_s->global->dbus, wpa_s->dbus_new_path,
|
|
|
|
WPAS_DBUS_NEW_IFACE_INTERFACE, "PKCS11EnginePath");
|
|
|
|
wpa_dbus_mark_property_changed(
|
|
|
|
wpa_s->global->dbus, wpa_s->dbus_new_path,
|
|
|
|
WPAS_DBUS_NEW_IFACE_INTERFACE, "PKCS11ModulePath");
|
|
|
|
}
|
2013-11-23 03:38:07 -05:00
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-11-09 16:51:59 -05:00
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_capabilities - Return interface capabilities
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2009-11-09 16:51:59 -05:00
|
|
|
*
|
|
|
|
* Getter for "Capabilities" property of an interface.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_capabilities(DBusMessageIter *iter,
|
|
|
|
DBusError *error, void *user_data)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
2009-11-09 16:51:59 -05:00
|
|
|
struct wpa_driver_capa capa;
|
|
|
|
int res;
|
2011-07-29 14:25:39 -04:00
|
|
|
DBusMessageIter iter_dict, iter_dict_entry, iter_dict_val, iter_array,
|
2009-11-10 10:51:59 -05:00
|
|
|
variant_iter;
|
|
|
|
const char *scans[] = { "active", "passive", "ssid" };
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
if (!dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT,
|
2014-12-31 06:57:48 -05:00
|
|
|
"a{sv}", &variant_iter) ||
|
|
|
|
!wpa_dbus_dict_open_write(&variant_iter, &iter_dict))
|
2009-11-09 16:51:59 -05:00
|
|
|
goto nomem;
|
|
|
|
|
|
|
|
res = wpa_drv_get_capa(wpa_s, &capa);
|
|
|
|
|
|
|
|
/***** pairwise cipher */
|
|
|
|
if (res < 0) {
|
|
|
|
const char *args[] = {"ccmp", "tkip", "none"};
|
2014-12-31 16:21:10 -05:00
|
|
|
|
2009-11-09 16:51:59 -05:00
|
|
|
if (!wpa_dbus_dict_append_string_array(
|
2009-11-10 10:51:59 -05:00
|
|
|
&iter_dict, "Pairwise", args,
|
2013-10-26 10:00:57 -04:00
|
|
|
ARRAY_SIZE(args)))
|
2009-11-09 16:51:59 -05:00
|
|
|
goto nomem;
|
|
|
|
} else {
|
|
|
|
if (!wpa_dbus_dict_begin_string_array(&iter_dict, "Pairwise",
|
|
|
|
&iter_dict_entry,
|
|
|
|
&iter_dict_val,
|
2014-12-31 06:57:48 -05:00
|
|
|
&iter_array) ||
|
|
|
|
((capa.enc & WPA_DRIVER_CAPA_ENC_CCMP_256) &&
|
|
|
|
!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "ccmp-256")) ||
|
|
|
|
((capa.enc & WPA_DRIVER_CAPA_ENC_GCMP_256) &&
|
|
|
|
!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "gcmp-256")) ||
|
|
|
|
((capa.enc & WPA_DRIVER_CAPA_ENC_CCMP) &&
|
|
|
|
!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "ccmp")) ||
|
|
|
|
((capa.enc & WPA_DRIVER_CAPA_ENC_GCMP) &&
|
|
|
|
!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "gcmp")) ||
|
|
|
|
((capa.enc & WPA_DRIVER_CAPA_ENC_TKIP) &&
|
|
|
|
!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "tkip")) ||
|
|
|
|
((capa.key_mgmt & WPA_DRIVER_CAPA_KEY_MGMT_WPA_NONE) &&
|
|
|
|
!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "none")) ||
|
|
|
|
!wpa_dbus_dict_end_string_array(&iter_dict,
|
2009-11-09 16:51:59 -05:00
|
|
|
&iter_dict_entry,
|
|
|
|
&iter_dict_val,
|
|
|
|
&iter_array))
|
|
|
|
goto nomem;
|
|
|
|
}
|
|
|
|
|
|
|
|
/***** group cipher */
|
|
|
|
if (res < 0) {
|
|
|
|
const char *args[] = {
|
|
|
|
"ccmp", "tkip", "wep104", "wep40"
|
|
|
|
};
|
2014-12-31 16:21:10 -05:00
|
|
|
|
2009-11-09 16:51:59 -05:00
|
|
|
if (!wpa_dbus_dict_append_string_array(
|
2009-11-10 10:51:59 -05:00
|
|
|
&iter_dict, "Group", args,
|
2013-10-26 10:00:57 -04:00
|
|
|
ARRAY_SIZE(args)))
|
2009-11-09 16:51:59 -05:00
|
|
|
goto nomem;
|
|
|
|
} else {
|
|
|
|
if (!wpa_dbus_dict_begin_string_array(&iter_dict, "Group",
|
|
|
|
&iter_dict_entry,
|
|
|
|
&iter_dict_val,
|
2014-12-31 06:57:48 -05:00
|
|
|
&iter_array) ||
|
|
|
|
((capa.enc & WPA_DRIVER_CAPA_ENC_CCMP_256) &&
|
|
|
|
!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "ccmp-256")) ||
|
|
|
|
((capa.enc & WPA_DRIVER_CAPA_ENC_GCMP_256) &&
|
|
|
|
!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "gcmp-256")) ||
|
|
|
|
((capa.enc & WPA_DRIVER_CAPA_ENC_CCMP) &&
|
|
|
|
!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "ccmp")) ||
|
|
|
|
((capa.enc & WPA_DRIVER_CAPA_ENC_GCMP) &&
|
|
|
|
!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "gcmp")) ||
|
|
|
|
((capa.enc & WPA_DRIVER_CAPA_ENC_TKIP) &&
|
|
|
|
!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "tkip")) ||
|
|
|
|
((capa.enc & WPA_DRIVER_CAPA_ENC_WEP104) &&
|
|
|
|
!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "wep104")) ||
|
|
|
|
((capa.enc & WPA_DRIVER_CAPA_ENC_WEP40) &&
|
|
|
|
!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "wep40")) ||
|
|
|
|
!wpa_dbus_dict_end_string_array(&iter_dict,
|
2009-11-09 16:51:59 -05:00
|
|
|
&iter_dict_entry,
|
|
|
|
&iter_dict_val,
|
|
|
|
&iter_array))
|
|
|
|
goto nomem;
|
|
|
|
}
|
|
|
|
|
|
|
|
/***** key management */
|
|
|
|
if (res < 0) {
|
|
|
|
const char *args[] = {
|
|
|
|
"wpa-psk", "wpa-eap", "ieee8021x", "wpa-none",
|
|
|
|
#ifdef CONFIG_WPS
|
|
|
|
"wps",
|
|
|
|
#endif /* CONFIG_WPS */
|
|
|
|
"none"
|
|
|
|
};
|
|
|
|
if (!wpa_dbus_dict_append_string_array(
|
2009-11-10 10:51:59 -05:00
|
|
|
&iter_dict, "KeyMgmt", args,
|
2013-10-26 10:00:57 -04:00
|
|
|
ARRAY_SIZE(args)))
|
2009-11-09 16:51:59 -05:00
|
|
|
goto nomem;
|
|
|
|
} else {
|
|
|
|
if (!wpa_dbus_dict_begin_string_array(&iter_dict, "KeyMgmt",
|
|
|
|
&iter_dict_entry,
|
|
|
|
&iter_dict_val,
|
2014-12-31 06:57:48 -05:00
|
|
|
&iter_array) ||
|
|
|
|
!wpa_dbus_dict_string_array_add_element(&iter_array,
|
|
|
|
"none") ||
|
|
|
|
!wpa_dbus_dict_string_array_add_element(&iter_array,
|
2009-11-09 16:51:59 -05:00
|
|
|
"ieee8021x"))
|
|
|
|
goto nomem;
|
|
|
|
|
|
|
|
if (capa.key_mgmt & (WPA_DRIVER_CAPA_KEY_MGMT_WPA |
|
|
|
|
WPA_DRIVER_CAPA_KEY_MGMT_WPA2)) {
|
|
|
|
if (!wpa_dbus_dict_string_array_add_element(
|
2014-12-31 06:57:48 -05:00
|
|
|
&iter_array, "wpa-eap") ||
|
|
|
|
((capa.key_mgmt & WPA_DRIVER_CAPA_KEY_MGMT_FT) &&
|
|
|
|
!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "wpa-ft-eap")))
|
2009-11-09 16:51:59 -05:00
|
|
|
goto nomem;
|
2010-04-11 14:37:28 -04:00
|
|
|
|
|
|
|
/* TODO: Ensure that driver actually supports sha256 encryption. */
|
|
|
|
#ifdef CONFIG_IEEE80211W
|
|
|
|
if (!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "wpa-eap-sha256"))
|
|
|
|
goto nomem;
|
|
|
|
#endif /* CONFIG_IEEE80211W */
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
if (capa.key_mgmt & (WPA_DRIVER_CAPA_KEY_MGMT_WPA_PSK |
|
|
|
|
WPA_DRIVER_CAPA_KEY_MGMT_WPA2_PSK)) {
|
|
|
|
if (!wpa_dbus_dict_string_array_add_element(
|
2014-12-31 06:57:48 -05:00
|
|
|
&iter_array, "wpa-psk") ||
|
|
|
|
((capa.key_mgmt &
|
|
|
|
WPA_DRIVER_CAPA_KEY_MGMT_FT_PSK) &&
|
|
|
|
!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "wpa-ft-psk")))
|
2009-11-09 16:51:59 -05:00
|
|
|
goto nomem;
|
2010-04-11 14:37:28 -04:00
|
|
|
|
|
|
|
/* TODO: Ensure that driver actually supports sha256 encryption. */
|
|
|
|
#ifdef CONFIG_IEEE80211W
|
|
|
|
if (!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "wpa-psk-sha256"))
|
|
|
|
goto nomem;
|
|
|
|
#endif /* CONFIG_IEEE80211W */
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
2014-12-31 06:57:48 -05:00
|
|
|
if ((capa.key_mgmt & WPA_DRIVER_CAPA_KEY_MGMT_WPA_NONE) &&
|
|
|
|
!wpa_dbus_dict_string_array_add_element(&iter_array,
|
|
|
|
"wpa-none"))
|
|
|
|
goto nomem;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_WPS
|
2009-11-10 10:51:59 -05:00
|
|
|
if (!wpa_dbus_dict_string_array_add_element(&iter_array,
|
|
|
|
"wps"))
|
2009-11-09 16:51:59 -05:00
|
|
|
goto nomem;
|
|
|
|
#endif /* CONFIG_WPS */
|
|
|
|
|
|
|
|
if (!wpa_dbus_dict_end_string_array(&iter_dict,
|
|
|
|
&iter_dict_entry,
|
|
|
|
&iter_dict_val,
|
|
|
|
&iter_array))
|
|
|
|
goto nomem;
|
|
|
|
}
|
|
|
|
|
|
|
|
/***** WPA protocol */
|
|
|
|
if (res < 0) {
|
|
|
|
const char *args[] = { "rsn", "wpa" };
|
2014-12-31 16:21:10 -05:00
|
|
|
|
2009-11-09 16:51:59 -05:00
|
|
|
if (!wpa_dbus_dict_append_string_array(
|
2009-11-10 10:51:59 -05:00
|
|
|
&iter_dict, "Protocol", args,
|
2013-10-26 10:00:57 -04:00
|
|
|
ARRAY_SIZE(args)))
|
2009-11-09 16:51:59 -05:00
|
|
|
goto nomem;
|
|
|
|
} else {
|
|
|
|
if (!wpa_dbus_dict_begin_string_array(&iter_dict, "Protocol",
|
|
|
|
&iter_dict_entry,
|
|
|
|
&iter_dict_val,
|
2014-12-31 06:57:48 -05:00
|
|
|
&iter_array) ||
|
|
|
|
((capa.key_mgmt & (WPA_DRIVER_CAPA_KEY_MGMT_WPA2 |
|
|
|
|
WPA_DRIVER_CAPA_KEY_MGMT_WPA2_PSK)) &&
|
|
|
|
!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "rsn")) ||
|
|
|
|
((capa.key_mgmt & (WPA_DRIVER_CAPA_KEY_MGMT_WPA |
|
|
|
|
WPA_DRIVER_CAPA_KEY_MGMT_WPA_PSK)) &&
|
|
|
|
!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "wpa")) ||
|
|
|
|
!wpa_dbus_dict_end_string_array(&iter_dict,
|
2009-11-09 16:51:59 -05:00
|
|
|
&iter_dict_entry,
|
|
|
|
&iter_dict_val,
|
|
|
|
&iter_array))
|
|
|
|
goto nomem;
|
|
|
|
}
|
|
|
|
|
|
|
|
/***** auth alg */
|
|
|
|
if (res < 0) {
|
|
|
|
const char *args[] = { "open", "shared", "leap" };
|
2014-12-31 16:21:10 -05:00
|
|
|
|
2009-11-09 16:51:59 -05:00
|
|
|
if (!wpa_dbus_dict_append_string_array(
|
2009-11-10 10:51:59 -05:00
|
|
|
&iter_dict, "AuthAlg", args,
|
2013-10-26 10:00:57 -04:00
|
|
|
ARRAY_SIZE(args)))
|
2009-11-09 16:51:59 -05:00
|
|
|
goto nomem;
|
|
|
|
} else {
|
|
|
|
if (!wpa_dbus_dict_begin_string_array(&iter_dict, "AuthAlg",
|
|
|
|
&iter_dict_entry,
|
|
|
|
&iter_dict_val,
|
|
|
|
&iter_array))
|
|
|
|
goto nomem;
|
|
|
|
|
2014-12-31 06:57:48 -05:00
|
|
|
if (((capa.auth & WPA_DRIVER_AUTH_OPEN) &&
|
|
|
|
!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "open")) ||
|
|
|
|
((capa.auth & WPA_DRIVER_AUTH_SHARED) &&
|
|
|
|
!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "shared")) ||
|
|
|
|
((capa.auth & WPA_DRIVER_AUTH_LEAP) &&
|
|
|
|
!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "leap")) ||
|
|
|
|
!wpa_dbus_dict_end_string_array(&iter_dict,
|
2009-11-09 16:51:59 -05:00
|
|
|
&iter_dict_entry,
|
|
|
|
&iter_dict_val,
|
|
|
|
&iter_array))
|
|
|
|
goto nomem;
|
|
|
|
}
|
|
|
|
|
|
|
|
/***** Scan */
|
2009-11-10 10:51:59 -05:00
|
|
|
if (!wpa_dbus_dict_append_string_array(&iter_dict, "Scan", scans,
|
2013-10-26 10:00:57 -04:00
|
|
|
ARRAY_SIZE(scans)))
|
2009-11-09 16:51:59 -05:00
|
|
|
goto nomem;
|
|
|
|
|
|
|
|
/***** Modes */
|
2011-06-23 13:51:27 -04:00
|
|
|
if (!wpa_dbus_dict_begin_string_array(&iter_dict, "Modes",
|
|
|
|
&iter_dict_entry,
|
|
|
|
&iter_dict_val,
|
2014-12-31 06:57:48 -05:00
|
|
|
&iter_array) ||
|
|
|
|
!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "infrastructure") ||
|
|
|
|
!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "ad-hoc") ||
|
|
|
|
(res >= 0 && (capa.flags & WPA_DRIVER_FLAGS_AP) &&
|
|
|
|
!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "ap")) ||
|
|
|
|
(res >= 0 && (capa.flags & WPA_DRIVER_FLAGS_P2P_CAPABLE) &&
|
|
|
|
!wpa_dbus_dict_string_array_add_element(
|
|
|
|
&iter_array, "p2p")) ||
|
|
|
|
!wpa_dbus_dict_end_string_array(&iter_dict,
|
2011-06-23 13:51:27 -04:00
|
|
|
&iter_dict_entry,
|
|
|
|
&iter_dict_val,
|
|
|
|
&iter_array))
|
|
|
|
goto nomem;
|
|
|
|
/***** Modes end */
|
|
|
|
|
2011-10-02 06:27:09 -04:00
|
|
|
if (res >= 0) {
|
|
|
|
dbus_int32_t max_scan_ssid = capa.max_scan_ssids;
|
|
|
|
|
|
|
|
if (!wpa_dbus_dict_append_int32(&iter_dict, "MaxScanSSID",
|
|
|
|
max_scan_ssid))
|
|
|
|
goto nomem;
|
|
|
|
}
|
|
|
|
|
2014-12-31 06:57:48 -05:00
|
|
|
if (!wpa_dbus_dict_close_write(&variant_iter, &iter_dict) ||
|
|
|
|
!dbus_message_iter_close_container(iter, &variant_iter))
|
2009-11-09 16:51:59 -05:00
|
|
|
goto nomem;
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
return TRUE;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
nomem:
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
|
|
|
|
return FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_state - Get interface state
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2009-11-09 16:51:59 -05:00
|
|
|
*
|
|
|
|
* Getter for "State" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_state(DBusMessageIter *iter, DBusError *error,
|
|
|
|
void *user_data)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
2009-11-09 16:51:59 -05:00
|
|
|
const char *str_state;
|
|
|
|
char *state_ls, *tmp;
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t success = FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2010-01-01 04:56:56 -05:00
|
|
|
str_state = wpa_supplicant_state_txt(wpa_s->wpa_state);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2010-01-01 04:56:56 -05:00
|
|
|
/* make state string lowercase to fit new DBus API convention
|
|
|
|
*/
|
|
|
|
state_ls = tmp = os_strdup(str_state);
|
|
|
|
if (!tmp) {
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
|
|
|
|
return FALSE;
|
2010-01-01 04:56:56 -05:00
|
|
|
}
|
|
|
|
while (*tmp) {
|
|
|
|
*tmp = tolower(*tmp);
|
|
|
|
tmp++;
|
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
success = wpas_dbus_simple_property_getter(iter, DBUS_TYPE_STRING,
|
|
|
|
&state_ls, error);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2010-01-01 04:56:56 -05:00
|
|
|
os_free(state_ls);
|
2009-11-10 10:51:59 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
return success;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
2010-01-01 04:56:56 -05:00
|
|
|
|
2009-11-09 16:51:59 -05:00
|
|
|
/**
|
|
|
|
* wpas_dbus_new_iface_get_scanning - Get interface scanning state
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2009-11-09 16:51:59 -05:00
|
|
|
*
|
|
|
|
* Getter for "scanning" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_scanning(DBusMessageIter *iter, DBusError *error,
|
2014-12-31 16:21:10 -05:00
|
|
|
void *user_data)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
2009-11-09 16:51:59 -05:00
|
|
|
dbus_bool_t scanning = wpa_s->scanning ? TRUE : FALSE;
|
2011-07-29 14:25:39 -04:00
|
|
|
|
|
|
|
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_BOOLEAN,
|
|
|
|
&scanning, error);
|
2010-01-01 04:56:56 -05:00
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_ap_scan - Control roaming mode
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2009-11-09 16:51:59 -05:00
|
|
|
*
|
|
|
|
* Getter function for "ApScan" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_ap_scan(DBusMessageIter *iter, DBusError *error,
|
|
|
|
void *user_data)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
2009-11-09 16:51:59 -05:00
|
|
|
dbus_uint32_t ap_scan = wpa_s->conf->ap_scan;
|
2011-07-29 14:25:39 -04:00
|
|
|
|
|
|
|
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_UINT32,
|
|
|
|
&ap_scan, error);
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_setter_ap_scan - Control roaming mode
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2009-11-09 16:51:59 -05:00
|
|
|
*
|
|
|
|
* Setter function for "ApScan" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_setter_ap_scan(DBusMessageIter *iter, DBusError *error,
|
|
|
|
void *user_data)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
2009-11-09 16:51:59 -05:00
|
|
|
dbus_uint32_t ap_scan;
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
if (!wpas_dbus_simple_property_setter(iter, error, DBUS_TYPE_UINT32,
|
|
|
|
&ap_scan))
|
|
|
|
return FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
if (wpa_supplicant_set_ap_scan(wpa_s, ap_scan)) {
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error_const(error, DBUS_ERROR_FAILED,
|
|
|
|
"ap_scan must be 0, 1, or 2");
|
|
|
|
return FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
2011-07-29 14:25:39 -04:00
|
|
|
return TRUE;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-01-28 04:21:37 -05:00
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_fast_reauth - Control fast
|
|
|
|
* reauthentication (TLS session resumption)
|
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
|
|
|
*
|
|
|
|
* Getter function for "FastReauth" property.
|
|
|
|
*/
|
|
|
|
dbus_bool_t wpas_dbus_getter_fast_reauth(DBusMessageIter *iter,
|
|
|
|
DBusError *error,
|
|
|
|
void *user_data)
|
|
|
|
{
|
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
|
|
|
dbus_bool_t fast_reauth = wpa_s->conf->fast_reauth ? TRUE : FALSE;
|
|
|
|
|
|
|
|
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_BOOLEAN,
|
|
|
|
&fast_reauth, error);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_setter_fast_reauth - Control fast
|
|
|
|
* reauthentication (TLS session resumption)
|
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
|
|
|
*
|
|
|
|
* Setter function for "FastReauth" property.
|
|
|
|
*/
|
|
|
|
dbus_bool_t wpas_dbus_setter_fast_reauth(DBusMessageIter *iter,
|
|
|
|
DBusError *error,
|
|
|
|
void *user_data)
|
|
|
|
{
|
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
|
|
|
dbus_bool_t fast_reauth;
|
|
|
|
|
|
|
|
if (!wpas_dbus_simple_property_setter(iter, error, DBUS_TYPE_BOOLEAN,
|
|
|
|
&fast_reauth))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
wpa_s->conf->fast_reauth = fast_reauth;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-06-30 09:43:50 -04:00
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_disconnect_reason - Get most recent reason for disconnect
|
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
|
|
|
*
|
|
|
|
* Getter for "DisconnectReason" property. The reason is negative if it is
|
|
|
|
* locally generated.
|
|
|
|
*/
|
|
|
|
dbus_bool_t wpas_dbus_getter_disconnect_reason(DBusMessageIter *iter,
|
|
|
|
DBusError *error,
|
|
|
|
void *user_data)
|
|
|
|
{
|
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
|
|
|
dbus_int32_t reason = wpa_s->disconnect_reason;
|
2014-12-31 16:21:10 -05:00
|
|
|
|
2012-06-30 09:43:50 -04:00
|
|
|
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_INT32,
|
|
|
|
&reason, error);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-03-20 06:40:59 -04:00
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_bss_expire_age - Get BSS entry expiration age
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2011-03-20 06:40:59 -04:00
|
|
|
*
|
|
|
|
* Getter function for "BSSExpireAge" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_bss_expire_age(DBusMessageIter *iter,
|
|
|
|
DBusError *error,
|
|
|
|
void *user_data)
|
2011-03-20 06:40:59 -04:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
2011-03-20 06:40:59 -04:00
|
|
|
dbus_uint32_t expire_age = wpa_s->conf->bss_expiration_age;
|
2011-07-29 14:25:39 -04:00
|
|
|
|
|
|
|
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_UINT32,
|
|
|
|
&expire_age, error);
|
2011-03-20 06:40:59 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_setter_bss_expire_age - Control BSS entry expiration age
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2011-03-20 06:40:59 -04:00
|
|
|
*
|
|
|
|
* Setter function for "BSSExpireAge" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_setter_bss_expire_age(DBusMessageIter *iter,
|
|
|
|
DBusError *error,
|
|
|
|
void *user_data)
|
2011-03-20 06:40:59 -04:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
2011-03-20 06:40:59 -04:00
|
|
|
dbus_uint32_t expire_age;
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
if (!wpas_dbus_simple_property_setter(iter, error, DBUS_TYPE_UINT32,
|
|
|
|
&expire_age))
|
|
|
|
return FALSE;
|
2011-03-20 06:40:59 -04:00
|
|
|
|
|
|
|
if (wpa_supplicant_set_bss_expiration_age(wpa_s, expire_age)) {
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error_const(error, DBUS_ERROR_FAILED,
|
|
|
|
"BSSExpireAge must be >= 10");
|
|
|
|
return FALSE;
|
2011-03-20 06:40:59 -04:00
|
|
|
}
|
2011-07-29 14:25:39 -04:00
|
|
|
return TRUE;
|
2011-03-20 06:40:59 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_bss_expire_count - Get BSS entry expiration scan count
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2011-03-20 06:40:59 -04:00
|
|
|
*
|
|
|
|
* Getter function for "BSSExpireCount" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_bss_expire_count(DBusMessageIter *iter,
|
|
|
|
DBusError *error,
|
|
|
|
void *user_data)
|
2011-03-20 06:40:59 -04:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
2012-08-04 17:43:19 -04:00
|
|
|
dbus_uint32_t expire_count = wpa_s->conf->bss_expiration_scan_count;
|
2011-07-29 14:25:39 -04:00
|
|
|
|
|
|
|
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_UINT32,
|
|
|
|
&expire_count, error);
|
2011-03-20 06:40:59 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_setter_bss_expire_count - Control BSS entry expiration scan count
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2011-03-20 06:40:59 -04:00
|
|
|
*
|
|
|
|
* Setter function for "BSSExpireCount" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_setter_bss_expire_count(DBusMessageIter *iter,
|
|
|
|
DBusError *error,
|
|
|
|
void *user_data)
|
2011-03-20 06:40:59 -04:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
2011-03-20 06:40:59 -04:00
|
|
|
dbus_uint32_t expire_count;
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
if (!wpas_dbus_simple_property_setter(iter, error, DBUS_TYPE_UINT32,
|
|
|
|
&expire_count))
|
|
|
|
return FALSE;
|
2011-03-20 06:40:59 -04:00
|
|
|
|
|
|
|
if (wpa_supplicant_set_bss_expiration_count(wpa_s, expire_count)) {
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error_const(error, DBUS_ERROR_FAILED,
|
|
|
|
"BSSExpireCount must be > 0");
|
|
|
|
return FALSE;
|
2011-03-20 06:40:59 -04:00
|
|
|
}
|
2011-07-29 14:25:39 -04:00
|
|
|
return TRUE;
|
2011-03-20 06:40:59 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-04-04 18:24:26 -04:00
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_country - Control country code
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2011-04-04 18:24:26 -04:00
|
|
|
*
|
|
|
|
* Getter function for "Country" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_country(DBusMessageIter *iter, DBusError *error,
|
|
|
|
void *user_data)
|
2011-04-04 18:24:26 -04:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
2011-04-04 18:24:26 -04:00
|
|
|
char country[3];
|
|
|
|
char *str = country;
|
|
|
|
|
|
|
|
country[0] = wpa_s->conf->country[0];
|
|
|
|
country[1] = wpa_s->conf->country[1];
|
|
|
|
country[2] = '\0';
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_STRING,
|
|
|
|
&str, error);
|
2011-04-04 18:24:26 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_setter_country - Control country code
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2011-04-04 18:24:26 -04:00
|
|
|
*
|
|
|
|
* Setter function for "Country" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_setter_country(DBusMessageIter *iter, DBusError *error,
|
|
|
|
void *user_data)
|
2011-04-04 18:24:26 -04:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
2011-04-04 18:24:26 -04:00
|
|
|
const char *country;
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
if (!wpas_dbus_simple_property_setter(iter, error, DBUS_TYPE_STRING,
|
|
|
|
&country))
|
|
|
|
return FALSE;
|
2011-04-04 18:24:26 -04:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
if (!country[0] || !country[1]) {
|
|
|
|
dbus_set_error_const(error, DBUS_ERROR_FAILED,
|
|
|
|
"invalid country code");
|
|
|
|
return FALSE;
|
|
|
|
}
|
2011-04-04 18:24:26 -04:00
|
|
|
|
|
|
|
if (wpa_s->drv_priv != NULL && wpa_drv_set_country(wpa_s, country)) {
|
|
|
|
wpa_printf(MSG_DEBUG, "Failed to set country");
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error_const(error, DBUS_ERROR_FAILED,
|
|
|
|
"failed to set country code");
|
|
|
|
return FALSE;
|
2011-04-04 18:24:26 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
wpa_s->conf->country[0] = country[0];
|
|
|
|
wpa_s->conf->country[1] = country[1];
|
2011-07-29 14:25:39 -04:00
|
|
|
return TRUE;
|
2011-04-04 18:24:26 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-04-01 11:05:22 -04:00
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_scan_interval - Get scan interval
|
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
|
|
|
*
|
|
|
|
* Getter function for "ScanInterval" property.
|
|
|
|
*/
|
|
|
|
dbus_bool_t wpas_dbus_getter_scan_interval(DBusMessageIter *iter,
|
|
|
|
DBusError *error,
|
|
|
|
void *user_data)
|
|
|
|
{
|
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
|
|
|
dbus_int32_t scan_interval = wpa_s->scan_interval;
|
|
|
|
|
|
|
|
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_INT32,
|
|
|
|
&scan_interval, error);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_setter_scan_interval - Control scan interval
|
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
|
|
|
*
|
|
|
|
* Setter function for "ScanInterval" property.
|
|
|
|
*/
|
|
|
|
dbus_bool_t wpas_dbus_setter_scan_interval(DBusMessageIter *iter,
|
|
|
|
DBusError *error,
|
|
|
|
void *user_data)
|
|
|
|
{
|
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
|
|
|
dbus_int32_t scan_interval;
|
|
|
|
|
|
|
|
if (!wpas_dbus_simple_property_setter(iter, error, DBUS_TYPE_INT32,
|
|
|
|
&scan_interval))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (wpa_supplicant_set_scan_interval(wpa_s, scan_interval)) {
|
|
|
|
dbus_set_error_const(error, DBUS_ERROR_FAILED,
|
|
|
|
"scan_interval must be >= 0");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-11-09 16:51:59 -05:00
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_ifname - Get interface name
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2009-11-09 16:51:59 -05:00
|
|
|
*
|
|
|
|
* Getter for "Ifname" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_ifname(DBusMessageIter *iter, DBusError *error,
|
|
|
|
void *user_data)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
2010-01-01 04:56:56 -05:00
|
|
|
const char *ifname = wpa_s->ifname;
|
2011-07-29 14:25:39 -04:00
|
|
|
|
|
|
|
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_STRING,
|
|
|
|
&ifname, error);
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_driver - Get interface name
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2009-11-09 16:51:59 -05:00
|
|
|
*
|
|
|
|
* Getter for "Driver" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_driver(DBusMessageIter *iter, DBusError *error,
|
|
|
|
void *user_data)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
2010-01-01 04:56:56 -05:00
|
|
|
const char *driver;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
if (wpa_s->driver == NULL || wpa_s->driver->name == NULL) {
|
2014-12-31 16:21:10 -05:00
|
|
|
wpa_printf(MSG_DEBUG, "%s[dbus]: wpa_s has no driver set",
|
|
|
|
__func__);
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error(error, DBUS_ERROR_FAILED, "%s: no driver set",
|
|
|
|
__func__);
|
|
|
|
return FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
driver = wpa_s->driver->name;
|
2011-07-29 14:25:39 -04:00
|
|
|
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_STRING,
|
|
|
|
&driver, error);
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_current_bss - Get current bss object path
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2009-11-09 16:51:59 -05:00
|
|
|
*
|
|
|
|
* Getter for "CurrentBSS" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_current_bss(DBusMessageIter *iter,
|
|
|
|
DBusError *error,
|
|
|
|
void *user_data)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
2010-01-02 10:17:00 -05:00
|
|
|
char path_buf[WPAS_DBUS_OBJECT_PATH_MAX], *bss_obj_path = path_buf;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2015-04-29 06:13:34 -04:00
|
|
|
if (wpa_s->current_bss && wpa_s->dbus_new_path)
|
2009-11-10 10:51:59 -05:00
|
|
|
os_snprintf(bss_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
|
2009-12-27 18:10:07 -05:00
|
|
|
"%s/" WPAS_DBUS_NEW_BSSIDS_PART "/%u",
|
2010-01-02 09:59:19 -05:00
|
|
|
wpa_s->dbus_new_path, wpa_s->current_bss->id);
|
2009-11-09 16:51:59 -05:00
|
|
|
else
|
2009-11-10 10:51:59 -05:00
|
|
|
os_snprintf(bss_obj_path, WPAS_DBUS_OBJECT_PATH_MAX, "/");
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_OBJECT_PATH,
|
|
|
|
&bss_obj_path, error);
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_current_network - Get current network object path
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2009-11-09 16:51:59 -05:00
|
|
|
*
|
|
|
|
* Getter for "CurrentNetwork" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_current_network(DBusMessageIter *iter,
|
|
|
|
DBusError *error,
|
|
|
|
void *user_data)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
2010-01-02 10:17:00 -05:00
|
|
|
char path_buf[WPAS_DBUS_OBJECT_PATH_MAX], *net_obj_path = path_buf;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2015-04-29 06:13:34 -04:00
|
|
|
if (wpa_s->current_ssid && wpa_s->dbus_new_path)
|
2009-11-10 10:51:59 -05:00
|
|
|
os_snprintf(net_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
|
2010-01-01 12:12:31 -05:00
|
|
|
"%s/" WPAS_DBUS_NEW_NETWORKS_PART "/%u",
|
|
|
|
wpa_s->dbus_new_path, wpa_s->current_ssid->id);
|
2009-11-09 16:51:59 -05:00
|
|
|
else
|
2009-11-10 10:51:59 -05:00
|
|
|
os_snprintf(net_obj_path, WPAS_DBUS_OBJECT_PATH_MAX, "/");
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_OBJECT_PATH,
|
|
|
|
&net_obj_path, error);
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-03-15 07:53:56 -04:00
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_current_auth_mode - Get current authentication type
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2011-03-15 07:53:56 -04:00
|
|
|
*
|
|
|
|
* Getter for "CurrentAuthMode" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_current_auth_mode(DBusMessageIter *iter,
|
|
|
|
DBusError *error,
|
|
|
|
void *user_data)
|
2011-03-15 07:53:56 -04:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
2011-03-15 07:53:56 -04:00
|
|
|
const char *eap_mode;
|
|
|
|
const char *auth_mode;
|
|
|
|
char eap_mode_buf[WPAS_DBUS_AUTH_MODE_MAX];
|
|
|
|
|
|
|
|
if (wpa_s->wpa_state != WPA_COMPLETED) {
|
|
|
|
auth_mode = "INACTIVE";
|
|
|
|
} else if (wpa_s->key_mgmt == WPA_KEY_MGMT_IEEE8021X ||
|
|
|
|
wpa_s->key_mgmt == WPA_KEY_MGMT_IEEE8021X_NO_WPA) {
|
|
|
|
eap_mode = wpa_supplicant_get_eap_mode(wpa_s);
|
|
|
|
os_snprintf(eap_mode_buf, WPAS_DBUS_AUTH_MODE_MAX,
|
|
|
|
"EAP-%s", eap_mode);
|
|
|
|
auth_mode = eap_mode_buf;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
auth_mode = wpa_key_mgmt_txt(wpa_s->key_mgmt,
|
|
|
|
wpa_s->current_ssid->proto);
|
|
|
|
}
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_STRING,
|
|
|
|
&auth_mode, error);
|
2011-03-15 07:53:56 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-11-09 16:51:59 -05:00
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_bridge_ifname - Get interface name
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2009-11-09 16:51:59 -05:00
|
|
|
*
|
|
|
|
* Getter for "BridgeIfname" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_bridge_ifname(DBusMessageIter *iter,
|
|
|
|
DBusError *error,
|
|
|
|
void *user_data)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
2011-11-13 13:54:44 -05:00
|
|
|
const char *bridge_ifname = wpa_s->bridge_ifname;
|
2014-12-31 16:21:10 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_STRING,
|
|
|
|
&bridge_ifname, error);
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_bsss - Get array of BSSs objects
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2009-11-09 16:51:59 -05:00
|
|
|
*
|
|
|
|
* Getter for "BSSs" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_bsss(DBusMessageIter *iter, DBusError *error,
|
|
|
|
void *user_data)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
2009-12-27 18:10:07 -05:00
|
|
|
struct wpa_bss *bss;
|
2010-01-01 04:56:56 -05:00
|
|
|
char **paths;
|
|
|
|
unsigned int i = 0;
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t success = FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2015-04-29 06:13:34 -04:00
|
|
|
if (!wpa_s->dbus_new_path) {
|
|
|
|
dbus_set_error(error, DBUS_ERROR_FAILED,
|
|
|
|
"%s: no D-Bus interface", __func__);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2012-08-13 13:44:21 -04:00
|
|
|
paths = os_calloc(wpa_s->num_bss, sizeof(char *));
|
2010-01-01 04:56:56 -05:00
|
|
|
if (!paths) {
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
|
|
|
|
return FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Loop through scan results and append each result's object path */
|
2009-12-27 18:10:07 -05:00
|
|
|
dl_list_for_each(bss, &wpa_s->bss_id, struct wpa_bss, list_id) {
|
2010-01-01 04:56:56 -05:00
|
|
|
paths[i] = os_zalloc(WPAS_DBUS_OBJECT_PATH_MAX);
|
|
|
|
if (paths[i] == NULL) {
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY,
|
|
|
|
"no memory");
|
2009-11-09 16:51:59 -05:00
|
|
|
goto out;
|
|
|
|
}
|
2009-12-27 18:10:07 -05:00
|
|
|
/* Construct the object path for this BSS. */
|
2010-01-01 04:56:56 -05:00
|
|
|
os_snprintf(paths[i++], WPAS_DBUS_OBJECT_PATH_MAX,
|
2009-12-27 18:10:07 -05:00
|
|
|
"%s/" WPAS_DBUS_NEW_BSSIDS_PART "/%u",
|
2010-01-01 12:12:31 -05:00
|
|
|
wpa_s->dbus_new_path, bss->id);
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
success = wpas_dbus_simple_array_property_getter(iter,
|
|
|
|
DBUS_TYPE_OBJECT_PATH,
|
|
|
|
paths, wpa_s->num_bss,
|
|
|
|
error);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
out:
|
2010-01-02 10:17:00 -05:00
|
|
|
while (i)
|
2010-01-01 04:56:56 -05:00
|
|
|
os_free(paths[--i]);
|
|
|
|
os_free(paths);
|
2011-07-29 14:25:39 -04:00
|
|
|
return success;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_networks - Get array of networks objects
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2009-11-09 16:51:59 -05:00
|
|
|
*
|
|
|
|
* Getter for "Networks" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_networks(DBusMessageIter *iter, DBusError *error,
|
|
|
|
void *user_data)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
2009-11-09 16:51:59 -05:00
|
|
|
struct wpa_ssid *ssid;
|
2010-01-01 04:56:56 -05:00
|
|
|
char **paths;
|
|
|
|
unsigned int i = 0, num = 0;
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t success = FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2015-04-29 06:13:34 -04:00
|
|
|
if (!wpa_s->dbus_new_path) {
|
|
|
|
dbus_set_error(error, DBUS_ERROR_FAILED,
|
|
|
|
"%s: no D-Bus interface", __func__);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2010-01-01 04:56:56 -05:00
|
|
|
for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next)
|
2011-06-23 14:25:13 -04:00
|
|
|
if (!network_is_persistent_group(ssid))
|
|
|
|
num++;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2012-08-13 13:44:21 -04:00
|
|
|
paths = os_calloc(num, sizeof(char *));
|
2010-01-01 04:56:56 -05:00
|
|
|
if (!paths) {
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error(error, DBUS_ERROR_NO_MEMORY, "no memory");
|
|
|
|
return FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
2010-01-01 04:56:56 -05:00
|
|
|
/* Loop through configured networks and append object path of each */
|
2009-11-09 16:51:59 -05:00
|
|
|
for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next) {
|
2011-06-23 14:25:13 -04:00
|
|
|
if (network_is_persistent_group(ssid))
|
|
|
|
continue;
|
2010-01-01 04:56:56 -05:00
|
|
|
paths[i] = os_zalloc(WPAS_DBUS_OBJECT_PATH_MAX);
|
|
|
|
if (paths[i] == NULL) {
|
2014-12-31 16:21:10 -05:00
|
|
|
dbus_set_error(error, DBUS_ERROR_NO_MEMORY,
|
|
|
|
"no memory");
|
2009-11-09 16:51:59 -05:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Construct the object path for this network. */
|
2010-01-01 04:56:56 -05:00
|
|
|
os_snprintf(paths[i++], WPAS_DBUS_OBJECT_PATH_MAX,
|
2009-11-10 10:51:59 -05:00
|
|
|
"%s/" WPAS_DBUS_NEW_NETWORKS_PART "/%d",
|
2010-01-01 12:12:31 -05:00
|
|
|
wpa_s->dbus_new_path, ssid->id);
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
success = wpas_dbus_simple_array_property_getter(iter,
|
|
|
|
DBUS_TYPE_OBJECT_PATH,
|
|
|
|
paths, num, error);
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
out:
|
2010-01-01 04:56:56 -05:00
|
|
|
while (i)
|
|
|
|
os_free(paths[--i]);
|
|
|
|
os_free(paths);
|
2011-07-29 14:25:39 -04:00
|
|
|
return success;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-11-23 03:38:07 -05:00
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_pkcs11_engine_path - Get PKCS #11 engine path
|
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: A dbus message containing the PKCS #11 engine path
|
|
|
|
*
|
|
|
|
* Getter for "PKCS11EnginePath" property.
|
|
|
|
*/
|
|
|
|
dbus_bool_t wpas_dbus_getter_pkcs11_engine_path(DBusMessageIter *iter,
|
|
|
|
DBusError *error,
|
|
|
|
void *user_data)
|
|
|
|
{
|
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
|
|
|
const char *pkcs11_engine_path;
|
|
|
|
|
|
|
|
if (wpa_s->conf->pkcs11_engine_path == NULL)
|
|
|
|
pkcs11_engine_path = "";
|
|
|
|
else
|
|
|
|
pkcs11_engine_path = wpa_s->conf->pkcs11_engine_path;
|
|
|
|
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_STRING,
|
|
|
|
&pkcs11_engine_path, error);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_pkcs11_module_path - Get PKCS #11 module path
|
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: A dbus message containing the PKCS #11 module path
|
|
|
|
*
|
|
|
|
* Getter for "PKCS11ModulePath" property.
|
|
|
|
*/
|
|
|
|
dbus_bool_t wpas_dbus_getter_pkcs11_module_path(DBusMessageIter *iter,
|
|
|
|
DBusError *error,
|
|
|
|
void *user_data)
|
|
|
|
{
|
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
|
|
|
const char *pkcs11_module_path;
|
|
|
|
|
|
|
|
if (wpa_s->conf->pkcs11_module_path == NULL)
|
|
|
|
pkcs11_module_path = "";
|
|
|
|
else
|
|
|
|
pkcs11_module_path = wpa_s->conf->pkcs11_module_path;
|
|
|
|
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_STRING,
|
|
|
|
&pkcs11_module_path, error);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-11-09 16:51:59 -05:00
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_blobs - Get all blobs defined for this interface
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2009-11-09 16:51:59 -05:00
|
|
|
*
|
|
|
|
* Getter for "Blobs" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_blobs(DBusMessageIter *iter, DBusError *error,
|
|
|
|
void *user_data)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct wpa_supplicant *wpa_s = user_data;
|
|
|
|
DBusMessageIter variant_iter, dict_iter, entry_iter, array_iter;
|
2009-11-09 16:51:59 -05:00
|
|
|
struct wpa_config_blob *blob;
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
if (!dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT,
|
2010-01-01 13:50:12 -05:00
|
|
|
"a{say}", &variant_iter) ||
|
|
|
|
!dbus_message_iter_open_container(&variant_iter, DBUS_TYPE_ARRAY,
|
2009-11-10 10:51:59 -05:00
|
|
|
"{say}", &dict_iter)) {
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
|
|
|
|
return FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
blob = wpa_s->conf->blobs;
|
|
|
|
while (blob) {
|
2009-11-10 10:51:59 -05:00
|
|
|
if (!dbus_message_iter_open_container(&dict_iter,
|
|
|
|
DBUS_TYPE_DICT_ENTRY,
|
2010-01-01 13:50:12 -05:00
|
|
|
NULL, &entry_iter) ||
|
|
|
|
!dbus_message_iter_append_basic(&entry_iter,
|
2009-11-10 10:51:59 -05:00
|
|
|
DBUS_TYPE_STRING,
|
2010-01-01 13:50:12 -05:00
|
|
|
&(blob->name)) ||
|
|
|
|
!dbus_message_iter_open_container(&entry_iter,
|
2009-11-10 10:51:59 -05:00
|
|
|
DBUS_TYPE_ARRAY,
|
|
|
|
DBUS_TYPE_BYTE_AS_STRING,
|
2010-01-01 13:50:12 -05:00
|
|
|
&array_iter) ||
|
|
|
|
!dbus_message_iter_append_fixed_array(&array_iter,
|
2009-11-10 10:51:59 -05:00
|
|
|
DBUS_TYPE_BYTE,
|
|
|
|
&(blob->data),
|
2010-01-01 13:50:12 -05:00
|
|
|
blob->len) ||
|
|
|
|
!dbus_message_iter_close_container(&entry_iter,
|
|
|
|
&array_iter) ||
|
|
|
|
!dbus_message_iter_close_container(&dict_iter,
|
2009-11-10 10:51:59 -05:00
|
|
|
&entry_iter)) {
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY,
|
|
|
|
"no memory");
|
|
|
|
return FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
blob = blob->next;
|
|
|
|
}
|
|
|
|
|
2010-01-01 13:50:12 -05:00
|
|
|
if (!dbus_message_iter_close_container(&variant_iter, &dict_iter) ||
|
2011-07-29 14:25:39 -04:00
|
|
|
!dbus_message_iter_close_container(iter, &variant_iter)) {
|
|
|
|
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
|
|
|
|
return FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static struct wpa_bss * get_bss_helper(struct bss_handler_args *args,
|
|
|
|
DBusError *error, const char *func_name)
|
|
|
|
{
|
|
|
|
struct wpa_bss *res = wpa_bss_get_id(args->wpa_s, args->id);
|
|
|
|
|
|
|
|
if (!res) {
|
|
|
|
wpa_printf(MSG_ERROR, "%s[dbus]: no bss with id %d found",
|
2014-12-31 16:21:10 -05:00
|
|
|
func_name, args->id);
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error(error, DBUS_ERROR_FAILED,
|
|
|
|
"%s: BSS %d not found",
|
|
|
|
func_name, args->id);
|
|
|
|
}
|
|
|
|
|
|
|
|
return res;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
2010-01-01 05:28:24 -05:00
|
|
|
* wpas_dbus_getter_bss_bssid - Return the BSSID of a BSS
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2009-11-09 16:51:59 -05:00
|
|
|
*
|
2010-01-01 05:28:24 -05:00
|
|
|
* Getter for "BSSID" property.
|
2009-11-09 16:51:59 -05:00
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_bss_bssid(DBusMessageIter *iter, DBusError *error,
|
|
|
|
void *user_data)
|
2010-01-01 05:28:24 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct bss_handler_args *args = user_data;
|
|
|
|
struct wpa_bss *res;
|
2010-01-01 05:28:24 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
res = get_bss_helper(args, error, __func__);
|
|
|
|
if (!res)
|
|
|
|
return FALSE;
|
2010-01-01 05:28:24 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
return wpas_dbus_simple_array_property_getter(iter, DBUS_TYPE_BYTE,
|
|
|
|
res->bssid, ETH_ALEN,
|
|
|
|
error);
|
2010-01-01 05:28:24 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_bss_ssid - Return the SSID of a BSS
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2010-01-01 05:28:24 -05:00
|
|
|
*
|
|
|
|
* Getter for "SSID" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_bss_ssid(DBusMessageIter *iter, DBusError *error,
|
|
|
|
void *user_data)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct bss_handler_args *args = user_data;
|
|
|
|
struct wpa_bss *res;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
res = get_bss_helper(args, error, __func__);
|
|
|
|
if (!res)
|
|
|
|
return FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
return wpas_dbus_simple_array_property_getter(iter, DBUS_TYPE_BYTE,
|
|
|
|
res->ssid, res->ssid_len,
|
|
|
|
error);
|
2010-01-01 05:28:24 -05:00
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
|
2010-01-01 05:28:24 -05:00
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_bss_privacy - Return the privacy flag of a BSS
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2010-01-01 05:28:24 -05:00
|
|
|
*
|
|
|
|
* Getter for "Privacy" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_bss_privacy(DBusMessageIter *iter,
|
|
|
|
DBusError *error, void *user_data)
|
2010-01-01 05:28:24 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct bss_handler_args *args = user_data;
|
|
|
|
struct wpa_bss *res;
|
2010-01-01 05:28:24 -05:00
|
|
|
dbus_bool_t privacy;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
res = get_bss_helper(args, error, __func__);
|
|
|
|
if (!res)
|
|
|
|
return FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2010-01-10 11:18:08 -05:00
|
|
|
privacy = (res->caps & IEEE80211_CAP_PRIVACY) ? TRUE : FALSE;
|
2011-07-29 14:25:39 -04:00
|
|
|
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_BOOLEAN,
|
|
|
|
&privacy, error);
|
2010-01-01 05:28:24 -05:00
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
|
2010-01-01 05:28:24 -05:00
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_bss_mode - Return the mode of a BSS
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2010-01-01 05:28:24 -05:00
|
|
|
*
|
|
|
|
* Getter for "Mode" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_bss_mode(DBusMessageIter *iter, DBusError *error,
|
|
|
|
void *user_data)
|
2010-01-01 05:28:24 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct bss_handler_args *args = user_data;
|
|
|
|
struct wpa_bss *res;
|
2010-01-01 05:28:24 -05:00
|
|
|
const char *mode;
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
res = get_bss_helper(args, error, __func__);
|
|
|
|
if (!res)
|
|
|
|
return FALSE;
|
2014-05-12 03:35:41 -04:00
|
|
|
if (bss_is_dmg(res)) {
|
|
|
|
switch (res->caps & IEEE80211_CAP_DMG_MASK) {
|
|
|
|
case IEEE80211_CAP_DMG_PBSS:
|
|
|
|
case IEEE80211_CAP_DMG_IBSS:
|
|
|
|
mode = "ad-hoc";
|
|
|
|
break;
|
|
|
|
case IEEE80211_CAP_DMG_AP:
|
|
|
|
mode = "infrastructure";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (res->caps & IEEE80211_CAP_IBSS)
|
|
|
|
mode = "ad-hoc";
|
|
|
|
else
|
|
|
|
mode = "infrastructure";
|
|
|
|
}
|
2010-01-01 05:28:24 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_STRING,
|
|
|
|
&mode, error);
|
2010-01-01 05:28:24 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_bss_level - Return the signal strength of a BSS
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2010-01-01 05:28:24 -05:00
|
|
|
*
|
|
|
|
* Getter for "Level" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_bss_signal(DBusMessageIter *iter,
|
|
|
|
DBusError *error, void *user_data)
|
2010-01-01 05:28:24 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct bss_handler_args *args = user_data;
|
|
|
|
struct wpa_bss *res;
|
2012-01-28 10:57:48 -05:00
|
|
|
s16 level;
|
2010-01-01 05:28:24 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
res = get_bss_helper(args, error, __func__);
|
|
|
|
if (!res)
|
|
|
|
return FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2012-01-28 10:57:48 -05:00
|
|
|
level = (s16) res->level;
|
2011-07-29 14:25:39 -04:00
|
|
|
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_INT16,
|
2012-01-28 10:57:48 -05:00
|
|
|
&level, error);
|
2010-01-01 05:28:24 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_bss_frequency - Return the frequency of a BSS
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2010-01-01 05:28:24 -05:00
|
|
|
*
|
|
|
|
* Getter for "Frequency" property.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_bss_frequency(DBusMessageIter *iter,
|
|
|
|
DBusError *error, void *user_data)
|
2010-01-01 05:28:24 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct bss_handler_args *args = user_data;
|
|
|
|
struct wpa_bss *res;
|
2012-01-28 10:57:48 -05:00
|
|
|
u16 freq;
|
2010-01-01 05:28:24 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
res = get_bss_helper(args, error, __func__);
|
|
|
|
if (!res)
|
|
|
|
return FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2012-01-28 10:57:48 -05:00
|
|
|
freq = (u16) res->freq;
|
2011-07-29 14:25:39 -04:00
|
|
|
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_UINT16,
|
2012-01-28 10:57:48 -05:00
|
|
|
&freq, error);
|
2010-01-01 05:28:24 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-01-04 09:52:30 -05:00
|
|
|
static int cmp_u8s_desc(const void *a, const void *b)
|
|
|
|
{
|
|
|
|
return (*(u8 *) b - *(u8 *) a);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-01-01 05:28:24 -05:00
|
|
|
/**
|
2010-01-04 09:52:30 -05:00
|
|
|
* wpas_dbus_getter_bss_rates - Return available bit rates of a BSS
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2010-01-01 05:28:24 -05:00
|
|
|
*
|
2010-01-04 09:52:30 -05:00
|
|
|
* Getter for "Rates" property.
|
2010-01-01 05:28:24 -05:00
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_bss_rates(DBusMessageIter *iter,
|
|
|
|
DBusError *error, void *user_data)
|
2010-01-01 05:28:24 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct bss_handler_args *args = user_data;
|
|
|
|
struct wpa_bss *res;
|
2010-01-04 09:52:30 -05:00
|
|
|
u8 *ie_rates = NULL;
|
|
|
|
u32 *real_rates;
|
|
|
|
int rates_num, i;
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t success = FALSE;
|
2010-01-01 05:28:24 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
res = get_bss_helper(args, error, __func__);
|
|
|
|
if (!res)
|
|
|
|
return FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2010-01-04 09:52:30 -05:00
|
|
|
rates_num = wpa_bss_get_bit_rates(res, &ie_rates);
|
|
|
|
if (rates_num < 0)
|
2011-07-29 14:25:39 -04:00
|
|
|
return FALSE;
|
2010-01-04 09:52:30 -05:00
|
|
|
|
|
|
|
qsort(ie_rates, rates_num, 1, cmp_u8s_desc);
|
|
|
|
|
|
|
|
real_rates = os_malloc(sizeof(u32) * rates_num);
|
|
|
|
if (!real_rates) {
|
|
|
|
os_free(ie_rates);
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
|
|
|
|
return FALSE;
|
2010-01-04 09:52:30 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < rates_num; i++)
|
|
|
|
real_rates[i] = ie_rates[i] * 500000;
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
success = wpas_dbus_simple_array_property_getter(iter, DBUS_TYPE_UINT32,
|
|
|
|
real_rates, rates_num,
|
|
|
|
error);
|
2010-01-04 09:52:30 -05:00
|
|
|
|
|
|
|
os_free(ie_rates);
|
|
|
|
os_free(real_rates);
|
2011-07-29 14:25:39 -04:00
|
|
|
return success;
|
2010-01-01 05:28:24 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
static dbus_bool_t wpas_dbus_get_bss_security_prop(DBusMessageIter *iter,
|
|
|
|
struct wpa_ie_data *ie_data,
|
|
|
|
DBusError *error)
|
2010-01-16 09:37:37 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
DBusMessageIter iter_dict, variant_iter;
|
2010-01-16 09:37:37 -05:00
|
|
|
const char *group;
|
2013-12-24 15:21:04 -05:00
|
|
|
const char *pairwise[5]; /* max 5 pairwise ciphers is supported */
|
2015-01-25 16:32:01 -05:00
|
|
|
const char *key_mgmt[9]; /* max 9 key managements may be supported */
|
2010-01-16 09:37:37 -05:00
|
|
|
int n;
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
if (!dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT,
|
2010-01-16 09:37:37 -05:00
|
|
|
"a{sv}", &variant_iter))
|
|
|
|
goto nomem;
|
|
|
|
|
|
|
|
if (!wpa_dbus_dict_open_write(&variant_iter, &iter_dict))
|
|
|
|
goto nomem;
|
|
|
|
|
|
|
|
/* KeyMgmt */
|
|
|
|
n = 0;
|
|
|
|
if (ie_data->key_mgmt & WPA_KEY_MGMT_PSK)
|
|
|
|
key_mgmt[n++] = "wpa-psk";
|
|
|
|
if (ie_data->key_mgmt & WPA_KEY_MGMT_FT_PSK)
|
|
|
|
key_mgmt[n++] = "wpa-ft-psk";
|
|
|
|
if (ie_data->key_mgmt & WPA_KEY_MGMT_PSK_SHA256)
|
|
|
|
key_mgmt[n++] = "wpa-psk-sha256";
|
|
|
|
if (ie_data->key_mgmt & WPA_KEY_MGMT_IEEE8021X)
|
|
|
|
key_mgmt[n++] = "wpa-eap";
|
|
|
|
if (ie_data->key_mgmt & WPA_KEY_MGMT_FT_IEEE8021X)
|
|
|
|
key_mgmt[n++] = "wpa-ft-eap";
|
|
|
|
if (ie_data->key_mgmt & WPA_KEY_MGMT_IEEE8021X_SHA256)
|
|
|
|
key_mgmt[n++] = "wpa-eap-sha256";
|
2015-01-25 16:32:01 -05:00
|
|
|
#ifdef CONFIG_SUITEB
|
2014-11-16 06:20:51 -05:00
|
|
|
if (ie_data->key_mgmt & WPA_KEY_MGMT_IEEE8021X_SUITE_B)
|
|
|
|
key_mgmt[n++] = "wpa-eap-suite-b";
|
2015-01-25 16:32:01 -05:00
|
|
|
#endif /* CONFIG_SUITEB */
|
|
|
|
#ifdef CONFIG_SUITEB192
|
|
|
|
if (ie_data->key_mgmt & WPA_KEY_MGMT_IEEE8021X_SUITE_B_192)
|
|
|
|
key_mgmt[n++] = "wpa-eap-suite-b-192";
|
|
|
|
#endif /* CONFIG_SUITEB192 */
|
2010-01-16 09:37:37 -05:00
|
|
|
if (ie_data->key_mgmt & WPA_KEY_MGMT_NONE)
|
|
|
|
key_mgmt[n++] = "wpa-none";
|
|
|
|
|
|
|
|
if (!wpa_dbus_dict_append_string_array(&iter_dict, "KeyMgmt",
|
|
|
|
key_mgmt, n))
|
|
|
|
goto nomem;
|
|
|
|
|
|
|
|
/* Group */
|
|
|
|
switch (ie_data->group_cipher) {
|
|
|
|
case WPA_CIPHER_WEP40:
|
|
|
|
group = "wep40";
|
|
|
|
break;
|
|
|
|
case WPA_CIPHER_TKIP:
|
|
|
|
group = "tkip";
|
|
|
|
break;
|
|
|
|
case WPA_CIPHER_CCMP:
|
|
|
|
group = "ccmp";
|
|
|
|
break;
|
2012-08-29 04:52:15 -04:00
|
|
|
case WPA_CIPHER_GCMP:
|
|
|
|
group = "gcmp";
|
|
|
|
break;
|
2010-01-16 09:37:37 -05:00
|
|
|
case WPA_CIPHER_WEP104:
|
|
|
|
group = "wep104";
|
|
|
|
break;
|
2013-12-24 15:21:04 -05:00
|
|
|
case WPA_CIPHER_CCMP_256:
|
|
|
|
group = "ccmp-256";
|
|
|
|
break;
|
|
|
|
case WPA_CIPHER_GCMP_256:
|
|
|
|
group = "gcmp-256";
|
|
|
|
break;
|
2010-01-16 09:37:37 -05:00
|
|
|
default:
|
|
|
|
group = "";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!wpa_dbus_dict_append_string(&iter_dict, "Group", group))
|
|
|
|
goto nomem;
|
|
|
|
|
|
|
|
/* Pairwise */
|
|
|
|
n = 0;
|
|
|
|
if (ie_data->pairwise_cipher & WPA_CIPHER_TKIP)
|
|
|
|
pairwise[n++] = "tkip";
|
|
|
|
if (ie_data->pairwise_cipher & WPA_CIPHER_CCMP)
|
|
|
|
pairwise[n++] = "ccmp";
|
2012-08-29 04:52:15 -04:00
|
|
|
if (ie_data->pairwise_cipher & WPA_CIPHER_GCMP)
|
|
|
|
pairwise[n++] = "gcmp";
|
2013-12-24 15:21:04 -05:00
|
|
|
if (ie_data->pairwise_cipher & WPA_CIPHER_CCMP_256)
|
|
|
|
pairwise[n++] = "ccmp-256";
|
|
|
|
if (ie_data->pairwise_cipher & WPA_CIPHER_GCMP_256)
|
|
|
|
pairwise[n++] = "gcmp-256";
|
2010-01-16 09:37:37 -05:00
|
|
|
|
|
|
|
if (!wpa_dbus_dict_append_string_array(&iter_dict, "Pairwise",
|
|
|
|
pairwise, n))
|
|
|
|
goto nomem;
|
|
|
|
|
|
|
|
/* Management group (RSN only) */
|
|
|
|
if (ie_data->proto == WPA_PROTO_RSN) {
|
|
|
|
switch (ie_data->mgmt_group_cipher) {
|
|
|
|
#ifdef CONFIG_IEEE80211W
|
|
|
|
case WPA_CIPHER_AES_128_CMAC:
|
|
|
|
group = "aes128cmac";
|
|
|
|
break;
|
|
|
|
#endif /* CONFIG_IEEE80211W */
|
|
|
|
default:
|
|
|
|
group = "";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!wpa_dbus_dict_append_string(&iter_dict, "MgmtGroup",
|
|
|
|
group))
|
|
|
|
goto nomem;
|
|
|
|
}
|
|
|
|
|
2014-12-31 06:57:48 -05:00
|
|
|
if (!wpa_dbus_dict_close_write(&variant_iter, &iter_dict) ||
|
|
|
|
!dbus_message_iter_close_container(iter, &variant_iter))
|
2010-01-16 09:37:37 -05:00
|
|
|
goto nomem;
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
return TRUE;
|
2010-01-16 09:37:37 -05:00
|
|
|
|
|
|
|
nomem:
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
|
|
|
|
return FALSE;
|
2010-01-16 09:37:37 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-01-01 05:28:24 -05:00
|
|
|
/**
|
2010-01-16 09:37:37 -05:00
|
|
|
* wpas_dbus_getter_bss_wpa - Return the WPA options of a BSS
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2010-01-01 05:28:24 -05:00
|
|
|
*
|
2010-01-16 09:37:37 -05:00
|
|
|
* Getter for "WPA" property.
|
2010-01-01 05:28:24 -05:00
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_bss_wpa(DBusMessageIter *iter, DBusError *error,
|
|
|
|
void *user_data)
|
2010-01-01 05:28:24 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct bss_handler_args *args = user_data;
|
|
|
|
struct wpa_bss *res;
|
2010-01-16 09:37:37 -05:00
|
|
|
struct wpa_ie_data wpa_data;
|
2010-01-01 05:28:24 -05:00
|
|
|
const u8 *ie;
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
res = get_bss_helper(args, error, __func__);
|
|
|
|
if (!res)
|
|
|
|
return FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2010-01-16 09:37:37 -05:00
|
|
|
os_memset(&wpa_data, 0, sizeof(wpa_data));
|
2010-01-01 05:28:24 -05:00
|
|
|
ie = wpa_bss_get_vendor_ie(res, WPA_IE_VENDOR_TYPE);
|
2014-12-31 06:57:48 -05:00
|
|
|
if (ie && wpa_parse_wpa_ie(ie, 2 + ie[1], &wpa_data) < 0) {
|
|
|
|
dbus_set_error_const(error, DBUS_ERROR_FAILED,
|
|
|
|
"failed to parse WPA IE");
|
|
|
|
return FALSE;
|
2010-09-04 15:01:29 -04:00
|
|
|
}
|
2010-01-16 09:37:37 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
return wpas_dbus_get_bss_security_prop(iter, &wpa_data, error);
|
2010-01-01 05:28:24 -05:00
|
|
|
}
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
|
2010-01-01 05:28:24 -05:00
|
|
|
/**
|
2010-01-16 09:37:37 -05:00
|
|
|
* wpas_dbus_getter_bss_rsn - Return the RSN options of a BSS
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2010-01-01 05:28:24 -05:00
|
|
|
*
|
2010-01-16 09:37:37 -05:00
|
|
|
* Getter for "RSN" property.
|
2010-01-01 05:28:24 -05:00
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_bss_rsn(DBusMessageIter *iter, DBusError *error,
|
|
|
|
void *user_data)
|
2010-01-01 05:28:24 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct bss_handler_args *args = user_data;
|
|
|
|
struct wpa_bss *res;
|
2010-01-16 09:37:37 -05:00
|
|
|
struct wpa_ie_data wpa_data;
|
2010-01-01 05:28:24 -05:00
|
|
|
const u8 *ie;
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
res = get_bss_helper(args, error, __func__);
|
|
|
|
if (!res)
|
|
|
|
return FALSE;
|
2010-01-01 05:28:24 -05:00
|
|
|
|
2010-01-16 09:37:37 -05:00
|
|
|
os_memset(&wpa_data, 0, sizeof(wpa_data));
|
2010-01-01 05:28:24 -05:00
|
|
|
ie = wpa_bss_get_ie(res, WLAN_EID_RSN);
|
2014-12-31 06:57:48 -05:00
|
|
|
if (ie && wpa_parse_wpa_ie(ie, 2 + ie[1], &wpa_data) < 0) {
|
|
|
|
dbus_set_error_const(error, DBUS_ERROR_FAILED,
|
|
|
|
"failed to parse RSN IE");
|
|
|
|
return FALSE;
|
2010-09-04 15:01:29 -04:00
|
|
|
}
|
2010-01-16 09:37:37 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
return wpas_dbus_get_bss_security_prop(iter, &wpa_data, error);
|
2010-01-01 05:28:24 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-11-03 12:37:20 -04:00
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_bss_wps - Return the WPS options of a BSS
|
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
|
|
|
*
|
|
|
|
* Getter for "WPS" property.
|
|
|
|
*/
|
|
|
|
dbus_bool_t wpas_dbus_getter_bss_wps(DBusMessageIter *iter, DBusError *error,
|
|
|
|
void *user_data)
|
|
|
|
{
|
|
|
|
struct bss_handler_args *args = user_data;
|
|
|
|
struct wpa_bss *res;
|
|
|
|
#ifdef CONFIG_WPS
|
|
|
|
struct wpabuf *wps_ie;
|
|
|
|
#endif /* CONFIG_WPS */
|
|
|
|
DBusMessageIter iter_dict, variant_iter;
|
2015-04-10 20:11:46 -04:00
|
|
|
int wps_support = 0;
|
2012-11-03 12:37:20 -04:00
|
|
|
const char *type = "";
|
|
|
|
|
|
|
|
res = get_bss_helper(args, error, __func__);
|
|
|
|
if (!res)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (!dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT,
|
2014-12-31 06:57:48 -05:00
|
|
|
"a{sv}", &variant_iter) ||
|
|
|
|
!wpa_dbus_dict_open_write(&variant_iter, &iter_dict))
|
2012-11-03 12:37:20 -04:00
|
|
|
goto nomem;
|
|
|
|
|
|
|
|
#ifdef CONFIG_WPS
|
|
|
|
wps_ie = wpa_bss_get_vendor_ie_multi(res, WPS_IE_VENDOR_TYPE);
|
|
|
|
if (wps_ie) {
|
2015-04-10 20:11:46 -04:00
|
|
|
wps_support = 1;
|
2012-11-03 12:37:20 -04:00
|
|
|
if (wps_is_selected_pbc_registrar(wps_ie))
|
|
|
|
type = "pbc";
|
|
|
|
else if (wps_is_selected_pin_registrar(wps_ie))
|
|
|
|
type = "pin";
|
2014-10-28 12:20:37 -04:00
|
|
|
|
|
|
|
wpabuf_free(wps_ie);
|
2012-11-03 12:37:20 -04:00
|
|
|
}
|
|
|
|
#endif /* CONFIG_WPS */
|
|
|
|
|
2015-04-10 20:11:46 -04:00
|
|
|
if ((wps_support && !wpa_dbus_dict_append_string(&iter_dict, "Type", type)) ||
|
2014-12-31 06:57:48 -05:00
|
|
|
!wpa_dbus_dict_close_write(&variant_iter, &iter_dict) ||
|
|
|
|
!dbus_message_iter_close_container(iter, &variant_iter))
|
2012-11-03 12:37:20 -04:00
|
|
|
goto nomem;
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
nomem:
|
|
|
|
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-01-01 05:28:24 -05:00
|
|
|
/**
|
2010-01-16 09:37:37 -05:00
|
|
|
* wpas_dbus_getter_bss_ies - Return all IEs of a BSS
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2010-01-01 05:28:24 -05:00
|
|
|
*
|
2010-01-16 09:37:37 -05:00
|
|
|
* Getter for "IEs" property.
|
2010-01-01 05:28:24 -05:00
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_bss_ies(DBusMessageIter *iter, DBusError *error,
|
|
|
|
void *user_data)
|
2010-01-01 05:28:24 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct bss_handler_args *args = user_data;
|
|
|
|
struct wpa_bss *res;
|
2010-01-01 05:28:24 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
res = get_bss_helper(args, error, __func__);
|
|
|
|
if (!res)
|
|
|
|
return FALSE;
|
2010-01-01 05:28:24 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
return wpas_dbus_simple_array_property_getter(iter, DBUS_TYPE_BYTE,
|
|
|
|
res + 1, res->ie_len,
|
|
|
|
error);
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-09-04 14:10:54 -04:00
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_bss_age - Return time in seconds since BSS was last seen
|
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
|
|
|
*
|
|
|
|
* Getter for BSS age
|
|
|
|
*/
|
|
|
|
dbus_bool_t wpas_dbus_getter_bss_age(DBusMessageIter *iter, DBusError *error,
|
|
|
|
void *user_data)
|
|
|
|
{
|
|
|
|
struct bss_handler_args *args = user_data;
|
|
|
|
struct wpa_bss *res;
|
|
|
|
struct os_reltime now, diff = { 0, 0 };
|
|
|
|
u32 age;
|
|
|
|
|
|
|
|
res = get_bss_helper(args, error, __func__);
|
|
|
|
if (!res)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
os_get_reltime(&now);
|
|
|
|
os_reltime_sub(&now, &res->last_update, &diff);
|
|
|
|
age = diff.sec > 0 ? diff.sec : 0;
|
|
|
|
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_UINT32, &age,
|
|
|
|
error);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-11-09 16:51:59 -05:00
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_enabled - Check whether network is enabled or disabled
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2009-11-09 16:51:59 -05:00
|
|
|
*
|
|
|
|
* Getter for "enabled" property of a configured network.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_enabled(DBusMessageIter *iter, DBusError *error,
|
|
|
|
void *user_data)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct network_handler_args *net = user_data;
|
2009-11-09 16:51:59 -05:00
|
|
|
dbus_bool_t enabled = net->ssid->disabled ? FALSE : TRUE;
|
2011-07-29 14:25:39 -04:00
|
|
|
|
|
|
|
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_BOOLEAN,
|
|
|
|
&enabled, error);
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_setter_enabled - Mark a configured network as enabled or disabled
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2009-11-09 16:51:59 -05:00
|
|
|
*
|
|
|
|
* Setter for "Enabled" property of a configured network.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_setter_enabled(DBusMessageIter *iter, DBusError *error,
|
|
|
|
void *user_data)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct network_handler_args *net = user_data;
|
2009-11-09 16:51:59 -05:00
|
|
|
struct wpa_supplicant *wpa_s;
|
|
|
|
struct wpa_ssid *ssid;
|
|
|
|
dbus_bool_t enable;
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
if (!wpas_dbus_simple_property_setter(iter, error, DBUS_TYPE_BOOLEAN,
|
|
|
|
&enable))
|
|
|
|
return FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
|
|
|
wpa_s = net->wpa_s;
|
|
|
|
ssid = net->ssid;
|
|
|
|
|
2009-11-10 10:51:59 -05:00
|
|
|
if (enable)
|
2009-11-09 16:51:59 -05:00
|
|
|
wpa_supplicant_enable_network(wpa_s, ssid);
|
2009-11-10 10:51:59 -05:00
|
|
|
else
|
2009-11-09 16:51:59 -05:00
|
|
|
wpa_supplicant_disable_network(wpa_s, ssid);
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
return TRUE;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_getter_network_properties - Get options for a configured network
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2009-11-09 16:51:59 -05:00
|
|
|
*
|
|
|
|
* Getter for "Properties" property of a configured network.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_getter_network_properties(DBusMessageIter *iter,
|
|
|
|
DBusError *error,
|
|
|
|
void *user_data)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct network_handler_args *net = user_data;
|
|
|
|
DBusMessageIter variant_iter, dict_iter;
|
2009-11-09 16:51:59 -05:00
|
|
|
char **iterator;
|
2011-02-02 10:00:12 -05:00
|
|
|
char **props = wpa_config_get_all(net->ssid, 1);
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t success = FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
if (!props) {
|
|
|
|
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
|
|
|
|
return FALSE;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
if (!dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT, "a{sv}",
|
|
|
|
&variant_iter) ||
|
2010-01-01 13:50:12 -05:00
|
|
|
!wpa_dbus_dict_open_write(&variant_iter, &dict_iter)) {
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
|
2009-11-09 16:51:59 -05:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
iterator = props;
|
|
|
|
while (*iterator) {
|
|
|
|
if (!wpa_dbus_dict_append_string(&dict_iter, *iterator,
|
2009-11-10 10:51:59 -05:00
|
|
|
*(iterator + 1))) {
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY,
|
|
|
|
"no memory");
|
2009-11-09 16:51:59 -05:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
iterator += 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-01-01 13:50:12 -05:00
|
|
|
if (!wpa_dbus_dict_close_write(&variant_iter, &dict_iter) ||
|
2011-07-29 14:25:39 -04:00
|
|
|
!dbus_message_iter_close_container(iter, &variant_iter)) {
|
|
|
|
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
|
2009-11-09 16:51:59 -05:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
success = TRUE;
|
|
|
|
|
2009-11-09 16:51:59 -05:00
|
|
|
out:
|
|
|
|
iterator = props;
|
|
|
|
while (*iterator) {
|
|
|
|
os_free(*iterator);
|
|
|
|
iterator++;
|
|
|
|
}
|
|
|
|
os_free(props);
|
2011-07-29 14:25:39 -04:00
|
|
|
return success;
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wpas_dbus_setter_network_properties - Set options for a configured network
|
2011-07-29 14:25:39 -04:00
|
|
|
* @iter: Pointer to incoming dbus message iter
|
|
|
|
* @error: Location to store error on failure
|
|
|
|
* @user_data: Function specific data
|
|
|
|
* Returns: TRUE on success, FALSE on failure
|
2009-11-09 16:51:59 -05:00
|
|
|
*
|
|
|
|
* Setter for "Properties" property of a configured network.
|
|
|
|
*/
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_bool_t wpas_dbus_setter_network_properties(DBusMessageIter *iter,
|
|
|
|
DBusError *error,
|
|
|
|
void *user_data)
|
2009-11-09 16:51:59 -05:00
|
|
|
{
|
2011-07-29 14:25:39 -04:00
|
|
|
struct network_handler_args *net = user_data;
|
2009-11-09 16:51:59 -05:00
|
|
|
struct wpa_ssid *ssid = net->ssid;
|
2011-07-29 14:25:39 -04:00
|
|
|
DBusMessageIter variant_iter;
|
2009-11-09 16:51:59 -05:00
|
|
|
|
2011-07-29 14:25:39 -04:00
|
|
|
dbus_message_iter_recurse(iter, &variant_iter);
|
|
|
|
return set_network_properties(net->wpa_s, ssid, &variant_iter, error);
|
2009-11-09 16:51:59 -05:00
|
|
|
}
|
2012-04-01 14:13:38 -04:00
|
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_AP
|
|
|
|
|
|
|
|
DBusMessage * wpas_dbus_handler_subscribe_preq(
|
|
|
|
DBusMessage *message, struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
struct wpas_dbus_priv *priv = wpa_s->global->dbus;
|
|
|
|
char *name;
|
|
|
|
|
|
|
|
if (wpa_s->preq_notify_peer != NULL) {
|
|
|
|
if (os_strcmp(dbus_message_get_sender(message),
|
|
|
|
wpa_s->preq_notify_peer) == 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return dbus_message_new_error(message,
|
|
|
|
WPAS_DBUS_ERROR_SUBSCRIPTION_IN_USE,
|
|
|
|
"Another application is already subscribed");
|
|
|
|
}
|
|
|
|
|
|
|
|
name = os_strdup(dbus_message_get_sender(message));
|
|
|
|
if (!name)
|
2015-01-01 15:36:52 -05:00
|
|
|
return wpas_dbus_error_no_memory(message);
|
2012-04-01 14:13:38 -04:00
|
|
|
|
|
|
|
wpa_s->preq_notify_peer = name;
|
|
|
|
|
|
|
|
/* Subscribe to clean up if application closes socket */
|
|
|
|
wpas_dbus_subscribe_noc(priv);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Double-check it's still alive to make sure that we didn't
|
|
|
|
* miss the NameOwnerChanged signal, e.g. while strdup'ing.
|
|
|
|
*/
|
|
|
|
if (!dbus_bus_name_has_owner(priv->con, name, NULL)) {
|
|
|
|
/*
|
|
|
|
* Application no longer exists, clean up.
|
|
|
|
* The return value is irrelevant now.
|
|
|
|
*
|
|
|
|
* Need to check if the NameOwnerChanged handling
|
|
|
|
* already cleaned up because we have processed
|
|
|
|
* DBus messages while checking if the name still
|
|
|
|
* has an owner.
|
|
|
|
*/
|
|
|
|
if (!wpa_s->preq_notify_peer)
|
|
|
|
return NULL;
|
|
|
|
os_free(wpa_s->preq_notify_peer);
|
|
|
|
wpa_s->preq_notify_peer = NULL;
|
|
|
|
wpas_dbus_unsubscribe_noc(priv);
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
DBusMessage * wpas_dbus_handler_unsubscribe_preq(
|
|
|
|
DBusMessage *message, struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
struct wpas_dbus_priv *priv = wpa_s->global->dbus;
|
|
|
|
|
|
|
|
if (!wpa_s->preq_notify_peer)
|
|
|
|
return dbus_message_new_error(message,
|
|
|
|
WPAS_DBUS_ERROR_NO_SUBSCRIPTION,
|
|
|
|
"Not subscribed");
|
|
|
|
|
|
|
|
if (os_strcmp(wpa_s->preq_notify_peer,
|
|
|
|
dbus_message_get_sender(message)))
|
|
|
|
return dbus_message_new_error(message,
|
|
|
|
WPAS_DBUS_ERROR_SUBSCRIPTION_EPERM,
|
|
|
|
"Can't unsubscribe others");
|
|
|
|
|
|
|
|
os_free(wpa_s->preq_notify_peer);
|
|
|
|
wpa_s->preq_notify_peer = NULL;
|
|
|
|
wpas_dbus_unsubscribe_noc(priv);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void wpas_dbus_signal_preq(struct wpa_supplicant *wpa_s,
|
|
|
|
const u8 *addr, const u8 *dst, const u8 *bssid,
|
|
|
|
const u8 *ie, size_t ie_len, u32 ssi_signal)
|
|
|
|
{
|
|
|
|
DBusMessage *msg;
|
|
|
|
DBusMessageIter iter, dict_iter;
|
|
|
|
struct wpas_dbus_priv *priv = wpa_s->global->dbus;
|
|
|
|
|
|
|
|
/* Do nothing if the control interface is not turned on */
|
2015-04-29 06:13:34 -04:00
|
|
|
if (priv == NULL || !wpa_s->dbus_new_path)
|
2012-04-01 14:13:38 -04:00
|
|
|
return;
|
|
|
|
|
|
|
|
if (wpa_s->preq_notify_peer == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
msg = dbus_message_new_signal(wpa_s->dbus_new_path,
|
|
|
|
WPAS_DBUS_NEW_IFACE_INTERFACE,
|
|
|
|
"ProbeRequest");
|
|
|
|
if (msg == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
dbus_message_set_destination(msg, wpa_s->preq_notify_peer);
|
|
|
|
|
|
|
|
dbus_message_iter_init_append(msg, &iter);
|
|
|
|
|
2014-12-31 06:57:48 -05:00
|
|
|
if (!wpa_dbus_dict_open_write(&iter, &dict_iter) ||
|
|
|
|
(addr && !wpa_dbus_dict_append_byte_array(&dict_iter, "addr",
|
|
|
|
(const char *) addr,
|
|
|
|
ETH_ALEN)) ||
|
|
|
|
(dst && !wpa_dbus_dict_append_byte_array(&dict_iter, "dst",
|
|
|
|
(const char *) dst,
|
|
|
|
ETH_ALEN)) ||
|
|
|
|
(bssid && !wpa_dbus_dict_append_byte_array(&dict_iter, "bssid",
|
|
|
|
(const char *) bssid,
|
|
|
|
ETH_ALEN)) ||
|
|
|
|
(ie && ie_len && !wpa_dbus_dict_append_byte_array(&dict_iter, "ies",
|
|
|
|
(const char *) ie,
|
|
|
|
ie_len)) ||
|
|
|
|
(ssi_signal && !wpa_dbus_dict_append_int32(&dict_iter, "signal",
|
|
|
|
ssi_signal)) ||
|
|
|
|
!wpa_dbus_dict_close_write(&iter, &dict_iter))
|
2012-04-01 14:13:38 -04:00
|
|
|
goto fail;
|
|
|
|
|
|
|
|
dbus_connection_send(priv->con, msg, NULL);
|
|
|
|
goto out;
|
|
|
|
fail:
|
|
|
|
wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
|
|
|
|
out:
|
|
|
|
dbus_message_unref(msg);
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* CONFIG_AP */
|