DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

dbus: Pass property description to getters/setters

Browse source 
We'll use it later for global interface properties.

Signed-off-by: Dan Williams <dcbw@redhat.com>
This commit is contained in:
Dan Williams 2015-10-13 11:45:33 -05:00 • committed by Jouni Malinen
parent c93b7e1888
commit 1aa0fb77ea
7 changed files with 377 additions and 561 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

294
wpa_supplicant/dbus/dbus_new_handlers.c
View file

@ -711,9 +711,9 @@ DBusMessage * wpas_dbus_handler_get_interface(DBusMessage *message,
* *
* Getter for "DebugLevel" property. * Getter for "DebugLevel" property.
*/ */
dbus_bool_t wpas_dbus_getter_debug_level(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_debug_level(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
const char *str; const char *str;
int idx = wpa_debug_level; int idx = wpa_debug_level;
@ -737,9 +737,9 @@ dbus_bool_t wpas_dbus_getter_debug_level(DBusMessageIter *iter,
* *
* Getter for "DebugTimestamp" property. * Getter for "DebugTimestamp" property.
*/ */
dbus_bool_t wpas_dbus_getter_debug_timestamp(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_debug_timestamp(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_BOOLEAN, return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_BOOLEAN,
&wpa_debug_timestamp, error); &wpa_debug_timestamp, error);
@ -756,9 +756,9 @@ dbus_bool_t wpas_dbus_getter_debug_timestamp(DBusMessageIter *iter,
* *
* Getter for "DebugShowKeys" property. * Getter for "DebugShowKeys" property.
*/ */
dbus_bool_t wpas_dbus_getter_debug_show_keys(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_debug_show_keys(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_BOOLEAN, return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_BOOLEAN,
&wpa_debug_show_keys, error); &wpa_debug_show_keys, error);
@ -774,8 +774,9 @@ dbus_bool_t wpas_dbus_getter_debug_show_keys(DBusMessageIter *iter,
* *
* Setter for "DebugLevel" property. * Setter for "DebugLevel" property.
*/ */
dbus_bool_t wpas_dbus_setter_debug_level(DBusMessageIter *iter, dbus_bool_t wpas_dbus_setter_debug_level(
DBusError *error, void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_global *global = user_data; struct wpa_global *global = user_data;
const char *str = NULL; const char *str = NULL;
@ -812,9 +813,9 @@ dbus_bool_t wpas_dbus_setter_debug_level(DBusMessageIter *iter,
* *
* Setter for "DebugTimestamp" property. * Setter for "DebugTimestamp" property.
*/ */
dbus_bool_t wpas_dbus_setter_debug_timestamp(DBusMessageIter *iter, dbus_bool_t wpas_dbus_setter_debug_timestamp(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_global *global = user_data; struct wpa_global *global = user_data;
dbus_bool_t val; dbus_bool_t val;
@ -838,9 +839,9 @@ dbus_bool_t wpas_dbus_setter_debug_timestamp(DBusMessageIter *iter,
* *
* Setter for "DebugShowKeys" property. * Setter for "DebugShowKeys" property.
*/ */
dbus_bool_t wpas_dbus_setter_debug_show_keys(DBusMessageIter *iter, dbus_bool_t wpas_dbus_setter_debug_show_keys(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_global *global = user_data; struct wpa_global *global = user_data;
dbus_bool_t val; dbus_bool_t val;
@ -867,9 +868,9 @@ dbus_bool_t wpas_dbus_setter_debug_show_keys(DBusMessageIter *iter,
* by dbus clients to return list of registered interfaces objects * by dbus clients to return list of registered interfaces objects
* paths * paths
*/ */
dbus_bool_t wpas_dbus_getter_interfaces(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_interfaces(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_global *global = user_data; struct wpa_global *global = user_data;
struct wpa_supplicant *wpa_s; struct wpa_supplicant *wpa_s;
@ -912,8 +913,9 @@ dbus_bool_t wpas_dbus_getter_interfaces(DBusMessageIter *iter,
* Getter for "EapMethods" property. Handles requests * Getter for "EapMethods" property. Handles requests
* by dbus clients to return list of strings with supported EAP methods * by dbus clients to return list of strings with supported EAP methods
*/ */
dbus_bool_t wpas_dbus_getter_eap_methods(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_eap_methods(
DBusError *error, void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
char **eap_methods; char **eap_methods;
size_t num_items = 0; size_t num_items = 0;
@ -948,9 +950,9 @@ dbus_bool_t wpas_dbus_getter_eap_methods(DBusMessageIter *iter,
* return a list of strings with supported capabilities like AP, RSN IBSS, * return a list of strings with supported capabilities like AP, RSN IBSS,
* and P2P that are determined at compile time. * and P2P that are determined at compile time.
*/ */
dbus_bool_t wpas_dbus_getter_global_capabilities(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_global_capabilities(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
const char *capabilities[5] = { NULL, NULL, NULL, NULL, NULL }; const char *capabilities[5] = { NULL, NULL, NULL, NULL, NULL };
size_t num_items = 0; size_t num_items = 0;
@ -2359,8 +2361,9 @@ DBusMessage * wpas_dbus_handler_set_pkcs11_engine_and_module_path(
* *
* Getter for "Capabilities" property of an interface. * Getter for "Capabilities" property of an interface.
*/ */
dbus_bool_t wpas_dbus_getter_capabilities(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_capabilities(
DBusError *error, void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
struct wpa_driver_capa capa; struct wpa_driver_capa capa;
@ -2650,8 +2653,9 @@ nomem:
* *
* Getter for "State" property. * Getter for "State" property.
*/ */
dbus_bool_t wpas_dbus_getter_state(DBusMessageIter *iter, DBusError *error, dbus_bool_t wpas_dbus_getter_state(
void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
const char *str_state; const char *str_state;
@ -2690,8 +2694,9 @@ dbus_bool_t wpas_dbus_getter_state(DBusMessageIter *iter, DBusError *error,
* *
* Getter for "scanning" property. * Getter for "scanning" property.
*/ */
dbus_bool_t wpas_dbus_getter_scanning(DBusMessageIter *iter, DBusError *error, dbus_bool_t wpas_dbus_getter_scanning(
void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
dbus_bool_t scanning = wpa_s->scanning ? TRUE : FALSE; dbus_bool_t scanning = wpa_s->scanning ? TRUE : FALSE;
@ -2710,8 +2715,9 @@ dbus_bool_t wpas_dbus_getter_scanning(DBusMessageIter *iter, DBusError *error,
* *
* Getter function for "ApScan" property. * Getter function for "ApScan" property.
*/ */
dbus_bool_t wpas_dbus_getter_ap_scan(DBusMessageIter *iter, DBusError *error, dbus_bool_t wpas_dbus_getter_ap_scan(
void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
dbus_uint32_t ap_scan = wpa_s->conf->ap_scan; dbus_uint32_t ap_scan = wpa_s->conf->ap_scan;
@ -2730,8 +2736,9 @@ dbus_bool_t wpas_dbus_getter_ap_scan(DBusMessageIter *iter, DBusError *error,
* *
* Setter function for "ApScan" property. * Setter function for "ApScan" property.
*/ */
dbus_bool_t wpas_dbus_setter_ap_scan(DBusMessageIter *iter, DBusError *error, dbus_bool_t wpas_dbus_setter_ap_scan(
void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
dbus_uint32_t ap_scan; dbus_uint32_t ap_scan;
@ -2759,9 +2766,9 @@ dbus_bool_t wpas_dbus_setter_ap_scan(DBusMessageIter *iter, DBusError *error,
* *
* Getter function for "FastReauth" property. * Getter function for "FastReauth" property.
*/ */
dbus_bool_t wpas_dbus_getter_fast_reauth(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_fast_reauth(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
dbus_bool_t fast_reauth = wpa_s->conf->fast_reauth ? TRUE : FALSE; dbus_bool_t fast_reauth = wpa_s->conf->fast_reauth ? TRUE : FALSE;
@ -2781,9 +2788,9 @@ dbus_bool_t wpas_dbus_getter_fast_reauth(DBusMessageIter *iter,
* *
* Setter function for "FastReauth" property. * Setter function for "FastReauth" property.
*/ */
dbus_bool_t wpas_dbus_setter_fast_reauth(DBusMessageIter *iter, dbus_bool_t wpas_dbus_setter_fast_reauth(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
dbus_bool_t fast_reauth; dbus_bool_t fast_reauth;
@ -2807,9 +2814,9 @@ dbus_bool_t wpas_dbus_setter_fast_reauth(DBusMessageIter *iter,
* Getter for "DisconnectReason" property. The reason is negative if it is * Getter for "DisconnectReason" property. The reason is negative if it is
* locally generated. * locally generated.
*/ */
dbus_bool_t wpas_dbus_getter_disconnect_reason(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_disconnect_reason(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
dbus_int32_t reason = wpa_s->disconnect_reason; dbus_int32_t reason = wpa_s->disconnect_reason;
@ -2828,9 +2835,9 @@ dbus_bool_t wpas_dbus_getter_disconnect_reason(DBusMessageIter *iter,
* *
* Getter function for "BSSExpireAge" property. * Getter function for "BSSExpireAge" property.
*/ */
dbus_bool_t wpas_dbus_getter_bss_expire_age(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_bss_expire_age(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
dbus_uint32_t expire_age = wpa_s->conf->bss_expiration_age; dbus_uint32_t expire_age = wpa_s->conf->bss_expiration_age;
@ -2849,9 +2856,9 @@ dbus_bool_t wpas_dbus_getter_bss_expire_age(DBusMessageIter *iter,
* *
* Setter function for "BSSExpireAge" property. * Setter function for "BSSExpireAge" property.
*/ */
dbus_bool_t wpas_dbus_setter_bss_expire_age(DBusMessageIter *iter, dbus_bool_t wpas_dbus_setter_bss_expire_age(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
dbus_uint32_t expire_age; dbus_uint32_t expire_age;
@ -2878,9 +2885,9 @@ dbus_bool_t wpas_dbus_setter_bss_expire_age(DBusMessageIter *iter,
* *
* Getter function for "BSSExpireCount" property. * Getter function for "BSSExpireCount" property.
*/ */
dbus_bool_t wpas_dbus_getter_bss_expire_count(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_bss_expire_count(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
dbus_uint32_t expire_count = wpa_s->conf->bss_expiration_scan_count; dbus_uint32_t expire_count = wpa_s->conf->bss_expiration_scan_count;
@ -2899,9 +2906,9 @@ dbus_bool_t wpas_dbus_getter_bss_expire_count(DBusMessageIter *iter,
* *
* Setter function for "BSSExpireCount" property. * Setter function for "BSSExpireCount" property.
*/ */
dbus_bool_t wpas_dbus_setter_bss_expire_count(DBusMessageIter *iter, dbus_bool_t wpas_dbus_setter_bss_expire_count(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
dbus_uint32_t expire_count; dbus_uint32_t expire_count;
@ -2928,8 +2935,9 @@ dbus_bool_t wpas_dbus_setter_bss_expire_count(DBusMessageIter *iter,
* *
* Getter function for "Country" property. * Getter function for "Country" property.
*/ */
dbus_bool_t wpas_dbus_getter_country(DBusMessageIter *iter, DBusError *error, dbus_bool_t wpas_dbus_getter_country(
void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
char country[3]; char country[3];
@ -2953,8 +2961,9 @@ dbus_bool_t wpas_dbus_getter_country(DBusMessageIter *iter, DBusError *error,
* *
* Setter function for "Country" property. * Setter function for "Country" property.
*/ */
dbus_bool_t wpas_dbus_setter_country(DBusMessageIter *iter, DBusError *error, dbus_bool_t wpas_dbus_setter_country(
void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
const char *country; const char *country;
@ -2991,9 +3000,9 @@ dbus_bool_t wpas_dbus_setter_country(DBusMessageIter *iter, DBusError *error,
* *
* Getter function for "ScanInterval" property. * Getter function for "ScanInterval" property.
*/ */
dbus_bool_t wpas_dbus_getter_scan_interval(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_scan_interval(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
dbus_int32_t scan_interval = wpa_s->scan_interval; dbus_int32_t scan_interval = wpa_s->scan_interval;
@ -3012,9 +3021,9 @@ dbus_bool_t wpas_dbus_getter_scan_interval(DBusMessageIter *iter,
* *
* Setter function for "ScanInterval" property. * Setter function for "ScanInterval" property.
*/ */
dbus_bool_t wpas_dbus_setter_scan_interval(DBusMessageIter *iter, dbus_bool_t wpas_dbus_setter_scan_interval(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
dbus_int32_t scan_interval; dbus_int32_t scan_interval;
@ -3041,8 +3050,9 @@ dbus_bool_t wpas_dbus_setter_scan_interval(DBusMessageIter *iter,
* *
* Getter for "Ifname" property. * Getter for "Ifname" property.
*/ */
dbus_bool_t wpas_dbus_getter_ifname(DBusMessageIter *iter, DBusError *error, dbus_bool_t wpas_dbus_getter_ifname(
void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
const char *ifname = wpa_s->ifname; const char *ifname = wpa_s->ifname;
@ -3061,8 +3071,9 @@ dbus_bool_t wpas_dbus_getter_ifname(DBusMessageIter *iter, DBusError *error,
* *
* Getter for "Driver" property. * Getter for "Driver" property.
*/ */
dbus_bool_t wpas_dbus_getter_driver(DBusMessageIter *iter, DBusError *error, dbus_bool_t wpas_dbus_getter_driver(
void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
const char *driver; const char *driver;
@ -3090,9 +3101,9 @@ dbus_bool_t wpas_dbus_getter_driver(DBusMessageIter *iter, DBusError *error,
* *
* Getter for "CurrentBSS" property. * Getter for "CurrentBSS" property.
*/ */
dbus_bool_t wpas_dbus_getter_current_bss(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_current_bss(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
char path_buf[WPAS_DBUS_OBJECT_PATH_MAX], *bss_obj_path = path_buf; char path_buf[WPAS_DBUS_OBJECT_PATH_MAX], *bss_obj_path = path_buf;
@ -3118,9 +3129,9 @@ dbus_bool_t wpas_dbus_getter_current_bss(DBusMessageIter *iter,
* *
* Getter for "CurrentNetwork" property. * Getter for "CurrentNetwork" property.
*/ */
dbus_bool_t wpas_dbus_getter_current_network(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_current_network(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
char path_buf[WPAS_DBUS_OBJECT_PATH_MAX], *net_obj_path = path_buf; char path_buf[WPAS_DBUS_OBJECT_PATH_MAX], *net_obj_path = path_buf;
@ -3146,9 +3157,9 @@ dbus_bool_t wpas_dbus_getter_current_network(DBusMessageIter *iter,
* *
* Getter for "CurrentAuthMode" property. * Getter for "CurrentAuthMode" property.
*/ */
dbus_bool_t wpas_dbus_getter_current_auth_mode(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_current_auth_mode(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
const char *eap_mode; const char *eap_mode;
@ -3183,9 +3194,9 @@ dbus_bool_t wpas_dbus_getter_current_auth_mode(DBusMessageIter *iter,
* *
* Getter for "BridgeIfname" property. * Getter for "BridgeIfname" property.
*/ */
dbus_bool_t wpas_dbus_getter_bridge_ifname(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_bridge_ifname(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
const char *bridge_ifname = wpa_s->bridge_ifname; const char *bridge_ifname = wpa_s->bridge_ifname;
@ -3204,8 +3215,9 @@ dbus_bool_t wpas_dbus_getter_bridge_ifname(DBusMessageIter *iter,
* *
* Getter for "BSSs" property. * Getter for "BSSs" property.
*/ */
dbus_bool_t wpas_dbus_getter_bsss(DBusMessageIter *iter, DBusError *error, dbus_bool_t wpas_dbus_getter_bsss(
void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
struct wpa_bss *bss; struct wpa_bss *bss;
@ -3261,8 +3273,9 @@ out:
* *
* Getter for "Networks" property. * Getter for "Networks" property.
*/ */
dbus_bool_t wpas_dbus_getter_networks(DBusMessageIter *iter, DBusError *error, dbus_bool_t wpas_dbus_getter_networks(
void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
struct wpa_ssid *ssid; struct wpa_ssid *ssid;
@ -3324,9 +3337,9 @@ out:
* *
* Getter for "PKCS11EnginePath" property. * Getter for "PKCS11EnginePath" property.
*/ */
dbus_bool_t wpas_dbus_getter_pkcs11_engine_path(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_pkcs11_engine_path(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
const char *pkcs11_engine_path; const char *pkcs11_engine_path;
@ -3349,9 +3362,9 @@ dbus_bool_t wpas_dbus_getter_pkcs11_engine_path(DBusMessageIter *iter,
* *
* Getter for "PKCS11ModulePath" property. * Getter for "PKCS11ModulePath" property.
*/ */
dbus_bool_t wpas_dbus_getter_pkcs11_module_path(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_pkcs11_module_path(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
const char *pkcs11_module_path; const char *pkcs11_module_path;
@ -3374,8 +3387,9 @@ dbus_bool_t wpas_dbus_getter_pkcs11_module_path(DBusMessageIter *iter,
* *
* Getter for "Blobs" property. * Getter for "Blobs" property.
*/ */
dbus_bool_t wpas_dbus_getter_blobs(DBusMessageIter *iter, DBusError *error, dbus_bool_t wpas_dbus_getter_blobs(
void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
DBusMessageIter variant_iter, dict_iter, entry_iter, array_iter; DBusMessageIter variant_iter, dict_iter, entry_iter, array_iter;
@ -3453,8 +3467,9 @@ static struct wpa_bss * get_bss_helper(struct bss_handler_args *args,
* *
* Getter for "BSSID" property. * Getter for "BSSID" property.
*/ */
dbus_bool_t wpas_dbus_getter_bss_bssid(DBusMessageIter *iter, DBusError *error, dbus_bool_t wpas_dbus_getter_bss_bssid(
void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct bss_handler_args *args = user_data; struct bss_handler_args *args = user_data;
struct wpa_bss *res; struct wpa_bss *res;
@ -3478,8 +3493,9 @@ dbus_bool_t wpas_dbus_getter_bss_bssid(DBusMessageIter *iter, DBusError *error,
* *
* Getter for "SSID" property. * Getter for "SSID" property.
*/ */
dbus_bool_t wpas_dbus_getter_bss_ssid(DBusMessageIter *iter, DBusError *error, dbus_bool_t wpas_dbus_getter_bss_ssid(
void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct bss_handler_args *args = user_data; struct bss_handler_args *args = user_data;
struct wpa_bss *res; struct wpa_bss *res;
@ -3503,8 +3519,9 @@ dbus_bool_t wpas_dbus_getter_bss_ssid(DBusMessageIter *iter, DBusError *error,
* *
* Getter for "Privacy" property. * Getter for "Privacy" property.
*/ */
dbus_bool_t wpas_dbus_getter_bss_privacy(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_bss_privacy(
DBusError *error, void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct bss_handler_args *args = user_data; struct bss_handler_args *args = user_data;
struct wpa_bss *res; struct wpa_bss *res;
@ -3529,8 +3546,9 @@ dbus_bool_t wpas_dbus_getter_bss_privacy(DBusMessageIter *iter,
* *
* Getter for "Mode" property. * Getter for "Mode" property.
*/ */
dbus_bool_t wpas_dbus_getter_bss_mode(DBusMessageIter *iter, DBusError *error, dbus_bool_t wpas_dbus_getter_bss_mode(
void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct bss_handler_args *args = user_data; struct bss_handler_args *args = user_data;
struct wpa_bss *res; struct wpa_bss *res;
@ -3570,8 +3588,9 @@ dbus_bool_t wpas_dbus_getter_bss_mode(DBusMessageIter *iter, DBusError *error,
* *
* Getter for "Level" property. * Getter for "Level" property.
*/ */
dbus_bool_t wpas_dbus_getter_bss_signal(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_bss_signal(
DBusError *error, void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct bss_handler_args *args = user_data; struct bss_handler_args *args = user_data;
struct wpa_bss *res; struct wpa_bss *res;
@ -3596,8 +3615,9 @@ dbus_bool_t wpas_dbus_getter_bss_signal(DBusMessageIter *iter,
* *
* Getter for "Frequency" property. * Getter for "Frequency" property.
*/ */
dbus_bool_t wpas_dbus_getter_bss_frequency(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_bss_frequency(
DBusError *error, void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct bss_handler_args *args = user_data; struct bss_handler_args *args = user_data;
struct wpa_bss *res; struct wpa_bss *res;
@ -3628,8 +3648,9 @@ static int cmp_u8s_desc(const void *a, const void *b)
* *
* Getter for "Rates" property. * Getter for "Rates" property.
*/ */
dbus_bool_t wpas_dbus_getter_bss_rates(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_bss_rates(
DBusError *error, void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct bss_handler_args *args = user_data; struct bss_handler_args *args = user_data;
struct wpa_bss *res; struct wpa_bss *res;
@ -3668,9 +3689,9 @@ dbus_bool_t wpas_dbus_getter_bss_rates(DBusMessageIter *iter,
} }
static dbus_bool_t wpas_dbus_get_bss_security_prop(DBusMessageIter *iter, static dbus_bool_t wpas_dbus_get_bss_security_prop(
struct wpa_ie_data *ie_data, const struct wpa_dbus_property_desc *property_desc,
DBusError *error) DBusMessageIter *iter, struct wpa_ie_data *ie_data, DBusError *error)
{ {
DBusMessageIter iter_dict, variant_iter; DBusMessageIter iter_dict, variant_iter;
const char *group; const char *group;
@ -3801,8 +3822,9 @@ nomem:
* *
* Getter for "WPA" property. * Getter for "WPA" property.
*/ */
dbus_bool_t wpas_dbus_getter_bss_wpa(DBusMessageIter *iter, DBusError *error, dbus_bool_t wpas_dbus_getter_bss_wpa(
void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct bss_handler_args *args = user_data; struct bss_handler_args *args = user_data;
struct wpa_bss *res; struct wpa_bss *res;
@ -3821,7 +3843,7 @@ dbus_bool_t wpas_dbus_getter_bss_wpa(DBusMessageIter *iter, DBusError *error,
return FALSE; return FALSE;
} }
return wpas_dbus_get_bss_security_prop(iter, &wpa_data, error); return wpas_dbus_get_bss_security_prop(property_desc, iter, &wpa_data, error);
} }
@ -3834,8 +3856,9 @@ dbus_bool_t wpas_dbus_getter_bss_wpa(DBusMessageIter *iter, DBusError *error,
* *
* Getter for "RSN" property. * Getter for "RSN" property.
*/ */
dbus_bool_t wpas_dbus_getter_bss_rsn(DBusMessageIter *iter, DBusError *error, dbus_bool_t wpas_dbus_getter_bss_rsn(
void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct bss_handler_args *args = user_data; struct bss_handler_args *args = user_data;
struct wpa_bss *res; struct wpa_bss *res;
@ -3854,7 +3877,7 @@ dbus_bool_t wpas_dbus_getter_bss_rsn(DBusMessageIter *iter, DBusError *error,
return FALSE; return FALSE;
} }
return wpas_dbus_get_bss_security_prop(iter, &wpa_data, error); return wpas_dbus_get_bss_security_prop(property_desc, iter, &wpa_data, error);
} }
@ -3867,8 +3890,9 @@ dbus_bool_t wpas_dbus_getter_bss_rsn(DBusMessageIter *iter, DBusError *error,
* *
* Getter for "WPS" property. * Getter for "WPS" property.
*/ */
dbus_bool_t wpas_dbus_getter_bss_wps(DBusMessageIter *iter, DBusError *error, dbus_bool_t wpas_dbus_getter_bss_wps(
void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct bss_handler_args *args = user_data; struct bss_handler_args *args = user_data;
struct wpa_bss *res; struct wpa_bss *res;
@ -3923,8 +3947,9 @@ nomem:
* *
* Getter for "IEs" property. * Getter for "IEs" property.
*/ */
dbus_bool_t wpas_dbus_getter_bss_ies(DBusMessageIter *iter, DBusError *error, dbus_bool_t wpas_dbus_getter_bss_ies(
void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct bss_handler_args *args = user_data; struct bss_handler_args *args = user_data;
struct wpa_bss *res; struct wpa_bss *res;
@ -3948,8 +3973,9 @@ dbus_bool_t wpas_dbus_getter_bss_ies(DBusMessageIter *iter, DBusError *error,
* *
* Getter for BSS age * Getter for BSS age
*/ */
dbus_bool_t wpas_dbus_getter_bss_age(DBusMessageIter *iter, DBusError *error, dbus_bool_t wpas_dbus_getter_bss_age(
void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct bss_handler_args *args = user_data; struct bss_handler_args *args = user_data;
struct wpa_bss *res; struct wpa_bss *res;
@ -3977,8 +4003,9 @@ dbus_bool_t wpas_dbus_getter_bss_age(DBusMessageIter *iter, DBusError *error,
* *
* Getter for "enabled" property of a configured network. * Getter for "enabled" property of a configured network.
*/ */
dbus_bool_t wpas_dbus_getter_enabled(DBusMessageIter *iter, DBusError *error, dbus_bool_t wpas_dbus_getter_enabled(
void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct network_handler_args *net = user_data; struct network_handler_args *net = user_data;
dbus_bool_t enabled = net->ssid->disabled ? FALSE : TRUE; dbus_bool_t enabled = net->ssid->disabled ? FALSE : TRUE;
@ -3997,8 +4024,9 @@ dbus_bool_t wpas_dbus_getter_enabled(DBusMessageIter *iter, DBusError *error,
* *
* Setter for "Enabled" property of a configured network. * Setter for "Enabled" property of a configured network.
*/ */
dbus_bool_t wpas_dbus_setter_enabled(DBusMessageIter *iter, DBusError *error, dbus_bool_t wpas_dbus_setter_enabled(
void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct network_handler_args *net = user_data; struct network_handler_args *net = user_data;
struct wpa_supplicant *wpa_s; struct wpa_supplicant *wpa_s;
@ -4030,9 +4058,9 @@ dbus_bool_t wpas_dbus_setter_enabled(DBusMessageIter *iter, DBusError *error,
* *
* Getter for "Properties" property of a configured network. * Getter for "Properties" property of a configured network.
*/ */
dbus_bool_t wpas_dbus_getter_network_properties(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_network_properties(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct network_handler_args *net = user_data; struct network_handler_args *net = user_data;
DBusMessageIter variant_iter, dict_iter; DBusMessageIter variant_iter, dict_iter;
@ -4092,9 +4120,9 @@ out:
* *
* Setter for "Properties" property of a configured network. * Setter for "Properties" property of a configured network.
*/ */
dbus_bool_t wpas_dbus_setter_network_properties(DBusMessageIter *iter, dbus_bool_t wpas_dbus_setter_network_properties(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct network_handler_args *net = user_data; struct network_handler_args *net = user_data;
struct wpa_ssid *ssid = net->ssid; struct wpa_ssid *ssid = net->ssid;

250
wpa_supplicant/dbus/dbus_new_handlers.h
View file

@ -10,6 +10,8 @@
#ifndef CTRL_IFACE_DBUS_NEW_HANDLERS_H #ifndef CTRL_IFACE_DBUS_NEW_HANDLERS_H
#define CTRL_IFACE_DBUS_NEW_HANDLERS_H #define CTRL_IFACE_DBUS_NEW_HANDLERS_H
#include "dbus_new_helpers.h"
struct network_handler_args { struct network_handler_args {
struct wpa_supplicant *wpa_s; struct wpa_supplicant *wpa_s;
struct wpa_ssid *ssid; struct wpa_ssid *ssid;
@ -53,39 +55,15 @@ DBusMessage * wpas_dbus_handler_get_interface(DBusMessage *message,
DBusMessage * wpas_dbus_handler_expect_disconnect(DBusMessage *message, DBusMessage * wpas_dbus_handler_expect_disconnect(DBusMessage *message,
struct wpa_global *global); struct wpa_global *global);
dbus_bool_t wpas_dbus_getter_debug_level(DBusMessageIter *iter, DECLARE_ACCESSOR(wpas_dbus_getter_debug_level);
DBusError *error, DECLARE_ACCESSOR(wpas_dbus_getter_debug_timestamp);
void *user_data); DECLARE_ACCESSOR(wpas_dbus_getter_debug_show_keys);
DECLARE_ACCESSOR(wpas_dbus_setter_debug_level);
dbus_bool_t wpas_dbus_getter_debug_timestamp(DBusMessageIter *iter, DECLARE_ACCESSOR(wpas_dbus_setter_debug_timestamp);
DBusError *error, DECLARE_ACCESSOR(wpas_dbus_setter_debug_show_keys);
void *user_data); DECLARE_ACCESSOR(wpas_dbus_getter_interfaces);
DECLARE_ACCESSOR(wpas_dbus_getter_eap_methods);
dbus_bool_t wpas_dbus_getter_debug_show_keys(DBusMessageIter *iter, DECLARE_ACCESSOR(wpas_dbus_getter_global_capabilities);
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_setter_debug_level(DBusMessageIter *iter,
DBusError *error, void *user_data);
dbus_bool_t wpas_dbus_setter_debug_timestamp(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_setter_debug_show_keys(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_interfaces(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_eap_methods(DBusMessageIter *iter,
DBusError *error, void *user_data);
dbus_bool_t wpas_dbus_getter_global_capabilities(DBusMessageIter *iter,
DBusError *error,
void *user_data);
DBusMessage * wpas_dbus_handler_scan(DBusMessage *message, DBusMessage * wpas_dbus_handler_scan(DBusMessage *message,
struct wpa_supplicant *wpa_s); struct wpa_supplicant *wpa_s);
@ -149,150 +127,50 @@ DBusMessage * wpas_dbus_handler_eap_logoff(DBusMessage *message,
DBusMessage * wpas_dbus_handler_eap_logon(DBusMessage *message, DBusMessage * wpas_dbus_handler_eap_logon(DBusMessage *message,
struct wpa_supplicant *wpa_s); struct wpa_supplicant *wpa_s);
dbus_bool_t wpas_dbus_getter_capabilities(DBusMessageIter *iter, DECLARE_ACCESSOR(wpas_dbus_getter_capabilities);
DBusError *error, void *user_data); DECLARE_ACCESSOR(wpas_dbus_getter_state);
DECLARE_ACCESSOR(wpas_dbus_getter_scanning);
dbus_bool_t wpas_dbus_getter_state(DBusMessageIter *iter, DBusError *error, DECLARE_ACCESSOR(wpas_dbus_getter_ap_scan);
void *user_data); DECLARE_ACCESSOR(wpas_dbus_setter_ap_scan);
DECLARE_ACCESSOR(wpas_dbus_getter_fast_reauth);
dbus_bool_t wpas_dbus_getter_scanning(DBusMessageIter *iter, DBusError *error, DECLARE_ACCESSOR(wpas_dbus_setter_fast_reauth);
void *user_data); DECLARE_ACCESSOR(wpas_dbus_getter_disconnect_reason);
DECLARE_ACCESSOR(wpas_dbus_getter_disassociate_reason);
dbus_bool_t wpas_dbus_getter_ap_scan(DBusMessageIter *iter, DBusError *error, DECLARE_ACCESSOR(wpas_dbus_getter_bss_expire_age);
void *user_data); DECLARE_ACCESSOR(wpas_dbus_setter_bss_expire_age);
DECLARE_ACCESSOR(wpas_dbus_getter_bss_expire_count);
dbus_bool_t wpas_dbus_setter_ap_scan(DBusMessageIter *iter, DBusError *error, DECLARE_ACCESSOR(wpas_dbus_setter_bss_expire_count);
void *user_data); DECLARE_ACCESSOR(wpas_dbus_getter_country);
DECLARE_ACCESSOR(wpas_dbus_setter_country);
dbus_bool_t wpas_dbus_getter_fast_reauth(DBusMessageIter *iter, DECLARE_ACCESSOR(wpas_dbus_getter_scan_interval);
DBusError *error, DECLARE_ACCESSOR(wpas_dbus_setter_scan_interval);
void *user_data); DECLARE_ACCESSOR(wpas_dbus_getter_ifname);
DECLARE_ACCESSOR(wpas_dbus_getter_driver);
dbus_bool_t wpas_dbus_setter_fast_reauth(DBusMessageIter *iter, DECLARE_ACCESSOR(wpas_dbus_getter_bridge_ifname);
DBusError *error, DECLARE_ACCESSOR(wpas_dbus_getter_current_bss);
void *user_data); DECLARE_ACCESSOR(wpas_dbus_getter_current_network);
DECLARE_ACCESSOR(wpas_dbus_getter_current_auth_mode);
dbus_bool_t wpas_dbus_getter_disconnect_reason(DBusMessageIter *iter, DECLARE_ACCESSOR(wpas_dbus_getter_bsss);
DBusError *error, DECLARE_ACCESSOR(wpas_dbus_getter_networks);
void *user_data); DECLARE_ACCESSOR(wpas_dbus_getter_pkcs11_engine_path);
DECLARE_ACCESSOR(wpas_dbus_getter_pkcs11_module_path);
dbus_bool_t wpas_dbus_getter_bss_expire_age(DBusMessageIter *iter, DECLARE_ACCESSOR(wpas_dbus_getter_blobs);
DBusError *error, void *user_data); DECLARE_ACCESSOR(wpas_dbus_getter_bss_bssid);
DECLARE_ACCESSOR(wpas_dbus_getter_bss_ssid);
dbus_bool_t wpas_dbus_setter_bss_expire_age(DBusMessageIter *iter, DECLARE_ACCESSOR(wpas_dbus_getter_bss_privacy);
DBusError *error, DECLARE_ACCESSOR(wpas_dbus_getter_bss_mode);
void *user_data); DECLARE_ACCESSOR(wpas_dbus_getter_bss_signal);
DECLARE_ACCESSOR(wpas_dbus_getter_bss_frequency);
dbus_bool_t wpas_dbus_getter_bss_expire_count(DBusMessageIter *iter, DECLARE_ACCESSOR(wpas_dbus_getter_bss_rates);
DBusError *error, DECLARE_ACCESSOR(wpas_dbus_getter_bss_wpa);
void *user_data); DECLARE_ACCESSOR(wpas_dbus_getter_bss_rsn);
DECLARE_ACCESSOR(wpas_dbus_getter_bss_wps);
dbus_bool_t wpas_dbus_setter_bss_expire_count(DBusMessageIter *iter, DECLARE_ACCESSOR(wpas_dbus_getter_bss_ies);
DBusError *error, DECLARE_ACCESSOR(wpas_dbus_getter_bss_age);
void *user_data); DECLARE_ACCESSOR(wpas_dbus_getter_enabled);
DECLARE_ACCESSOR(wpas_dbus_setter_enabled);
dbus_bool_t wpas_dbus_getter_country(DBusMessageIter *iter, DBusError *error, DECLARE_ACCESSOR(wpas_dbus_getter_network_properties);
void *user_data); DECLARE_ACCESSOR(wpas_dbus_setter_network_properties);
dbus_bool_t wpas_dbus_setter_country(DBusMessageIter *iter, DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_scan_interval(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_setter_scan_interval(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_ifname(DBusMessageIter *iter, DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_driver(DBusMessageIter *iter, DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_bridge_ifname(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_current_bss(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_current_network(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_current_auth_mode(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_bsss(DBusMessageIter *iter, DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_networks(DBusMessageIter *iter, DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_pkcs11_engine_path(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_pkcs11_module_path(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_blobs(DBusMessageIter *iter, DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_bss_bssid(DBusMessageIter *iter, DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_bss_ssid(DBusMessageIter *iter, DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_bss_privacy(DBusMessageIter *iter,
DBusError *error, void *user_data);
dbus_bool_t wpas_dbus_getter_bss_mode(DBusMessageIter *iter, DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_bss_signal(DBusMessageIter *iter,
DBusError *error, void *user_data);
dbus_bool_t wpas_dbus_getter_bss_frequency(DBusMessageIter *iter,
DBusError *error, void *user_data);
dbus_bool_t wpas_dbus_getter_bss_rates(DBusMessageIter *iter,
DBusError *error, void *user_data);
dbus_bool_t wpas_dbus_getter_bss_wpa(DBusMessageIter *iter, DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_bss_rsn(DBusMessageIter *iter, DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_bss_wps(DBusMessageIter *iter, DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_bss_ies(DBusMessageIter *iter, DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_bss_age(DBusMessageIter *iter, DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_enabled(DBusMessageIter *iter, DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_setter_enabled(DBusMessageIter *iter, DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_network_properties(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_setter_network_properties(DBusMessageIter *iter,
DBusError *error,
void *user_data);
DBusMessage * wpas_dbus_handler_wps_start(DBusMessage *message, DBusMessage * wpas_dbus_handler_wps_start(DBusMessage *message,
struct wpa_supplicant *wpa_s); struct wpa_supplicant *wpa_s);
@ -300,20 +178,10 @@ DBusMessage * wpas_dbus_handler_wps_start(DBusMessage *message,
DBusMessage * wpas_dbus_handler_wps_cancel(DBusMessage *message, DBusMessage * wpas_dbus_handler_wps_cancel(DBusMessage *message,
struct wpa_supplicant *wpa_s); struct wpa_supplicant *wpa_s);
dbus_bool_t wpas_dbus_getter_process_credentials(DBusMessageIter *iter, DECLARE_ACCESSOR(wpas_dbus_getter_process_credentials);
DBusError *error, void *user_data); DECLARE_ACCESSOR(wpas_dbus_setter_process_credentials);
DECLARE_ACCESSOR(wpas_dbus_getter_config_methods);
dbus_bool_t wpas_dbus_setter_process_credentials(DBusMessageIter *iter, DECLARE_ACCESSOR(wpas_dbus_setter_config_methods);
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_config_methods(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_setter_config_methods(DBusMessageIter *iter,
DBusError *error,
void *user_data);
DBusMessage * wpas_dbus_handler_tdls_discover(DBusMessage *message, DBusMessage * wpas_dbus_handler_tdls_discover(DBusMessage *message,
struct wpa_supplicant *wpa_s); struct wpa_supplicant *wpa_s);

187
wpa_supplicant/dbus/dbus_new_handlers_p2p.c
View file

@ -807,9 +807,9 @@ DBusMessage * wpas_dbus_handler_p2p_prov_disc_req(DBusMessage *message,
* P2P Device property accessor methods. * P2P Device property accessor methods.
*/ */
dbus_bool_t wpas_dbus_getter_p2p_device_config(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_p2p_device_config(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
DBusMessageIter variant_iter, dict_iter; DBusMessageIter variant_iter, dict_iter;
@ -916,9 +916,9 @@ err_no_mem:
} }
dbus_bool_t wpas_dbus_setter_p2p_device_config(DBusMessageIter *iter, dbus_bool_t wpas_dbus_setter_p2p_device_config(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
DBusMessageIter variant_iter, iter_dict; DBusMessageIter variant_iter, iter_dict;
@ -1087,8 +1087,9 @@ dbus_bool_t wpas_dbus_setter_p2p_device_config(DBusMessageIter *iter,
} }
dbus_bool_t wpas_dbus_getter_p2p_peers(DBusMessageIter *iter, DBusError *error, dbus_bool_t wpas_dbus_getter_p2p_peers(
void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
struct p2p_data *p2p = wpa_s->global->p2p; struct p2p_data *p2p = wpa_s->global->p2p;
@ -1201,8 +1202,9 @@ static enum wpas_p2p_role wpas_get_p2p_role(struct wpa_supplicant *wpa_s)
} }
dbus_bool_t wpas_dbus_getter_p2p_role(DBusMessageIter *iter, DBusError *error, dbus_bool_t wpas_dbus_getter_p2p_role(
void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
char *str; char *str;
@ -1224,8 +1226,9 @@ dbus_bool_t wpas_dbus_getter_p2p_role(DBusMessageIter *iter, DBusError *error,
} }
dbus_bool_t wpas_dbus_getter_p2p_group(DBusMessageIter *iter, DBusError *error, dbus_bool_t wpas_dbus_getter_p2p_group(
void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
char path_buf[WPAS_DBUS_OBJECT_PATH_MAX]; char path_buf[WPAS_DBUS_OBJECT_PATH_MAX];
@ -1243,8 +1246,9 @@ dbus_bool_t wpas_dbus_getter_p2p_group(DBusMessageIter *iter, DBusError *error,
} }
dbus_bool_t wpas_dbus_getter_p2p_peergo(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_p2p_peergo(
DBusError *error, void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
char go_peer_obj_path[WPAS_DBUS_OBJECT_PATH_MAX], *path; char go_peer_obj_path[WPAS_DBUS_OBJECT_PATH_MAX], *path;
@ -1271,9 +1275,9 @@ dbus_bool_t wpas_dbus_getter_p2p_peergo(DBusMessageIter *iter,
* Peer object properties accessor methods * Peer object properties accessor methods
*/ */
dbus_bool_t wpas_dbus_getter_p2p_peer_device_name(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_p2p_peer_device_name(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct peer_handler_args *peer_args = user_data; struct peer_handler_args *peer_args = user_data;
const struct p2p_peer_info *info; const struct p2p_peer_info *info;
@ -1309,9 +1313,9 @@ dbus_bool_t wpas_dbus_getter_p2p_peer_device_name(DBusMessageIter *iter,
} }
dbus_bool_t wpas_dbus_getter_p2p_peer_manufacturer(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_p2p_peer_manufacturer(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct peer_handler_args *peer_args = user_data; struct peer_handler_args *peer_args = user_data;
const struct p2p_peer_info *info; const struct p2p_peer_info *info;
@ -1346,9 +1350,9 @@ dbus_bool_t wpas_dbus_getter_p2p_peer_manufacturer(DBusMessageIter *iter,
} }
dbus_bool_t wpas_dbus_getter_p2p_peer_modelname(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_p2p_peer_modelname(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct peer_handler_args *peer_args = user_data; struct peer_handler_args *peer_args = user_data;
const struct p2p_peer_info *info; const struct p2p_peer_info *info;
@ -1383,9 +1387,9 @@ dbus_bool_t wpas_dbus_getter_p2p_peer_modelname(DBusMessageIter *iter,
} }
dbus_bool_t wpas_dbus_getter_p2p_peer_modelnumber(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_p2p_peer_modelnumber(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct peer_handler_args *peer_args = user_data; struct peer_handler_args *peer_args = user_data;
const struct p2p_peer_info *info; const struct p2p_peer_info *info;
@ -1420,9 +1424,9 @@ dbus_bool_t wpas_dbus_getter_p2p_peer_modelnumber(DBusMessageIter *iter,
} }
dbus_bool_t wpas_dbus_getter_p2p_peer_serialnumber(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_p2p_peer_serialnumber(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct peer_handler_args *peer_args = user_data; struct peer_handler_args *peer_args = user_data;
const struct p2p_peer_info *info; const struct p2p_peer_info *info;
@ -1458,6 +1462,7 @@ dbus_bool_t wpas_dbus_getter_p2p_peer_serialnumber(DBusMessageIter *iter,
dbus_bool_t wpas_dbus_getter_p2p_peer_primary_device_type( dbus_bool_t wpas_dbus_getter_p2p_peer_primary_device_type(
const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct peer_handler_args *peer_args = user_data; struct peer_handler_args *peer_args = user_data;
@ -1483,9 +1488,9 @@ dbus_bool_t wpas_dbus_getter_p2p_peer_primary_device_type(
} }
dbus_bool_t wpas_dbus_getter_p2p_peer_config_method(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_p2p_peer_config_method(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct peer_handler_args *peer_args = user_data; struct peer_handler_args *peer_args = user_data;
const struct p2p_peer_info *info; const struct p2p_peer_info *info;
@ -1508,9 +1513,9 @@ dbus_bool_t wpas_dbus_getter_p2p_peer_config_method(DBusMessageIter *iter,
} }
dbus_bool_t wpas_dbus_getter_p2p_peer_level(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_p2p_peer_level(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct peer_handler_args *peer_args = user_data; struct peer_handler_args *peer_args = user_data;
const struct p2p_peer_info *info; const struct p2p_peer_info *info;
@ -1533,9 +1538,9 @@ dbus_bool_t wpas_dbus_getter_p2p_peer_level(DBusMessageIter *iter,
} }
dbus_bool_t wpas_dbus_getter_p2p_peer_device_capability(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_p2p_peer_device_capability(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct peer_handler_args *peer_args = user_data; struct peer_handler_args *peer_args = user_data;
const struct p2p_peer_info *info; const struct p2p_peer_info *info;
@ -1558,9 +1563,9 @@ dbus_bool_t wpas_dbus_getter_p2p_peer_device_capability(DBusMessageIter *iter,
} }
dbus_bool_t wpas_dbus_getter_p2p_peer_group_capability(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_p2p_peer_group_capability(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct peer_handler_args *peer_args = user_data; struct peer_handler_args *peer_args = user_data;
const struct p2p_peer_info *info; const struct p2p_peer_info *info;
@ -1584,6 +1589,7 @@ dbus_bool_t wpas_dbus_getter_p2p_peer_group_capability(DBusMessageIter *iter,
dbus_bool_t wpas_dbus_getter_p2p_peer_secondary_device_types( dbus_bool_t wpas_dbus_getter_p2p_peer_secondary_device_types(
const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct peer_handler_args *peer_args = user_data; struct peer_handler_args *peer_args = user_data;
@ -1649,9 +1655,9 @@ dbus_bool_t wpas_dbus_getter_p2p_peer_secondary_device_types(
} }
dbus_bool_t wpas_dbus_getter_p2p_peer_vendor_extension(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_p2p_peer_vendor_extension(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpabuf *vendor_extension[P2P_MAX_WPS_VENDOR_EXT]; struct wpabuf *vendor_extension[P2P_MAX_WPS_VENDOR_EXT];
unsigned int i, num = 0; unsigned int i, num = 0;
@ -1684,8 +1690,9 @@ dbus_bool_t wpas_dbus_getter_p2p_peer_vendor_extension(DBusMessageIter *iter,
} }
dbus_bool_t wpas_dbus_getter_p2p_peer_ies(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_p2p_peer_ies(
DBusError *error, void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct peer_handler_args *peer_args = user_data; struct peer_handler_args *peer_args = user_data;
const struct p2p_peer_info *info; const struct p2p_peer_info *info;
@ -1709,9 +1716,9 @@ dbus_bool_t wpas_dbus_getter_p2p_peer_ies(DBusMessageIter *iter,
} }
dbus_bool_t wpas_dbus_getter_p2p_peer_device_address(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_p2p_peer_device_address(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct peer_handler_args *peer_args = user_data; struct peer_handler_args *peer_args = user_data;
const struct p2p_peer_info *info; const struct p2p_peer_info *info;
@ -1774,9 +1781,9 @@ out_of_memory:
} }
dbus_bool_t wpas_dbus_getter_p2p_peer_groups(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_p2p_peer_groups(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct peer_handler_args *peer_args = user_data; struct peer_handler_args *peer_args = user_data;
const struct p2p_peer_info *info; const struct p2p_peer_info *info;
@ -1842,9 +1849,9 @@ out:
* *
* Getter for "PersistentGroups" property. * Getter for "PersistentGroups" property.
*/ */
dbus_bool_t wpas_dbus_getter_persistent_groups(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_persistent_groups(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
struct wpa_ssid *ssid; struct wpa_ssid *ssid;
@ -1904,16 +1911,16 @@ out:
* *
* Getter for "Properties" property of a persistent group. * Getter for "Properties" property of a persistent group.
*/ */
dbus_bool_t wpas_dbus_getter_persistent_group_properties(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_persistent_group_properties(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct network_handler_args *net = user_data; struct network_handler_args *net = user_data;
/* Leveraging the fact that persistent group object is still /* Leveraging the fact that persistent group object is still
* represented in same manner as network within. * represented in same manner as network within.
*/ */
return wpas_dbus_getter_network_properties(iter, error, net); return wpas_dbus_getter_network_properties(property_desc, iter, error, net);
} }
@ -1927,9 +1934,9 @@ dbus_bool_t wpas_dbus_getter_persistent_group_properties(DBusMessageIter *iter,
* *
* Setter for "Properties" property of a persistent group. * Setter for "Properties" property of a persistent group.
*/ */
dbus_bool_t wpas_dbus_setter_persistent_group_properties(DBusMessageIter *iter, dbus_bool_t wpas_dbus_setter_persistent_group_properties(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct network_handler_args *net = user_data; struct network_handler_args *net = user_data;
struct wpa_ssid *ssid = net->ssid; struct wpa_ssid *ssid = net->ssid;
@ -2142,9 +2149,9 @@ DBusMessage * wpas_dbus_handler_remove_all_persistent_groups(
* Group object properties accessor methods * Group object properties accessor methods
*/ */
dbus_bool_t wpas_dbus_getter_p2p_group_members(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_p2p_group_members(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
struct wpa_ssid *ssid; struct wpa_ssid *ssid;
@ -2211,8 +2218,9 @@ out_of_memory:
} }
dbus_bool_t wpas_dbus_getter_p2p_group_ssid(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_p2p_group_ssid(
DBusError *error, void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
@ -2224,9 +2232,9 @@ dbus_bool_t wpas_dbus_getter_p2p_group_ssid(DBusMessageIter *iter,
} }
dbus_bool_t wpas_dbus_getter_p2p_group_bssid(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_p2p_group_bssid(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
u8 role = wpas_get_p2p_role(wpa_s); u8 role = wpas_get_p2p_role(wpa_s);
@ -2248,9 +2256,9 @@ dbus_bool_t wpas_dbus_getter_p2p_group_bssid(DBusMessageIter *iter,
} }
dbus_bool_t wpas_dbus_getter_p2p_group_frequency(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_p2p_group_frequency(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
u16 op_freq; u16 op_freq;
@ -2271,9 +2279,9 @@ dbus_bool_t wpas_dbus_getter_p2p_group_frequency(DBusMessageIter *iter,
} }
dbus_bool_t wpas_dbus_getter_p2p_group_passphrase(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_p2p_group_passphrase(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
char *p_pass; char *p_pass;
@ -2292,8 +2300,9 @@ dbus_bool_t wpas_dbus_getter_p2p_group_passphrase(DBusMessageIter *iter,
} }
dbus_bool_t wpas_dbus_getter_p2p_group_psk(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_p2p_group_psk(
DBusError *error, void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
u8 *p_psk = NULL; u8 *p_psk = NULL;
@ -2313,9 +2322,9 @@ dbus_bool_t wpas_dbus_getter_p2p_group_psk(DBusMessageIter *iter,
} }
dbus_bool_t wpas_dbus_getter_p2p_group_vendor_ext(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_p2p_group_vendor_ext(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
struct hostapd_data *hapd; struct hostapd_data *hapd;
@ -2348,9 +2357,9 @@ dbus_bool_t wpas_dbus_getter_p2p_group_vendor_ext(DBusMessageIter *iter,
} }
dbus_bool_t wpas_dbus_setter_p2p_group_vendor_ext(DBusMessageIter *iter, dbus_bool_t wpas_dbus_setter_p2p_group_vendor_ext(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
DBusMessageIter variant_iter, iter_dict, array_iter, sub; DBusMessageIter variant_iter, iter_dict, array_iter, sub;
@ -2876,8 +2885,9 @@ DBusMessage * wpas_dbus_handler_p2p_serv_disc_external(
#ifdef CONFIG_WIFI_DISPLAY #ifdef CONFIG_WIFI_DISPLAY
dbus_bool_t wpas_dbus_getter_global_wfd_ies(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_global_wfd_ies(
DBusError *error, void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_global *global = user_data; struct wpa_global *global = user_data;
struct wpabuf *ie; struct wpabuf *ie;
@ -2898,8 +2908,9 @@ dbus_bool_t wpas_dbus_getter_global_wfd_ies(DBusMessageIter *iter,
} }
dbus_bool_t wpas_dbus_setter_global_wfd_ies(DBusMessageIter *iter, dbus_bool_t wpas_dbus_setter_global_wfd_ies(
DBusError *error, void *user_data) const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_global *global = user_data; struct wpa_global *global = user_data;
DBusMessageIter variant, array; DBusMessageIter variant, array;

164
wpa_supplicant/dbus/dbus_new_handlers_p2p.h
View file

@ -89,139 +89,50 @@ DBusMessage *wpas_dbus_handler_p2p_serv_disc_external(
/* /*
* P2P Device property accessor methods. * P2P Device property accessor methods.
*/ */
dbus_bool_t wpas_dbus_setter_p2p_device_config(DBusMessageIter *iter, DECLARE_ACCESSOR(wpas_dbus_setter_p2p_device_config);
DBusError *error, DECLARE_ACCESSOR(wpas_dbus_getter_p2p_device_config);
void *user_data); DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peers);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_role);
dbus_bool_t wpas_dbus_getter_p2p_device_config(DBusMessageIter *iter, DECLARE_ACCESSOR(wpas_dbus_getter_p2p_group);
DBusError *error, DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peergo);
void *user_data);
dbus_bool_t wpas_dbus_getter_p2p_peers(DBusMessageIter *iter, DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_p2p_role(DBusMessageIter *iter, DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_p2p_group(DBusMessageIter *iter, DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_p2p_peergo(DBusMessageIter *iter,
DBusError *error,
void *user_data);
/* /*
* P2P Peer properties. * P2P Peer properties.
*/ */
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_device_name);
dbus_bool_t wpas_dbus_getter_p2p_peer_device_name(DBusMessageIter *iter, DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_manufacturer);
DBusError *error, DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_modelname);
void *user_data); DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_modelnumber);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_serialnumber);
dbus_bool_t wpas_dbus_getter_p2p_peer_manufacturer(DBusMessageIter *iter, DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_primary_device_type);
DBusError *error, DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_config_method);
void *user_data); DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_level);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_device_capability);
dbus_bool_t wpas_dbus_getter_p2p_peer_modelname(DBusMessageIter *iter, DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_group_capability);
DBusError *error, DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_secondary_device_types);
void *user_data); DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_vendor_extension);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_ies);
dbus_bool_t wpas_dbus_getter_p2p_peer_modelnumber(DBusMessageIter *iter, DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_device_address);
DBusError *error, DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_groups);
void *user_data);
dbus_bool_t wpas_dbus_getter_p2p_peer_serialnumber(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_p2p_peer_primary_device_type(
DBusMessageIter *iter, DBusError *error, void *user_data);
dbus_bool_t wpas_dbus_getter_p2p_peer_config_method(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_p2p_peer_level(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_p2p_peer_device_capability(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_p2p_peer_group_capability(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_p2p_peer_secondary_device_types(
DBusMessageIter *iter, DBusError *error, void *user_data);
dbus_bool_t wpas_dbus_getter_p2p_peer_vendor_extension(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_p2p_peer_ies(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_p2p_peer_device_address(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_p2p_peer_groups(DBusMessageIter *iter,
DBusError *error,
void *user_data);
/* /*
* P2P Group properties * P2P Group properties
*/ */
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_group_members);
dbus_bool_t wpas_dbus_getter_p2p_group_members(DBusMessageIter *iter, DECLARE_ACCESSOR(wpas_dbus_getter_p2p_group_ssid);
DBusError *error, DECLARE_ACCESSOR(wpas_dbus_getter_p2p_group_bssid);
void *user_data); DECLARE_ACCESSOR(wpas_dbus_getter_p2p_group_frequency);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_group_passphrase);
dbus_bool_t wpas_dbus_getter_p2p_group_ssid(DBusMessageIter *iter, DECLARE_ACCESSOR(wpas_dbus_getter_p2p_group_psk);
DBusError *error, DECLARE_ACCESSOR(wpas_dbus_getter_p2p_group_vendor_ext);
void *user_data); DECLARE_ACCESSOR(wpas_dbus_setter_p2p_group_vendor_ext);
dbus_bool_t wpas_dbus_getter_p2p_group_bssid(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_p2p_group_frequency(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_p2p_group_passphrase(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_p2p_group_psk(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_p2p_group_vendor_ext(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_setter_p2p_group_vendor_ext(DBusMessageIter *iter,
DBusError *error,
void *user_data);
/* /*
* P2P Persistent Groups and properties * P2P Persistent Groups and properties
*/ */
DECLARE_ACCESSOR(wpas_dbus_getter_persistent_groups);
dbus_bool_t wpas_dbus_getter_persistent_groups(DBusMessageIter *iter, DECLARE_ACCESSOR(wpas_dbus_getter_persistent_group_properties);
DBusError *error, DECLARE_ACCESSOR(wpas_dbus_setter_persistent_group_properties);
void *user_data);
dbus_bool_t wpas_dbus_getter_persistent_group_properties(DBusMessageIter *iter,
DBusError *error, void *user_data);
dbus_bool_t wpas_dbus_setter_persistent_group_properties(DBusMessageIter *iter,
DBusError *error,
void *user_data);
DBusMessage * wpas_dbus_handler_add_persistent_group( DBusMessage * wpas_dbus_handler_add_persistent_group(
DBusMessage *message, struct wpa_supplicant *wpa_s); DBusMessage *message, struct wpa_supplicant *wpa_s);
@ -233,15 +144,8 @@ DBusMessage * wpas_dbus_handler_remove_all_persistent_groups(
DBusMessage *message, struct wpa_supplicant *wpa_s); DBusMessage *message, struct wpa_supplicant *wpa_s);
#ifdef CONFIG_WIFI_DISPLAY #ifdef CONFIG_WIFI_DISPLAY
DECLARE_ACCESSOR(wpas_dbus_getter_global_wfd_ies);
dbus_bool_t wpas_dbus_getter_global_wfd_ies(DBusMessageIter *iter, DECLARE_ACCESSOR(wpas_dbus_setter_global_wfd_ies);
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_setter_global_wfd_ies(DBusMessageIter *iter,
DBusError *error,
void *user_data);
#endif /* CONFIG_WIFI_DISPLAY */ #endif /* CONFIG_WIFI_DISPLAY */
#endif /* DBUS_NEW_HANDLERS_P2P_H */ #endif /* DBUS_NEW_HANDLERS_P2P_H */

24
wpa_supplicant/dbus/dbus_new_handlers_wps.c
View file

@ -349,9 +349,9 @@ DBusMessage * wpas_dbus_handler_wps_cancel(DBusMessage *message,
* true if wps_cred_processing configuration field is not equal to 1 or false * true if wps_cred_processing configuration field is not equal to 1 or false
* if otherwise. * if otherwise.
*/ */
dbus_bool_t wpas_dbus_getter_process_credentials(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_process_credentials(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
dbus_bool_t process = wpa_s->conf->wps_cred_processing != 1; dbus_bool_t process = wpa_s->conf->wps_cred_processing != 1;
@ -371,9 +371,9 @@ dbus_bool_t wpas_dbus_getter_process_credentials(DBusMessageIter *iter,
* Setter for "ProcessCredentials" property. Sets credentials_processed on 2 * Setter for "ProcessCredentials" property. Sets credentials_processed on 2
* if boolean argument is true or on 1 if otherwise. * if boolean argument is true or on 1 if otherwise.
*/ */
dbus_bool_t wpas_dbus_setter_process_credentials(DBusMessageIter *iter, dbus_bool_t wpas_dbus_setter_process_credentials(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
dbus_bool_t process_credentials, old_pc; dbus_bool_t process_credentials, old_pc;
@ -407,9 +407,9 @@ dbus_bool_t wpas_dbus_setter_process_credentials(DBusMessageIter *iter,
* Getter for "ConfigMethods" property. Returned boolean will be true if * Getter for "ConfigMethods" property. Returned boolean will be true if
* providing the relevant string worked, or false otherwise. * providing the relevant string worked, or false otherwise.
*/ */
dbus_bool_t wpas_dbus_getter_config_methods(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_config_methods(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
char *methods = wpa_s->conf->config_methods; char *methods = wpa_s->conf->config_methods;
@ -431,9 +431,9 @@ dbus_bool_t wpas_dbus_getter_config_methods(DBusMessageIter *iter,
* Setter for "ConfigMethods" property. Sets the methods string, apply such * Setter for "ConfigMethods" property. Sets the methods string, apply such
* change and returns true on success. Returns false otherwise. * change and returns true on success. Returns false otherwise.
*/ */
dbus_bool_t wpas_dbus_setter_config_methods(DBusMessageIter *iter, dbus_bool_t wpas_dbus_setter_config_methods(
DBusError *error, const struct wpa_dbus_property_desc *property_desc,
void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
char *methods, *new_methods; char *methods, *new_methods;

9
wpa_supplicant/dbus/dbus_new_helpers.c
View file

@ -46,7 +46,7 @@ static dbus_bool_t fill_dict_with_properties(
goto error; goto error;
/* An error getting a property fails the request entirely */ /* An error getting a property fails the request entirely */
if (!dsc->getter(&entry_iter, error, user_data)) { if (!dsc->getter(dsc, &entry_iter, error, user_data)) {
wpa_printf(MSG_INFO, wpa_printf(MSG_INFO,
"dbus: %s dbus_interface=%s dbus_property=%s getter failed", "dbus: %s dbus_interface=%s dbus_property=%s getter failed",
__func__, dsc->dbus_interface, __func__, dsc->dbus_interface,
@ -176,7 +176,7 @@ static DBusMessage * properties_get(DBusMessage *message,
dbus_message_iter_init_append(reply, &iter); dbus_message_iter_init_append(reply, &iter);
dbus_error_init(&error); dbus_error_init(&error);
if (dsc->getter(&iter, &error, user_data) == FALSE) { if (dsc->getter(dsc, &iter, &error, user_data) == FALSE) {
dbus_message_unref(reply); dbus_message_unref(reply);
reply = wpas_dbus_reply_new_from_error( reply = wpas_dbus_reply_new_from_error(
message, &error, DBUS_ERROR_FAILED, message, &error, DBUS_ERROR_FAILED,
@ -213,7 +213,7 @@ static DBusMessage * properties_set(DBusMessage *message,
/* Iter will now point to the property's new value */ /* Iter will now point to the property's new value */
dbus_error_init(&error); dbus_error_init(&error);
if (dsc->setter(&iter, &error, user_data) == TRUE) { if (dsc->setter(dsc, &iter, &error, user_data) == TRUE) {
/* Success */ /* Success */
reply = dbus_message_new_method_return(message); reply = dbus_message_new_method_return(message);
} else { } else {
@ -627,7 +627,8 @@ static dbus_bool_t put_changed_properties(
return FALSE; return FALSE;
dbus_error_init(&error); dbus_error_init(&error);
if (!dsc->getter(&entry_iter, &error, obj_dsc->user_data)) { if (!dsc->getter(dsc, &entry_iter, &error, obj_dsc->user_data))
{
if (dbus_error_is_set(&error)) { if (dbus_error_is_set(&error)) {
wpa_printf(MSG_ERROR, wpa_printf(MSG_ERROR,
"dbus: %s: Cannot get new value of property %s: (%s) %s", "dbus: %s: Cannot get new value of property %s: (%s) %s",

10
wpa_supplicant/dbus/dbus_new_helpers.h
View file

@ -16,9 +16,13 @@ typedef DBusMessage * (*WPADBusMethodHandler)(DBusMessage *message,
void *user_data); void *user_data);
typedef void (*WPADBusArgumentFreeFunction)(void *handler_arg); typedef void (*WPADBusArgumentFreeFunction)(void *handler_arg);
typedef dbus_bool_t (*WPADBusPropertyAccessor)(DBusMessageIter *iter, struct wpa_dbus_property_desc;
DBusError *error, typedef dbus_bool_t (*WPADBusPropertyAccessor)(
void *user_data); const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data);
#define DECLARE_ACCESSOR(f) \
dbus_bool_t f(const struct wpa_dbus_property_desc *property_desc, \
DBusMessageIter *iter, DBusError *error, void *user_data)
struct wpa_dbus_object_desc { struct wpa_dbus_object_desc {
DBusConnection *connection; DBusConnection *connection;