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

343 lines
12 KiB
C
Raw Normal View History

P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/*
* wpa_supplicant - P2P
* Copyright (c) 2009-2010, Atheros Communications
*
Remove the GPL notification from files contributed by Atheros Remove the GPL notification text from files that were initially contributed by Atheros Communications or Qualcomm Atheros. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-02-11 15:31:36 +01:00
* This software may be distributed under the terms of the BSD license.
* See README for more details.
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
*/
#ifndef P2P_SUPPLICANT_H
#define P2P_SUPPLICANT_H
enum p2p_wps_method;
Fix build without CONFIG_P2P=y
2010-09-09 16:20:28 +02:00
struct p2p_go_neg_results;
P2P: Skip GO Neg Conf ack failure workaround of send failures The workaround to ignore no ctrl::ack received for GO Negotiation Confirmation frame was only supposed to be used when the frame was actually transmitted and just the ack was not received. However, due to the way the driver failure on transmitting the frame were reported, this ended up getting applied for all failures in sending the GO Negotiation Confirmation frame. Improve this by providing a mechanism to indicate whether send_action operations fail locally before the frame was actually transmitted or because of not receiving ack frame after having transmitted the frame.
2010-10-19 11:47:33 +02:00
enum p2p_send_action_result;
P2P: Embed publically visible struct in peer info This embeds some information about each P2P peer that will be publically visible in a struct that is shared. The dev_found notification function is also passed the new struct, which requires some work for the driver-based P2P management. Signed-off-by: Konguraj(Raj) Kulanthaivel <konguraj.kulanthaivel@intel.com> Signed-off-by: Fabien Marotte <fabienx.marotte@linux.intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-24 20:51:17 +01:00
struct p2p_peer_info;
P2P: Use peer's channel list to limit GO freq on invitation Peer device includes its list of allowed operating channels in the Invitation Response frame. When we are becoming the GO, use that list from the peer to filter out acceptable channels to avoid selecting a channel that the peer is unable to use. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-01 13:22:29 +01:00
struct p2p_channels;
P2P: Create P2P Device interface if supported If the capability flag of the driver indicates a dedicated P2P Device is supported, a P2P Device interface is created. Create the P2P Device in main interface creation loop when the added interface flags support and P2P supplicant is not yet initialized avoiding recursion of add_interface. Do not register l2_packet for P2P Device interface (both for EAPOL and for TDLS). Signed-hostap: Arend van Spriel <arend@broadcom.com>
2013-06-30 09:17:47 +02:00
struct wps_event_fail;
P2PS: Process P2PS provisioning commands This extends wpas_p2p_prov_disc() implementation to accept P2PS parameters. None of the callers are yet using this functionality; the following commit introduces a user. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 15:25:18 +01:00
struct p2ps_provision;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Do not perform P2P GO CS in some cases A P2P GO channel switch should not be triggered in all cases that require channel list update. Specifically, a P2P GO CS should not be triggered in case that the P2P GO state changed or in case that that the P2P GO has just completed a CS. To fix this, add reason code to wpas_p2p_channel_list_update() and trigger CS flow only for the relevant cases. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:27 +02:00
enum wpas_p2p_channel_update_trig {
WPAS_P2P_CHANNEL_UPDATE_ANY,
WPAS_P2P_CHANNEL_UPDATE_DRIVER,
WPAS_P2P_CHANNEL_UPDATE_STATE_CHANGE,
WPAS_P2P_CHANNEL_UPDATE_AVOID,
WPAS_P2P_CHANNEL_UPDATE_DISALLOW,
WPAS_P2P_CHANNEL_UPDATE_CS,
};
P2P: Use only the -m config for P2P management device Previously, the case of non-netdev P2P management device ended up pulling in both the main interface (e.g., wlan0) and P2P Device interface (from command line -m argument) as configuration. Similarly, the main interface ended up included both configuration files. This is not really helpful for various use cases, e.g., when permanent P2P group information is stored in the P2P Devince interface, but it gets duplicated in the main station interface configuration. Clean this up by changing the -m<file> argument to replace, not concatenate, configuration information. In other words, the main station interface will not read this configuration and the P2P Device interface (non-netdev) does not read parameters from the station interface configuration file. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-03 21:50:21 +02:00
int wpas_p2p_add_p2pdev_interface(struct wpa_supplicant *wpa_s,
const char *conf_p2p_dev);
P2P: Add utility functions to get GO/client interface This will be useful for a peer to know if it is part of a group either as a client of our local GO or as the peer GO. Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
2014-06-02 16:42:04 +02:00
struct wpa_supplicant * wpas_get_p2p_go_iface(struct wpa_supplicant *wpa_s,
const u8 *ssid, size_t ssid_len);
struct wpa_supplicant * wpas_get_p2p_client_iface(struct wpa_supplicant *wpa_s,
const u8 *peer_dev_addr);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
int wpas_p2p_connect(struct wpa_supplicant *wpa_s, const u8 *peer_addr,
const char *pin, enum p2p_wps_method wps_method,
P2P: Add automatic GO Negotiation vs. join-a-group selection p2p_connect command can now be used with an optional "auto" parameter to request wpa_supplicant to determine automatically whether to use join-a-group operation (if the peer is operating as a GO) or group formation. This makes it easier for external programs to handle connection type selection by offloading this to wpa_supplicant. The previously used p2p_connect join commands can be replaced with p2p_connect auto to use this new mechanism. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-13 15:04:36 +02:00
int persistent_group, int auto_join, int join,
P2P: Add support for VHT 80+80 MHz and 160 MHz The new max_oper_chwidth and freq2 arguments to P2P_CONNECT, P2P_INVITE, and P2P_GROUP_ADD control interface commands can be used to request larger VHT operating channel bandwidth to be used than the previously used maximum 80 MHz. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-28 22:14:10 +01:00
int auth, int go_intent, int freq,
unsigned int vht_center_freq2, int persistent_id,
int pd, int ht40, int vht, unsigned int max_oper_chwidth);
P2P: Handle frequency conflict in single channel concurrency case Based on priority, remove the connection with least priority whenever a frequency conflict is detected. Signed-hostap: Jithu Jance <jithu@broadcom.com>
2013-11-26 14:10:16 +01:00
int wpas_p2p_handle_frequency_conflicts(struct wpa_supplicant *wpa_s,
int freq, struct wpa_ssid *ssid);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
int wpas_p2p_group_add(struct wpa_supplicant *wpa_s, int persistent_group,
P2P: Add support for VHT 80+80 MHz and 160 MHz The new max_oper_chwidth and freq2 arguments to P2P_CONNECT, P2P_INVITE, and P2P_GROUP_ADD control interface commands can be used to request larger VHT operating channel bandwidth to be used than the previously used maximum 80 MHz. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-28 22:14:10 +01:00
int freq, int vht_center_freq2, int ht40, int vht,
int max_oper_chwidth);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
int wpas_p2p_group_add_persistent(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid, int addr_allocated,
P2P: Add support for VHT 80+80 MHz and 160 MHz The new max_oper_chwidth and freq2 arguments to P2P_CONNECT, P2P_INVITE, and P2P_GROUP_ADD control interface commands can be used to request larger VHT operating channel bandwidth to be used than the previously used maximum 80 MHz. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-28 22:14:10 +01:00
int force_freq, int neg_freq,
int vht_center_freq2, int ht40,
int vht, int max_oper_chwidth,
const struct p2p_channels *channels,
P2P: Require fresh scan results for persistent group re-invocation The P2P group is not yet operating when going through invitation exchange for re-invocation. Previously, an old cached scan result could be used to skip the scan immediately after the invitation exchange. While this may result in the fastest possible connection, it does have some issues with cases where the GO takes some time to start up. It would also be at least theoretically possible for some of the BSS parameters to be different, so having a fresh scan result from the new GO instance may be desired in any case. Add a mechanism to skip scan results that have been last updated before a specific point in time and as the first user for this mechanism, require chan results to be more recent than the invitation message exchange for the P2P Client role in persistent group re-invocation case. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-08-21 17:28:28 +02:00
int connection_timeout, int force_scan);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
struct p2p_group * wpas_p2p_group_init(struct wpa_supplicant *wpa_s,
P2P: Store SSID of the group in p2p_group data This can be used with P2P management operations that need to verify whether the local device is operating a specific group based on P2P Group ID attribute from a peer. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-08 16:33:14 +02:00
struct wpa_ssid *ssid);
P2P: Add p2p_prov_disc auto mechanism wpa_supplicant can now be requested to automatically figure out whether the indicated peer is operating as a GO and if so, use join-a-group style PD instead of pre-GO Negotiation PD. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-26 16:13:03 +02:00
enum wpas_p2p_prov_disc_use {
WPAS_P2P_PD_FOR_GO_NEG,
WPAS_P2P_PD_FOR_JOIN,
P2PS: Process P2PS provisioning commands This extends wpas_p2p_prov_disc() implementation to accept P2PS parameters. None of the callers are yet using this functionality; the following commit introduces a user. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 15:25:18 +01:00
WPAS_P2P_PD_AUTO,
WPAS_P2P_PD_FOR_ASP
P2P: Add p2p_prov_disc auto mechanism wpa_supplicant can now be requested to automatically figure out whether the indicated peer is operating as a GO and if so, use join-a-group style PD instead of pre-GO Negotiation PD. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-26 16:13:03 +02:00
};
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
int wpas_p2p_prov_disc(struct wpa_supplicant *wpa_s, const u8 *peer_addr,
P2P: Add p2p_prov_disc auto mechanism wpa_supplicant can now be requested to automatically figure out whether the indicated peer is operating as a GO and if so, use join-a-group style PD instead of pre-GO Negotiation PD. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-26 16:13:03 +02:00
const char *config_method,
P2PS: Process P2PS provisioning commands This extends wpas_p2p_prov_disc() implementation to accept P2PS parameters. None of the callers are yet using this functionality; the following commit introduces a user. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 15:25:18 +01:00
enum wpas_p2p_prov_disc_use use,
struct p2ps_provision *p2ps_prov);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
void wpas_send_action_tx_status(struct wpa_supplicant *wpa_s, const u8 *dst,
P2P: Skip GO Neg Conf ack failure workaround of send failures The workaround to ignore no ctrl::ack received for GO Negotiation Confirmation frame was only supposed to be used when the frame was actually transmitted and just the ack was not received. However, due to the way the driver failure on transmitting the frame were reported, this ended up getting applied for all failures in sending the GO Negotiation Confirmation frame. Improve this by providing a mechanism to indicate whether send_action operations fail locally before the frame was actually transmitted or because of not receiving ack frame after having transmitted the frame.
2010-10-19 11:47:33 +02:00
const u8 *data, size_t data_len,
enum p2p_send_action_result result);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
int wpas_p2p_scan_result_text(const u8 *ies, size_t ies_len, char *buf,
char *end);
enum p2p_discovery_type;
int wpas_p2p_find(struct wpa_supplicant *wpa_s, unsigned int timeout,
P2P: Add option for requested device type in P2P search/scan With this, p2p_find can be extended to find certain requested device types. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-19 11:57:46 +01:00
enum p2p_discovery_type type,
P2P: Allow Device ID to be specified for p2p_find command dev_id=<P2P Device Addr> can now be specified as an argument to p2p_find to request P2P find for a specific P2P device. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-01-08 18:25:29 +01:00
unsigned int num_req_dev_types, const u8 *req_dev_types,
P2PS: Add option to specify seek strings into P2P_FIND P2PS seek strings can now be specified in the P2P_FIND control interface command with one or more optional "seek=<str>" parameters. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-09-05 16:27:20 +02:00
const u8 *dev_id, unsigned int search_delay,
P2P: Allow a specific channel to be specified in P2P_FIND The optional freq=<MHz> can now be used with the P2P_FIND command to specify a single channel to scan during the first round of P2P search. For example, this can be used to replace the full initial scan with a single channel scan of a known operation channel. Signed-off-by: Daichi Ueura <daichi.ueura@sonymobile.com>
2014-11-05 12:35:09 +01:00
u8 seek_cnt, const char **seek_string, int freq);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
void wpas_p2p_stop_find(struct wpa_supplicant *wpa_s);
int wpas_p2p_listen(struct wpa_supplicant *wpa_s, unsigned int timeout);
P2P: Avoid truncation of long listen operation due to offchan tx On receiving the cancel remain on channel event, the pending_tx is scheduled immediately and returned. This was preventing the wpas_p2p_listen_start function from execution thereby resulting in termination of the long listen operation. Signed-off-by: Jithu Jance <jithu@broadcom.com>
2014-08-20 18:25:06 +02:00
int wpas_p2p_listen_start(struct wpa_supplicant *wpa_s, unsigned int timeout);
P2P: Include P2P IE in (Re)AssocReq to infra AP if it uses P2P IE While this is not strictly speaking required by the P2P specification for a not-P2P Managed Device, this can provide useful information for the P2P manager AP and may be needed to pass certification tests.
2010-07-07 06:37:20 +02:00
int wpas_p2p_assoc_req_ie(struct wpa_supplicant *wpa_s, struct wpa_bss *bss,
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
u8 *buf, size_t len, int p2p_group);
void wpas_p2p_scan_ie(struct wpa_supplicant *wpa_s, struct wpabuf *ies);
P2P: Fix 32-bit compiler warnings on service discovery reference Convert core wpa_supplicant code to use u64 instead of void * for the P2P service discovery reference. Use uintptr_t in type casts in p2p_supplicant.c to handle the conversion without warnings. Note: This needs to be revisited for 128-bit CPU where sizeof(void *) could be larger than sizeof(u64). Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-11 17:06:34 +01:00
u64 wpas_p2p_sd_request(struct wpa_supplicant *wpa_s, const u8 *dst,
const struct wpabuf *tlvs);
P2PS: Add support to send ASP service requests This extends the P2P_SERV_DISC_REQ control interface command with a new "asp" service type. This takes service id, service string, and optional service info as arguments. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-09 16:12:27 +01:00
u64 wpas_p2p_sd_request_asp(struct wpa_supplicant *wpa_s, const u8 *dst, u8 id,
const char *svc_str, const char *info_substr);
P2P: Fix 32-bit compiler warnings on service discovery reference Convert core wpa_supplicant code to use u64 instead of void * for the P2P service discovery reference. Use uintptr_t in type casts in p2p_supplicant.c to handle the conversion without warnings. Note: This needs to be revisited for 128-bit CPU where sizeof(void *) could be larger than sizeof(u64). Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-11 17:06:34 +01:00
u64 wpas_p2p_sd_request_upnp(struct wpa_supplicant *wpa_s, const u8 *dst,
u8 version, const char *query);
WFD: Add support for sending Wi-Fi Display service discovery requests wpa_cli p2p_serv_disc_req command can now be used to request WSD request to be sent to specified or all peers who support WSD. format: wifi-display <list of roles> <list of subelements> examples: p2p_serv_disc_req 00:00:00:00:00:00 wifi-display [source] 2,3,4,5 p2p_serv_disc_req 02:01:02:03:04:05 wifi-display [pri-sink] 3 p2p_serv_disc_req 00:00:00:00:00:00 wifi-display [sec-source] 2 p2p_serv_disc_req 00:00:00:00:00:00 wifi-display [source+sink] 2,3,4,5 p2p_serv_disc_req 00:00:00:00:00:00 wifi-display [source][pri-sink] 2,3,4,5 Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 20:48:57 +01:00
u64 wpas_p2p_sd_request_wifi_display(struct wpa_supplicant *wpa_s,
const u8 *dst, const char *role);
P2P: Fix 32-bit compiler warnings on service discovery reference Convert core wpa_supplicant code to use u64 instead of void * for the P2P service discovery reference. Use uintptr_t in type casts in p2p_supplicant.c to handle the conversion without warnings. Note: This needs to be revisited for 128-bit CPU where sizeof(void *) could be larger than sizeof(u64). Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-11 17:06:34 +01:00
int wpas_p2p_sd_cancel_request(struct wpa_supplicant *wpa_s, u64 req);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
void wpas_p2p_sd_response(struct wpa_supplicant *wpa_s, int freq,
const u8 *dst, u8 dialog_token,
const struct wpabuf *resp_tlvs);
void wpas_p2p_sd_service_update(struct wpa_supplicant *wpa_s);
void wpas_p2p_service_flush(struct wpa_supplicant *wpa_s);
int wpas_p2p_service_add_bonjour(struct wpa_supplicant *wpa_s,
struct wpabuf *query, struct wpabuf *resp);
int wpas_p2p_service_del_bonjour(struct wpa_supplicant *wpa_s,
const struct wpabuf *query);
int wpas_p2p_service_add_upnp(struct wpa_supplicant *wpa_s, u8 version,
const char *service);
int wpas_p2p_service_del_upnp(struct wpa_supplicant *wpa_s, u8 version,
const char *service);
P2PS: Extend add/del services logic to support ASP In addition, add a new P2P_SERVICE_REP command that can be used to replace existing ASP advertisements. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-09 15:02:50 +01:00
int wpas_p2p_service_add_asp(struct wpa_supplicant *wpa_s, int auto_accept,
u32 adv_id, const char *adv_str, u8 svc_state,
P2PS: Add CPT parameter to P2P_SERVICE_ADD asp command Add Coordination Transport Protocol parameter to P2P_SERVICE_ADD asp command. Extend p2ps_advertisement structure to contain CPT priorities and a supported CPT bitmask. The format of the new parameter: cpt=<cpt>[:<cpt>] where <cpt> is a name of the Coordination Protocol Transport. This implementation supports two CPT names: UDP and MAC. The order of specified CPTs defines their priorities where the first one has the highest priority. Signed-off-by: Max Stepanov <Max.Stepanov@intel.com> Reviewed-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com>
2015-07-02 15:21:20 +02:00
u16 config_methods, const char *svc_info,
const u8 *cpt_priority);
P2PS: Extend add/del services logic to support ASP In addition, add a new P2P_SERVICE_REP command that can be used to replace existing ASP advertisements. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-09 15:02:50 +01:00
int wpas_p2p_service_del_asp(struct wpa_supplicant *wpa_s, u32 adv_id);
P2PS: Delete ASP advertisements on wpas_p2p_service_flush Delete all ASP serice advertisement on wpas_p2p_service_flush similarly to Bonjour and UPnP services. Signed-off-by: Max Stepanov <Max.Stepanov@intel.com>
2015-03-16 06:16:57 +01:00
void wpas_p2p_service_flush_asp(struct wpa_supplicant *wpa_s);
P2PS: Extend add/del services logic to support ASP In addition, add a new P2P_SERVICE_REP command that can be used to replace existing ASP advertisements. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-09 15:02:50 +01:00
int wpas_p2p_service_p2ps_id_exists(struct wpa_supplicant *wpa_s, u32 adv_id);
P2P: Move upper layer SD interaction into a separate file wpa_supplicant/p2p_supplicant.c has reached almost 10000 lines in length and was getting a bit inconvenient to edit, so start splitting it into separate files. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-15 19:25:48 +01:00
void wpas_sd_request(void *ctx, int freq, const u8 *sa, u8 dialog_token,
u16 update_indic, const u8 *tlvs, size_t tlvs_len);
void wpas_sd_response(void *ctx, const u8 *sa, u16 update_indic,
const u8 *tlvs, size_t tlvs_len);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
int wpas_p2p_reject(struct wpa_supplicant *wpa_s, const u8 *addr);
int wpas_p2p_invite(struct wpa_supplicant *wpa_s, const u8 *peer_addr,
P2P: Allow p2p_invite-persistent to specify channel for GO The freq and ht40 parameters can now be used with the p2p_invite command when reinvoking a persistent group as the GO. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-31 20:20:51 +02:00
struct wpa_ssid *ssid, const u8 *go_dev_addr, int freq,
P2P: Add support for VHT 80+80 MHz and 160 MHz The new max_oper_chwidth and freq2 arguments to P2P_CONNECT, P2P_INVITE, and P2P_GROUP_ADD control interface commands can be used to request larger VHT operating channel bandwidth to be used than the previously used maximum 80 MHz. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-28 22:14:10 +01:00
int vht_center_freq2, int ht40, int vht,
int max_oper_chwidth, int pref_freq);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
int wpas_p2p_invite_group(struct wpa_supplicant *wpa_s, const char *ifname,
const u8 *peer_addr, const u8 *go_dev_addr);
int wpas_p2p_presence_req(struct wpa_supplicant *wpa_s, u32 duration1,
u32 interval1, u32 duration2, u32 interval2);
int wpas_p2p_ext_listen(struct wpa_supplicant *wpa_s, unsigned int period,
unsigned int interval);
Fix disconnection event processing Commit 0d30cc240fa36905b034dc9676f9d8da0ac18e56 forced wpa_s->current_ssid and wpa_s->key_mgmt to be cleared in wpa_supplicant_mark_disassoc() which gets called from wpa_supplicant_event_disassoc(). This broke IEEE 802.1X authentication failure processing and P2P deauthentication notification (group termination). Fix this by splitting wpa_supplicant_event_disassoc() into two parts and make wpas_p2p_deauth_notif() indicate whether the interface was removed. If so, the last part of disassocition event processing is skipped. Since the wpa_supplicant_mark_disassoc() call is in the second part, the above mentioned issues are resolved. In addition, this cleans up the P2P group interface removal case by not trying to use fast reconnection mechanism just before the interface gets removed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-31 21:04:41 +02:00
int wpas_p2p_deauth_notif(struct wpa_supplicant *wpa_s, const u8 *bssid,
u16 reason_code, const u8 *ie, size_t ie_len,
int locally_generated);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
void wpas_p2p_disassoc_notif(struct wpa_supplicant *wpa_s, const u8 *bssid,
P2P: Remove client group on Deauthentication reason code 3 The GO can indicate that the P2P Group session is ending by sending a Deauthentication frame with reason code 3 (Deauthenticated because sending STA is leaving) based on P2P specification section 3.2.9. Use this reason code to remove the P2P client group without waiting for the group idle timeout. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-03 15:43:06 +02:00
u16 reason_code, const u8 *ie, size_t ie_len,
int locally_generated);
P2P: Disable periodic NoA when non-P2P STA is connected For now, this applies to the test command that can be used to set periodic NoA (p2p_set noa). The value are stored and periodic NoA is enabled whenever there are no non-P2P STAs connected to the GO.
2010-07-09 02:14:24 +02:00
int wpas_p2p_set_noa(struct wpa_supplicant *wpa_s, u8 count, int start,
int duration);
P2P: Add support for cross connection If enabled, cross connection allows GO to forward IPv4 packets using masquerading NAT from the P2P clients in the group to an uplink WLAN connection. This is disabled by default and can be enabled with "wpa_cli p2p_set cross_connect 1" on the P2P device interface.
2010-07-10 19:19:34 +02:00
int wpas_p2p_set_cross_connect(struct wpa_supplicant *wpa_s, int enabled);
P2P: Add p2p_cancel command for cancelling ongoing group formation
2010-10-19 14:53:28 +02:00
int wpas_p2p_cancel(struct wpa_supplicant *wpa_s);
P2P: Add p2p_unauthorize command This can be used to remove authorization from a previous p2p_connect commands that has not yet resulted in completed GO Negotiation.
2010-11-25 12:09:50 +01:00
int wpas_p2p_unauthorize(struct wpa_supplicant *wpa_s, const char *addr);
P2P: Add wpas_p2p_disconnect() Add a new API function wpas_p2p_disconnect() to disconnect from or dissolve a group. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-02 16:30:15 +01:00
int wpas_p2p_disconnect(struct wpa_supplicant *wpa_s);
P2P: Show persistent group info on P2P_PEER data Add "persistent=<network id>" line to P2P_PEER ctrl_iface data if a persistent group credentials are available for this peer. This makes it easier for external programs to figure out when a persistent group could be re-invoked with this peer. For now, this information is only available on the P2P client, but similar information can be added for GO once a list of P2P clients is maintained with the persistent group data. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-22 20:45:20 +01:00
struct wpa_ssid * wpas_p2p_get_persistent(struct wpa_supplicant *wpa_s,
P2P: Set Invitation Type to 1 for GO inviting to a persistent group When a GO is operating a persistent group and invites a peer that has been a P2P client in that persistent group, the Invitation Type in the Invitation Request frame can be set to 1 to indicate that this is a reinvocation of a persistent group. Do this based on the maintained list of P2P clients that have been provided the credentials to this group. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-02-06 20:54:36 +01:00
const u8 *addr, const u8 *ssid,
size_t ssid_len);
P2P: Maintain a list of P2P Clients for persistent group on GO Add a new persistent group network block field, p2p_client_list, to maintain a list of P2P Clients that have connected to a persistent group. This allows GO of a persistent group to figure out more easily whether re-invocation of a persistent group can be used with a specific peer device. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-22 21:47:41 +01:00
void wpas_p2p_notify_ap_sta_authorized(struct wpa_supplicant *wpa_s,
const u8 *addr);
P2P: Allow older scan results to improve p2p_connect-auto robustness Previusly the peer was assumed to not be operating a GO if the BSS entry for it was not updated in the single scan run started by p2p_connect-auto. This is not very robust since a scan may miss the peer if either a Probe Request or Probe Response frame is lost. Improve robustness by assuming the peer is still operating the GO and starting the join operation. If the GO is not found during PD-for-join or the single-channel scans during the join, fall back to GO Negotiation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-08 16:13:56 +02:00
int wpas_p2p_scan_no_go_seen(struct wpa_supplicant *wpa_s);
P2P: Enable 40 MHz support for autonomous P2P group addition Add optional "ht40" argument for p2p_group_add command to enable 40 MHz in 5GHz band. This configures the secondary channel, when HT support is enabled and if the HW supports 40 MHz channel width. Signed-hostap: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
2012-08-15 21:53:01 +02:00
int wpas_p2p_get_ht40_mode(struct wpa_supplicant *wpa_s,
struct hostapd_hw_modes *mode, u8 channel);
P2P: Add VHT support Start GO with VHT support if VHT option was requested and the appropriate channels are available. Signed-hostap: Eliad Peller <eliadx.peller@intel.com>
2013-10-27 19:08:36 +01:00
int wpas_p2p_get_vht80_center(struct wpa_supplicant *wpa_s,
struct hostapd_hw_modes *mode, u8 channel);
nl80211: Add VHT 160 MHz channel flags This extends the previous design that covered only the VHT 80 MHz cases for VHT channel flags. New functions are introduced to allow 160 MHz bandwidth cases to determine the center channel and check availability of a 160 MHz channel. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-28 22:14:10 +01:00
int wpas_p2p_get_vht160_center(struct wpa_supplicant *wpa_s,
struct hostapd_hw_modes *mode, u8 channel);
P2P: Use 500 ms search delay by default during concurrent operations If the p2p_find command is used without the delay parameter, a 500 ms default search delay will now be used when any interface using the same radio is in an concurrent operation. "p2p_find delay=0" can be used to enforce the old behavior in such a case if needed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-23 17:34:57 +02:00
unsigned int wpas_p2p_search_delay(struct wpa_supplicant *wpa_s);
P2P: Maintain list of per-client PSKs for persistent groups Record all generated per-client PSKs in the persistent group network block and configure these for the GO Authenticator whenever re-starting the persistent group. This completes per-client PSK support for persistent groups. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-09-01 12:40:33 +02:00
void wpas_p2p_new_psk_cb(struct wpa_supplicant *wpa_s, const u8 *mac_addr,
const u8 *p2p_dev_addr,
const u8 *psk, size_t psk_len);
P2P: Add a command for removing a client from all groups The new control interface command P2P_REMOVE_CLIENT <P2P Device Address|iface=Address> can now be used to remove the specified client from all groups (ongoing and persistent) in which the local device is a GO. This will remove any per-client PSK entries and deauthenticate the device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-09-01 16:37:22 +02:00
void wpas_p2p_remove_client(struct wpa_supplicant *wpa_s, const u8 *peer,
int iface_addr);
P2P NFC: Build connection handover messages "NFC_GET_HANDOVER_{REQ,SEL} NDEF P2P-CR" can now be used to build P2P alternative carrier record for NFC connection handover request/select messages. Static connection handover case can be enabled by configuring the DH parameters (either with wps_nfc_* configuration parameters or with WPS_NFC_TOKEN command at run time. The NFC Tag contents can be generated with "NFC_GET_HANDOVER_SEL NDEF P2P-CR-TAG" after having configured Listen channel (p2p_listen_reg_class/p2p_listen_channel). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-15 16:07:28 +01:00
struct wpabuf * wpas_p2p_nfc_handover_req(struct wpa_supplicant *wpa_s,
int ndef);
struct wpabuf * wpas_p2p_nfc_handover_sel(struct wpa_supplicant *wpa_s,
int ndef, int tag);
P2P NFC: Report handover select from tag for static handover WPS_NFC_TAG_READ can be used to report static connection handover where the connection handover select message was read from an NFC tag. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-27 17:38:41 +02:00
int wpas_p2p_nfc_tag_process(struct wpa_supplicant *wpa_s,
P2P NFC: Add support for freq option in NFC ctrl_iface commands This can be used to force an operating channel for P2P group formation triggered by NFC operations. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-12-04 04:44:56 +01:00
const struct wpabuf *data, int forced_freq);
P2P NFC: Report connection handover as trigger for P2P "NFC_REPORT_HANDOVER {INIT,RESP} P2P <req> <sel>" can now be used to report completed NFC negotiated connection handover in which the P2P alternative carrier was selected. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-27 17:50:14 +02:00
int wpas_p2p_nfc_report_handover(struct wpa_supplicant *wpa_s, int init,
const struct wpabuf *req,
P2P NFC: Add support for freq option in NFC ctrl_iface commands This can be used to force an operating channel for P2P group formation triggered by NFC operations. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-12-04 04:44:56 +01:00
const struct wpabuf *sel, int forced_freq);
P2P NFC: Add NFC tag enabling for static handover The device with the NFC Tag can be configured to enable NFC to be used with "P2P_SET nfc_tag 1" and "P2P_LISTEN" commands to allow static handover to be used. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-27 16:50:50 +02:00
int wpas_p2p_nfc_tag_enabled(struct wpa_supplicant *wpa_s, int enabled);
P2P: Fix segfault when PBC overlap is detected If a separate P2P group interface is used, PBC overlap during group formation causes the group interface to be removed, which ends up with the interface context becoming invalid. Fix this by scheduling a timeout to process the PBC overlap and interface removal instead of removing the interface directly before the connection operation has returned. Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2014-03-27 07:58:30 +01:00
void wpas_p2p_pbc_overlap_cb(void *eloop_ctx, void *timeout_ctx);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Use common function for re-starting P2P scan after station scan Make the implementation more consistent and cleaner by using a single function for addressing all the cases where completion of a station mode scan operation allows a P2P operation (search) to be re-started. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-18 15:31:09 +01:00
#ifdef CONFIG_P2P
P2P: Clean up by moving ifdef CONFIG_P2P to p2p_suppplicant.h This removes number of unnecessary #ifdef CONFIG_P2P blocks from generic code by hiding the conditional build into p2p_supplicant.h with empty inline functions. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-15 18:31:53 +02:00
int wpas_p2p_init(struct wpa_global *global, struct wpa_supplicant *wpa_s);
void wpas_p2p_deinit(struct wpa_supplicant *wpa_s);
void wpas_p2p_completed(struct wpa_supplicant *wpa_s);
void wpas_p2p_update_config(struct wpa_supplicant *wpa_s);
int wpas_p2p_probe_req_rx(struct wpa_supplicant *wpa_s, const u8 *addr,
const u8 *dst, const u8 *bssid,
const u8 *ie, size_t ie_len,
P2P: Add rx_freq parameter to Probe Request frame handler In some cases, Probe Request frames can be received by a peer not only on a listen channel. In this case an additional rx_freq parameter explitly contains a Probe Request frame RX frequency. In case rx_freq is set to 0, a Probe Request frame RX channel is assumed to be our own listen channel (p2p->cfg->channel). Signed-off-by: Max Stepanov <Max.Stepanov@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com>
2015-06-10 10:43:31 +02:00
unsigned int rx_freq, int ssi_signal);
P2P: Clean up by moving ifdef CONFIG_P2P to p2p_suppplicant.h This removes number of unnecessary #ifdef CONFIG_P2P blocks from generic code by hiding the conditional build into p2p_supplicant.h with empty inline functions. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-15 18:31:53 +02:00
void wpas_p2p_wps_success(struct wpa_supplicant *wpa_s, const u8 *peer_addr,
int registrar);
P2P: Do not perform P2P GO CS in some cases A P2P GO channel switch should not be triggered in all cases that require channel list update. Specifically, a P2P GO CS should not be triggered in case that the P2P GO state changed or in case that that the P2P GO has just completed a CS. To fix this, add reason code to wpas_p2p_channel_list_update() and trigger CS flow only for the relevant cases. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:27 +02:00
void wpas_p2p_update_channel_list(struct wpa_supplicant *wpa_s,
enum wpas_p2p_channel_update_trig trig);
P2P: Clean up by moving ifdef CONFIG_P2P to p2p_suppplicant.h This removes number of unnecessary #ifdef CONFIG_P2P blocks from generic code by hiding the conditional build into p2p_supplicant.h with empty inline functions. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-15 18:31:53 +02:00
void wpas_p2p_update_best_channels(struct wpa_supplicant *wpa_s,
int freq_24, int freq_5, int freq_overall);
void wpas_p2p_rx_action(struct wpa_supplicant *wpa_s, const u8 *da,
const u8 *sa, const u8 *bssid,
u8 category, const u8 *data, size_t len, int freq);
void wpas_p2p_remain_on_channel_cb(struct wpa_supplicant *wpa_s,
unsigned int freq, unsigned int duration);
void wpas_p2p_cancel_remain_on_channel_cb(struct wpa_supplicant *wpa_s,
unsigned int freq);
void wpas_p2p_interface_unavailable(struct wpa_supplicant *wpa_s);
void wpas_p2p_notif_connected(struct wpa_supplicant *wpa_s);
void wpas_p2p_notif_disconnected(struct wpa_supplicant *wpa_s);
int wpas_p2p_notif_pbc_overlap(struct wpa_supplicant *wpa_s);
P2P: Add event messages for possible PSK failures on P2P groups It is possible for the GO of a persistent group to change the PSK or remove a client when per-client PSKs are used and this can happen without the SSID changing (i.e., the group is still valid, but just not for a specific client). If the client side of such persistent group ends up trying to use an invalidated persistent group information, the connection will fail in 4-way handshake. A new WPS provisioning step is needed to recover from this. Detect this type of case based on two 4-way handshake failures when acting as a P2P client in a persistent group. A new "P2P-PERSISTENT-PSK-FAIL id=<persistent group id>" event is used to indicate when this happens. This makes it easier for upper layers to remove the persistent group information with "REMOVE_NETWORK <persistent group id>" if desired (e.g., based on user confirmation). In addition to indicating the error cases for persistent groups, all this type of PSK failures end up in the client removing the group with the new reason=PSK_FAILURE information in the P2P-GROUP-REMOVED event. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-09-01 20:28:16 +02:00
int wpas_p2p_4way_hs_failed(struct wpa_supplicant *wpa_s);
P2P: Fix crash when failed to create GO interface wpa_supplicant crashes if driver configuration for AP mode interface configuration fails after group negotiation. This is because of a regression from commit 1075b2957169d8f9d6dddd7679339c751dc9515b that ends up freeing the wpa_s instance from within wpa_supplicant_create_ap() without the caller knowing. Fix this by using an eloop timeout to free remove the P2P group so that wpa_supplicant_create_ap() and especially wpa_supplicant_associate() callers do not need to know about interface getting possibly removed. In addition, move the P2P specific code into p2p_supplicant.c where it really belongs. This allows the already existing group formation timeout to be used by reducing the timeout to zero. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-03 10:17:21 +02:00
void wpas_p2p_ap_setup_failed(struct wpa_supplicant *wpa_s);
P2P: Clean up by moving ifdef CONFIG_P2P to p2p_suppplicant.h This removes number of unnecessary #ifdef CONFIG_P2P blocks from generic code by hiding the conditional build into p2p_supplicant.h with empty inline functions. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-15 18:31:53 +02:00
void wpas_p2p_indicate_state_change(struct wpa_supplicant *wpa_s);
void wpas_p2p_deinit_iface(struct wpa_supplicant *wpa_s);
void wpas_p2p_ap_deinit(struct wpa_supplicant *wpa_s);
void wpas_p2p_network_removed(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid);
int wpas_p2p_in_progress(struct wpa_supplicant *wpa_s);
int wpas_p2p_wps_eapol_cb(struct wpa_supplicant *wpa_s);
void wpas_p2p_wps_failed(struct wpa_supplicant *wpa_s,
struct wps_event_fail *fail);
P2P: Remove all child interfaces when removing the parent This is needed to allow dynamic removal of an interface that adds the P2P Device interface without leaving behind the management interface with invalid wpa_s->parent pointer. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-20 11:40:29 +02:00
int wpas_p2p_group_remove(struct wpa_supplicant *wpa_s, const char *ifname);
P2P: Clean up by moving ifdef CONFIG_P2P to p2p_suppplicant.h This removes number of unnecessary #ifdef CONFIG_P2P blocks from generic code by hiding the conditional build into p2p_supplicant.h with empty inline functions. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-15 18:31:53 +02:00
P2P: Use common function for re-starting P2P scan after station scan Make the implementation more consistent and cleaner by using a single function for addressing all the cases where completion of a station mode scan operation allows a P2P operation (search) to be re-started. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-18 15:31:09 +01:00
#else /* CONFIG_P2P */
P2P: Clean up by moving ifdef CONFIG_P2P to p2p_suppplicant.h This removes number of unnecessary #ifdef CONFIG_P2P blocks from generic code by hiding the conditional build into p2p_supplicant.h with empty inline functions. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-15 18:31:53 +02:00
static inline int
wpas_p2p_init(struct wpa_global *global, struct wpa_supplicant *wpa_s)
{
return 0;
}
static inline void wpas_p2p_deinit(struct wpa_supplicant *wpa_s)
{
}
static inline void wpas_p2p_completed(struct wpa_supplicant *wpa_s)
{
}
static inline void wpas_p2p_update_config(struct wpa_supplicant *wpa_s)
{
}
static inline int wpas_p2p_probe_req_rx(struct wpa_supplicant *wpa_s,
const u8 *addr,
const u8 *dst, const u8 *bssid,
const u8 *ie, size_t ie_len,
P2P: Add rx_freq parameter to Probe Request frame handler In some cases, Probe Request frames can be received by a peer not only on a listen channel. In this case an additional rx_freq parameter explitly contains a Probe Request frame RX frequency. In case rx_freq is set to 0, a Probe Request frame RX channel is assumed to be our own listen channel (p2p->cfg->channel). Signed-off-by: Max Stepanov <Max.Stepanov@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com>
2015-06-10 10:43:31 +02:00
unsigned int rx_freq, int ssi_signal)
P2P: Clean up by moving ifdef CONFIG_P2P to p2p_suppplicant.h This removes number of unnecessary #ifdef CONFIG_P2P blocks from generic code by hiding the conditional build into p2p_supplicant.h with empty inline functions. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-15 18:31:53 +02:00
{
return 0;
}
static inline void wpas_p2p_wps_success(struct wpa_supplicant *wpa_s,
const u8 *peer_addr, int registrar)
{
}
P2P: Do not perform P2P GO CS in some cases A P2P GO channel switch should not be triggered in all cases that require channel list update. Specifically, a P2P GO CS should not be triggered in case that the P2P GO state changed or in case that that the P2P GO has just completed a CS. To fix this, add reason code to wpas_p2p_channel_list_update() and trigger CS flow only for the relevant cases. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:27 +02:00
static inline void
wpas_p2p_update_channel_list(struct wpa_supplicant *wpa_s,
enum wpas_p2p_channel_update_trig trig)
P2P: Clean up by moving ifdef CONFIG_P2P to p2p_suppplicant.h This removes number of unnecessary #ifdef CONFIG_P2P blocks from generic code by hiding the conditional build into p2p_supplicant.h with empty inline functions. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-15 18:31:53 +02:00
{
}
static inline void wpas_p2p_update_best_channels(struct wpa_supplicant *wpa_s,
int freq_24, int freq_5,
int freq_overall)
{
}
static inline void wpas_p2p_rx_action(struct wpa_supplicant *wpa_s,
const u8 *da,
const u8 *sa, const u8 *bssid,
u8 category, const u8 *data, size_t len,
int freq)
{
}
static inline void wpas_p2p_remain_on_channel_cb(struct wpa_supplicant *wpa_s,
unsigned int freq,
unsigned int duration)
{
}
static inline void
wpas_p2p_cancel_remain_on_channel_cb(struct wpa_supplicant *wpa_s,
unsigned int freq)
{
}
static inline void wpas_p2p_interface_unavailable(struct wpa_supplicant *wpa_s)
{
}
static inline void wpas_p2p_notif_connected(struct wpa_supplicant *wpa_s)
{
}
static inline void wpas_p2p_notif_disconnected(struct wpa_supplicant *wpa_s)
{
}
static inline int wpas_p2p_notif_pbc_overlap(struct wpa_supplicant *wpa_s)
{
return 0;
}
P2P: Add event messages for possible PSK failures on P2P groups It is possible for the GO of a persistent group to change the PSK or remove a client when per-client PSKs are used and this can happen without the SSID changing (i.e., the group is still valid, but just not for a specific client). If the client side of such persistent group ends up trying to use an invalidated persistent group information, the connection will fail in 4-way handshake. A new WPS provisioning step is needed to recover from this. Detect this type of case based on two 4-way handshake failures when acting as a P2P client in a persistent group. A new "P2P-PERSISTENT-PSK-FAIL id=<persistent group id>" event is used to indicate when this happens. This makes it easier for upper layers to remove the persistent group information with "REMOVE_NETWORK <persistent group id>" if desired (e.g., based on user confirmation). In addition to indicating the error cases for persistent groups, all this type of PSK failures end up in the client removing the group with the new reason=PSK_FAILURE information in the P2P-GROUP-REMOVED event. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-09-01 20:28:16 +02:00
static inline int wpas_p2p_4way_hs_failed(struct wpa_supplicant *wpa_s)
{
return 0;
}
P2P: Fix crash when failed to create GO interface wpa_supplicant crashes if driver configuration for AP mode interface configuration fails after group negotiation. This is because of a regression from commit 1075b2957169d8f9d6dddd7679339c751dc9515b that ends up freeing the wpa_s instance from within wpa_supplicant_create_ap() without the caller knowing. Fix this by using an eloop timeout to free remove the P2P group so that wpa_supplicant_create_ap() and especially wpa_supplicant_associate() callers do not need to know about interface getting possibly removed. In addition, move the P2P specific code into p2p_supplicant.c where it really belongs. This allows the already existing group formation timeout to be used by reducing the timeout to zero. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-03 10:17:21 +02:00
static inline void wpas_p2p_ap_setup_failed(struct wpa_supplicant *wpa_s)
{
}
P2P: Clean up by moving ifdef CONFIG_P2P to p2p_suppplicant.h This removes number of unnecessary #ifdef CONFIG_P2P blocks from generic code by hiding the conditional build into p2p_supplicant.h with empty inline functions. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-15 18:31:53 +02:00
static inline void wpas_p2p_indicate_state_change(struct wpa_supplicant *wpa_s)
{
}
static inline void wpas_p2p_deinit_iface(struct wpa_supplicant *wpa_s)
{
}
static inline void wpas_p2p_ap_deinit(struct wpa_supplicant *wpa_s)
{
}
static inline void wpas_p2p_network_removed(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid)
{
}
static inline int wpas_p2p_in_progress(struct wpa_supplicant *wpa_s)
{
return 0;
}
static inline int wpas_p2p_wps_eapol_cb(struct wpa_supplicant *wpa_s)
{
return 0;
}
static inline void wpas_p2p_wps_failed(struct wpa_supplicant *wpa_s,
struct wps_event_fail *fail)
{
}
P2P: Remove all child interfaces when removing the parent This is needed to allow dynamic removal of an interface that adds the P2P Device interface without leaving behind the management interface with invalid wpa_s->parent pointer. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-20 11:40:29 +02:00
static inline int wpas_p2p_group_remove(struct wpa_supplicant *wpa_s,
const char *ifname)
{
return 0;
}
P2P: Use common function for re-starting P2P scan after station scan Make the implementation more consistent and cleaner by using a single function for addressing all the cases where completion of a station mode scan operation allows a P2P operation (search) to be re-started. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-18 15:31:09 +01:00
#endif /* CONFIG_P2P */
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
#endif /* P2P_SUPPLICANT_H */
Reference in a new issue Copy permalink