/*
* WPA Supplicant / dbus-based control interface
* Copyright (c) 2006, Dan Williams <dcbw@redhat.com> and Red Hat, Inc.
- * Copyright (c) 2009, Witold Sowa <witold.sowa@gmail.com>
+ * Copyright (c) 2009-2010, Witold Sowa <witold.sowa@gmail.com>
+ * Copyright (c) 2009, Jouni Malinen <j@w1.fi>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
#include "includes.h"
#include "common.h"
-#include "drivers/driver.h"
#include "wps/wps.h"
#include "../config.h"
#include "../wpa_supplicant_i.h"
+#include "../bss.h"
#include "dbus_new_helpers.h"
#include "dbus_dict_helpers.h"
#include "dbus_new.h"
#include "dbus_new_handlers.h"
-
-/**
- * wpas_dbus_set_path - Assign a dbus path to an interface
- * @wpa_s: wpa_supplicant interface structure
- * @path: dbus path to set on the interface
- * Returns: 0 on success, -1 on error
- */
-static int wpas_dbus_set_path(struct wpa_supplicant *wpa_s,
- const char *path)
-{
- u32 len = os_strlen(path);
- if (len >= WPAS_DBUS_OBJECT_PATH_MAX)
- return -1;
- if (wpa_s->dbus_new_path)
- return -1;
- wpa_s->dbus_new_path = os_strdup(path);
- return 0;
-}
+#include "dbus_common.h"
+#include "dbus_common_i.h"
/**
* wpas_dbus_signal_interface - Send a interface related event signal
* @wpa_s: %wpa_supplicant network interface data
* @sig_name: signal name - InterfaceAdded or InterfaceRemoved
+ * @properties: Whether to add second argument with object properties
*
* Notify listeners about event related with interface
*/
static void wpas_dbus_signal_interface(struct wpa_supplicant *wpa_s,
- const char *sig_name)
+ const char *sig_name, int properties)
{
- struct ctrl_iface_dbus_new_priv *iface;
- DBusMessage *_signal;
- const char *path;
+ struct wpas_dbus_priv *iface;
+ DBusMessage *msg;
+ DBusMessageIter iter, iter_dict;
- iface = wpa_s->global->dbus_new_ctrl_iface;
+ iface = wpa_s->global->dbus;
/* Do nothing if the control interface is not turned on */
if (iface == NULL)
return;
- path = wpas_dbus_get_path(wpa_s);
- if (path == NULL) {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_interface[dbus]: "
- "Interface doesn't have a dbus path. "
- "Can't send signal.");
+ msg = dbus_message_new_signal(WPAS_DBUS_NEW_PATH,
+ WPAS_DBUS_NEW_INTERFACE, sig_name);
+ if (msg == NULL)
return;
- }
- _signal = dbus_message_new_signal(WPAS_DBUS_NEW_PATH,
- WPAS_DBUS_NEW_INTERFACE, sig_name);
- if (_signal == NULL) {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_interface[dbus]: "
- "enough memory to send scan results signal.");
- return;
- }
- if (dbus_message_append_args(_signal, DBUS_TYPE_OBJECT_PATH, &path,
- DBUS_TYPE_INVALID)) {
- dbus_connection_send(iface->con, _signal, NULL);
- } else {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_interface[dbus]: "
- "not enough memory to construct signal.");
+ dbus_message_iter_init_append(msg, &iter);
+ if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH,
+ &wpa_s->dbus_new_path))
+ goto err;
+
+ if (properties) {
+ if (!wpa_dbus_dict_open_write(&iter, &iter_dict))
+ goto err;
+
+ wpa_dbus_get_object_properties(iface, wpa_s->dbus_new_path,
+ WPAS_DBUS_NEW_IFACE_INTERFACE,
+ &iter_dict);
+
+ if (!wpa_dbus_dict_close_write(&iter, &iter_dict))
+ goto err;
}
- dbus_message_unref(_signal);
+
+ dbus_connection_send(iface->con, msg, NULL);
+ dbus_message_unref(msg);
+ return;
+
+err:
+ wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
+ dbus_message_unref(msg);
}
/**
- * wpas_dbus_signal_interface_created - Send a interface created signal
+ * wpas_dbus_signal_interface_added - Send a interface created signal
* @wpa_s: %wpa_supplicant network interface data
*
* Notify listeners about creating new interface
*/
-static void wpas_dbus_signal_interface_created(struct wpa_supplicant *wpa_s)
+static void wpas_dbus_signal_interface_added(struct wpa_supplicant *wpa_s)
{
- wpas_dbus_signal_interface(wpa_s, "InterfaceCreated");
+ wpas_dbus_signal_interface(wpa_s, "InterfaceAdded", TRUE);
}
*/
static void wpas_dbus_signal_interface_removed(struct wpa_supplicant *wpa_s)
{
- wpas_dbus_signal_interface(wpa_s, "InterfaceRemoved");
+ wpas_dbus_signal_interface(wpa_s, "InterfaceRemoved", FALSE);
}
*
* Notify listeners about finishing a scan
*/
-static void wpas_dbus_signal_scan_done(struct wpa_supplicant *wpa_s,
- int success)
+void wpas_dbus_signal_scan_done(struct wpa_supplicant *wpa_s, int success)
{
- struct ctrl_iface_dbus_new_priv *iface;
- DBusMessage *_signal;
- const char *path;
+ struct wpas_dbus_priv *iface;
+ DBusMessage *msg;
dbus_bool_t succ;
- iface = wpa_s->global->dbus_new_ctrl_iface;
+ iface = wpa_s->global->dbus;
/* Do nothing if the control interface is not turned on */
if (iface == NULL)
return;
- path = wpas_dbus_get_path(wpa_s);
- if (path == NULL) {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_scan_done[dbus]: "
- "Interface doesn't have a dbus path. "
- "Can't send signal.");
+ msg = dbus_message_new_signal(wpa_s->dbus_new_path,
+ WPAS_DBUS_NEW_IFACE_INTERFACE,
+ "ScanDone");
+ if (msg == NULL)
return;
- }
- _signal = dbus_message_new_signal(path, WPAS_DBUS_NEW_IFACE_INTERFACE,
- "ScanDone");
- if (_signal == NULL) {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_scan_done[dbus]: "
- "enough memory to send signal.");
- return;
- }
succ = success ? TRUE : FALSE;
- if (dbus_message_append_args(_signal, DBUS_TYPE_BOOLEAN, &succ,
- DBUS_TYPE_INVALID)) {
- dbus_connection_send(iface->con, _signal, NULL);
- } else {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_scan_done[dbus]: "
- "not enough memory to construct signal.");
- }
- dbus_message_unref(_signal);
+ if (dbus_message_append_args(msg, DBUS_TYPE_BOOLEAN, &succ,
+ DBUS_TYPE_INVALID))
+ dbus_connection_send(iface->con, msg, NULL);
+ else
+ wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
+ dbus_message_unref(msg);
}
* @wpa_s: %wpa_supplicant network interface data
* @bss_obj_path: BSS object path
* @sig_name: signal name - BSSAdded or BSSRemoved
+ * @properties: Whether to add second argument with object properties
*
* Notify listeners about event related with BSS
*/
static void wpas_dbus_signal_bss(struct wpa_supplicant *wpa_s,
const char *bss_obj_path,
- const char *sig_name)
+ const char *sig_name, int properties)
{
- struct ctrl_iface_dbus_new_priv *iface;
- DBusMessage *_signal;
- const char *path;
+ struct wpas_dbus_priv *iface;
+ DBusMessage *msg;
+ DBusMessageIter iter, iter_dict;
- iface = wpa_s->global->dbus_new_ctrl_iface;
+ iface = wpa_s->global->dbus;
/* Do nothing if the control interface is not turned on */
if (iface == NULL)
return;
- path = wpas_dbus_get_path(wpa_s);
- if (path == NULL) {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_bss[dbus]: "
- "Interface doesn't have a dbus path. "
- "Can't send signal.");
+ msg = dbus_message_new_signal(wpa_s->dbus_new_path,
+ WPAS_DBUS_NEW_IFACE_INTERFACE,
+ sig_name);
+ if (msg == NULL)
return;
- }
- _signal = dbus_message_new_signal(path, WPAS_DBUS_NEW_IFACE_INTERFACE,
- sig_name);
- if (_signal == NULL) {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_bss[dbus]: "
- "enough memory to send signal.");
- return;
- }
- if (dbus_message_append_args(_signal, DBUS_TYPE_OBJECT_PATH,
- &bss_obj_path, DBUS_TYPE_INVALID)) {
- dbus_connection_send(iface->con, _signal, NULL);
- } else {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_bss[dbus]: "
- "not enough memory to construct signal.");
+ dbus_message_iter_init_append(msg, &iter);
+ if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH,
+ &bss_obj_path))
+ goto err;
+
+ if (properties) {
+ if (!wpa_dbus_dict_open_write(&iter, &iter_dict))
+ goto err;
+
+ wpa_dbus_get_object_properties(iface, bss_obj_path,
+ WPAS_DBUS_NEW_IFACE_BSS,
+ &iter_dict);
+
+ if (!wpa_dbus_dict_close_write(&iter, &iter_dict))
+ goto err;
}
- dbus_message_unref(_signal);
+
+ dbus_connection_send(iface->con, msg, NULL);
+ dbus_message_unref(msg);
+ return;
+
+err:
+ wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
+ dbus_message_unref(msg);
}
static void wpas_dbus_signal_bss_added(struct wpa_supplicant *wpa_s,
const char *bss_obj_path)
{
- wpas_dbus_signal_bss(wpa_s, bss_obj_path, "BSSAdded");
+ wpas_dbus_signal_bss(wpa_s, bss_obj_path, "BSSAdded", TRUE);
}
static void wpas_dbus_signal_bss_removed(struct wpa_supplicant *wpa_s,
const char *bss_obj_path)
{
- wpas_dbus_signal_bss(wpa_s, bss_obj_path, "BSSRemoved");
+ wpas_dbus_signal_bss(wpa_s, bss_obj_path, "BSSRemoved", FALSE);
}
static void wpas_dbus_signal_blob(struct wpa_supplicant *wpa_s,
const char *name, const char *sig_name)
{
- struct ctrl_iface_dbus_new_priv *iface;
- DBusMessage *_signal;
- const char *path;
+ struct wpas_dbus_priv *iface;
+ DBusMessage *msg;
- iface = wpa_s->global->dbus_new_ctrl_iface;
+ iface = wpa_s->global->dbus;
/* Do nothing if the control interface is not turned on */
if (iface == NULL)
return;
- path = wpas_dbus_get_path(wpa_s);
- if (path == NULL) {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_blob[dbus]: "
- "Interface doesn't have a dbus path. "
- "Can't send signal.");
+ msg = dbus_message_new_signal(wpa_s->dbus_new_path,
+ WPAS_DBUS_NEW_IFACE_INTERFACE,
+ sig_name);
+ if (msg == NULL)
return;
- }
- _signal = dbus_message_new_signal(path, WPAS_DBUS_NEW_IFACE_INTERFACE,
- sig_name);
- if (_signal == NULL) {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_blob[dbus]: "
- "enough memory to send signal.");
- return;
- }
- if (dbus_message_append_args(_signal, DBUS_TYPE_STRING, &name,
- DBUS_TYPE_INVALID)) {
- dbus_connection_send(iface->con, _signal, NULL);
- } else {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_blob[dbus]: "
- "not enough memory to construct signal.");
- }
- dbus_message_unref(_signal);
+ if (dbus_message_append_args(msg, DBUS_TYPE_STRING, &name,
+ DBUS_TYPE_INVALID))
+ dbus_connection_send(iface->con, msg, NULL);
+ else
+ wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
+ dbus_message_unref(msg);
}
*
* Notify listeners about adding a new blob
*/
-static void wpas_dbus_signal_blob_added(struct wpa_supplicant *wpa_s,
- const char *name)
+void wpas_dbus_signal_blob_added(struct wpa_supplicant *wpa_s,
+ const char *name)
{
wpas_dbus_signal_blob(wpa_s, name, "BlobAdded");
}
*
* Notify listeners about removing blob
*/
-static void wpas_dbus_signal_blob_removed(struct wpa_supplicant *wpa_s,
- const char *name)
+void wpas_dbus_signal_blob_removed(struct wpa_supplicant *wpa_s,
+ const char *name)
{
wpas_dbus_signal_blob(wpa_s, name, "BlobRemoved");
}
* @wpa_s: %wpa_supplicant network interface data
* @id: new network id
* @sig_name: signal name - NetworkAdded, NetworkRemoved or NetworkSelected
+ * @properties: determines if add second argument with object properties
*
* Notify listeners about event related with configured network
*/
static void wpas_dbus_signal_network(struct wpa_supplicant *wpa_s,
- int id, const char *sig_name)
+ int id, const char *sig_name,
+ int properties)
{
- struct ctrl_iface_dbus_new_priv *iface;
- DBusMessage *_signal;
- const char *path;
- char *net_obj_path;
+ struct wpas_dbus_priv *iface;
+ DBusMessage *msg;
+ DBusMessageIter iter, iter_dict;
+ char net_obj_path[WPAS_DBUS_OBJECT_PATH_MAX], *path;
- iface = wpa_s->global->dbus_new_ctrl_iface;
+ iface = wpa_s->global->dbus;
/* Do nothing if the control interface is not turned on */
if (iface == NULL)
return;
- path = wpas_dbus_get_path(wpa_s);
- if (path == NULL) {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_network[dbus]: "
- "Interface doesn't have a dbus path. "
- "Can't send signal.");
- return;
- }
-
- net_obj_path = os_zalloc(WPAS_DBUS_OBJECT_PATH_MAX);
- if (net_obj_path == NULL)
- return;
os_snprintf(net_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
- "%s/" WPAS_DBUS_NEW_NETWORKS_PART "/%u", path, id);
-
- _signal = dbus_message_new_signal(path, WPAS_DBUS_NEW_IFACE_INTERFACE,
- sig_name);
- if (_signal == NULL) {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_network[dbus]: "
- "enough memory to send signal.");
- os_free(net_obj_path);
+ "%s/" WPAS_DBUS_NEW_NETWORKS_PART "/%u",
+ wpa_s->dbus_new_path, id);
+
+ msg = dbus_message_new_signal(wpa_s->dbus_new_path,
+ WPAS_DBUS_NEW_IFACE_INTERFACE,
+ sig_name);
+ if (msg == NULL)
return;
- }
- if (dbus_message_append_args(_signal, DBUS_TYPE_OBJECT_PATH,
- &net_obj_path, DBUS_TYPE_INVALID)) {
- dbus_connection_send(iface->con, _signal, NULL);
- } else {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_network[dbus]: "
- "not enough memory to construct signal.");
+ dbus_message_iter_init_append(msg, &iter);
+ path = net_obj_path;
+ if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH,
+ &path))
+ goto err;
+
+ if (properties) {
+ if (!wpa_dbus_dict_open_write(&iter, &iter_dict))
+ goto err;
+
+ wpa_dbus_get_object_properties(iface, net_obj_path,
+ WPAS_DBUS_NEW_IFACE_NETWORK,
+ &iter_dict);
+
+ if (!wpa_dbus_dict_close_write(&iter, &iter_dict))
+ goto err;
}
- os_free(net_obj_path);
- dbus_message_unref(_signal);
+ dbus_connection_send(iface->con, msg, NULL);
+
+ dbus_message_unref(msg);
+ return;
+
+err:
+ wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
+ dbus_message_unref(msg);
}
static void wpas_dbus_signal_network_added(struct wpa_supplicant *wpa_s,
int id)
{
- wpas_dbus_signal_network(wpa_s, id, "NetworkAdded");
+ wpas_dbus_signal_network(wpa_s, id, "NetworkAdded", TRUE);
}
static void wpas_dbus_signal_network_removed(struct wpa_supplicant *wpa_s,
int id)
{
- wpas_dbus_signal_network(wpa_s, id, "NetworkRemoved");
+ wpas_dbus_signal_network(wpa_s, id, "NetworkRemoved", FALSE);
}
*
* Notify listeners about selecting a network
*/
-static void wpas_dbus_signal_network_selected(struct wpa_supplicant *wpa_s,
- int id)
+void wpas_dbus_signal_network_selected(struct wpa_supplicant *wpa_s, int id)
{
- wpas_dbus_signal_network(wpa_s, id, "NetworkSelected");
-}
-
-
-/**
- * wpas_dbus_signal_state_changed - Send a state changed signal
- * @wpa_s: %wpa_supplicant network interface data
- * @new_state: new state wpa_supplicant is entering
- * @old_state: old state wpa_supplicant is leaving
- *
- * Notify listeners that wpa_supplicant has changed state
- */
-static void wpas_dbus_signal_state_changed(struct wpa_supplicant *wpa_s,
- wpa_states new_state,
- wpa_states old_state)
-{
- struct ctrl_iface_dbus_new_priv *iface;
- DBusMessage *_signal = NULL;
- const char *path;
- char *new_state_str, *old_state_str;
- char *tmp;
-
- /* Do nothing if the control interface is not turned on */
- if (wpa_s->global == NULL)
- return;
- iface = wpa_s->global->dbus_new_ctrl_iface;
- if (iface == NULL)
- return;
-
- /* Only send signal if state really changed */
- if (new_state == old_state)
- return;
-
- path = wpas_dbus_get_path(wpa_s);
- if (path == NULL) {
- perror("wpas_dbus_signal_state_changed[dbus]: "
- "interface didn't have a dbus path");
- wpa_printf(MSG_ERROR,
- "wpas_dbus_signal_state_changed[dbus]: "
- "interface didn't have a dbus path; can't send "
- "signal.");
- return;
- }
- _signal = dbus_message_new_signal(path, WPAS_DBUS_NEW_IFACE_INTERFACE,
- "StateChanged");
- if (_signal == NULL) {
- perror("wpas_dbus_signal_state_changed[dbus]: "
- "couldn't create dbus signal; likely out of memory");
- wpa_printf(MSG_ERROR,
- "wpas_dbus_signal_state_changed[dbus]: "
- "couldn't create dbus signal; likely out of "
- "memory.");
- return;
- }
-
- new_state_str = os_strdup(wpa_supplicant_state_txt(new_state));
- old_state_str = os_strdup(wpa_supplicant_state_txt(old_state));
- if (new_state_str == NULL || old_state_str == NULL) {
- perror("wpas_dbus_signal_state_changed[dbus]: "
- "couldn't convert state strings");
- wpa_printf(MSG_ERROR,
- "wpas_dbus_signal_state_changed[dbus]: "
- "couldn't convert state strings.");
- goto out;
- }
-
- /* make state string lowercase to fit new DBus API convention */
- tmp = new_state_str;
- while (*tmp) {
- *tmp = tolower(*tmp);
- tmp++;
- }
- tmp = old_state_str;
- while (*tmp) {
- *tmp = tolower(*tmp);
- tmp++;
- }
-
- if (!dbus_message_append_args(_signal,
- DBUS_TYPE_STRING, &new_state_str,
- DBUS_TYPE_STRING, &old_state_str,
- DBUS_TYPE_INVALID)) {
- perror("wpas_dbus_signal_state_changed[dbus]: "
- "not enough memory to construct state change signal.");
- wpa_printf(MSG_ERROR,
- "wpas_dbus_signal_state_changed[dbus]: "
- "not enough memory to construct state change "
- "signal.");
- goto out;
- }
-
- dbus_connection_send(iface->con, _signal, NULL);
-
-out:
- dbus_message_unref(_signal);
- os_free(new_state_str);
- os_free(old_state_str);
+ wpas_dbus_signal_network(wpa_s, id, "NetworkSelected", FALSE);
}
* Sends PropertyChanged signals containing new value of Enabled property
* for specified network
*/
-static void wpas_dbus_signal_network_enabled_changed(
- struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid)
+void wpas_dbus_signal_network_enabled_changed(struct wpa_supplicant *wpa_s,
+ struct wpa_ssid *ssid)
{
- struct network_handler_args args = {wpa_s, ssid};
-
char path[WPAS_DBUS_OBJECT_PATH_MAX];
os_snprintf(path, WPAS_DBUS_OBJECT_PATH_MAX,
"%s/" WPAS_DBUS_NEW_NETWORKS_PART "/%d",
- wpas_dbus_get_path(wpa_s), ssid->id);
+ wpa_s->dbus_new_path, ssid->id);
- wpa_dbus_signal_property_changed(wpa_s->global->dbus_new_ctrl_iface,
- (WPADBusPropertyAccessor)
- wpas_dbus_getter_enabled, &args,
- path, WPAS_DBUS_NEW_IFACE_NETWORK,
- "Enabled");
+ wpa_dbus_mark_property_changed(wpa_s->global->dbus, path,
+ WPAS_DBUS_NEW_IFACE_NETWORK, "Enabled");
}
*
* Sends Event dbus signal with name "success" and empty dict as arguments
*/
-static void wpas_dbus_signal_wps_event_success(struct wpa_supplicant *wpa_s)
+void wpas_dbus_signal_wps_event_success(struct wpa_supplicant *wpa_s)
{
- DBusMessage *_signal = NULL;
+ DBusMessage *msg;
DBusMessageIter iter, dict_iter;
- struct ctrl_iface_dbus_new_priv *iface;
+ struct wpas_dbus_priv *iface;
char *key = "success";
- const char *path;
- iface = wpa_s->global->dbus_new_ctrl_iface;
+ iface = wpa_s->global->dbus;
/* Do nothing if the control interface is not turned on */
if (iface == NULL)
return;
- path = wpas_dbus_get_path(wpa_s);
- if (!path) {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_wps_event_success"
- "[dbus]: interface has no dbus path set");
+ msg = dbus_message_new_signal(wpa_s->dbus_new_path,
+ WPAS_DBUS_NEW_IFACE_WPS, "Event");
+ if (msg == NULL)
return;
- }
-
- _signal = dbus_message_new_signal(path, WPAS_DBUS_NEW_IFACE_WPS,
- "Event");
- if (!_signal) {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_wps_event_success"
- "[dbus]: out of memory when creating a signal");
- return;
- }
- dbus_message_iter_init_append(_signal, &iter);
+ dbus_message_iter_init_append(msg, &iter);
if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &key) ||
!wpa_dbus_dict_open_write(&iter, &dict_iter) ||
- !wpa_dbus_dict_close_write(&iter, &dict_iter)) {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_wps_event_success"
- "[dbus]: out of memory");
- goto out;
- }
+ !wpa_dbus_dict_close_write(&iter, &dict_iter))
+ wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
+ else
+ dbus_connection_send(iface->con, msg, NULL);
- dbus_connection_send(iface->con, _signal, NULL);
-out:
- dbus_message_unref(_signal);
+ dbus_message_unref(msg);
}
* Sends Event dbus signal with name "fail" and dictionary containing
* "msg field with fail message number (int32) as arguments
*/
-static void wpas_dbus_signal_wps_event_fail(struct wpa_supplicant *wpa_s,
- struct wps_event_fail *fail)
+void wpas_dbus_signal_wps_event_fail(struct wpa_supplicant *wpa_s,
+ struct wps_event_fail *fail)
{
- DBusMessage *_signal = NULL;
+ DBusMessage *msg;
DBusMessageIter iter, dict_iter;
- struct ctrl_iface_dbus_new_priv *iface;
+ struct wpas_dbus_priv *iface;
char *key = "fail";
- const char *path;
- iface = wpa_s->global->dbus_new_ctrl_iface;
+ iface = wpa_s->global->dbus;
/* Do nothing if the control interface is not turned on */
if (iface == NULL)
return;
- path = wpas_dbus_get_path(wpa_s);
- if (!path) {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_wps_event_fail[dbus]: "
- "interface has no dbus path set");
+ msg = dbus_message_new_signal(wpa_s->dbus_new_path,
+ WPAS_DBUS_NEW_IFACE_WPS, "Event");
+ if (msg == NULL)
return;
- }
- _signal = dbus_message_new_signal(path, WPAS_DBUS_NEW_IFACE_WPS,
- "Event");
- if (!_signal) {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_wps_event_fail[dbus]: "
- "out of memory when creating a signal");
- return;
- }
-
- dbus_message_iter_init_append(_signal, &iter);
+ dbus_message_iter_init_append(msg, &iter);
if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &key) ||
!wpa_dbus_dict_open_write(&iter, &dict_iter) ||
!wpa_dbus_dict_append_int32(&dict_iter, "msg", fail->msg) ||
- !wpa_dbus_dict_close_write(&iter, &dict_iter)) {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_wps_event_fail[dbus]: "
- "out of memory");
- goto out;
- }
+ !wpa_dbus_dict_close_write(&iter, &dict_iter))
+ wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
+ else
+ dbus_connection_send(iface->con, msg, NULL);
- dbus_connection_send(iface->con, _signal, NULL);
-out:
- dbus_message_unref(_signal);
+ dbus_message_unref(msg);
}
* Sends Event dbus signal with name "m2d" and dictionary containing
* fields of wps_event_m2d structure.
*/
-static void wpas_dbus_signal_wps_event_m2d(struct wpa_supplicant *wpa_s,
- struct wps_event_m2d *m2d)
+void wpas_dbus_signal_wps_event_m2d(struct wpa_supplicant *wpa_s,
+ struct wps_event_m2d *m2d)
{
- DBusMessage *_signal = NULL;
+ DBusMessage *msg;
DBusMessageIter iter, dict_iter;
- struct ctrl_iface_dbus_new_priv *iface;
+ struct wpas_dbus_priv *iface;
char *key = "m2d";
- const char *path;
- iface = wpa_s->global->dbus_new_ctrl_iface;
+ iface = wpa_s->global->dbus;
/* Do nothing if the control interface is not turned on */
if (iface == NULL)
return;
- path = wpas_dbus_get_path(wpa_s);
- if (!path) {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_wps_event_m2d[dbus]: "
- "interface has no dbus path set");
+ msg = dbus_message_new_signal(wpa_s->dbus_new_path,
+ WPAS_DBUS_NEW_IFACE_WPS, "Event");
+ if (msg == NULL)
return;
- }
- _signal = dbus_message_new_signal(path, WPAS_DBUS_NEW_IFACE_WPS,
- "Event");
- if (!_signal) {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_wps_event_m2d[dbus]: "
- "out of memory when creating a signal");
- return;
- }
+ dbus_message_iter_init_append(msg, &iter);
- dbus_message_iter_init_append(_signal, &iter);
-
- if (!(dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &key) &&
- wpa_dbus_dict_open_write(&iter, &dict_iter) &&
- wpa_dbus_dict_append_uint16(&dict_iter, "config_methods",
- m2d->config_methods) &&
- wpa_dbus_dict_append_byte_array(&dict_iter, "manufacturer",
- (const char *) m2d->manufacturer,
- m2d->manufacturer_len) &&
- wpa_dbus_dict_append_byte_array(&dict_iter, "model_name",
- (const char *) m2d->model_name,
- m2d->model_name_len) &&
- wpa_dbus_dict_append_byte_array(&dict_iter, "model_number",
- (const char *) m2d->model_number,
- m2d->model_number_len) &&
- wpa_dbus_dict_append_byte_array(&dict_iter, "serial_number",
- (const char *)
- m2d->serial_number,
- m2d->serial_number_len) &&
- wpa_dbus_dict_append_byte_array(&dict_iter, "dev_name",
- (const char *) m2d->dev_name,
- m2d->dev_name_len) &&
- wpa_dbus_dict_append_byte_array(&dict_iter, "primary_dev_type",
- (const char *)
- m2d->primary_dev_type, 8) &&
- wpa_dbus_dict_append_uint16(&dict_iter, "config_error",
- m2d->config_error) &&
- wpa_dbus_dict_append_uint16(&dict_iter, "dev_password_id",
- m2d->dev_password_id) &&
- wpa_dbus_dict_close_write(&iter, &dict_iter))) {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_wps_event_m2d[dbus]: "
- "out of memory");
- goto out;
- }
-
- dbus_connection_send(iface->con, _signal, NULL);
-out:
- dbus_message_unref(_signal);
+ if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &key) ||
+ !wpa_dbus_dict_open_write(&iter, &dict_iter) ||
+ !wpa_dbus_dict_append_uint16(&dict_iter, "config_methods",
+ m2d->config_methods) ||
+ !wpa_dbus_dict_append_byte_array(&dict_iter, "manufacturer",
+ (const char *) m2d->manufacturer,
+ m2d->manufacturer_len) ||
+ !wpa_dbus_dict_append_byte_array(&dict_iter, "model_name",
+ (const char *) m2d->model_name,
+ m2d->model_name_len) ||
+ !wpa_dbus_dict_append_byte_array(&dict_iter, "model_number",
+ (const char *) m2d->model_number,
+ m2d->model_number_len) ||
+ !wpa_dbus_dict_append_byte_array(&dict_iter, "serial_number",
+ (const char *)
+ m2d->serial_number,
+ m2d->serial_number_len) ||
+ !wpa_dbus_dict_append_byte_array(&dict_iter, "dev_name",
+ (const char *) m2d->dev_name,
+ m2d->dev_name_len) ||
+ !wpa_dbus_dict_append_byte_array(&dict_iter, "primary_dev_type",
+ (const char *)
+ m2d->primary_dev_type, 8) ||
+ !wpa_dbus_dict_append_uint16(&dict_iter, "config_error",
+ m2d->config_error) ||
+ !wpa_dbus_dict_append_uint16(&dict_iter, "dev_password_id",
+ m2d->dev_password_id) ||
+ !wpa_dbus_dict_close_write(&iter, &dict_iter))
+ wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
+ else
+ dbus_connection_send(iface->con, msg, NULL);
+
+ dbus_message_unref(msg);
}
*
* Sends signal with credentials in directory argument
*/
-static void wpas_dbus_signal_wps_cred(struct wpa_supplicant *wpa_s,
- const struct wps_credential *cred)
+void wpas_dbus_signal_wps_cred(struct wpa_supplicant *wpa_s,
+ const struct wps_credential *cred)
{
- DBusMessage *_signal = NULL;
+ DBusMessage *msg;
DBusMessageIter iter, dict_iter;
- struct ctrl_iface_dbus_new_priv *iface;
- const char *path;
+ struct wpas_dbus_priv *iface;
char *auth_type[6]; /* we have six possible authorization types */
int at_num = 0;
char *encr_type[4]; /* we have four possible encryption types */
int et_num = 0;
- iface = wpa_s->global->dbus_new_ctrl_iface;
+ iface = wpa_s->global->dbus;
/* Do nothing if the control interface is not turned on */
if (iface == NULL)
return;
- path = wpas_dbus_get_path(wpa_s);
- if (!path) {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_wps_cred[dbus]: "
- "interface has no dbus path set");
+ msg = dbus_message_new_signal(wpa_s->dbus_new_path,
+ WPAS_DBUS_NEW_IFACE_WPS,
+ "Credentials");
+ if (msg == NULL)
return;
- }
-
- _signal = dbus_message_new_signal(path, WPAS_DBUS_NEW_IFACE_WPS,
- "Credentials");
- if (!_signal) {
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_wps_cred[dbus]: "
- "out of memory when creating a signal");
- return;
- }
-
- dbus_message_iter_init_append(_signal, &iter);
- if (!wpa_dbus_dict_open_write(&iter, &dict_iter)) {
- perror("wpas_dbus_signal_wps_cred[dbus]: out of memory "
- "when opening a dictionary");
+ dbus_message_iter_init_append(msg, &iter);
+ if (!wpa_dbus_dict_open_write(&iter, &dict_iter))
goto nomem;
- }
if (cred->auth_type & WPS_AUTH_OPEN)
auth_type[at_num++] = "open";
if (!wpa_dbus_dict_append_byte_array(
&dict_iter, "BSSID",
(const char *) wpa_s->current_ssid->bssid,
- ETH_ALEN)) {
- perror("wpas_dbus_signal_wps_cred[dbus]: out of "
- "memory when appending bssid to dictionary");
+ ETH_ALEN))
goto nomem;
- }
- }
-
- if (!(wpa_dbus_dict_append_byte_array(&dict_iter, "SSID",
- (const char *) cred->ssid,
- cred->ssid_len) &&
- wpa_dbus_dict_append_string_array(&dict_iter, "AuthType",
- (const char **) auth_type,
- at_num) &&
- wpa_dbus_dict_append_string_array(&dict_iter, "EncrType",
- (const char **) encr_type,
- et_num) &&
- wpa_dbus_dict_append_byte_array(&dict_iter, "Key",
- (const char *) cred->key,
- cred->key_len) &&
- wpa_dbus_dict_append_uint32(&dict_iter, "KeyIndex",
- cred->key_idx))) {
- perror("wpas_dbus_signal_wps_cred[dbus]: out of memory "
- "when appending to dictionary");
- goto nomem;
}
- if (!wpa_dbus_dict_close_write(&iter, &dict_iter)) {
- perror("wpas_dbus_signal_wps_cred[dbus]: out of memory "
- "when closing a dictionary");
+ if (!wpa_dbus_dict_append_byte_array(&dict_iter, "SSID",
+ (const char *) cred->ssid,
+ cred->ssid_len) ||
+ !wpa_dbus_dict_append_string_array(&dict_iter, "AuthType",
+ (const char **) auth_type,
+ at_num) ||
+ !wpa_dbus_dict_append_string_array(&dict_iter, "EncrType",
+ (const char **) encr_type,
+ et_num) ||
+ !wpa_dbus_dict_append_byte_array(&dict_iter, "Key",
+ (const char *) cred->key,
+ cred->key_len) ||
+ !wpa_dbus_dict_append_uint32(&dict_iter, "KeyIndex",
+ cred->key_idx) ||
+ !wpa_dbus_dict_close_write(&iter, &dict_iter))
goto nomem;
- }
- dbus_connection_send(iface->con, _signal, NULL);
+ dbus_connection_send(iface->con, msg, NULL);
nomem:
- dbus_message_unref(_signal);
+ dbus_message_unref(msg);
}
#endif /* CONFIG_WPS */
* Sends ProertyChanged signals with path, interface and arguments
* depending on which property has changed.
*/
-static void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
- enum wpas_dbus_prop property)
+void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
+ enum wpas_dbus_prop property)
{
WPADBusPropertyAccessor getter;
- char *iface;
char *prop;
- void *arg;
+
+ if (wpa_s->dbus_new_path == NULL)
+ return; /* Skip signal since D-Bus setup is not yet ready */
switch (property) {
case WPAS_DBUS_PROP_AP_SCAN:
getter = (WPADBusPropertyAccessor) wpas_dbus_getter_ap_scan;
- arg = wpa_s;
- iface = WPAS_DBUS_NEW_IFACE_INTERFACE;
prop = "ApScan";
break;
case WPAS_DBUS_PROP_SCANNING:
getter = (WPADBusPropertyAccessor) wpas_dbus_getter_scanning;
- arg = wpa_s;
- iface = WPAS_DBUS_NEW_IFACE_INTERFACE;
prop = "Scanning";
break;
+ case WPAS_DBUS_PROP_STATE:
+ getter = (WPADBusPropertyAccessor) wpas_dbus_getter_state;
+ prop = "State";
+ break;
case WPAS_DBUS_PROP_CURRENT_BSS:
getter = (WPADBusPropertyAccessor)
wpas_dbus_getter_current_bss;
- arg = wpa_s;
- iface = WPAS_DBUS_NEW_IFACE_INTERFACE;
prop = "CurrentBSS";
break;
case WPAS_DBUS_PROP_CURRENT_NETWORK:
getter = (WPADBusPropertyAccessor)
wpas_dbus_getter_current_network;
- arg = wpa_s;
- iface = WPAS_DBUS_NEW_IFACE_INTERFACE;
prop = "CurrentNetwork";
break;
default:
- wpa_printf(MSG_ERROR, "wpas_dbus_signal_prop_changed[dbus]: "
- "Unknown Property enum value %d", property);
+ wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d",
+ __func__, property);
return;
}
- wpa_dbus_signal_property_changed(wpa_s->global->dbus_new_ctrl_iface,
- getter, arg,
- wpas_dbus_get_path(wpa_s), iface,
- prop);
+ wpa_dbus_mark_property_changed(wpa_s->global->dbus,
+ wpa_s->dbus_new_path,
+ WPAS_DBUS_NEW_IFACE_INTERFACE, prop);
}
/**
- * wpas_dbus_signal_debug_params_changed - Signals change of debug params
- * @global: wpa_global structure
+ * wpas_dbus_bss_signal_prop_changed - Signals change of BSS property
+ * @wpa_s: %wpa_supplicant network interface data
+ * @property: indicates which property has changed
+ * @id: unique BSS identifier
*
- * Sends ProertyChanged signals informing that debug params has changed.
+ * Sends PropertyChanged signals with path, interface, and arguments depending
+ * on which property has changed.
*/
-static void wpas_dbus_signal_debug_params_changed(struct wpa_global *global)
+void wpas_dbus_bss_signal_prop_changed(struct wpa_supplicant *wpa_s,
+ enum wpas_dbus_bss_prop property,
+ unsigned int id)
{
+ char path[WPAS_DBUS_OBJECT_PATH_MAX];
+ char *prop;
- wpa_dbus_signal_property_changed(global->dbus_new_ctrl_iface,
- (WPADBusPropertyAccessor)
- wpas_dbus_getter_debug_params,
- global, WPAS_DBUS_NEW_PATH,
- WPAS_DBUS_NEW_INTERFACE,
- "DebugParams");
+ switch (property) {
+ case WPAS_DBUS_BSS_PROP_SIGNAL:
+ prop = "Signal";
+ break;
+ case WPAS_DBUS_BSS_PROP_FREQ:
+ prop = "Frequency";
+ break;
+ case WPAS_DBUS_BSS_PROP_MODE:
+ prop = "Mode";
+ break;
+ case WPAS_DBUS_BSS_PROP_PRIVACY:
+ prop = "Privacy";
+ break;
+ case WPAS_DBUS_BSS_PROP_RATES:
+ prop = "Rates";
+ break;
+ case WPAS_DBUS_BSS_PROP_WPA:
+ prop = "WPA";
+ break;
+ case WPAS_DBUS_BSS_PROP_RSN:
+ prop = "RSN";
+ break;
+ case WPAS_DBUS_BSS_PROP_IES:
+ prop = "IEs";
+ break;
+ default:
+ wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d",
+ __func__, property);
+ return;
+ }
+
+ os_snprintf(path, WPAS_DBUS_OBJECT_PATH_MAX,
+ "%s/" WPAS_DBUS_NEW_BSSIDS_PART "/%u",
+ wpa_s->dbus_new_path, id);
+
+ wpa_dbus_mark_property_changed(wpa_s->global->dbus, path,
+ WPAS_DBUS_NEW_IFACE_BSS, prop);
}
-struct wpas_dbus_method {
- const char *name;
- const char *iface;
- WPADBusMethodHandler handler;
- struct wpa_dbus_argument args[3];
-};
+/**
+ * wpas_dbus_signal_debug_level_changed - Signals change of debug param
+ * @global: wpa_global structure
+ *
+ * Sends ProertyChanged signals informing that debug level has changed.
+ */
+void wpas_dbus_signal_debug_level_changed(struct wpa_global *global)
+{
+ wpa_dbus_mark_property_changed(global->dbus, WPAS_DBUS_NEW_PATH,
+ WPAS_DBUS_NEW_INTERFACE,
+ "DebugLevel");
+}
-struct wpas_dbus_property {
- const char *name;
- const char *iface;
- const char *type;
- WPADBusPropertyAccessor getter;
- WPADBusPropertyAccessor setter;
- enum dbus_prop_access _access;
-};
-struct wpas_dbus_signal {
- const char *name;
- const char *iface;
- struct wpa_dbus_argument args[3];
-};
+/**
+ * wpas_dbus_signal_debug_timestamp_changed - Signals change of debug param
+ * @global: wpa_global structure
+ *
+ * Sends ProertyChanged signals informing that debug timestamp has changed.
+ */
+void wpas_dbus_signal_debug_timestamp_changed(struct wpa_global *global)
+{
+ wpa_dbus_mark_property_changed(global->dbus, WPAS_DBUS_NEW_PATH,
+ WPAS_DBUS_NEW_INTERFACE,
+ "DebugTimestamp");
+}
+
+
+/**
+ * wpas_dbus_signal_debug_show_keys_changed - Signals change of debug param
+ * @global: wpa_global structure
+ *
+ * Sends ProertyChanged signals informing that debug show_keys has changed.
+ */
+void wpas_dbus_signal_debug_show_keys_changed(struct wpa_global *global)
+{
+ wpa_dbus_mark_property_changed(global->dbus, WPAS_DBUS_NEW_PATH,
+ WPAS_DBUS_NEW_INTERFACE,
+ "DebugShowKeys");
+}
static void wpas_dbus_register(struct wpa_dbus_object_desc *obj_desc,
void *priv,
- const struct wpas_dbus_method *methods,
- const struct wpas_dbus_property *properties,
- const struct wpas_dbus_signal *signals)
+ WPADBusArgumentFreeFunction priv_free,
+ const struct wpa_dbus_method_desc *methods,
+ const struct wpa_dbus_property_desc *properties,
+ const struct wpa_dbus_signal_desc *signals)
{
- int i;
+ int n;
- for (i = 0; methods && methods[i].name; i++) {
- wpa_dbus_method_register(obj_desc, methods[i].iface,
- methods[i].name, methods[i].handler,
- priv, NULL, methods[i].args);
- }
+ obj_desc->user_data = priv;
+ obj_desc->user_data_free_func = priv_free;
+ obj_desc->methods = methods;
+ obj_desc->properties = properties;
+ obj_desc->signals = signals;
- for (i = 0; properties && properties[i].name; i++) {
- wpa_dbus_property_register(obj_desc, properties[i].iface,
- properties[i].name,
- properties[i].type,
- properties[i].getter,
- properties[i].setter,
- priv, NULL, properties[i]._access);
- }
+ for (n = 0; properties && properties->dbus_property; properties++)
+ n++;
- for (i = 0; signals && signals[i].name; i++) {
- wpa_dbus_signal_register(obj_desc, signals[i].iface,
- signals[i].name, signals[i].args);
- }
+ obj_desc->prop_changed_flags = os_zalloc(n);
+ if (!obj_desc->prop_changed_flags)
+ wpa_printf(MSG_DEBUG, "dbus: %s: can't register handlers",
+ __func__);
}
-static const struct wpas_dbus_method wpas_dbus_global_methods[] = {
+static const struct wpa_dbus_method_desc wpas_dbus_global_methods[] = {
{ "CreateInterface", WPAS_DBUS_NEW_INTERFACE,
(WPADBusMethodHandler) &wpas_dbus_handler_create_interface,
{
{ NULL, NULL, NULL, { END_ARGS } }
};
-static const struct wpas_dbus_property wpas_dbus_global_properties[] = {
- { "DebugParams", WPAS_DBUS_NEW_INTERFACE, "(ibb)",
- (WPADBusPropertyAccessor) &wpas_dbus_getter_debug_params,
- (WPADBusPropertyAccessor) &wpas_dbus_setter_debug_params,
+static const struct wpa_dbus_property_desc wpas_dbus_global_properties[] = {
+ { "DebugLevel", WPAS_DBUS_NEW_INTERFACE, "s",
+ (WPADBusPropertyAccessor) wpas_dbus_getter_debug_level,
+ (WPADBusPropertyAccessor) wpas_dbus_setter_debug_level,
+ RW
+ },
+ { "DebugTimestamp", WPAS_DBUS_NEW_INTERFACE, "b",
+ (WPADBusPropertyAccessor) wpas_dbus_getter_debug_timestamp,
+ (WPADBusPropertyAccessor) wpas_dbus_setter_debug_timestamp,
+ RW
+ },
+ { "DebugShowKeys", WPAS_DBUS_NEW_INTERFACE, "b",
+ (WPADBusPropertyAccessor) wpas_dbus_getter_debug_show_keys,
+ (WPADBusPropertyAccessor) wpas_dbus_setter_debug_show_keys,
RW
},
{ "Interfaces", WPAS_DBUS_NEW_INTERFACE, "ao",
R
},
{ "EapMethods", WPAS_DBUS_NEW_INTERFACE, "as",
- wpas_dbus_getter_eap_methods,
+ (WPADBusPropertyAccessor) wpas_dbus_getter_eap_methods,
NULL,
R
},
{ NULL, NULL, NULL, NULL, NULL, 0 }
};
-static const struct wpas_dbus_signal wpas_dbus_global_signals[] = {
+static const struct wpa_dbus_signal_desc wpas_dbus_global_signals[] = {
{ "InterfaceAdded", WPAS_DBUS_NEW_INTERFACE,
{
{ "path", "o", ARG_OUT },
+ { "properties", "a{sv}", ARG_OUT },
END_ARGS
}
},
/**
* wpas_dbus_ctrl_iface_init - Initialize dbus control interface
* @global: Pointer to global data from wpa_supplicant_init()
- * Returns: Pointer to dbus_new_ctrl_iface date or %NULL on failure
+ * Returns: 0 on success or -1 on failure
*
* Initialize the dbus control interface for wpa_supplicantand and start
* receiving commands from external programs over the bus.
*/
-static struct ctrl_iface_dbus_new_priv * wpas_dbus_ctrl_iface_init(
- struct wpa_global *global)
+int wpas_dbus_ctrl_iface_init(struct wpas_dbus_priv *priv)
{
- struct ctrl_iface_dbus_new_priv *ctrl_iface;
struct wpa_dbus_object_desc *obj_desc;
+ int ret;
obj_desc = os_zalloc(sizeof(struct wpa_dbus_object_desc));
if (!obj_desc) {
wpa_printf(MSG_ERROR, "Not enough memory "
"to create object description");
- return NULL;
+ return -1;
}
- wpas_dbus_register(obj_desc, global, wpas_dbus_global_methods,
+ wpas_dbus_register(obj_desc, priv->global, NULL,
+ wpas_dbus_global_methods,
wpas_dbus_global_properties,
wpas_dbus_global_signals);
- ctrl_iface = wpa_dbus_ctrl_iface_init(global, WPAS_DBUS_NEW_PATH,
- WPAS_DBUS_NEW_SERVICE,
- obj_desc);
- if (!ctrl_iface)
+ wpa_printf(MSG_DEBUG, "dbus: Register D-Bus object '%s'",
+ WPAS_DBUS_NEW_PATH);
+ ret = wpa_dbus_ctrl_iface_init(priv, WPAS_DBUS_NEW_PATH,
+ WPAS_DBUS_NEW_SERVICE,
+ obj_desc);
+ if (ret < 0)
free_dbus_object_desc(obj_desc);
+ else
+ priv->dbus_new_initialized = 1;
- return ctrl_iface;
+ return ret;
}
/**
* wpas_dbus_ctrl_iface_deinit - Deinitialize dbus ctrl interface for
* wpa_supplicant
- * @iface: Pointer to dbus private data from
- * wpas_dbus_ctrl_iface_init()
+ * @iface: Pointer to dbus private data from wpas_dbus_init()
*
* Deinitialize the dbus control interface that was initialized with
* wpas_dbus_ctrl_iface_init().
*/
-static void wpas_dbus_ctrl_iface_deinit(struct ctrl_iface_dbus_new_priv *iface)
+void wpas_dbus_ctrl_iface_deinit(struct wpas_dbus_priv *iface)
{
- if (iface) {
- dbus_connection_unregister_object_path(iface->con,
- WPAS_DBUS_NEW_PATH);
- wpa_dbus_ctrl_iface_deinit(iface);
- }
+ if (!iface->dbus_new_initialized)
+ return;
+ wpa_printf(MSG_DEBUG, "dbus: Unregister D-Bus object '%s'",
+ WPAS_DBUS_NEW_PATH);
+ dbus_connection_unregister_object_path(iface->con,
+ WPAS_DBUS_NEW_PATH);
}
+static void wpa_dbus_free(void *ptr)
+{
+ os_free(ptr);
+}
+
+
+static const struct wpa_dbus_property_desc wpas_dbus_network_properties[] = {
+ { "Properties", WPAS_DBUS_NEW_IFACE_NETWORK, "a{sv}",
+ (WPADBusPropertyAccessor) wpas_dbus_getter_network_properties,
+ (WPADBusPropertyAccessor) wpas_dbus_setter_network_properties,
+ RW
+ },
+ { "Enabled", WPAS_DBUS_NEW_IFACE_NETWORK, "b",
+ (WPADBusPropertyAccessor) wpas_dbus_getter_enabled,
+ (WPADBusPropertyAccessor) wpas_dbus_setter_enabled,
+ RW
+ },
+ { NULL, NULL, NULL, NULL, NULL, 0 }
+};
+
+
+static const struct wpa_dbus_signal_desc wpas_dbus_network_signals[] = {
+ { "PropertiesChanged", WPAS_DBUS_NEW_IFACE_NETWORK,
+ {
+ { "properties", "a{sv}", ARG_OUT },
+ END_ARGS
+ }
+ },
+ { NULL, NULL, { END_ARGS } }
+};
+
+
/**
* wpas_dbus_register_network - Register a configured network with dbus
* @wpa_s: wpa_supplicant interface structure
*
* Registers network representing object with dbus
*/
-static int wpas_dbus_register_network(struct wpa_supplicant *wpa_s,
- struct wpa_ssid *ssid)
+int wpas_dbus_register_network(struct wpa_supplicant *wpa_s,
+ struct wpa_ssid *ssid)
{
- struct ctrl_iface_dbus_new_priv *ctrl_iface;
+ struct wpas_dbus_priv *ctrl_iface;
struct wpa_dbus_object_desc *obj_desc;
-
- struct network_handler_args *arg1 = NULL;
- struct network_handler_args *arg2 = NULL;
-
- char *net_obj_path;
-
- struct wpa_dbus_argument sargs[] = {
- { "properties", "a{sv}", ARG_OUT },
- END_ARGS
- };
+ struct network_handler_args *arg;
+ char net_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
/* Do nothing if the control interface is not turned on */
if (wpa_s == NULL || wpa_s->global == NULL)
return 0;
- ctrl_iface = wpa_s->global->dbus_new_ctrl_iface;
+ ctrl_iface = wpa_s->global->dbus;
if (ctrl_iface == NULL)
return 0;
- net_obj_path = os_zalloc(WPAS_DBUS_OBJECT_PATH_MAX);
- if (net_obj_path == NULL)
- return -1;
os_snprintf(net_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
"%s/" WPAS_DBUS_NEW_NETWORKS_PART "/%u",
- wpas_dbus_get_path(wpa_s), ssid->id);
+ wpa_s->dbus_new_path, ssid->id);
+ wpa_printf(MSG_DEBUG, "dbus: Register network object '%s'",
+ net_obj_path);
obj_desc = os_zalloc(sizeof(struct wpa_dbus_object_desc));
if (!obj_desc) {
wpa_printf(MSG_ERROR, "Not enough memory "
}
/* allocate memory for handlers arguments */
- arg1 = os_zalloc(sizeof(struct network_handler_args));
- if (!arg1) {
- wpa_printf(MSG_ERROR, "Not enough memory "
- "to create arguments for method");
- goto err;
- }
- arg2 = os_zalloc(sizeof(struct network_handler_args));
- if (!arg2) {
+ arg = os_zalloc(sizeof(struct network_handler_args));
+ if (!arg) {
wpa_printf(MSG_ERROR, "Not enough memory "
"to create arguments for method");
goto err;
}
- arg1->wpa_s = wpa_s;
- arg1->ssid = ssid;
- arg2->wpa_s = wpa_s;
- arg2->ssid = ssid;
-
- /* Enabled property */
- wpa_dbus_property_register(obj_desc, WPAS_DBUS_NEW_IFACE_NETWORK,
- "Enabled", "b",
- (WPADBusPropertyAccessor)
- wpas_dbus_getter_enabled,
- (WPADBusPropertyAccessor)
- wpas_dbus_setter_enabled,
- arg1, free, RW);
-
- /* Properties property */
- wpa_dbus_property_register(obj_desc, WPAS_DBUS_NEW_IFACE_NETWORK,
- "Properties", "a{sv}",
- (WPADBusPropertyAccessor)
- wpas_dbus_getter_network_properties,
- (WPADBusPropertyAccessor)
- wpas_dbus_setter_network_properties,
- arg2, free, RW);
-
- /* PropertiesChanged signal */
- wpa_dbus_signal_register(obj_desc, WPAS_DBUS_NEW_IFACE_NETWORK,
- "PropertiesChanged", sargs);
+ arg->wpa_s = wpa_s;
+ arg->ssid = ssid;
+
+ wpas_dbus_register(obj_desc, arg, wpa_dbus_free, NULL,
+ wpas_dbus_network_properties,
+ wpas_dbus_network_signals);
if (wpa_dbus_register_object_per_iface(ctrl_iface, net_obj_path,
wpa_s->ifname, obj_desc))
wpas_dbus_signal_network_added(wpa_s, ssid->id);
- os_free(net_obj_path);
return 0;
err:
- os_free(net_obj_path);
- os_free(obj_desc);
- os_free(arg1);
- os_free(arg2);
+ free_dbus_object_desc(obj_desc);
return -1;
}
*
* Unregisters network representing object from dbus
*/
-static int wpas_dbus_unregister_network(struct wpa_supplicant *wpa_s, int nid)
+int wpas_dbus_unregister_network(struct wpa_supplicant *wpa_s, int nid)
{
- struct ctrl_iface_dbus_new_priv *ctrl_iface;
- char *net_obj_path;
+ struct wpas_dbus_priv *ctrl_iface;
+ char net_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
int ret;
/* Do nothing if the control interface is not turned on */
- if (wpa_s == NULL || wpa_s->global == NULL)
+ if (wpa_s == NULL || wpa_s->global == NULL ||
+ wpa_s->dbus_new_path == NULL)
return 0;
- ctrl_iface = wpa_s->global->dbus_new_ctrl_iface;
+ ctrl_iface = wpa_s->global->dbus;
if (ctrl_iface == NULL)
return 0;
- net_obj_path = os_zalloc(WPAS_DBUS_OBJECT_PATH_MAX);
- if (net_obj_path == NULL)
- return -1;
os_snprintf(net_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
"%s/" WPAS_DBUS_NEW_NETWORKS_PART "/%u",
- wpas_dbus_get_path(wpa_s), nid);
+ wpa_s->dbus_new_path, nid);
+ wpa_printf(MSG_DEBUG, "dbus: Unregister network object '%s'",
+ net_obj_path);
ret = wpa_dbus_unregister_object_per_iface(ctrl_iface, net_obj_path);
if (!ret)
wpas_dbus_signal_network_removed(wpa_s, nid);
- os_free(net_obj_path);
return ret;
}
+static const struct wpa_dbus_property_desc wpas_dbus_bss_properties[] = {
+ { "SSID", WPAS_DBUS_NEW_IFACE_BSS, "ay",
+ (WPADBusPropertyAccessor) wpas_dbus_getter_bss_ssid,
+ NULL,
+ R
+ },
+ { "BSSID", WPAS_DBUS_NEW_IFACE_BSS, "ay",
+ (WPADBusPropertyAccessor) wpas_dbus_getter_bss_bssid,
+ NULL,
+ R
+ },
+ { "Privacy", WPAS_DBUS_NEW_IFACE_BSS, "b",
+ (WPADBusPropertyAccessor) wpas_dbus_getter_bss_privacy,
+ NULL,
+ R
+ },
+ { "Mode", WPAS_DBUS_NEW_IFACE_BSS, "s",
+ (WPADBusPropertyAccessor) wpas_dbus_getter_bss_mode,
+ NULL,
+ R
+ },
+ { "Signal", WPAS_DBUS_NEW_IFACE_BSS, "n",
+ (WPADBusPropertyAccessor) wpas_dbus_getter_bss_signal,
+ NULL,
+ R
+ },
+ { "Frequency", WPAS_DBUS_NEW_IFACE_BSS, "q",
+ (WPADBusPropertyAccessor) wpas_dbus_getter_bss_frequency,
+ NULL,
+ R
+ },
+ { "Rates", WPAS_DBUS_NEW_IFACE_BSS, "au",
+ (WPADBusPropertyAccessor) wpas_dbus_getter_bss_rates,
+ NULL,
+ R
+ },
+ { "WPA", WPAS_DBUS_NEW_IFACE_BSS, "a{sv}",
+ (WPADBusPropertyAccessor) wpas_dbus_getter_bss_wpa,
+ NULL,
+ R
+ },
+ { "RSN", WPAS_DBUS_NEW_IFACE_BSS, "a{sv}",
+ (WPADBusPropertyAccessor) wpas_dbus_getter_bss_rsn,
+ NULL,
+ R
+ },
+ { "IEs", WPAS_DBUS_NEW_IFACE_BSS, "ay",
+ (WPADBusPropertyAccessor) wpas_dbus_getter_bss_ies,
+ NULL,
+ R
+ },
+ { NULL, NULL, NULL, NULL, NULL, 0 }
+};
+
+
+static const struct wpa_dbus_signal_desc wpas_dbus_bss_signals[] = {
+ { "PropertiesChanged", WPAS_DBUS_NEW_IFACE_BSS,
+ {
+ { "properties", "a{sv}", ARG_OUT },
+ END_ARGS
+ }
+ },
+ { NULL, NULL, { END_ARGS } }
+};
+
+
/**
* wpas_dbus_unregister_bss - Unregister a scanned BSS from dbus
* @wpa_s: wpa_supplicant interface structure
* @bssid: scanned network bssid
+ * @id: unique BSS identifier
* Returns: 0 on success, -1 on failure
*
* Unregisters BSS representing object from dbus
*/
-static int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s,
- u8 bssid[ETH_ALEN])
+int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s,
+ u8 bssid[ETH_ALEN], unsigned int id)
{
- struct ctrl_iface_dbus_new_priv *ctrl_iface;
- char *bss_obj_path;
+ struct wpas_dbus_priv *ctrl_iface;
+ char bss_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
/* Do nothing if the control interface is not turned on */
if (wpa_s == NULL || wpa_s->global == NULL)
return 0;
- ctrl_iface = wpa_s->global->dbus_new_ctrl_iface;
+ ctrl_iface = wpa_s->global->dbus;
if (ctrl_iface == NULL)
return 0;
- bss_obj_path = os_zalloc(WPAS_DBUS_OBJECT_PATH_MAX);
- if (bss_obj_path == NULL)
- return -1;
-
os_snprintf(bss_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
- "%s/" WPAS_DBUS_NEW_BSSIDS_PART "/" WPAS_DBUS_BSSID_FORMAT,
- wpas_dbus_get_path(wpa_s), MAC2STR(bssid));
+ "%s/" WPAS_DBUS_NEW_BSSIDS_PART "/%u",
+ wpa_s->dbus_new_path, id);
+ wpa_printf(MSG_DEBUG, "dbus: Unregister BSS object '%s'",
+ bss_obj_path);
if (wpa_dbus_unregister_object_per_iface(ctrl_iface, bss_obj_path)) {
- wpa_printf(MSG_ERROR,
- "Cannot unregister BSSID dbus object %s.",
+ wpa_printf(MSG_ERROR, "dbus: Cannot unregister BSS object %s",
bss_obj_path);
- os_free(bss_obj_path);
return -1;
}
wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path);
- os_free(bss_obj_path);
return 0;
}
* wpas_dbus_register_bss - Register a scanned BSS with dbus
* @wpa_s: wpa_supplicant interface structure
* @bssid: scanned network bssid
+ * @id: unique BSS identifier
* Returns: 0 on success, -1 on failure
*
* Registers BSS representing object with dbus
*/
-static int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s,
- u8 bssid[ETH_ALEN])
+int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s,
+ u8 bssid[ETH_ALEN], unsigned int id)
{
- struct ctrl_iface_dbus_new_priv *ctrl_iface;
+ struct wpas_dbus_priv *ctrl_iface;
struct wpa_dbus_object_desc *obj_desc;
- char *bss_obj_path;
-
- struct bss_handler_args *arg = NULL;
+ char bss_obj_path[WPAS_DBUS_OBJECT_PATH_MAX];
+ struct bss_handler_args *arg;
/* Do nothing if the control interface is not turned on */
if (wpa_s == NULL || wpa_s->global == NULL)
return 0;
- ctrl_iface = wpa_s->global->dbus_new_ctrl_iface;
+ ctrl_iface = wpa_s->global->dbus;
if (ctrl_iface == NULL)
return 0;
- bss_obj_path = os_zalloc(WPAS_DBUS_OBJECT_PATH_MAX);
- if (bss_obj_path == NULL)
- return -1;
-
os_snprintf(bss_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
- "%s/" WPAS_DBUS_NEW_BSSIDS_PART "/" WPAS_DBUS_BSSID_FORMAT,
- wpas_dbus_get_path(wpa_s), MAC2STR(bssid));
+ "%s/" WPAS_DBUS_NEW_BSSIDS_PART "/%u",
+ wpa_s->dbus_new_path, id);
obj_desc = os_zalloc(sizeof(struct wpa_dbus_object_desc));
if (!obj_desc) {
goto err;
}
arg->wpa_s = wpa_s;
- os_memcpy(arg->bssid, bssid, ETH_ALEN);
+ arg->id = id;
- /* Properties property */
- wpa_dbus_property_register(obj_desc, WPAS_DBUS_NEW_IFACE_BSSID,
- "Properties", "a{sv}",
- (WPADBusPropertyAccessor)
- wpas_dbus_getter_bss_properties, NULL,
- arg, free, R);
+ wpas_dbus_register(obj_desc, arg, wpa_dbus_free, NULL,
+ wpas_dbus_bss_properties,
+ wpas_dbus_bss_signals);
+ wpa_printf(MSG_DEBUG, "dbus: Register BSS object '%s'",
+ bss_obj_path);
if (wpa_dbus_register_object_per_iface(ctrl_iface, bss_obj_path,
wpa_s->ifname, obj_desc)) {
wpa_printf(MSG_ERROR,
wpas_dbus_signal_bss_added(wpa_s, bss_obj_path);
- os_free(bss_obj_path);
return 0;
err:
- os_free(bss_obj_path);
- os_free(obj_desc);
- os_free(arg);
+ free_dbus_object_desc(obj_desc);
return -1;
}
-static const struct wpas_dbus_method wpas_dbus_interface_methods[] = {
+static const struct wpa_dbus_method_desc wpas_dbus_interface_methods[] = {
{ "Scan", WPAS_DBUS_NEW_IFACE_INTERFACE,
(WPADBusMethodHandler) &wpas_dbus_handler_scan,
{
{ NULL, NULL, NULL, { END_ARGS } }
};
-static const struct wpas_dbus_property wpas_dbus_interface_properties[] = {
+static const struct wpa_dbus_property_desc wpas_dbus_interface_properties[] = {
{ "Capabilities", WPAS_DBUS_NEW_IFACE_INTERFACE, "a{sv}",
(WPADBusPropertyAccessor) wpas_dbus_getter_capabilities,
NULL, R
{ NULL, NULL, NULL, NULL, NULL, 0 }
};
-static const struct wpas_dbus_signal wpas_dbus_interface_signals[] = {
+static const struct wpa_dbus_signal_desc wpas_dbus_interface_signals[] = {
{ "ScanDone", WPAS_DBUS_NEW_IFACE_INTERFACE,
{
{ "success", "b", ARG_OUT },
END_ARGS
}
},
- { "StateChanged", WPAS_DBUS_NEW_IFACE_INTERFACE,
- {
- { "newState", "s", ARG_OUT },
- { "oldState", "s", ARG_OUT },
- END_ARGS
- }
- },
{ "BSSAdded", WPAS_DBUS_NEW_IFACE_INTERFACE,
{
{ "path", "o", ARG_OUT },
+ { "properties", "a{sv}", ARG_OUT },
END_ARGS
}
},
{ "NetworkAdded", WPAS_DBUS_NEW_IFACE_INTERFACE,
{
{ "path", "o", ARG_OUT },
+ { "properties", "a{sv}", ARG_OUT },
END_ARGS
}
},
};
-static int wpas_dbus_register_interface(struct wpa_supplicant *wpa_s)
+int wpas_dbus_register_interface(struct wpa_supplicant *wpa_s)
{
struct wpa_dbus_object_desc *obj_desc = NULL;
- char *path;
- struct ctrl_iface_dbus_new_priv *ctrl_iface =
- wpa_s->global->dbus_new_ctrl_iface;
+ struct wpas_dbus_priv *ctrl_iface = wpa_s->global->dbus;
int next;
/* Do nothing if the control interface is not turned on */
return 0;
/* Create and set the interface's object path */
- path = os_zalloc(WPAS_DBUS_OBJECT_PATH_MAX);
- if (path == NULL)
+ wpa_s->dbus_new_path = os_zalloc(WPAS_DBUS_OBJECT_PATH_MAX);
+ if (wpa_s->dbus_new_path == NULL)
return -1;
- next = wpa_dbus_next_objid(ctrl_iface);
- os_snprintf(path, WPAS_DBUS_OBJECT_PATH_MAX,
+ next = ctrl_iface->next_objid++;
+ os_snprintf(wpa_s->dbus_new_path, WPAS_DBUS_OBJECT_PATH_MAX,
WPAS_DBUS_NEW_PATH_INTERFACES "/%u",
next);
- if (wpas_dbus_set_path(wpa_s, path)) {
- wpa_printf(MSG_DEBUG,
- "Failed to set dbus path for interface %s",
- wpa_s->ifname);
- goto err;
- }
obj_desc = os_zalloc(sizeof(struct wpa_dbus_object_desc));
if (!obj_desc) {
goto err;
}
- wpas_dbus_register(obj_desc, wpa_s, wpas_dbus_interface_methods,
+ wpas_dbus_register(obj_desc, wpa_s, NULL, wpas_dbus_interface_methods,
wpas_dbus_interface_properties,
wpas_dbus_interface_signals);
- if (wpa_dbus_register_object_per_iface(ctrl_iface, path, wpa_s->ifname,
- obj_desc))
+ wpa_printf(MSG_DEBUG, "dbus: Register interface object '%s'",
+ wpa_s->dbus_new_path);
+ if (wpa_dbus_register_object_per_iface(ctrl_iface,
+ wpa_s->dbus_new_path,
+ wpa_s->ifname, obj_desc))
goto err;
- wpas_dbus_signal_interface_created(wpa_s);
+ wpas_dbus_signal_interface_added(wpa_s);
- os_free(path);
return 0;
err:
- os_free(obj_desc);
- os_free(path);
+ os_free(wpa_s->dbus_new_path);
+ wpa_s->dbus_new_path = NULL;
+ free_dbus_object_desc(obj_desc);
return -1;
}
-static int wpas_dbus_unregister_interface(struct wpa_supplicant *wpa_s)
+int wpas_dbus_unregister_interface(struct wpa_supplicant *wpa_s)
{
- struct ctrl_iface_dbus_new_priv *ctrl_iface;
- struct wpa_ssid *ssid;
- size_t i;
+ struct wpas_dbus_priv *ctrl_iface;
/* Do nothing if the control interface is not turned on */
if (wpa_s == NULL || wpa_s->global == NULL)
return 0;
- ctrl_iface = wpa_s->global->dbus_new_ctrl_iface;
+ ctrl_iface = wpa_s->global->dbus;
if (ctrl_iface == NULL)
return 0;
- /* unregister all BSSs and networks from dbus */
- for (i = 0; i < wpa_s->scan_res->num; i++) {
- wpas_dbus_unregister_bss(wpa_s,
- wpa_s->scan_res->res[i]->bssid);
- }
-
- ssid = wpa_s->conf->ssid;
- while (ssid) {
- wpas_dbus_unregister_network(wpa_s, ssid->id);
- ssid = ssid->next;
- }
-
+ wpa_printf(MSG_DEBUG, "dbus: Unregister interface object '%s'",
+ wpa_s->dbus_new_path);
if (wpa_dbus_unregister_object_per_iface(ctrl_iface,
- wpas_dbus_get_path(wpa_s)))
+ wpa_s->dbus_new_path))
return -1;
wpas_dbus_signal_interface_removed(wpa_s);
return 0;
}
-
-
-static struct wpas_dbus_callbacks callbacks =
-{
- .dbus_ctrl_init = wpas_dbus_ctrl_iface_init,
- .dbus_ctrl_deinit = wpas_dbus_ctrl_iface_deinit,
-
- .signal_interface_created = wpas_dbus_signal_interface_created,
- .signal_interface_removed = wpas_dbus_signal_interface_removed,
-
- .register_interface = wpas_dbus_register_interface,
- .unregister_interface = wpas_dbus_unregister_interface,
-
- .signal_scan_done = wpas_dbus_signal_scan_done,
-
- .signal_blob_added = wpas_dbus_signal_blob_added,
- .signal_blob_removed = wpas_dbus_signal_blob_removed,
-
- .signal_network_selected = wpas_dbus_signal_network_selected,
-
- .signal_state_changed = wpas_dbus_signal_state_changed,
- .register_network = wpas_dbus_register_network,
- .unregister_network = wpas_dbus_unregister_network,
-
- .signal_network_enabled_changed =
- wpas_dbus_signal_network_enabled_changed,
-
- .register_bss = wpas_dbus_register_bss,
- .unregister_bss = wpas_dbus_unregister_bss,
-
- .signal_prop_changed = wpas_dbus_signal_prop_changed,
- .signal_debug_params_changed = wpas_dbus_signal_debug_params_changed,
-
-#ifdef CONFIG_WPS
- .signal_wps_event_success = wpas_dbus_signal_wps_event_success,
- .signal_wps_event_fail = wpas_dbus_signal_wps_event_fail,
- .signal_wps_event_m2d = wpas_dbus_signal_wps_event_m2d,
- .signal_wps_credentials = wpas_dbus_signal_wps_cred,
-#endif /* CONFIG_WPS */
-};
-
-
-struct wpas_dbus_callbacks * wpas_dbus_get_callbacks(void)
-{
- return &callbacks;
-}
-
-
-/**
- * wpas_dbus_get_path - Get an interface's dbus path
- * @wpa_s: %wpa_supplicant interface structure
- * Returns: Interface's dbus object path, or %NULL on error
- */
-const char * wpas_dbus_get_path(struct wpa_supplicant *wpa_s)
-{
- return wpa_s->dbus_new_path;
-}
projects / libeap.git / blobdiff