wpa_supplicant: new DBus API implementation
This patch implements the new DBus API. Both, the new and the previous API may work concurrently and may be turned on or off separately in .config file. Some features of the new API are: - more wpa_supplicant's events are signaled with DBus signals, - introspection data (requires libxml2 and may be disabled), - CurrentBSS and CurrentNetwork properties, - PropertyChanged signal for most of properties, - Relatively easy to extend. .config options for the new API are: CONFIG_CTRL_IFACE_DBUS_NEW=y and CONFIG_CTRL_IFACE_DBUS_INTRO=y for introspection. This commit misses couple of parts from the full implementation (these are still under review): - fetching all configuration parameters for learning WPS information - scan result BSS add/remove notification (register_bss() and unregister_bss() notification callbacks)master
Witold Sowa
15 years ago
committed by
Jouni Malinen
parent
097c7b3723
commit
8fc2fb56e4
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,142 @@
|
||||
/*
|
||||
* 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>
|
||||
*
|
||||
* 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
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* Alternatively, this software may be distributed under the terms of BSD
|
||||
* license.
|
||||
*
|
||||
* See README and COPYING for more details.
|
||||
*/
|
||||
|
||||
#ifndef CTRL_IFACE_DBUS_NEW_H
|
||||
#define CTRL_IFACE_DBUS_NEW_H
|
||||
|
||||
struct wpa_global;
|
||||
struct wpa_supplicant;
|
||||
struct wpa_ssid;
|
||||
struct wps_event_m2d;
|
||||
struct wps_event_fail;
|
||||
struct wps_credential;
|
||||
|
||||
enum wpas_dbus_prop {
|
||||
WPAS_DBUS_PROP_AP_SCAN,
|
||||
WPAS_DBUS_PROP_SCANNING,
|
||||
WPAS_DBUS_PROP_CURRENT_BSS,
|
||||
WPAS_DBUS_PROP_CURRENT_NETWORK,
|
||||
};
|
||||
|
||||
struct wpas_dbus_callbacks {
|
||||
struct ctrl_iface_dbus_new_priv * (*dbus_ctrl_init)(
|
||||
struct wpa_global *global);
|
||||
|
||||
void (*dbus_ctrl_deinit)(struct ctrl_iface_dbus_new_priv *iface);
|
||||
|
||||
void (*signal_interface_created)(struct wpa_supplicant *wpa_s);
|
||||
void (*signal_interface_removed)(struct wpa_supplicant *wpa_s);
|
||||
|
||||
int (*register_interface)(struct wpa_supplicant *wpa_s);
|
||||
int (*unregister_interface)(struct wpa_supplicant *wpa_s);
|
||||
|
||||
void (*signal_scan_done)(struct wpa_supplicant *wpa_s, int success);
|
||||
|
||||
void (*signal_blob_added)(struct wpa_supplicant *wpa_s,
|
||||
const char *name);
|
||||
void (*signal_blob_removed)(struct wpa_supplicant *wpa_s,
|
||||
const char *name);
|
||||
|
||||
void (*signal_network_selected)(struct wpa_supplicant *wpa_s, int id);
|
||||
|
||||
void (*signal_state_changed)(struct wpa_supplicant *wpa_s,
|
||||
wpa_states new_state,
|
||||
wpa_states old_state);
|
||||
|
||||
int (*register_network)(struct wpa_supplicant *wpa_s,
|
||||
struct wpa_ssid *ssid);
|
||||
int (*unregister_network)(struct wpa_supplicant *wpa_s,
|
||||
int nid);
|
||||
|
||||
void (*signal_network_enabled_changed)(struct wpa_supplicant *wpa_s,
|
||||
struct wpa_ssid *ssid);
|
||||
|
||||
int (*register_bss)(struct wpa_supplicant *wpa_s, u8 bssid[ETH_ALEN]);
|
||||
int (*unregister_bss)(struct wpa_supplicant *wpa_s,
|
||||
u8 bssid[ETH_ALEN]);
|
||||
|
||||
void (*signal_prop_changed)(struct wpa_supplicant *wpa_s,
|
||||
enum wpas_dbus_prop property);
|
||||
void (*signal_debug_params_changed)(struct wpa_global *global);
|
||||
|
||||
#ifdef CONFIG_WPS
|
||||
void (*signal_wps_event_success)(struct wpa_supplicant *wpa_s);
|
||||
void (*signal_wps_event_fail)(struct wpa_supplicant *wpa_s,
|
||||
struct wps_event_fail *fail);
|
||||
void (*signal_wps_event_m2d)(struct wpa_supplicant *wpa_s,
|
||||
struct wps_event_m2d *m2d);
|
||||
void (*signal_wps_credentials)(struct wpa_supplicant *wpa_s,
|
||||
const struct wps_credential *cred);
|
||||
#endif /* CONFIG_WPS */
|
||||
};
|
||||
|
||||
|
||||
#ifdef CONFIG_CTRL_IFACE_DBUS_NEW
|
||||
|
||||
#include <dbus/dbus.h>
|
||||
|
||||
#define WPAS_DBUS_OBJECT_PATH_MAX 150
|
||||
|
||||
#define WPAS_DBUS_NEW_SERVICE "fi.w1.wpa_supplicant1"
|
||||
#define WPAS_DBUS_NEW_PATH "/fi/w1/wpa_supplicant1"
|
||||
#define WPAS_DBUS_NEW_INTERFACE "fi.w1.wpa_supplicant1"
|
||||
|
||||
#define WPAS_DBUS_NEW_PATH_INTERFACES WPAS_DBUS_NEW_PATH "/Interfaces"
|
||||
#define WPAS_DBUS_NEW_IFACE_INTERFACE WPAS_DBUS_NEW_INTERFACE ".Interface"
|
||||
#define WPAS_DBUS_NEW_IFACE_WPS WPAS_DBUS_NEW_IFACE_INTERFACE ".WPS"
|
||||
|
||||
#define WPAS_DBUS_NEW_NETWORKS_PART "Networks"
|
||||
#define WPAS_DBUS_NEW_IFACE_NETWORK WPAS_DBUS_NEW_IFACE_INTERFACE ".Network"
|
||||
|
||||
#define WPAS_DBUS_NEW_BSSIDS_PART "BSSs"
|
||||
#define WPAS_DBUS_NEW_IFACE_BSSID WPAS_DBUS_NEW_IFACE_INTERFACE ".BSS"
|
||||
|
||||
|
||||
/* Errors */
|
||||
#define WPAS_DBUS_ERROR_UNKNOWN_ERROR \
|
||||
WPAS_DBUS_NEW_INTERFACE ".UnknownError"
|
||||
#define WPAS_DBUS_ERROR_INVALID_ARGS \
|
||||
WPAS_DBUS_NEW_INTERFACE ".InvalidArgs"
|
||||
|
||||
#define WPAS_DBUS_ERROR_IFACE_EXISTS \
|
||||
WPAS_DBUS_NEW_INTERFACE ".InterfaceExists"
|
||||
#define WPAS_DBUS_ERROR_IFACE_UNKNOWN \
|
||||
WPAS_DBUS_NEW_INTERFACE ".InterfaceUnknown"
|
||||
|
||||
#define WPAS_DBUS_ERROR_NOT_CONNECTED \
|
||||
WPAS_DBUS_NEW_IFACE_INTERFACE ".NotConnected"
|
||||
#define WPAS_DBUS_ERROR_NETWORK_UNKNOWN \
|
||||
WPAS_DBUS_NEW_IFACE_INTERFACE ".NetworkUnknown"
|
||||
|
||||
#define WPAS_DBUS_ERROR_BLOB_EXISTS \
|
||||
WPAS_DBUS_NEW_IFACE_INTERFACE ".BlobExists"
|
||||
#define WPAS_DBUS_ERROR_BLOB_UNKNOWN \
|
||||
WPAS_DBUS_NEW_IFACE_INTERFACE ".BlobUnknown"
|
||||
|
||||
#define WPAS_DBUS_BSSID_FORMAT "%02x%02x%02x%02x%02x%02x"
|
||||
|
||||
struct wpas_dbus_callbacks * wpas_dbus_get_callbacks(void);
|
||||
const char * wpas_dbus_get_path(struct wpa_supplicant *wpa_s);
|
||||
|
||||
#else /* CONFIG_CTRL_IFACE_DBUS_NEW */
|
||||
|
||||
static inline struct wpas_dbus_callbacks * wpas_dbus_get_callbacks(void)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#endif /* CONFIG_CTRL_IFACE_DBUS_NEW */
|
||||
|
||||
#endif /* CTRL_IFACE_DBUS_H_NEW */
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,142 @@
|
||||
/*
|
||||
* WPA Supplicant / dbus-based control interface
|
||||
* Copyright (c) 2006, Dan Williams <dcbw@redhat.com> and Red Hat, Inc.
|
||||
*
|
||||
* 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
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* Alternatively, this software may be distributed under the terms of BSD
|
||||
* license.
|
||||
*
|
||||
* See README and COPYING for more details.
|
||||
*/
|
||||
|
||||
#ifndef CTRL_IFACE_DBUS_NEW_HANDLERS_H
|
||||
#define CTRL_IFACE_DBUS_NEW_HANDLERS_H
|
||||
|
||||
struct network_handler_args {
|
||||
struct wpa_supplicant *wpa_s;
|
||||
struct wpa_ssid *ssid;
|
||||
};
|
||||
|
||||
struct bss_handler_args {
|
||||
struct wpa_supplicant *wpa_s;
|
||||
u8 bssid[ETH_ALEN];
|
||||
};
|
||||
|
||||
DBusMessage * wpas_dbus_handler_create_interface(DBusMessage *message,
|
||||
struct wpa_global *global);
|
||||
|
||||
DBusMessage * wpas_dbus_handler_remove_interface(DBusMessage *message,
|
||||
struct wpa_global *global);
|
||||
|
||||
DBusMessage * wpas_dbus_handler_get_interface(DBusMessage *message,
|
||||
struct wpa_global *global);
|
||||
|
||||
DBusMessage * wpas_dbus_getter_debug_params(DBusMessage *message,
|
||||
struct wpa_global *global);
|
||||
|
||||
DBusMessage * wpas_dbus_setter_debug_params(DBusMessage *message,
|
||||
struct wpa_global *global);
|
||||
|
||||
DBusMessage * wpas_dbus_getter_interfaces(DBusMessage *message,
|
||||
struct wpa_global *global);
|
||||
|
||||
DBusMessage * wpas_dbus_getter_eap_methods(DBusMessage *message,
|
||||
void *nothing);
|
||||
|
||||
DBusMessage * wpas_dbus_handler_scan(DBusMessage *message,
|
||||
struct wpa_supplicant *wpa_s);
|
||||
|
||||
DBusMessage * wpas_dbus_handler_disconnect(DBusMessage *message,
|
||||
struct wpa_supplicant *wpa_s);
|
||||
|
||||
DBusMessage * wpas_dbus_handler_add_network(DBusMessage *message,
|
||||
struct wpa_supplicant *wpa_s);
|
||||
|
||||
DBusMessage * wpas_dbus_handler_remove_network(DBusMessage *message,
|
||||
struct wpa_supplicant *wpa_s);
|
||||
|
||||
DBusMessage * wpas_dbus_handler_select_network(DBusMessage *message,
|
||||
struct wpa_supplicant *wpa_s);
|
||||
|
||||
DBusMessage * wpas_dbus_handler_add_blob(DBusMessage *message,
|
||||
struct wpa_supplicant *wpa_s);
|
||||
|
||||
DBusMessage * wpas_dbus_handler_get_blob(DBusMessage *message,
|
||||
struct wpa_supplicant *wpa_s);
|
||||
|
||||
DBusMessage * wpas_dbus_handler_remove_blob(DBusMessage *message,
|
||||
struct wpa_supplicant *wpa_s);
|
||||
|
||||
DBusMessage * wpas_dbus_getter_capabilities(DBusMessage *message,
|
||||
struct wpa_supplicant *wpa_s);
|
||||
|
||||
DBusMessage * wpas_dbus_getter_state(DBusMessage *message,
|
||||
struct wpa_supplicant *wpa_s);
|
||||
|
||||
DBusMessage * wpas_dbus_getter_scanning(DBusMessage *message,
|
||||
struct wpa_supplicant *wpa_s);
|
||||
|
||||
DBusMessage * wpas_dbus_getter_ap_scan(DBusMessage *message,
|
||||
struct wpa_supplicant *wpa_s);
|
||||
|
||||
DBusMessage * wpas_dbus_setter_ap_scan(DBusMessage *message,
|
||||
struct wpa_supplicant *wpa_s);
|
||||
|
||||
DBusMessage * wpas_dbus_getter_ifname(DBusMessage *message,
|
||||
struct wpa_supplicant *wpa_s);
|
||||
|
||||
DBusMessage * wpas_dbus_getter_driver(DBusMessage *message,
|
||||
struct wpa_supplicant *wpa_s);
|
||||
|
||||
DBusMessage * wpas_dbus_getter_bridge_ifname(DBusMessage *message,
|
||||
struct wpa_supplicant *wpa_s);
|
||||
|
||||
DBusMessage * wpas_dbus_getter_current_bss(DBusMessage *message,
|
||||
struct wpa_supplicant *wpa_s);
|
||||
|
||||
DBusMessage * wpas_dbus_getter_current_network(DBusMessage *message,
|
||||
struct wpa_supplicant *wpa_s);
|
||||
|
||||
DBusMessage * wpas_dbus_getter_bsss(DBusMessage *message,
|
||||
struct wpa_supplicant *wpa_s);
|
||||
|
||||
DBusMessage * wpas_dbus_getter_networks(DBusMessage *message,
|
||||
struct wpa_supplicant *wpa_s);
|
||||
|
||||
DBusMessage * wpas_dbus_getter_blobs(DBusMessage *message,
|
||||
struct wpa_supplicant *bss);
|
||||
|
||||
DBusMessage * wpas_dbus_getter_bss_properties(DBusMessage *message,
|
||||
struct bss_handler_args *bss);
|
||||
|
||||
DBusMessage * wpas_dbus_getter_enabled(DBusMessage *message,
|
||||
struct network_handler_args *net);
|
||||
|
||||
DBusMessage * wpas_dbus_setter_enabled(DBusMessage *message,
|
||||
struct network_handler_args *net);
|
||||
|
||||
DBusMessage * wpas_dbus_getter_network_properties(
|
||||
DBusMessage *message, struct network_handler_args *net);
|
||||
|
||||
DBusMessage * wpas_dbus_setter_network_properties(
|
||||
DBusMessage *message, struct network_handler_args *net);
|
||||
|
||||
|
||||
#ifdef CONFIG_WPS
|
||||
DBusMessage * wpas_dbus_handler_wps_start(DBusMessage *message,
|
||||
struct wpa_supplicant *wpa_s);
|
||||
|
||||
DBusMessage * wpas_dbus_getter_process_credentials(
|
||||
DBusMessage *message, struct wpa_supplicant *wpa_s);
|
||||
|
||||
DBusMessage * wpas_dbus_setter_process_credentials(
|
||||
DBusMessage *message, struct wpa_supplicant *wpa_s);
|
||||
|
||||
DBusMessage * wpas_dbus_getter_credentials(DBusMessage *message,
|
||||
struct wpa_supplicant *wpa_s);
|
||||
#endif /* CONFIG_WPS */
|
||||
|
||||
#endif /* CTRL_IFACE_DBUS_HANDLERS_NEW_H */
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,140 @@
|
||||
/*
|
||||
* 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>
|
||||
*
|
||||
* 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
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* Alternatively, this software may be distributed under the terms of BSD
|
||||
* license.
|
||||
*
|
||||
* See README and COPYING for more details.
|
||||
*/
|
||||
|
||||
#ifndef WPA_DBUS_CTRL_H
|
||||
#define WPA_DBUS_CTRL_H
|
||||
|
||||
#include <dbus/dbus.h>
|
||||
|
||||
struct ctrl_iface_dbus_new_priv {
|
||||
DBusConnection *con;
|
||||
int should_dispatch;
|
||||
void *application_data;
|
||||
|
||||
u32 next_objid;
|
||||
};
|
||||
|
||||
typedef DBusMessage * (* WPADBusMethodHandler)(DBusMessage *message,
|
||||
void *user_data);
|
||||
typedef void (* WPADBusArgumentFreeFunction)(void *handler_arg);
|
||||
|
||||
typedef DBusMessage * (* WPADBusPropertyAccessor)(DBusMessage *message,
|
||||
void *user_data);
|
||||
|
||||
struct wpa_dbus_object_desc {
|
||||
DBusConnection *connection;
|
||||
struct wpa_dbus_method_desc *methods;
|
||||
struct wpa_dbus_signal_desc *signals;
|
||||
struct wpa_dbus_property_desc *properties;
|
||||
};
|
||||
|
||||
enum dbus_prop_access { R, W, RW };
|
||||
|
||||
enum dbus_arg_direction { ARG_IN, ARG_OUT };
|
||||
|
||||
struct wpa_dbus_argument {
|
||||
char *name;
|
||||
char *type;
|
||||
enum dbus_arg_direction dir;
|
||||
};
|
||||
|
||||
#define END_ARGS { NULL, NULL, ARG_IN }
|
||||
|
||||
#ifdef CONFIG_CTRL_IFACE_DBUS_NEW
|
||||
|
||||
#ifndef SIGPOLL
|
||||
#ifdef SIGIO
|
||||
/*
|
||||
* If we do not have SIGPOLL, try to use SIGIO instead. This is needed for
|
||||
* FreeBSD.
|
||||
*/
|
||||
#define SIGPOLL SIGIO
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define WPAS_DBUS_OBJECT_PATH_MAX 150
|
||||
#define WPAS_DBUS_INTERFACE_MAX 150
|
||||
#define WPAS_DBUS_METHOD_SIGNAL_PROP_MAX 50
|
||||
|
||||
#define WPA_DBUS_INTROSPECTION_INTERFACE "org.freedesktop.DBus.Introspectable"
|
||||
#define WPA_DBUS_INTROSPECTION_METHOD "Introspect"
|
||||
#define WPA_DBUS_PROPERTIES_INTERFACE "org.freedesktop.DBus.Properties"
|
||||
#define WPA_DBUS_PROPERTIES_GET "Get"
|
||||
#define WPA_DBUS_PROPERTIES_SET "Set"
|
||||
#define WPA_DBUS_PROPERTIES_GETALL "GetAll"
|
||||
|
||||
void free_dbus_object_desc(struct wpa_dbus_object_desc *obj_dsc);
|
||||
|
||||
struct ctrl_iface_dbus_new_priv *
|
||||
wpa_dbus_ctrl_iface_init(void *application_data, char *dbus_path,
|
||||
char *dbus_service,
|
||||
struct wpa_dbus_object_desc *obj_desc);
|
||||
|
||||
void wpa_dbus_ctrl_iface_deinit(struct ctrl_iface_dbus_new_priv *iface);
|
||||
|
||||
int wpa_dbus_register_object_per_iface(
|
||||
struct ctrl_iface_dbus_new_priv *ctrl_iface,
|
||||
const char *path, const char *ifname,
|
||||
struct wpa_dbus_object_desc *obj_desc);
|
||||
|
||||
int wpa_dbus_unregister_object_per_iface(
|
||||
struct ctrl_iface_dbus_new_priv *ctrl_iface,
|
||||
const char *path);
|
||||
|
||||
int wpa_dbus_method_register(struct wpa_dbus_object_desc *obj_dsc,
|
||||
char *dbus_interface, char *dbus_method,
|
||||
WPADBusMethodHandler method_handler,
|
||||
void *handler_argument,
|
||||
WPADBusArgumentFreeFunction argument_free_func,
|
||||
struct wpa_dbus_argument args[]);
|
||||
|
||||
int wpa_dbus_signal_register(struct wpa_dbus_object_desc *obj_dsc,
|
||||
char *dbus_interface, char *dbus_signal,
|
||||
struct wpa_dbus_argument args[]);
|
||||
|
||||
int wpa_dbus_property_register(
|
||||
struct wpa_dbus_object_desc *obj_dsc,
|
||||
char *dbus_interface, char *dbus_property,
|
||||
char *type,
|
||||
WPADBusPropertyAccessor getter,
|
||||
WPADBusPropertyAccessor setter,
|
||||
void *user_data,
|
||||
WPADBusArgumentFreeFunction user_datat_free_func,
|
||||
enum dbus_prop_access access);
|
||||
|
||||
void wpa_dbus_signal_property_changed(struct ctrl_iface_dbus_new_priv *iface,
|
||||
WPADBusPropertyAccessor property_getter,
|
||||
void *getter_arg,
|
||||
const char *path,
|
||||
const char *interface_name,
|
||||
const char *property_name);
|
||||
|
||||
/* Methods internal to the dbus control interface */
|
||||
u32 wpa_dbus_next_objid(struct ctrl_iface_dbus_new_priv *iface);
|
||||
|
||||
|
||||
#else /* CONFIG_CTRL_IFACE_DBUS_NEW */
|
||||
|
||||
static inline void wpa_dbus_signal_property_changed(
|
||||
struct ctrl_iface_dbus_new_priv *iface,
|
||||
WPADBusPropertyAccessor property_getter, void *getter_arg,
|
||||
const char *path, const char *interface_name,
|
||||
const char *property_name)
|
||||
{
|
||||
}
|
||||
|
||||
#endif /* CONFIG_CTRL_IFACE_DBUS_NEW */
|
||||
|
||||
#endif /* WPA_DBUS_CTRL_H */
|
||||
Loading…
Reference in New Issue