59d59eb0e0
This reverts commit adf8f45f8a.
It is basically all wrong. The Pmf property did exist, with a signature of
"s" as documented in doc/dbus.doxygen. It was synthesized from
global_fields[].
The patch added a duplicate one, with a signature of "u", in violation
of D-Bus specification and to bemusement of tools that are careful
enough:
$ busctl introspect fi.w1.wpa_supplicant1 /fi/w1/wpa_supplicant1/Interfaces/666
Duplicate property
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
248 lines
9.4 KiB
C
248 lines
9.4 KiB
C
/*
|
|
* WPA Supplicant / dbus-based control interface
|
|
* Copyright (c) 2006, Dan Williams <dcbw@redhat.com> and Red Hat, Inc.
|
|
* Copyright (c) 2009-2010, Witold Sowa <witold.sowa@gmail.com>
|
|
*
|
|
* This software may be distributed under the terms of the BSD license.
|
|
* See README for more details.
|
|
*/
|
|
|
|
#ifndef CTRL_IFACE_DBUS_NEW_HANDLERS_H
|
|
#define CTRL_IFACE_DBUS_NEW_HANDLERS_H
|
|
|
|
#include "dbus_new_helpers.h"
|
|
|
|
struct network_handler_args {
|
|
struct wpa_supplicant *wpa_s;
|
|
struct wpa_ssid *ssid;
|
|
};
|
|
|
|
struct bss_handler_args {
|
|
struct wpa_supplicant *wpa_s;
|
|
unsigned int id;
|
|
};
|
|
|
|
dbus_bool_t wpas_dbus_simple_property_getter(DBusMessageIter *iter,
|
|
const int type,
|
|
const void *val,
|
|
DBusError *error);
|
|
|
|
dbus_bool_t wpas_dbus_simple_property_setter(DBusMessageIter *iter,
|
|
DBusError *error,
|
|
const int type, void *val);
|
|
|
|
dbus_bool_t wpas_dbus_simple_array_property_getter(DBusMessageIter *iter,
|
|
const int type,
|
|
const void *array,
|
|
size_t array_len,
|
|
DBusError *error);
|
|
|
|
dbus_bool_t wpas_dbus_simple_array_array_property_getter(DBusMessageIter *iter,
|
|
const int type,
|
|
struct wpabuf **array,
|
|
size_t array_len,
|
|
DBusError *error);
|
|
|
|
dbus_bool_t wpas_dbus_string_property_getter(DBusMessageIter *iter,
|
|
const void *val,
|
|
DBusError *error);
|
|
|
|
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_handler_expect_disconnect(DBusMessage *message,
|
|
struct wpa_global *global);
|
|
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_debug_level);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_debug_timestamp);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_debug_show_keys);
|
|
DECLARE_ACCESSOR(wpas_dbus_setter_debug_level);
|
|
DECLARE_ACCESSOR(wpas_dbus_setter_debug_timestamp);
|
|
DECLARE_ACCESSOR(wpas_dbus_setter_debug_show_keys);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_interfaces);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_eap_methods);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_global_capabilities);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_iface_global);
|
|
DECLARE_ACCESSOR(wpas_dbus_setter_iface_global);
|
|
|
|
DBusMessage * wpas_dbus_handler_scan(DBusMessage *message,
|
|
struct wpa_supplicant *wpa_s);
|
|
|
|
DBusMessage * wpas_dbus_handler_abort_scan(DBusMessage *message,
|
|
struct wpa_supplicant *wpa_s);
|
|
|
|
DBusMessage * wpas_dbus_handler_signal_poll(DBusMessage *message,
|
|
struct wpa_supplicant *wpa_s);
|
|
|
|
DBusMessage * wpas_dbus_handler_disconnect(DBusMessage *message,
|
|
struct wpa_supplicant *wpa_s);
|
|
|
|
dbus_bool_t set_network_properties(struct wpa_supplicant *wpa_s,
|
|
struct wpa_ssid *ssid,
|
|
DBusMessageIter *iter,
|
|
DBusError *error);
|
|
|
|
DBusMessage * wpas_dbus_handler_add_network(DBusMessage *message,
|
|
struct wpa_supplicant *wpa_s);
|
|
|
|
DBusMessage * wpas_dbus_handler_reassociate(DBusMessage *message,
|
|
struct wpa_supplicant *wpa_s);
|
|
|
|
DBusMessage * wpas_dbus_handler_reattach(DBusMessage *message,
|
|
struct wpa_supplicant *wpa_s);
|
|
|
|
DBusMessage * wpas_dbus_handler_reconnect(DBusMessage *message,
|
|
struct wpa_supplicant *wpa_s);
|
|
|
|
DBusMessage * wpas_dbus_handler_remove_network(DBusMessage *message,
|
|
struct wpa_supplicant *wpa_s);
|
|
|
|
DBusMessage * wpas_dbus_handler_remove_all_networks(
|
|
DBusMessage *message, struct wpa_supplicant *wpa_s);
|
|
|
|
DBusMessage * wpas_dbus_handler_select_network(DBusMessage *message,
|
|
struct wpa_supplicant *wpa_s);
|
|
|
|
DBusMessage * wpas_dbus_handler_network_reply(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_handler_set_pkcs11_engine_and_module_path(
|
|
DBusMessage *message, struct wpa_supplicant *wpa_s);
|
|
|
|
DBusMessage * wpas_dbus_handler_flush_bss(DBusMessage *message,
|
|
struct wpa_supplicant *wpa_s);
|
|
|
|
DBusMessage * wpas_dbus_handler_autoscan(DBusMessage *message,
|
|
struct wpa_supplicant *wpa_s);
|
|
|
|
DBusMessage * wpas_dbus_handler_eap_logoff(DBusMessage *message,
|
|
struct wpa_supplicant *wpa_s);
|
|
|
|
DBusMessage * wpas_dbus_handler_eap_logon(DBusMessage *message,
|
|
struct wpa_supplicant *wpa_s);
|
|
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_capabilities);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_state);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_scanning);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_ap_scan);
|
|
DECLARE_ACCESSOR(wpas_dbus_setter_ap_scan);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_fast_reauth);
|
|
DECLARE_ACCESSOR(wpas_dbus_setter_fast_reauth);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_disconnect_reason);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_disassociate_reason);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_assoc_status_code);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_bss_expire_age);
|
|
DECLARE_ACCESSOR(wpas_dbus_setter_bss_expire_age);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_bss_expire_count);
|
|
DECLARE_ACCESSOR(wpas_dbus_setter_bss_expire_count);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_country);
|
|
DECLARE_ACCESSOR(wpas_dbus_setter_country);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_scan_interval);
|
|
DECLARE_ACCESSOR(wpas_dbus_setter_scan_interval);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_ifname);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_driver);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_bridge_ifname);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_config_file);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_current_bss);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_current_network);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_current_auth_mode);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_bsss);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_networks);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_pkcs11_engine_path);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_pkcs11_module_path);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_blobs);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_bss_bssid);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_bss_ssid);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_bss_privacy);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_bss_mode);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_bss_signal);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_bss_frequency);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_bss_rates);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_bss_wpa);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_bss_rsn);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_bss_wps);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_bss_ies);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_bss_age);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_enabled);
|
|
DECLARE_ACCESSOR(wpas_dbus_setter_enabled);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_network_properties);
|
|
DECLARE_ACCESSOR(wpas_dbus_setter_network_properties);
|
|
|
|
DBusMessage * wpas_dbus_handler_wps_start(DBusMessage *message,
|
|
struct wpa_supplicant *wpa_s);
|
|
|
|
DBusMessage * wpas_dbus_handler_wps_cancel(DBusMessage *message,
|
|
struct wpa_supplicant *wpa_s);
|
|
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_process_credentials);
|
|
DECLARE_ACCESSOR(wpas_dbus_setter_process_credentials);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_config_methods);
|
|
DECLARE_ACCESSOR(wpas_dbus_setter_config_methods);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_wps_device_name);
|
|
DECLARE_ACCESSOR(wpas_dbus_setter_wps_device_name);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_wps_manufacturer);
|
|
DECLARE_ACCESSOR(wpas_dbus_setter_wps_manufacturer);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_wps_device_model_name);
|
|
DECLARE_ACCESSOR(wpas_dbus_setter_wps_device_model_name);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_wps_device_model_number);
|
|
DECLARE_ACCESSOR(wpas_dbus_setter_wps_device_model_number);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_wps_device_serial_number);
|
|
DECLARE_ACCESSOR(wpas_dbus_setter_wps_device_serial_number);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_wps_device_device_type);
|
|
DECLARE_ACCESSOR(wpas_dbus_setter_wps_device_device_type);
|
|
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_mesh_peers);
|
|
DECLARE_ACCESSOR(wpas_dbus_getter_mesh_group);
|
|
|
|
DBusMessage * wpas_dbus_handler_tdls_discover(DBusMessage *message,
|
|
struct wpa_supplicant *wpa_s);
|
|
DBusMessage * wpas_dbus_handler_tdls_setup(DBusMessage *message,
|
|
struct wpa_supplicant *wpa_s);
|
|
DBusMessage * wpas_dbus_handler_tdls_status(DBusMessage *message,
|
|
struct wpa_supplicant *wpa_s);
|
|
DBusMessage * wpas_dbus_handler_tdls_teardown(DBusMessage *message,
|
|
struct wpa_supplicant *wpa_s);
|
|
DBusMessage *
|
|
wpas_dbus_handler_tdls_channel_switch(DBusMessage *message,
|
|
struct wpa_supplicant *wpa_s);
|
|
DBusMessage *
|
|
wpas_dbus_handler_tdls_cancel_channel_switch(DBusMessage *message,
|
|
struct wpa_supplicant *wpa_s);
|
|
|
|
DBusMessage * wpas_dbus_handler_vendor_elem_add(DBusMessage *message,
|
|
struct wpa_supplicant *wpa_s);
|
|
DBusMessage * wpas_dbus_handler_vendor_elem_get(DBusMessage *message,
|
|
struct wpa_supplicant *wpa_s);
|
|
DBusMessage * wpas_dbus_handler_vendor_elem_remove(
|
|
DBusMessage *message, struct wpa_supplicant *wpa_s);
|
|
|
|
DBusMessage * wpas_dbus_handler_save_config(DBusMessage *message,
|
|
struct wpa_supplicant *wpa_s);
|
|
|
|
DBusMessage * wpas_dbus_error_invalid_args(DBusMessage *message,
|
|
const char *arg);
|
|
DBusMessage * wpas_dbus_error_unknown_error(DBusMessage *message,
|
|
const char *arg);
|
|
DBusMessage * wpas_dbus_error_no_memory(DBusMessage *message);
|
|
|
|
DBusMessage * wpas_dbus_handler_subscribe_preq(
|
|
DBusMessage *message, struct wpa_supplicant *wpa_s);
|
|
DBusMessage * wpas_dbus_handler_unsubscribe_preq(
|
|
DBusMessage *message, struct wpa_supplicant *wpa_s);
|
|
|
|
#endif /* CTRL_IFACE_DBUS_HANDLERS_NEW_H */
|