DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions
hostapd/src/p2p/p2p_i.h

739 lines
20 KiB
C
Raw Normal View History

P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/*
* P2P - Internal definitions for P2P module
* 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_I_H
#define P2P_I_H
#include "utils/list.h"
#include "p2p.h"
enum p2p_go_state {
UNKNOWN_GO,
LOCAL_GO,
REMOTE_GO
};
/**
* struct p2p_device - P2P Device data (internal to P2P module)
*/
struct p2p_device {
struct dl_list list;
wpa_supplicant: Use monotonic time for RX/BSS times The BSS table, scan timeout, and related functionality should use monotonic time since they care about relative values (age) only. Unfortunately, these are all connected, so the patch can't be split further. Another problem with this is that it changes the driver wrapper API. Though, it seems only the test driver is using this. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-12-16 21:08:28 +01:00
struct os_reltime last_seen;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
int listen_freq;
enum p2p_wps_method wps_method;
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 info;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/*
* If the peer was discovered based on an interface address (e.g., GO
* from Beacon/Probe Response), the interface address is stored here.
* p2p_device_addr must still be set in such a case to the unique
* identifier for the P2P Device.
*/
u8 interface_addr[ETH_ALEN];
/*
* P2P Device Address of the GO in whose group this P2P Device is a
* client.
*/
u8 member_in_go_dev[ETH_ALEN];
/*
* P2P Interface Address of the GO in whose group this P2P Device is a
* client.
*/
u8 member_in_go_iface[ETH_ALEN];
int go_neg_req_sent;
enum p2p_go_state go_state;
u8 dialog_token;
P2P: Assign GO tie breaker bit at the same time with dialog token Commit 624b4d5a6469c92b039e0d39655b9e0eb26588aa changed GO Negotiation to use the same Dialog Token value for all retransmissions of the GO Negotiation Request within the same session. However, it did leave the tie breaker bit changing for each frame. While this should not have caused issues for most cases, it looks like there are possible sequences where the peer may end up replying to two GO Negotiation Request frames with different tie breaker values. If in such a case the different GO Negotiation Response frames are used at each device, GO role determination may result in conflicting results when same GO intent is used. Fix this by assigning the tie breaker value at the same time with the dialog token (i.e., when processing the p2p_connect command instead of for each transmitted GO Negotiation Request frame) to avoid issues with GO selection. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-26 15:56:48 +01:00
u8 tie_breaker;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
u8 intended_addr[ETH_ALEN];
char country[3];
struct p2p_channels channels;
int oper_freq;
u8 oper_ssid[32];
size_t oper_ssid_len;
/**
P2P: Fix Provision Discovery name in debug messages Some debug messages used incorrect name for Provision Discovery. Replace "Provisioning Discovery" with "Provision Discovery". Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-11 16:36:38 +01:00
* req_config_methods - Pending provision discovery methods
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
*/
u16 req_config_methods;
P2P: Skip duplicated provision discovery on join If p2p_prov_disc join command is used prior to p2p_connect join, skip the duplicated provision discovery exchange. Signed-hostap: Jithu Jance <jithu@broadcom.com>
2011-12-06 20:44:57 +01:00
/**
* wps_prov_info - Stored provisioning WPS config method
*
* This is used to store pending WPS config method between Provisioning
* Discovery and connection to a running group.
*/
u16 wps_prov_info;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
#define P2P_DEV_PROBE_REQ_ONLY BIT(0)
#define P2P_DEV_REPORTED BIT(1)
#define P2P_DEV_NOT_YET_READY BIT(2)
#define P2P_DEV_SD_INFO BIT(3)
#define P2P_DEV_SD_SCHEDULE BIT(4)
#define P2P_DEV_PD_PEER_DISPLAY BIT(5)
#define P2P_DEV_PD_PEER_KEYPAD BIT(6)
#define P2P_DEV_USER_REJECTED BIT(7)
#define P2P_DEV_PEER_WAITING_RESPONSE BIT(8)
#define P2P_DEV_PREFER_PERSISTENT_GROUP BIT(9)
#define P2P_DEV_WAIT_GO_NEG_RESPONSE BIT(10)
#define P2P_DEV_WAIT_GO_NEG_CONFIRM BIT(11)
#define P2P_DEV_GROUP_CLIENT_ONLY BIT(12)
P2P: Fix channel forcing for p2p_connect auth
2010-07-02 17:27:00 +02:00
#define P2P_DEV_FORCE_FREQ BIT(13)
P2P: Do not re-send PD Request for join-a-group after acked frame We are not actually interested in the PD Response in join-a-group case, so there is no point in trying to send PD Request until the response is received. This avoids an extra PD getting started after a join-a-group operation in some cases.
2010-10-27 18:36:10 +02:00
#define P2P_DEV_PD_FOR_JOIN BIT(14)
P2P: Add new_device flag to dev_found callback The DBus code will want to have perfect matching of dev_found and the dev_lost it adds so it doesn't need to keep track internally. Enable that with a new flag in the core that tracks whether we have already notified about this -- the existing users can ignore it. The part where this is always set to 1 if the new device is discovered by a driver that has P2P in the driver is buggy -- the driver should feed the P2P peer database and then that should feed the notification here instead. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-24 20:59:58 +01:00
#define P2P_DEV_REPORTED_ONCE BIT(15)
P2P: Advertise Persistent Reconnect group capability The persistent_reconnect configuration parameter was used to decide whether to accept invitation to re-establish a persistent group. However, this was not being advertised in the Group Capability bitmap. Add the Persistent Reconnect bit based on this configuration to GO Negotiation frames and Beacon/Probe Response frames from the GO.
2011-10-24 16:29:37 +02:00
#define P2P_DEV_PREFER_PERSISTENT_RECONN BIT(16)
P2P: Add option for Provision Discovery before GO Negotiation This is a workaround for interoperability issues with some deployed P2P implementations that require a Provision Discovery exchange to be used before GO Negotiation. The new provdisc parameter for the p2p_connect command can be used to request this behavior without having to run a separate p2p_prov_disc command. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-11 15:25:47 +02:00
#define P2P_DEV_PD_BEFORE_GO_NEG BIT(17)
P2P: Allow P2P client to specify preferred group channel When re-invoking a persistent group in P2P client role, the new pref=<MHz> parameter can now be used with the p2p_invite command to indicate a preferred operating frequency. Unlike the older freq=<MHz> parameter, this leaves GO an option to select another channel (from our supported channels) if the GO cannot accept the channel. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-01 18:40:54 +01:00
#define P2P_DEV_NO_PREF_CHAN BIT(18)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
unsigned int flags;
int status; /* enum p2p_status_code */
unsigned int wait_count;
P2P: Limit the retransmission of GO Negotiation request to 120 If the peer you want to connect to is no longer available (does not acknowledge frames) when wpa_supplicant sends GO Negotition Request frames, retransmission of this frame is done until the associated p2p_device structure is removed on timeout. In that case, no signal is emitted to inform the GO Negotiation has failed. When sending an Invitation Request frame, the same retransmission mechanism is in place but limit the transmission to 100 and hitting the limit generates an event. This patch adds the same mechanism as the one in place for Invitation Request, but with limit of 120 to match the existing wait_count for for GO Negotiation.
2010-12-28 10:48:58 +01:00
unsigned int connect_reqs;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
unsigned int invitation_reqs;
u16 ext_listen_period;
u16 ext_listen_interval;
P2P: Add peer timeout into group formation 15 second timeout This adds some more time for WPS provisioning step in case the peer takes long time to start group interface operations.
2010-09-06 20:04:01 +02:00
u8 go_timeout;
u8 client_timeout;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
};
struct p2p_sd_query {
struct p2p_sd_query *next;
u8 peer[ETH_ALEN];
int for_all_peers;
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
int wsd; /* Wi-Fi Display Service Discovery Request */
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
struct wpabuf *tlvs;
};
P2P: Delay send_action call if p2p_scan is in progress In order to avoid confusing the driver with a new remain-on-channel request, delay sending of a new Action frame if the driver indicates Action frame RX diromg a scan.
2010-10-20 18:41:20 +02:00
struct p2p_pending_action_tx {
unsigned int freq;
u8 dst[ETH_ALEN];
u8 src[ETH_ALEN];
u8 bssid[ETH_ALEN];
size_t len;
unsigned int wait_time;
/* Followed by len octets of the frame */
};
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/**
* struct p2p_data - P2P module data (internal to P2P module)
*/
struct p2p_data {
/**
* cfg - P2P module configuration
*
* This is included in the same memory allocation with the
* struct p2p_data and as such, must not be freed separately.
*/
struct p2p_config *cfg;
/**
* state - The current P2P state
*/
enum p2p_state {
/**
* P2P_IDLE - Idle
*/
P2P_IDLE,
/**
* P2P_SEARCH - Search (Device Discovery)
*/
P2P_SEARCH,
/**
* P2P_CONNECT - Trying to start GO Negotiation
*/
P2P_CONNECT,
/**
* P2P_CONNECT_LISTEN - Listen during GO Negotiation start
*/
P2P_CONNECT_LISTEN,
/**
* P2P_GO_NEG - In GO Negotiation
*/
P2P_GO_NEG,
/**
* P2P_LISTEN_ONLY - Listen only
*/
P2P_LISTEN_ONLY,
/**
* P2P_WAIT_PEER_CONNECT - Waiting peer in List for GO Neg
*/
P2P_WAIT_PEER_CONNECT,
/**
* P2P_WAIT_PEER_IDLE - Waiting peer idle for GO Neg
*/
P2P_WAIT_PEER_IDLE,
/**
* P2P_SD_DURING_FIND - Service Discovery during find
*/
P2P_SD_DURING_FIND,
/**
* P2P_PROVISIONING - Provisioning (during group formation)
*/
P2P_PROVISIONING,
/**
* P2P_PD_DURING_FIND - Provision Discovery during find
*/
P2P_PD_DURING_FIND,
/**
* P2P_INVITE - Trying to start Invite
*/
P2P_INVITE,
/**
* P2P_INVITE_LISTEN - Listen during Invite
*/
P2P_INVITE_LISTEN,
} state;
/**
* min_disc_int - minDiscoverableInterval
*/
int min_disc_int;
/**
* max_disc_int - maxDiscoverableInterval
*/
int max_disc_int;
P2P: Allow discoverable interval for p2p_find to be configured The new P2P_SET parameter disc_int can now be used to configure discoverable interval for p2p_find operations. The format of the command for setting the values is "P2P_SET disc_int <minDiscoverableInterval> <maxDiscoverableInterval> <max TUs for discoverable interval>". The first two parameters are given in units of 100 TUs (102.4 ms). The third parameter can be used to further limit the interval into a specific TU amount. If it is set to -1, no such additional limitation is enforced. It should be noted that the P2P specification describes the random Listen state interval to be in units of 100 TUs, so setting the max TU value to anything else than -1 is not compliant with the specification and should not be used in normal cases. The default parameters can be set with "P2P_SET disc_int 1 3 -1". Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-10-30 14:12:04 +01:00
/**
* max_disc_tu - Maximum number of TUs for discoverable interval
*/
int max_disc_tu;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/**
* devices - List of known P2P Device peers
*/
struct dl_list devices;
/**
* go_neg_peer - Pointer to GO Negotiation peer
*/
struct p2p_device *go_neg_peer;
/**
* invite_peer - Pointer to Invite peer
*/
struct p2p_device *invite_peer;
const u8 *invite_go_dev_addr;
u8 invite_go_dev_addr_buf[ETH_ALEN];
/**
* sd_peer - Pointer to Service Discovery peer
*/
struct p2p_device *sd_peer;
/**
* sd_query - Pointer to Service Discovery query
*/
struct p2p_sd_query *sd_query;
/* GO Negotiation data */
/**
* intended_addr - Local Intended P2P Interface Address
*
* This address is used during group owner negotiation as the Intended
* P2P Interface Address and the group interface will be created with
* address as the local address in case of successfully completed
* negotiation.
*/
u8 intended_addr[ETH_ALEN];
/**
* go_intent - Local GO Intent to be used during GO Negotiation
*/
u8 go_intent;
/**
* next_tie_breaker - Next tie-breaker value to use in GO Negotiation
*/
u8 next_tie_breaker;
/**
* ssid - Selected SSID for GO Negotiation (if local end will be GO)
*/
u8 ssid[32];
/**
* ssid_len - ssid length in octets
*/
size_t ssid_len;
P2P: Do not change SSID during GO negotiation If GO Negotiation Request (or in theory, also GO Negotiation Response) frame is delivered multiple time for processing, the SSID of the group could end up getting changed. This could result in possible issues if the peer ended up using different SSID. To avoid this, make sure the SSID does not get changed unless the negotiation is for a new group.
2011-10-11 17:29:31 +02:00
/**
* ssid_set - Whether SSID is already set for GO Negotiation
*/
int ssid_set;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/**
* Regulatory class for own operational channel
*/
u8 op_reg_class;
/**
* op_channel - Own operational channel
*/
u8 op_channel;
/**
* channels - Own supported regulatory classes and channels
*
* List of supposerted channels per regulatory class. The regulatory
* classes are defined in IEEE Std 802.11-2007 Annex J and the
* numbering of the clases depends on the configured country code.
*/
struct p2p_channels channels;
P2P: Add option to remove channels from GO use The new p2p_no_go_freq frequency range list (comma-separated list of min-max frequency ranges in MHz) can now be used to configure channels on which the local device is not allowed to operate as a GO, but on which that device can be a P2P Client. These channels are left in the P2P Channel List in GO Negotiation to allow the peer device to select one of the channels for the cases where the peer becomes the GO. The local end will remove these channels from consideration if it becomes the GO. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-22 18:45:46 +02:00
struct wpa_freq_range_list no_go_freq;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
enum p2p_pending_action_state {
P2P_NO_PENDING_ACTION,
P2P_PENDING_GO_NEG_REQUEST,
P2P_PENDING_GO_NEG_RESPONSE,
P2P_PENDING_GO_NEG_RESPONSE_FAILURE,
P2P_PENDING_GO_NEG_CONFIRM,
P2P_PENDING_SD,
P2P_PENDING_PD,
P2P_PENDING_INVITATION_REQUEST,
P2P_PENDING_INVITATION_RESPONSE,
P2P_PENDING_DEV_DISC_REQUEST,
P2P_PENDING_DEV_DISC_RESPONSE,
P2P_PENDING_GO_DISC_REQ
} pending_action_state;
unsigned int pending_listen_freq;
unsigned int pending_listen_sec;
unsigned int pending_listen_usec;
u8 dev_capab;
int in_listen;
int drv_in_listen;
/**
* sd_queries - Pending service discovery queries
*/
struct p2p_sd_query *sd_queries;
/**
* srv_update_indic - Service Update Indicator for local services
*/
u16 srv_update_indic;
P2P: Initial support for SD fragmentation (GAS Comeback Request/Response)
2010-06-28 18:24:17 +02:00
struct wpabuf *sd_resp; /* Fragmented SD response */
u8 sd_resp_addr[ETH_ALEN];
u8 sd_resp_dialog_token;
size_t sd_resp_pos; /* Offset in sd_resp */
u8 sd_frag_id;
struct wpabuf *sd_rx_resp; /* Reassembled SD response */
P2P: Fix GAS fragmentation to match with IEEE 802.11u P2P specification v1.15 fixed the description of the GAS fragmentation to not duplicate NQP Query Response Field header in all fragments. This change makes the fragmentation match with the description in IEEE 802.11u. The change is not backwards compatible with previous P2P specification versions as far as fragmented SD responses are concerned.
2010-07-27 03:54:29 +02:00
u16 sd_rx_update_indic;
P2P: Initial support for SD fragmentation (GAS Comeback Request/Response)
2010-06-28 18:24:17 +02:00
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/* P2P Invitation data */
enum p2p_invite_role inv_role;
u8 inv_bssid[ETH_ALEN];
int inv_bssid_set;
u8 inv_ssid[32];
size_t inv_ssid_len;
u8 inv_sa[ETH_ALEN];
u8 inv_group_bssid[ETH_ALEN];
u8 *inv_group_bssid_ptr;
u8 inv_go_dev_addr[ETH_ALEN];
u8 inv_status;
int inv_op_freq;
int inv_persistent;
enum p2p_discovery_type find_type;
P2P: Wait until ongoing scan completes before starting P2P find The P2P_FIND command was failing if it was issued at the moment when a scan operation was in progress. Avoid returning failure in this case by scheduling the P2P find to start once the ongoing scan is completed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-15 20:25:21 +01:00
unsigned int last_p2p_find_timeout;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
u8 last_prog_scan_class;
u8 last_prog_scan_chan;
int p2p_scan_running;
enum p2p_after_scan {
P2P_AFTER_SCAN_NOTHING,
P2P_AFTER_SCAN_LISTEN,
P2P_AFTER_SCAN_CONNECT
} start_after_scan;
u8 after_scan_peer[ETH_ALEN];
P2P: Delay send_action call if p2p_scan is in progress In order to avoid confusing the driver with a new remain-on-channel request, delay sending of a new Action frame if the driver indicates Action frame RX diromg a scan.
2010-10-20 18:41:20 +02:00
struct p2p_pending_action_tx *after_scan_tx;
P2P: Fix after_scan_tx processing during ongoing operations When Action frame TX is postponed until a pending p2p_scan completes, there may be additional operations that need to be continued after the postponed Action frame TX operation completes. Fix this by starting pending operation (if any) from TX status event for after_scan_tx frames. This fixes common errors seen with the test_discovery hwsim test case. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-23 20:12:04 +02:00
unsigned int after_scan_tx_in_progress:1;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
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
/* Requested device types for find/search */
unsigned int num_req_dev_types;
u8 *req_dev_types;
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
u8 *find_dev_id;
u8 find_dev_id_buf[ETH_ALEN];
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
wpa_supplicant: Use monotonic time for RX/BSS times The BSS table, scan timeout, and related functionality should use monotonic time since they care about relative values (age) only. Unfortunately, these are all connected, so the patch can't be split further. Another problem with this is that it changes the driver wrapper API. Though, it seems only the test driver is using this. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-12-16 21:08:28 +01:00
struct os_reltime find_start; /* time of last p2p_find start */
P2P: Do not use old scan result data for peer discovery The driver may have cached (e.g., in cfg80211 BSS table) the scan results for relatively long time. To avoid reporting stale information, update P2P peers only based on results that have based on frames received after the last p2p_find operation was started. This helps especially in detecting when a previously operating GO stops the group since the BSS entry for that could live for 30 seconds in the cfg80211 cache. Running p2p_flush followed by p2p_find will now allow wpa_supplicant to not add a P2P peer entry for that GO if the group had been terminated just before that p2p_flush command. Previously, that GO could have been indicated as a newly found device for up to 30 seconds after it had stopped the group. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-12 18:25:18 +01:00
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
struct p2p_group **groups;
size_t num_groups;
struct p2p_device *pending_client_disc_go;
u8 pending_client_disc_addr[ETH_ALEN];
u8 pending_dev_disc_dialog_token;
u8 pending_dev_disc_addr[ETH_ALEN];
int pending_dev_disc_freq;
unsigned int pending_client_disc_freq;
int ext_listen_only;
unsigned int ext_listen_period;
unsigned int ext_listen_interval;
unsigned int ext_listen_interval_sec;
unsigned int ext_listen_interval_usec;
P2P: Add test command for filtering which peers are discovered "wpa_cli p2p_set peer_filter <MAC address>" can now be used to only allow a single P2P Device (based on P2P Device Address) to be discovered for testing. Setting the address to 00:00:00:00:00:00 disables the filter.
2010-06-29 07:11:39 +02:00
u8 peer_filter[ETH_ALEN];
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 cross_connect;
P2P: Add support for automatic channel selection at GO The driver wrapper may now indicate the preferred channel (e.g., based on scan results) on both 2.4 GHz and 5 GHz bands (and an overall best frequency). When setting up a GO, this preference information is used to select the operating channel if configuration does not include hardcoded channel. Similarly, this information can be used during GO Negotiation to indicate preference for a specific channel based on current channel conditions. p2p_group_add command can now use special values (freq=2 and freq=5) to indicate that the GO is to be started on the specified band.
2010-11-10 12:33:47 +01:00
int best_freq_24;
int best_freq_5;
int best_freq_overall;
P2P: Fix shared frequency preference for concurrent operations Commit 50285f5ca8086cca45afa42cd23c3a3c1cd58f40 changed number of rules in channel selection and among other things, it broke the design where the currently used operating channel on a virtual interface that is shared by the same radio is preferred to avoid costs related to multi-channel concurrency. Fix this regression by making the P2P module aware of the shared channel and using that preference as the highest priority when re-selecting the channel during negotiation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-14 15:22:31 +01:00
int own_freq_preference;
P2P: Allow adding of WPS vendor extension attributes This adds the ability to add WPS vendor extension attributes in P2P frames, like GO Negotiation and Probe Response frames. Signed-off-by: Jean-Michel Bachot <jean-michelx.bachot@linux.intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-19 10:57:10 +01:00
/**
* wps_vendor_ext - WPS Vendor Extensions to add
*/
P2P: Use a single define for max number of vendor extensions
2011-03-19 11:20:10 +01:00
struct wpabuf *wps_vendor_ext[P2P_MAX_WPS_VENDOR_EXT];
P2P: Retry provision discovery requests in IDLE state Since the peer may not be in Listen state when the provision discovery request is sent, try to send the request again number of times when in IDLE state. This was already done when p2p_find is in progress, but this commit adds retries to the case where no other P2P operations are in progress. Signed-off-by: Jayant Sane <jayant.sane@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:20:39 +02:00
/*
* user_initiated_pd - Whether a PD request is user initiated or not.
*/
u8 user_initiated_pd;
/*
* Keep track of which peer a given PD request was sent to.
* Used to raise a timeout alert in case there is no response.
*/
u8 pending_pd_devaddr[ETH_ALEN];
/*
* Retry counter for provision discovery requests when issued
* in IDLE state.
*/
int pd_retries;
P2P: Use larger GO config timeout if HT40 is used Increase GO config timeout if HT40 is used since it takes some time to scan channels for coex purposes before the BSS can be started. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-15 22:19:11 +02:00
P2P: Fix PD retry channel on join-a-group case Join-a-group needs to force the current operating channel of the target group as the frequency to use for the PD exchange. When the channel was selected based on a BSS entry for the GO, this worked only for the first PD Request frame while the retries reverted to a potentially different channel based on a P2P peer entry. Fix this by maintaining the forced channel through the PD retry sequence. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-20 17:06:15 +02:00
/**
* pd_force_freq - Forced frequency for PD retries or 0 to auto-select
*
* This is is used during PD retries for join-a-group case to use the
* correct operating frequency determined from a BSS entry for the GO.
*/
int pd_force_freq;
P2P: Use larger GO config timeout if HT40 is used Increase GO config timeout if HT40 is used since it takes some time to scan channels for coex purposes before the BSS can be started. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-15 22:19:11 +02:00
u8 go_timeout;
u8 client_timeout;
P2P: Add option for adding extra delay to p2p_find A new optional delay=<search delay in milliseconds> parameter can now be used with p2p_find command to request an extra delay between search iterations. This can be used, e.g., to make p2p_find friendlier to concurrent operations by avoiding it from taking 100% of the radio resources. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-23 17:20:58 +02:00
/* Extra delay in milliseconds between search iterations */
unsigned int search_delay;
int in_search_delay;
WFD: Add Wi-Fi Display support This commit adds control interface commands and internal storage of Wi-Fi Display related configuration. In addition, WFD IE is now added to various P2P frames, Probe Request/Response, and (Re)Association Request/Response frames. WFD subelements from peers are stored in the P2P peer table. Following control interface commands are now available: SET wifi_display <0/1> GET wifi_display WFD_SUBELEM_SET <subelem> [hexdump of length+body] WFD_SUBELEM_GET <subelem> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 16:26:01 +01:00
#ifdef CONFIG_WIFI_DISPLAY
struct wpabuf *wfd_ie_beacon;
struct wpabuf *wfd_ie_probe_req;
struct wpabuf *wfd_ie_probe_resp;
struct wpabuf *wfd_ie_assoc_req;
struct wpabuf *wfd_ie_invitation;
struct wpabuf *wfd_ie_prov_disc_req;
struct wpabuf *wfd_ie_prov_disc_resp;
struct wpabuf *wfd_ie_go_neg;
struct wpabuf *wfd_dev_info;
struct wpabuf *wfd_assoc_bssid;
struct wpabuf *wfd_coupled_sink_info;
#endif /* CONFIG_WIFI_DISPLAY */
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
};
/**
* struct p2p_message - Parsed P2P message (or P2P IE)
*/
struct p2p_message {
struct wpabuf *p2p_attributes;
struct wpabuf *wps_attributes;
WFD: Add Wi-Fi Display support This commit adds control interface commands and internal storage of Wi-Fi Display related configuration. In addition, WFD IE is now added to various P2P frames, Probe Request/Response, and (Re)Association Request/Response frames. WFD subelements from peers are stored in the P2P peer table. Following control interface commands are now available: SET wifi_display <0/1> GET wifi_display WFD_SUBELEM_SET <subelem> [hexdump of length+body] WFD_SUBELEM_GET <subelem> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 16:26:01 +01:00
struct wpabuf *wfd_subelems;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
u8 dialog_token;
const u8 *capability;
const u8 *go_intent;
const u8 *status;
const u8 *listen_channel;
const u8 *operating_channel;
const u8 *channel_list;
u8 channel_list_len;
const u8 *config_timeout;
const u8 *intended_addr;
const u8 *group_bssid;
const u8 *invitation_flags;
const u8 *group_info;
size_t group_info_len;
const u8 *group_id;
size_t group_id_len;
const u8 *device_id;
const u8 *manageability;
const u8 *noa;
size_t noa_len;
const u8 *ext_listen_timing;
const u8 *minor_reason_code;
/* P2P Device Info */
const u8 *p2p_device_info;
size_t p2p_device_info_len;
const u8 *p2p_device_addr;
const u8 *pri_dev_type;
u8 num_sec_dev_types;
char device_name[33];
u16 config_methods;
/* WPS IE */
u16 dev_password_id;
u16 wps_config_methods;
const u8 *wps_pri_dev_type;
P2P: Keep track of secondary device types for peers Signed-off-by: Jean-Michel Bachot <jean-michelx.bachot@linux.intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-17 10:45:46 +01:00
const u8 *wps_sec_dev_type_list;
size_t wps_sec_dev_type_list_len;
P2P: Use a single define for max number of vendor extensions
2011-03-19 11:20:10 +01:00
const u8 *wps_vendor_ext[P2P_MAX_WPS_VENDOR_EXT];
size_t wps_vendor_ext_len[P2P_MAX_WPS_VENDOR_EXT];
P2P: Store more WPS attributes for peers Store Manufacturer, Model Name, Model Number, and Serial Number attributes for P2P peers and expose these through the existing peer information mechanisms.
2011-03-28 14:27:10 +02:00
const u8 *manufacturer;
size_t manufacturer_len;
const u8 *model_name;
size_t model_name_len;
const u8 *model_number;
size_t model_number_len;
const u8 *serial_number;
size_t serial_number_len;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/* DS Parameter Set IE */
const u8 *ds_params;
/* SSID IE */
const u8 *ssid;
};
#define P2P_MAX_GROUP_ENTRIES 50
struct p2p_group_info {
unsigned int num_clients;
struct p2p_client_info {
const u8 *p2p_device_addr;
const u8 *p2p_interface_addr;
u8 dev_capab;
u16 config_methods;
const u8 *pri_dev_type;
u8 num_sec_dev_types;
const u8 *sec_dev_types;
const char *dev_name;
size_t dev_name_len;
} client[P2P_MAX_GROUP_ENTRIES];
};
/* p2p_utils.c */
int p2p_random(char *buf, size_t len);
P2P: Clean up channel--frequency conversion functions All P2P use cases are required to use the global operating table and there is no need to need to try to maintain some backwards compatibility with country code -specific values. Clean up the implementation by removing the unnecessary country parameter. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-27 20:03:16 +02:00
int p2p_channel_to_freq(int op_class, int channel);
int p2p_freq_to_channel(unsigned int freq, u8 *op_class, u8 *channel);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
void p2p_channels_intersect(const struct p2p_channels *a,
const struct p2p_channels *b,
struct p2p_channels *res);
P2P: Add option to allow additional client channels The new p2p_add_cli_chan=1 configuration parameter can be used to request passive-scan channels to be included in P2P channel lists for cases where the local end may become the P2P client in a group. This allows more options for the peer to use channels, e.g., if the local device is not aware of its current location and has marked most channels to require passive scanning. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-22 20:00:49 +02:00
void p2p_channels_union(const struct p2p_channels *a,
const struct p2p_channels *b,
struct p2p_channels *res);
P2P: Add option to remove channels from GO use The new p2p_no_go_freq frequency range list (comma-separated list of min-max frequency ranges in MHz) can now be used to configure channels on which the local device is not allowed to operate as a GO, but on which that device can be a P2P Client. These channels are left in the P2P Channel List in GO Negotiation to allow the peer device to select one of the channels for the cases where the peer becomes the GO. The local end will remove these channels from consideration if it becomes the GO. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-22 18:45:46 +02:00
void p2p_channels_remove_freqs(struct p2p_channels *chan,
const struct wpa_freq_range_list *list);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
int p2p_channels_includes(const struct p2p_channels *channels, u8 reg_class,
u8 channel);
P2P: Add more user friendly debug print of channel lists This makes it easier to go through the P2P channel list operations in the debug log without having to parse through the hexdump manually. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-22 17:44:05 +02:00
void p2p_channels_dump(struct p2p_data *p2p, const char *title,
const struct p2p_channels *chan);
P2P: Move random channel selection into a helper function The new p2p_channel_select() function can be re-used to implement random channel selection from a set of operating classes in all places that need such functonality. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-18 16:41:39 +01:00
int p2p_channel_select(struct p2p_channels *chans, const int *classes,
u8 *op_class, u8 *op_channel);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/* p2p_parse.c */
int p2p_parse_p2p_ie(const struct wpabuf *buf, struct p2p_message *msg);
int p2p_parse_ies(const u8 *data, size_t len, struct p2p_message *msg);
int p2p_parse(const u8 *data, size_t len, struct p2p_message *msg);
void p2p_parse_free(struct p2p_message *msg);
int p2p_attr_text(struct wpabuf *data, char *buf, char *end);
int p2p_group_info_parse(const u8 *gi, size_t gi_len,
struct p2p_group_info *info);
/* p2p_build.c */
struct p2p_noa_desc {
u8 count_type;
u32 duration;
u32 interval;
u32 start_time;
};
/* p2p_group.c */
const u8 * p2p_group_get_interface_addr(struct p2p_group *group);
u8 p2p_group_presence_req(struct p2p_group *group,
const u8 *client_interface_addr,
const u8 *noa, size_t noa_len);
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
int p2p_group_is_group_id_match(struct p2p_group *group, const u8 *group_id,
size_t group_id_len);
WFD: Add Wi-Fi Display support This commit adds control interface commands and internal storage of Wi-Fi Display related configuration. In addition, WFD IE is now added to various P2P frames, Probe Request/Response, and (Re)Association Request/Response frames. WFD subelements from peers are stored in the P2P peer table. Following control interface commands are now available: SET wifi_display <0/1> GET wifi_display WFD_SUBELEM_SET <subelem> [hexdump of length+body] WFD_SUBELEM_GET <subelem> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 16:26:01 +01:00
void p2p_group_update_ies(struct p2p_group *group);
wpa_supplicant: Fix updating GO beacons on WFD subelements change When WFD Subelements are set, the IE in the Beacon frames of already existing groups are not updated. This patch fixes this issue by setting beacon_update to be 1 on WFD IE update. Signed-hostap: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2013-11-03 14:24:13 +01:00
void p2p_group_force_beacon_update_ies(struct p2p_group *group);
WFD: Add Wi-Fi Display support This commit adds control interface commands and internal storage of Wi-Fi Display related configuration. In addition, WFD IE is now added to various P2P frames, Probe Request/Response, and (Re)Association Request/Response frames. WFD subelements from peers are stored in the P2P peer table. Following control interface commands are now available: SET wifi_display <0/1> GET wifi_display WFD_SUBELEM_SET <subelem> [hexdump of length+body] WFD_SUBELEM_GET <subelem> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 16:26:01 +01:00
struct wpabuf * p2p_group_get_wfd_ie(struct p2p_group *g);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
void p2p_buf_add_action_hdr(struct wpabuf *buf, u8 subtype, u8 dialog_token);
void p2p_buf_add_public_action_hdr(struct wpabuf *buf, u8 subtype,
u8 dialog_token);
u8 * p2p_buf_add_ie_hdr(struct wpabuf *buf);
void p2p_buf_add_status(struct wpabuf *buf, u8 status);
void p2p_buf_add_device_info(struct wpabuf *buf, struct p2p_data *p2p,
struct p2p_device *peer);
void p2p_buf_add_device_id(struct wpabuf *buf, const u8 *dev_addr);
void p2p_buf_update_ie_hdr(struct wpabuf *buf, u8 *len);
void p2p_buf_add_capability(struct wpabuf *buf, u8 dev_capab, u8 group_capab);
void p2p_buf_add_go_intent(struct wpabuf *buf, u8 go_intent);
void p2p_buf_add_listen_channel(struct wpabuf *buf, const char *country,
u8 reg_class, u8 channel);
void p2p_buf_add_operating_channel(struct wpabuf *buf, const char *country,
u8 reg_class, u8 channel);
void p2p_buf_add_channel_list(struct wpabuf *buf, const char *country,
struct p2p_channels *chan);
void p2p_buf_add_config_timeout(struct wpabuf *buf, u8 go_timeout,
u8 client_timeout);
void p2p_buf_add_intended_addr(struct wpabuf *buf, const u8 *interface_addr);
void p2p_buf_add_group_bssid(struct wpabuf *buf, const u8 *bssid);
void p2p_buf_add_group_id(struct wpabuf *buf, const u8 *dev_addr,
const u8 *ssid, size_t ssid_len);
void p2p_buf_add_invitation_flags(struct wpabuf *buf, u8 flags);
void p2p_buf_add_noa(struct wpabuf *buf, u8 noa_index, u8 opp_ps, u8 ctwindow,
struct p2p_noa_desc *desc1, struct p2p_noa_desc *desc2);
void p2p_buf_add_ext_listen_timing(struct wpabuf *buf, u16 period,
u16 interval);
void p2p_buf_add_p2p_interface(struct wpabuf *buf, struct p2p_data *p2p);
Add explicit buffer length checks for p2p_build_wps_ie() Even though the length of this buffer is based only on locally configured information, it is cleaner to include explicit buffer room validation steps when adding the attributes into the buffer. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-26 11:54:20 +02:00
int p2p_build_wps_ie(struct p2p_data *p2p, struct wpabuf *buf, int pw_id,
int all_attr);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/* p2p_sd.c */
struct p2p_sd_query * p2p_pending_sd_req(struct p2p_data *p2p,
struct p2p_device *dev);
void p2p_free_sd_queries(struct p2p_data *p2p);
void p2p_rx_gas_initial_req(struct p2p_data *p2p, const u8 *sa,
const u8 *data, size_t len, int rx_freq);
void p2p_rx_gas_initial_resp(struct p2p_data *p2p, const u8 *sa,
P2P: Initial support for SD fragmentation (GAS Comeback Request/Response)
2010-06-28 18:24:17 +02:00
const u8 *data, size_t len, int rx_freq);
void p2p_rx_gas_comeback_req(struct p2p_data *p2p, const u8 *sa,
const u8 *data, size_t len, int rx_freq);
void p2p_rx_gas_comeback_resp(struct p2p_data *p2p, const u8 *sa,
const u8 *data, size_t len, int rx_freq);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
int p2p_start_sd(struct p2p_data *p2p, struct p2p_device *dev);
/* p2p_go_neg.c */
int p2p_peer_channels_check(struct p2p_data *p2p, struct p2p_channels *own,
struct p2p_device *dev,
const u8 *channel_list, size_t channel_list_len);
void p2p_process_go_neg_req(struct p2p_data *p2p, const u8 *sa,
const u8 *data, size_t len, int rx_freq);
void p2p_process_go_neg_resp(struct p2p_data *p2p, const u8 *sa,
const u8 *data, size_t len, int rx_freq);
void p2p_process_go_neg_conf(struct p2p_data *p2p, const u8 *sa,
const u8 *data, size_t len);
int p2p_connect_send(struct p2p_data *p2p, struct p2p_device *dev);
P2P: Advertise immediate availability of WPS credential Use Device Password ID in WSC IE of Probe Request and Probe Response frames to advertise immediate availability of WPS credentials per P2P specification sections 3.1.2.1.1 (Listen State), 3.1.2.1.2 (Scan Phase), and 3.1.2.1.3 (Find Phase). For now, the Device Password ID is set only for the case where we are active GO Negotiation with a specific peer. In practice, this means that the Probe Response frames during pending GO Negotiation (whenever in Listen state) indicate availability of the credential. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-27 22:14:35 +01:00
u16 p2p_wps_method_pw_id(enum p2p_wps_method wps_method);
P2P: Allow peer to propose channel in invitation process Make Invitation process for re-invoking a persistent group behave similarly to GO Negotiation as far as channel negotiation is concerned. The Operating Channel value (if present) is used as a starting point if the local device does not have a forced operating channel (e.g., due to concurrent use). Channel lists from devices are then compared to check that the selected channel is in the intersection. If not, channel is selected based on GO Negotiation channel rules (best channel preferences etc.). Invitation Request is rejected if no common channel can be selected. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-24 21:15:58 +02:00
void p2p_reselect_channel(struct p2p_data *p2p,
struct p2p_channels *intersection);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/* p2p_pd.c */
void p2p_process_prov_disc_req(struct p2p_data *p2p, const u8 *sa,
const u8 *data, size_t len, int rx_freq);
void p2p_process_prov_disc_resp(struct p2p_data *p2p, const u8 *sa,
const u8 *data, size_t len);
int p2p_send_prov_disc_req(struct p2p_data *p2p, struct p2p_device *dev,
P2P: Fix Provision Discovery channel for some join-GO cases The Provision Discovery Request needs to be sent on the operating channel of the GO and as such, the frequency from the BSS table (scan results) need to override the frequency in the P2P peer table that could be based on the Listen channel of the GO. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-18 16:21:25 +01:00
int join, int force_freq);
P2P: Retry provision discovery requests in IDLE state Since the peer may not be in Listen state when the provision discovery request is sent, try to send the request again number of times when in IDLE state. This was already done when p2p_find is in progress, but this commit adds retries to the case where no other P2P operations are in progress. Signed-off-by: Jayant Sane <jayant.sane@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:20:39 +02:00
void p2p_reset_pending_pd(struct p2p_data *p2p);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/* p2p_invitation.c */
void p2p_process_invitation_req(struct p2p_data *p2p, const u8 *sa,
const u8 *data, size_t len, int rx_freq);
void p2p_process_invitation_resp(struct p2p_data *p2p, const u8 *sa,
const u8 *data, size_t len);
int p2p_invite_send(struct p2p_data *p2p, struct p2p_device *dev,
const u8 *go_dev_addr);
void p2p_invitation_req_cb(struct p2p_data *p2p, int success);
void p2p_invitation_resp_cb(struct p2p_data *p2p, int success);
/* p2p_dev_disc.c */
void p2p_process_dev_disc_req(struct p2p_data *p2p, const u8 *sa,
const u8 *data, size_t len, int rx_freq);
void p2p_dev_disc_req_cb(struct p2p_data *p2p, int success);
int p2p_send_dev_disc_req(struct p2p_data *p2p, struct p2p_device *dev);
void p2p_dev_disc_resp_cb(struct p2p_data *p2p, int success);
void p2p_process_dev_disc_resp(struct p2p_data *p2p, const u8 *sa,
const u8 *data, size_t len);
void p2p_go_disc_req_cb(struct p2p_data *p2p, int success);
void p2p_process_go_disc_req(struct p2p_data *p2p, const u8 *da, const u8 *sa,
const u8 *data, size_t len, int rx_freq);
/* p2p.c */
void p2p_set_state(struct p2p_data *p2p, int new_state);
void p2p_set_timeout(struct p2p_data *p2p, unsigned int sec,
unsigned int usec);
void p2p_clear_timeout(struct p2p_data *p2p);
void p2p_continue_find(struct p2p_data *p2p);
struct p2p_device * p2p_add_dev_from_go_neg_req(struct p2p_data *p2p,
const u8 *addr,
struct p2p_message *msg);
void p2p_add_dev_info(struct p2p_data *p2p, const u8 *addr,
struct p2p_device *dev, struct p2p_message *msg);
P2P: Consider age for the P2P scan results cfg80211 caches the scan results according the channel number. Due to the 15 sec aging this might cause the user mode to see more than one scan result with the same BSSID, e.g. - one scan result for the P2P Device and one for the P2P GO (once it's enabled). Fix this by updating the device entry only if the new peer entry is newer than the one previously stored. Signed-off-by: Yoni Divinsky <yoni.divinsky@ti.com> Signed-off-by: Victor Goldenshtein <victorg@ti.com> Signed-off-by: Igal Chernobelsky <igalc@ti.com> Signed-hostap: Arik Nemtsov <arik@wizery.com>
2012-12-25 10:22:42 +01:00
int p2p_add_device(struct p2p_data *p2p, const u8 *addr, int freq,
wpa_supplicant: Use monotonic time for RX/BSS times The BSS table, scan timeout, and related functionality should use monotonic time since they care about relative values (age) only. Unfortunately, these are all connected, so the patch can't be split further. Another problem with this is that it changes the driver wrapper API. Though, it seems only the test driver is using this. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-12-16 21:08:28 +01:00
struct os_reltime *rx_time, int level, const u8 *ies,
P2P: Consider age for the P2P scan results cfg80211 caches the scan results according the channel number. Due to the 15 sec aging this might cause the user mode to see more than one scan result with the same BSSID, e.g. - one scan result for the P2P Device and one for the P2P GO (once it's enabled). Fix this by updating the device entry only if the new peer entry is newer than the one previously stored. Signed-off-by: Yoni Divinsky <yoni.divinsky@ti.com> Signed-off-by: Victor Goldenshtein <victorg@ti.com> Signed-off-by: Igal Chernobelsky <igalc@ti.com> Signed-hostap: Arik Nemtsov <arik@wizery.com>
2012-12-25 10:22:42 +01:00
size_t ies_len, int scan_res);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
struct p2p_device * p2p_get_device(struct p2p_data *p2p, const u8 *addr);
struct p2p_device * p2p_get_device_interface(struct p2p_data *p2p,
const u8 *addr);
void p2p_go_neg_failed(struct p2p_data *p2p, struct p2p_device *peer,
int status);
void p2p_go_complete(struct p2p_data *p2p, struct p2p_device *peer);
int p2p_match_dev_type(struct p2p_data *p2p, struct wpabuf *wps);
int dev_type_list_match(const u8 *dev_type, const u8 *req_dev_type[],
size_t num_req_dev_type);
struct wpabuf * p2p_build_probe_resp_ies(struct p2p_data *p2p);
void p2p_build_ssid(struct p2p_data *p2p, u8 *ssid, size_t *ssid_len);
P2P: Delay send_action call if p2p_scan is in progress In order to avoid confusing the driver with a new remain-on-channel request, delay sending of a new Action frame if the driver indicates Action frame RX diromg a scan.
2010-10-20 18:41:20 +02:00
int p2p_send_action(struct p2p_data *p2p, unsigned int freq, const u8 *dst,
const u8 *src, const u8 *bssid, const u8 *buf,
size_t len, unsigned int wait_time);
P2P: Fix remain-on-channel use with PD/Invitation Request while in Listen If Listen state was in progress on another channel when a request to send an Action frame (e.g., Provision Discovery Request or Invitation Request to a peer on the peer's Listen channel that is different from our Listenc hannel) is issued, wpa_supplicant tried to use concurrent remain-on-channel operations. While some drivers can handle this cleanly, there are drivers that don't and wpa_supplicant is not expected to request concurrent remain-on-channel operations. Fix this by cancelling the ongoing remain-on-channel with stop_listen prior to sending the Action frame on another channel. If a P2P search was in progress, it will be continued after the timeout on the new operation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-27 16:23:41 +01:00
void p2p_stop_listen_for_freq(struct p2p_data *p2p, int freq);
P2P: Allow all channels in case of multi channel concurrency If multi channel concurrency is supported, we have to populate the p2p_channels with list of channels that we support. Use the same design that was previously added for GO Negotiation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-25 17:41:32 +01:00
int p2p_prepare_channel(struct p2p_data *p2p, struct p2p_device *dev,
P2P: Add option to allow additional client channels The new p2p_add_cli_chan=1 configuration parameter can be used to request passive-scan channels to be included in P2P channel lists for cases where the local end may become the P2P client in a group. This allows more options for the peer to use channels, e.g., if the local device is not aware of its current location and has marked most channels to require passive scanning. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-22 20:00:49 +02:00
unsigned int force_freq, unsigned int pref_freq,
int go);
P2P: Clean up debug prints Replace direct wpa_msg() calls with p2p_dbg(), p2p_info(), and p2p_err() calls that use a new debug_print() callback to handle actual debug printing outside the P2P module. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:47:36 +02:00
void p2p_dbg(struct p2p_data *p2p, const char *fmt, ...)
PRINTF_FORMAT(2, 3);
void p2p_info(struct p2p_data *p2p, const char *fmt, ...)
PRINTF_FORMAT(2, 3);
void p2p_err(struct p2p_data *p2p, const char *fmt, ...)
PRINTF_FORMAT(2, 3);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
#endif /* P2P_I_H */
Reference in a new issue Copy permalink