Remove disconnected APs from BSS table if likely out-of-range

[mech_eap.git] / wpa_supplicant / dbus / dbus_new_handlers_p2p.h

diff --git a/wpa_supplicant/dbus/dbus_new_handlers_p2p.h b/wpa_supplicant/dbus/dbus_new_handlers_p2p.h
index b0c1929..c4c0261 100644 (file)
--- a/wpa_supplicant/dbus/dbus_new_handlers_p2p.h
+++ b/wpa_supplicant/dbus/dbus_new_handlers_p2p.h
@@ -1,15 +1,9 @@
-
 /*
  * WPA Supplicant / dbus-based control interface for p2p
+ * Copyright (c) 2011-2012, Intel Corporation
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
  */
 
 #ifndef DBUS_NEW_HANDLERS_P2P_H
@@ -20,11 +14,6 @@ struct peer_handler_args {
        u8 p2p_device_addr[ETH_ALEN];
 };
 
-struct groupmember_handler_args {
-       struct wpa_supplicant *wpa_s;
-       u8 member_addr[ETH_ALEN];
-};
-
 /*
  * P2P Device methods
  */
@@ -57,6 +46,9 @@ DBusMessage *wpas_dbus_handler_p2p_connect(
                DBusMessage *message,
                struct wpa_supplicant *wpa_s);
 
+DBusMessage * wpas_dbus_handler_p2p_cancel(DBusMessage *message,
+                                          struct wpa_supplicant *wpa_s);
+
 DBusMessage *wpas_dbus_handler_p2p_invite(
                DBusMessage *message,
                struct wpa_supplicant *wpa_s);
@@ -64,6 +56,9 @@ DBusMessage *wpas_dbus_handler_p2p_invite(
 DBusMessage *wpas_dbus_handler_p2p_disconnect(
        DBusMessage *message, struct wpa_supplicant *wpa_s);
 
+DBusMessage * wpas_dbus_handler_p2p_remove_client(
+       DBusMessage *message, struct wpa_supplicant *wpa_s);
+
 DBusMessage *wpas_dbus_handler_p2p_flush(
        DBusMessage *message, struct wpa_supplicant *wpa_s);
 
@@ -94,49 +89,63 @@ DBusMessage *wpas_dbus_handler_p2p_serv_disc_external(
 /*
  * P2P Device property accessor methods.
  */
-DBusMessage *wpas_dbus_setter_p2p_device_properties(DBusMessage *message,
-                                     struct wpa_supplicant *wpa_s);
-
-DBusMessage *wpas_dbus_getter_p2p_device_properties(DBusMessage *message,
-                                     struct wpa_supplicant *wpa_s);
-
-DBusMessage *wpas_dbus_getter_p2p_peers(DBusMessage *message,
-                                         struct wpa_supplicant *wpa_s);
-
-DBusMessage *wpas_dbus_getter_p2p_role(DBusMessage *message,
-                                         struct wpa_supplicant *wpa_s);
-
-DBusMessage *wpas_dbus_getter_p2p_group(DBusMessage *message,
-                                         struct wpa_supplicant *wpa_s);
-
-DBusMessage *wpas_dbus_getter_p2p_peergo(DBusMessage *message,
-                                         struct wpa_supplicant *wpa_s);
+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);
 
 /*
  * P2P Peer properties.
  */
-DBusMessage *wpas_dbus_getter_p2p_peer_properties(
-               DBusMessage *message,
-               struct peer_handler_args *peer);
-
-DBusMessage *wpas_dbus_getter_p2p_peer_ies(
-               DBusMessage *message,
-               struct peer_handler_args *peer);
+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);
 
 /*
  * P2P Group properties
  */
+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);
 
-DBusMessage *wpas_dbus_getter_p2p_group_members(
-               DBusMessage *message,
-               struct wpa_supplicant *wpa_s);
+/*
+ * P2P Persistent Groups and properties
+ */
+DECLARE_ACCESSOR(wpas_dbus_getter_persistent_groups);
+DECLARE_ACCESSOR(wpas_dbus_getter_persistent_group_properties);
+DECLARE_ACCESSOR(wpas_dbus_setter_persistent_group_properties);
 
-DBusMessage *wpas_dbus_getter_p2p_group_properties(
-               DBusMessage *message,
-               struct wpa_supplicant *wpa_s);
+DBusMessage * wpas_dbus_handler_add_persistent_group(
+       DBusMessage *message, struct wpa_supplicant *wpa_s);
 
-DBusMessage *wpas_dbus_setter_p2p_group_properties(
-               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);
+
+#ifdef CONFIG_WIFI_DISPLAY
+DECLARE_ACCESSOR(wpas_dbus_getter_global_wfd_ies);
+DECLARE_ACCESSOR(wpas_dbus_setter_global_wfd_ies);
+#endif /* CONFIG_WIFI_DISPLAY */
 
 #endif /* DBUS_NEW_HANDLERS_P2P_H */