jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
hostap/wpa_supplicant/dbus/dbus_new_handlers_p2p.h

153 lines
5.1 KiB
C
Raw Permalink Normal View History

DBus: Add support for P2P primitives Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-13 00:08:19 +02:00
/*
* WPA Supplicant / dbus-based control interface for p2p
Update copyright and license notification in D-Bus interace P2P files This adds the copyright notice for Intel and moves to the license notification that uses only the BSD license. The changes were acknowledged by email ("Berg, Johannes" <johannes.berg@intel.com>, Mon, 7 May 2012 07:33:53 +0000). Signed-hostap: Jouni Malinen <j@w1.fi>
2012-05-07 12:07:22 +02:00
* Copyright (c) 2011-2012, Intel Corporation
DBus: Add support for P2P primitives Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-13 00:08:19 +02:00
*
Update copyright and license notification in D-Bus interace P2P files This adds the copyright notice for Intel and moves to the license notification that uses only the BSD license. The changes were acknowledged by email ("Berg, Johannes" <johannes.berg@intel.com>, Mon, 7 May 2012 07:33:53 +0000). Signed-hostap: Jouni Malinen <j@w1.fi>
2012-05-07 12:07:22 +02:00
* This software may be distributed under the terms of the BSD license.
* See README for more details.
DBus: Add support for P2P primitives Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-13 00:08:19 +02:00
*/
#ifndef DBUS_NEW_HANDLERS_P2P_H
#define DBUS_NEW_HANDLERS_P2P_H
struct peer_handler_args {
struct wpa_supplicant *wpa_s;
u8 p2p_device_addr[ETH_ALEN];
};
/*
* P2P Device methods
*/
DBusMessage *wpas_dbus_handler_p2p_find(
DBusMessage *message, struct wpa_supplicant *wpa_s);
DBusMessage *wpas_dbus_handler_p2p_stop_find(
DBusMessage *message, struct wpa_supplicant *wpa_s);
DBusMessage *wpas_dbus_handler_p2p_rejectpeer(
DBusMessage *message, struct wpa_supplicant *wpa_s);
DBusMessage *wpas_dbus_handler_p2p_listen(
DBusMessage *message, struct wpa_supplicant *wpa_s);
DBusMessage *wpas_dbus_handler_p2p_extendedlisten(
DBusMessage *message, struct wpa_supplicant *wpa_s);
DBusMessage *wpas_dbus_handler_p2p_presence_request(
DBusMessage *message, struct wpa_supplicant *wpa_s);
DBusMessage *wpas_dbus_handler_p2p_prov_disc_req(
DBusMessage *message, struct wpa_supplicant *wpa_s);
DBusMessage *wpas_dbus_handler_p2p_group_add(
DBusMessage *message, struct wpa_supplicant *wpa_s);
DBusMessage *wpas_dbus_handler_p2p_connect(
DBusMessage *message,
struct wpa_supplicant *wpa_s);
P2P: Add P2P Cancel method over D-Bus interface This patch adds P2P Cancel method over fi.w1.wpa_supplicant1.Interface.P2PDevice dbus interface. Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>
2015-05-26 07:05:47 +02:00
DBusMessage * wpas_dbus_handler_p2p_cancel(DBusMessage *message,
struct wpa_supplicant *wpa_s);
DBus: Add support for P2P primitives Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-13 00:08:19 +02:00
DBusMessage *wpas_dbus_handler_p2p_invite(
DBusMessage *message,
struct wpa_supplicant *wpa_s);
DBusMessage *wpas_dbus_handler_p2p_disconnect(
DBusMessage *message, struct wpa_supplicant *wpa_s);
dbus: Add RemoveClient method to remove a client from local GO This is equivalent to the P2P_REMOVE_CLIENT command on control interface. This can be used to remove the specified client [as object path or string format interface address] from all groups (operating and persistent) from the local GO. Argument(s): peer[object path] OR iface[string format MAC address] Signed-off-by: Purushottam Kushwaha <p.kushwaha@samsung.com> Signed-off-by: Jijo Jacob <jijo.jacob@samsung.com>
2015-06-16 13:35:56 +02:00
DBusMessage * wpas_dbus_handler_p2p_remove_client(
DBusMessage *message, struct wpa_supplicant *wpa_s);
DBus: Add support for P2P primitives Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-13 00:08:19 +02:00
DBusMessage *wpas_dbus_handler_p2p_flush(
DBusMessage *message, struct wpa_supplicant *wpa_s);
DBusMessage *wpas_dbus_handler_p2p_add_service(
DBusMessage *message, struct wpa_supplicant *wpa_s);
DBusMessage *wpas_dbus_handler_p2p_delete_service(
DBusMessage *message, struct wpa_supplicant *wpa_s);
DBusMessage *wpas_dbus_handler_p2p_flush_service(
DBusMessage *message, struct wpa_supplicant *wpa_s);
DBusMessage *wpas_dbus_handler_p2p_service_sd_req(
DBusMessage *message, struct wpa_supplicant *wpa_s);
DBusMessage *wpas_dbus_handler_p2p_service_sd_res(
DBusMessage *message, struct wpa_supplicant *wpa_s);
DBusMessage *wpas_dbus_handler_p2p_service_sd_cancel_req(
DBusMessage *message, struct wpa_supplicant *wpa_s);
DBusMessage *wpas_dbus_handler_p2p_service_update(
DBusMessage *message, struct wpa_supplicant *wpa_s);
DBusMessage *wpas_dbus_handler_p2p_serv_disc_external(
DBusMessage *message, struct wpa_supplicant *wpa_s);
/*
* P2P Device property accessor methods.
*/
dbus: Pass property description to getters/setters We'll use it later for global interface properties. Signed-off-by: Dan Williams <dcbw@redhat.com>
2015-10-13 18:45:33 +02:00
DECLARE_ACCESSOR(wpas_dbus_setter_p2p_device_config);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_device_config);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peers);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_role);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_group);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peergo);
DBus: Add support for P2P primitives Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-13 00:08:19 +02:00
/*
* P2P Peer properties.
*/
dbus: Pass property description to getters/setters We'll use it later for global interface properties. Signed-off-by: Dan Williams <dcbw@redhat.com>
2015-10-13 18:45:33 +02:00
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_device_name);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_manufacturer);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_modelname);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_modelnumber);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_serialnumber);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_primary_device_type);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_config_method);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_level);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_device_capability);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_group_capability);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_secondary_device_types);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_vendor_extension);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_ies);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_device_address);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_groups);
dbus: Add vendor specific information element in peer properties Make vendor specific information elements (VSIE) available in peer properties, so that VSIE of a specific peer can be retrieved using peer's object path. Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>
2018-02-16 13:02:39 +01:00
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_peer_vsie);
dbus: Add a Groups property to a Peer object on which it belongs If only the Peer is part of one or more group, this property will tell those via listing their object paths. Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
2014-06-02 16:42:05 +02:00
DBus: Add support for P2P primitives Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-13 00:08:19 +02:00
/*
* P2P Group properties
*/
dbus: Pass property description to getters/setters We'll use it later for global interface properties. Signed-off-by: Dan Williams <dcbw@redhat.com>
2015-10-13 18:45:33 +02:00
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_group_members);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_group_ssid);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_group_bssid);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_group_frequency);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_group_passphrase);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_group_psk);
DECLARE_ACCESSOR(wpas_dbus_getter_p2p_group_vendor_ext);
DECLARE_ACCESSOR(wpas_dbus_setter_p2p_group_vendor_ext);
DBus: Add support for P2P primitives Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-13 00:08:19 +02:00
P2P: Update D-Bus network object semantics during group formation Do not emit network objects during P2P group formation since such network objects can confuse certain apps. Instead, a persistent group object is created to allow apps to keep track of persistent groups. Persistent group objects only represent the info needed to recreate the group. Also fixes a minor bug in the handling of persistent group objects during WPS operations. Signed-off-by: Jayant Sane <jayant.sane@intel.com>
2011-06-23 20:25:13 +02:00
/*
P2P: More complete persistent group management over D-Bus Extend commit c2762e410fa319f75a174aeb12343beddf99fce4 to allow applications to manage (add/remove) persistent groups and accepted network object paths while invoking a persistent group.
2011-06-24 10:20:19 +02:00
* P2P Persistent Groups and properties
P2P: Update D-Bus network object semantics during group formation Do not emit network objects during P2P group formation since such network objects can confuse certain apps. Instead, a persistent group object is created to allow apps to keep track of persistent groups. Persistent group objects only represent the info needed to recreate the group. Also fixes a minor bug in the handling of persistent group objects during WPS operations. Signed-off-by: Jayant Sane <jayant.sane@intel.com>
2011-06-23 20:25:13 +02:00
*/
dbus: Pass property description to getters/setters We'll use it later for global interface properties. Signed-off-by: Dan Williams <dcbw@redhat.com>
2015-10-13 18:45:33 +02:00
DECLARE_ACCESSOR(wpas_dbus_getter_persistent_groups);
DECLARE_ACCESSOR(wpas_dbus_getter_persistent_group_properties);
DECLARE_ACCESSOR(wpas_dbus_setter_persistent_group_properties);
dbus: clean up new D-Bus interface getters and setters A number of fixes/improvements here: 1) Remove casting of getter/setter function types which allows us to change the prototypes in the future and not have hard-to-find runtime segfaults 2) Instead of having the getters create a fake reply message which then gets its arguments copied into the real reply message, and is then disposed, just pass message iters around and have them add their arguments to the message itself 3) For setters, just pass in the message iter positioned at the start of the argument list, instead of each setter having to skip over the standard interface+property name 4) Convert error handling to use DBusError and return the error back down through the call stacks to the function that will actually send the error back to the caller, instead of having a fake DBusMessage of type DBUS_MESSAGE_TYPE_ERROR that then needs to have the error extracted from it. But most of all, this fixes various segfaults (like rh #725517 and #678625) which were caused by some functions deep down in the getter callpaths wanting a source DBusMessage* when the getters were used for two things: signals (which don't have a source DBusMessage) and methods (which will have a source DBusMessage that's being replied to). This duality made the code fragile when handling errors like invalid IEs over the air. Signed-off-by: Dan Williams <dcbw@redhat.com>
2011-07-29 20:25:39 +02:00
P2P: More complete persistent group management over D-Bus Extend commit c2762e410fa319f75a174aeb12343beddf99fce4 to allow applications to manage (add/remove) persistent groups and accepted network object paths while invoking a persistent group.
2011-06-24 10:20:19 +02:00
DBusMessage * wpas_dbus_handler_add_persistent_group(
DBusMessage *message, struct wpa_supplicant *wpa_s);
DBusMessage * wpas_dbus_handler_remove_persistent_group(
DBusMessage *message, struct wpa_supplicant *wpa_s);
DBusMessage * wpas_dbus_handler_remove_all_persistent_groups(
DBusMessage *message, struct wpa_supplicant *wpa_s);
dbus: Add a global property to set or unset WFD IEs This permits to set or unset the WiFi Display subelements from DBus, by providing the full WFD specific IE frame. Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
2014-09-15 07:04:31 +02:00
#ifdef CONFIG_WIFI_DISPLAY
dbus: Pass property description to getters/setters We'll use it later for global interface properties. Signed-off-by: Dan Williams <dcbw@redhat.com>
2015-10-13 18:45:33 +02:00
DECLARE_ACCESSOR(wpas_dbus_getter_global_wfd_ies);
DECLARE_ACCESSOR(wpas_dbus_setter_global_wfd_ies);
dbus: Add a global property to set or unset WFD IEs This permits to set or unset the WiFi Display subelements from DBus, by providing the full WFD specific IE frame. Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
2014-09-15 07:04:31 +02:00
#endif /* CONFIG_WIFI_DISPLAY */
P2P: Update D-Bus network object semantics during group formation Do not emit network objects during P2P group formation since such network objects can confuse certain apps. Instead, a persistent group object is created to allow apps to keep track of persistent groups. Persistent group objects only represent the info needed to recreate the group. Also fixes a minor bug in the handling of persistent group objects during WPS operations. Signed-off-by: Jayant Sane <jayant.sane@intel.com>
2011-06-23 20:25:13 +02:00
DBus: Add support for P2P primitives Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-13 00:08:19 +02:00
#endif /* DBUS_NEW_HANDLERS_P2P_H */
Reference in a new issue Copy permalink