6,13c6,7
< * 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.
18a13,15
> #include "common/defs.h"
> #include "p2p/p2p.h"
>
25d21
< enum wpa_states;
32a29,31
> WPAS_DBUS_PROP_CURRENT_AUTH_MODE,
> WPAS_DBUS_PROP_BSSS,
> WPAS_DBUS_PROP_DISCONNECT_REASON,
42a42
> WPAS_DBUS_BSS_PROP_WPS,
61a62,63
> #define WPAS_DBUS_NEW_IFACE_P2PDEVICE \
> WPAS_DBUS_NEW_IFACE_INTERFACE ".P2PDevice"
62a65,85
> /*
> * Groups correspond to P2P groups where this device is a GO (owner)
> */
> #define WPAS_DBUS_NEW_P2P_GROUPS_PART "Groups"
> #define WPAS_DBUS_NEW_IFACE_P2P_GROUP WPAS_DBUS_NEW_INTERFACE ".Group"
>
> /*
> * Different dbus object for persistent groups so they do not get confused
> * with regular (configured) network objects.
> */
> #define WPAS_DBUS_NEW_PERSISTENT_GROUPS_PART "PersistentGroups"
> #define WPAS_DBUS_NEW_IFACE_PERSISTENT_GROUP \
> WPAS_DBUS_NEW_INTERFACE ".PersistentGroup"
>
> #define WPAS_DBUS_NEW_P2P_PEERS_PART "Peers"
> #define WPAS_DBUS_NEW_IFACE_P2P_PEER WPAS_DBUS_NEW_INTERFACE ".Peer"
>
> #define WPAS_DBUS_NEW_P2P_GROUPMEMBERS_PART "Members"
> #define WPAS_DBUS_NEW_IFACE_P2P_GROUPMEMBER \
> WPAS_DBUS_NEW_INTERFACE ".GroupMember"
>
78a102,108
> #define WPAS_DBUS_ERROR_CONNECT_CHANNEL_UNAVAILABLE \
> WPAS_DBUS_NEW_INTERFACE ".ConnectChannelUnavailable"
> #define WPAS_DBUS_ERROR_CONNECT_CHANNEL_UNSUPPORTED \
> WPAS_DBUS_NEW_INTERFACE ".ConnectChannelUnsupported"
> #define WPAS_DBUS_ERROR_CONNECT_UNSPECIFIED_ERROR \
> WPAS_DBUS_NEW_INTERFACE ".ConnectUnspecifiedError"
>
83a114,119
> #define WPAS_DBUS_ERROR_SUBSCRIPTION_IN_USE \
> WPAS_DBUS_NEW_INTERFACE ".SubscriptionInUse"
> #define WPAS_DBUS_ERROR_NO_SUBSCRIPTION \
> WPAS_DBUS_NEW_INTERFACE ".NoSubscription"
> #define WPAS_DBUS_ERROR_SUBSCRIPTION_EPERM \
> WPAS_DBUS_NEW_INTERFACE ".SubscriptionNotYou"
84a121,125
>
> void wpas_dbus_subscribe_noc(struct wpas_dbus_priv *priv);
> void wpas_dbus_unsubscribe_noc(struct wpas_dbus_priv *priv);
>
>
99a141,144
> void wpas_dbus_signal_network_request(struct wpa_supplicant *wpa_s,
> struct wpa_ssid *ssid,
> enum wpa_ctrl_req_type rtype,
> const char *default_text);
122a168,225
> int wpas_dbus_register_peer(struct wpa_supplicant *wpa_s, const u8 *dev_addr);
> void wpas_dbus_signal_peer_device_found(struct wpa_supplicant *wpa_s,
> const u8 *dev_addr);
> int wpas_dbus_unregister_peer(struct wpa_supplicant *wpa_s,
> const u8 *dev_addr);
> void wpas_dbus_signal_peer_device_lost(struct wpa_supplicant *wpa_s,
> const u8 *dev_addr);
> void wpas_dbus_signal_p2p_group_removed(struct wpa_supplicant *wpa_s,
> const char *role);
> void wpas_dbus_signal_p2p_provision_discovery(struct wpa_supplicant *wpa_s,
> const u8 *dev_addr, int request,
> enum p2p_prov_disc_status status,
> u16 config_methods,
> unsigned int generated_pin);
> void wpas_dbus_signal_p2p_go_neg_req(struct wpa_supplicant *wpa_s,
> const u8 *src, u16 dev_passwd_id);
> void wpas_dbus_signal_p2p_group_started(struct wpa_supplicant *wpa_s,
> const struct wpa_ssid *ssid,
> int client, int network_id);
> void wpas_dbus_register_p2p_group(struct wpa_supplicant *wpa_s,
> struct wpa_ssid *ssid);
> void wpas_dbus_signal_p2p_go_neg_resp(struct wpa_supplicant *wpa_s,
> struct p2p_go_neg_results *res);
> void wpas_dbus_unregister_p2p_group(struct wpa_supplicant *wpa_s,
> const struct wpa_ssid *ssid);
> int wpas_dbus_register_persistent_group(struct wpa_supplicant *wpa_s,
> struct wpa_ssid *ssid);
> int wpas_dbus_unregister_persistent_group(struct wpa_supplicant *wpa_s,
> int nid);
> void wpas_dbus_signal_p2p_invitation_result(struct wpa_supplicant *wpa_s,
> int status, const u8 *bssid);
> void wpas_dbus_register_p2p_groupmember(struct wpa_supplicant *wpa_s,
> const u8 *p2p_if_addr);
> void wpas_dbus_unregister_p2p_groupmember(struct wpa_supplicant *wpa_s,
> const u8 *p2p_if_addr);
> void wpas_dbus_signal_p2p_peer_disconnected(struct wpa_supplicant *wpa_s,
> const u8 *member);
> void wpas_dbus_signal_p2p_sd_request(struct wpa_supplicant *wpa_s,
> int freq, const u8 *sa, u8 dialog_token,
> u16 update_indic, const u8 *tlvs,
> size_t tlvs_len);
> void wpas_dbus_signal_p2p_sd_response(struct wpa_supplicant *wpa_s,
> const u8 *sa, u16 update_indic,
> const u8 *tlvs, size_t tlvs_len);
> void wpas_dbus_signal_p2p_peer_joined(struct wpa_supplicant *wpa_s,
> const u8 *member);
> void wpas_dbus_signal_p2p_wps_failed(struct wpa_supplicant *wpa_s,
> struct wps_event_fail *fail);
> void wpas_dbus_signal_certification(struct wpa_supplicant *wpa_s,
> int depth, const char *subject,
> const char *cert_hash,
> const struct wpabuf *cert);
> void wpas_dbus_signal_preq(struct wpa_supplicant *wpa_s,
> const u8 *addr, const u8 *dst, const u8 *bssid,
> const u8 *ie, size_t ie_len, u32 ssi_signal);
> void wpas_dbus_signal_eap_status(struct wpa_supplicant *wpa_s,
> const char *status, const char *parameter);
>
157a261,266
> static inline void wpas_dbus_signal_network_request(
> struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid,
> enum wpa_ctrl_req_type rtype, const char *default_txt)
> {
> }
>
231a341,495
> static inline int wpas_dbus_register_peer(struct wpa_supplicant *wpa_s,
> const u8 *dev_addr)
> {
> return 0;
> }
>
> static inline int wpas_dbus_unregister_peer(struct wpa_supplicant *wpa_s,
> const u8 *dev_addr)
> {
> return 0;
> }
>
> static inline void
> wpas_dbus_signal_p2p_group_removed(struct wpa_supplicant *wpa_s,
> const char *role)
> {
> }
>
> static inline void
> wpas_dbus_signal_p2p_provision_discovery(struct wpa_supplicant *wpa_s,
> const u8 *dev_addr, int request,
> enum p2p_prov_disc_status status,
> u16 config_methods,
> unsigned int generated_pin)
> {
> }
>
> static inline void wpas_dbus_signal_p2p_go_neg_req(
> struct wpa_supplicant *wpa_s,
> const u8 *src,
> u16 dev_passwd_id)
> {
> }
>
> static inline void
> wpas_dbus_signal_p2p_group_started(struct wpa_supplicant *wpa_s,
> const struct wpa_ssid *ssid,
> int client, int network_id)
> {
> }
>
> static inline void
> wpas_dbus_register_p2p_group(struct wpa_supplicant *wpa_s,
> struct wpa_ssid *ssid)
> {
> }
>
> static inline int wpas_dbus_register_persistent_group(
> struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid)
> {
> return 0;
> }
>
> static inline int wpas_dbus_unregister_persistent_group(
> struct wpa_supplicant *wpa_s, int nid)
> {
> return 0;
> }
>
> static inline void
> wpas_dbus_signal_p2p_go_neg_resp(struct wpa_supplicant *wpa_s,
> struct p2p_go_neg_results *res)
> {
> }
>
> static inline void
> wpas_dbus_unregister_p2p_group(struct wpa_supplicant *wpa_s,
> const struct wpa_ssid *ssid)
> {
> }
>
> static inline void wpas_dbus_signal_p2p_invitation_result(
> struct wpa_supplicant *wpa_s, int status,
> const u8 *bssid)
> {
> }
>
> static inline void
> wpas_dbus_register_p2p_groupmember(struct wpa_supplicant *wpa_s,
> const u8 *p2p_if_addr)
> {
> }
>
> static inline void
> wpas_dbus_signal_p2p_sd_request(struct wpa_supplicant *wpa_s, int freq,
> const u8 *sa, u8 dialog_token, u16 update_indic,
> const u8 *tlvs, size_t tlvs_len)
> {
> }
>
> static inline void
> wpas_dbus_signal_p2p_sd_response(struct wpa_supplicant *wpa_s,
> const u8 *sa, u16 update_indic,
> const u8 *tlvs, size_t tlvs_len)
> {
> }
>
> static inline void
> wpas_dbus_unregister_p2p_groupmember(struct wpa_supplicant *wpa_s,
> const u8 *p2p_if_addr)
> {
> }
>
> static inline void
> wpas_dbus_signal_p2p_peer_joined(struct wpa_supplicant *wpa_s,
> const u8 *member)
> {
> }
>
> static inline void
> wpas_dbus_signal_peer_device_found(struct wpa_supplicant *wpa_s,
> const u8 *dev_addr)
> {
> }
>
> static inline void
> wpas_dbus_signal_peer_device_lost(struct wpa_supplicant *wpa_s,
> const u8 *dev_addr)
> {
> }
>
> static inline void
> wpas_dbus_signal_p2p_peer_disconnected(struct wpa_supplicant *wpa_s,
> const u8 *member)
> {
> }
>
> static inline void
> wpas_dbus_signal_p2p_wps_failed(struct wpa_supplicant *wpa_s,
> struct wps_event_fail *fail)
> {
> }
>
> static inline void wpas_dbus_signal_certification(struct wpa_supplicant *wpa_s,
> int depth,
> const char *subject,
> const char *cert_hash,
> const struct wpabuf *cert)
> {
> }
>
> static inline void wpas_dbus_signal_preq(struct wpa_supplicant *wpa_s,
> const u8 *addr, const u8 *dst,
> const u8 *bssid,
> const u8 *ie, size_t ie_len,
> u32 ssi_signal)
> {
> }
>
> static inline void wpas_dbus_signal_eap_status(struct wpa_supplicant *wpa_s,
> const char *status,
> const char *parameter)
> {
> }
>