DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions
hostapd/wpa_supplicant/p2p_supplicant.c

9298 lines
262 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
Use radio work for P2P scan requests Avoid concurrent P2P scan requests with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 10:57:57 +01:00
* Copyright (c) 2010-2014, Jouni Malinen <j@w1.fi>
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
*
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
*/
#include "includes.h"
#include "common.h"
#include "eloop.h"
#include "common/ieee802_11_common.h"
#include "common/ieee802_11_defs.h"
#include "common/wpa_ctrl.h"
#include "wps/wps_i.h"
#include "p2p/p2p.h"
#include "ap/hostapd.h"
Do not add P2P IE into Beacon/Probe Response if P2P is disabled P2P IE was incorrectly added in wpa_supplicant AP mode even if P2P function was not actually enabled. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-14 15:26:45 +01:00
#include "ap/ap_config.h"
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
#include "ap/sta_info.h"
#include "ap/ap_drv_ops.h"
P2P NFC: Enable own NFC Tag on GO Registrar When "P2P_SET nfc_tag 1" is used to enable the own NFC Tag for P2P, also enable it for any running GO interface. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 17:08:26 +02:00
#include "ap/wps_hostapd.h"
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
#include "ap/p2p_hostapd.h"
DFS offload: P2P changes for autonomous GO Add P2P changes to allow bringing up P2P autonomous GO on a DFS channel if DFS functionality is offloaded to the driver. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-03-05 02:31:25 +01:00
#include "ap/dfs.h"
Clear WPA and EAPOL state machine config pointer on network removal Make sure that the WPA and EAPOL state machines do not hold a pointer to a network configuration that is about to be freed. This can fix potential issues with references to freed memory.
2011-06-27 18:02:24 +02:00
#include "eapol_supp/eapol_supp_sm.h"
#include "rsn_supp/wpa.h"
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
#include "wpa_supplicant_i.h"
#include "driver_i.h"
#include "ap.h"
#include "config_ssid.h"
#include "config.h"
#include "notify.h"
#include "scan.h"
#include "bss.h"
GAS: Use off-channel operations for requests This separates off-channel Action frame TX/RX from P2P into a generic implementation that can now be used both for P2P and GAS needs.
2011-09-29 18:22:08 +02:00
#include "offchannel.h"
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
#include "wps_supplicant.h"
#include "p2p_supplicant.h"
P2P: Add wfd_dev_info= field for device found event This field allows adds enough information into the P2P-DEVICE-FOUND events to figure out if the peer supports Wi-Fi Display. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-11-25 23:56:38 +01:00
#include "wifi_display.h"
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Allow multiple scan runs to find GO for p2p_connect join If the GO is not found, we cannot send Provisioning Discovery Request frame and cannot really connect anyway. Since the Provisioning Discovery is a mandatory part, it is better to continue join-scan until the GO is found instead of moving to the next step where normal connection scan is used (PD would not be used from there). Use a limit of 10 scan attempts for p2p_connect join to avoid getting in infinite loop trying to join. If the GO is not found with those scans, indicate failure (P2P-GROUP-FORMATION-FAILURE) and stop the join attempt.
2010-11-15 15:15:38 +01:00
/*
* How many times to try to scan to find the GO before giving up on join
* request.
*/
#define P2P_MAX_JOIN_SCAN_ATTEMPTS 10
P2P: Improve p2p_prov_disc-auto robustness Perform addition additional scan runs on the operating channel of the GO (if known from previous scan results) and fall back to initiate the PD for GO Negotiation if these additional scans do not detect the peer as GO. Signed-hostap: Sunil Dutt Undekari <duttus@codeaurora.org>
2012-06-06 14:46:05 +02:00
#define P2P_AUTO_PD_SCAN_ATTEMPTS 5
P2P: Move a GO from its operating frequency Upon any change in the currently used channels evaluate if a GO should move to a different operating frequency, where the possible scenarios: 1. The frequency that the GO is currently using is no longer valid, due to regulatory reasons, and thus the GO must be moved to some other frequency. 2. Due to Multi Concurrent Channel (MCC) policy considerations, it would be preferable, based on configuration settings, to prefer Same Channel Mode (SCM) over concurrent operation in multiple channels. The supported policies: - prefer SCM: prefer moving the GO to a frequency used by some other interface. - prefer SCM if Peer supports: prefer moving the GO to a frequency used by some other station interface iff the other station interface is using a frequency that is common between the local and the peer device (based on the GO Negotiation/Invitation signaling). - Stay on the current frequency. Currently, the GO transition to another frequency is handled by a complete tear down and re-setup of the GO. Still need to add CSA flow to the considerations. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:19 +02:00
/**
* Defines time interval in seconds when a GO needs to evacuate a frequency that
* it is currently using, but is no longer valid for P2P use cases.
*/
#define P2P_GO_FREQ_CHANGE_TIME 5
P2P: Implement wpas_p2p_move_go_csa() Use channel switch mechanism to move a P2P GO to a new channel, when required. In order to be able to reconfigure the GO channel, split wpa_supplicant_conf_ap() function, so the frequency configuration part can be reused to find additional CSA settings. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2015-09-08 11:46:16 +02:00
/**
* Defines CSA parameters which are used when GO evacuates the no longer valid
* channel (and if the driver supports channel switch).
*/
#define P2P_GO_CSA_COUNT 7
#define P2P_GO_CSA_BLOCK_TX 0
P2P: Use hardcoded idle timeout of 10 seconds in P2P client role The p2p_group_idle configuration parameter is much more useful for GO role, so use a separate hardcoded value of 10 seconds in P2P client role. In practice, this means that the P2P client role will automatically tear down the group when the GO tears down the group. The 10 second timeout is enough to recover from temporary disconnections without unnecessary tearing down the group if the GO is still present and allows the client to connect. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-18 21:21:22 +01:00
#ifndef P2P_MAX_CLIENT_IDLE
/*
* How many seconds to try to reconnect to the GO when connection in P2P client
* role has been lost.
*/
#define P2P_MAX_CLIENT_IDLE 10
#endif /* P2P_MAX_CLIENT_IDLE */
P2P: Extend use of group formation timeout until end of 4-way handshake Instead of relying on the P2P group idle timeout before the group connection has been fully established, re-start the group formation timeout in the end of the WPS provisioning step and clear it at the successful completion of the initial 4-way handshake. This allows the P2P group idle timeout to be set to a small value without triggering it during the initial scan and connection attempt. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-13 16:01:15 +02:00
#ifndef P2P_MAX_INITIAL_CONN_WAIT
/*
* How many seconds to wait for initial 4-way handshake to get completed after
P2P: Set a timeout for a persistent reinvoke on a P2P Client Use P2P group formation timeout to wait for the 4-way handshake to complete on a persistent reinvocation on a P2P Client. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-11 10:54:17 +01:00
* WPS provisioning step or after the re-invocation of a persistent group on a
* P2P Client.
P2P: Extend use of group formation timeout until end of 4-way handshake Instead of relying on the P2P group idle timeout before the group connection has been fully established, re-start the group formation timeout in the end of the WPS provisioning step and clear it at the successful completion of the initial 4-way handshake. This allows the P2P group idle timeout to be set to a small value without triggering it during the initial scan and connection attempt. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-13 16:01:15 +02:00
*/
#define P2P_MAX_INITIAL_CONN_WAIT 10
#endif /* P2P_MAX_INITIAL_CONN_WAIT */
P2P: Postpone concurrent scans when waiting for first client as GO Previously, concurrent station mode scans were postponed during an ongoing P2P group formation up to the point of completed WPS provisioning step. This would allow a scan to be started before the P2P client has completed association for the data connection if a scan request were timed to hit the window between the provisioning step and the following association. Avoid this by extending P2P-in-progress state to continue until the first data connection has been completed as part of group formation. Use a ten second timeout for this to avoid leaving scans disabled indefinitely if the client fails to connect completely. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-27 11:23:10 +02:00
#ifndef P2P_MAX_INITIAL_CONN_WAIT_GO
/*
* How many seconds to wait for initial 4-way handshake to get completed after
* WPS provisioning step on the GO. This controls the extra time the P2P
* operation is considered to be in progress (e.g., to delay other scans) after
* WPS provisioning has been completed on the GO during group formation.
*/
#define P2P_MAX_INITIAL_CONN_WAIT_GO 10
#endif /* P2P_MAX_INITIAL_CONN_WAIT_GO */
P2P: Use group formation timeout on persistent group GO Previously, GO considered the group to be fully re-invoked after starting beaconing on successful invitation exchange. This would leave the group running until idle timeout (which may not be enabled) or explicit removal if the client fails to connect for any reason. Since the client is expected to connect immediately after the invitation exchange that ends with status=0 (i.e., either client initiated the exchange or it responded with success), extend group formation timeout to cover that period until the first successfully completed data connection. This allows the GO to remove the group automatically if the client devices does not connect within P2P_MAX_INITIAL_CONN_WAIT_GO_REINVOKE (15) seconds. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-26 20:24:09 +02:00
#ifndef P2P_MAX_INITIAL_CONN_WAIT_GO_REINVOKE
/*
* How many seconds to wait for initial 4-way handshake to get completed after
* re-invocation of a persistent group on the GO when the client is expected
* to connect automatically (no user interaction).
*/
#define P2P_MAX_INITIAL_CONN_WAIT_GO_REINVOKE 15
#endif /* P2P_MAX_INITIAL_CONN_WAIT_GO_REINVOKE */
P2P: Derive group interface name bit more sensibly The interface name for the P2P group interface is derived from the P2P management interface. When the P2P management interface is a P2P Device interface, i.e., p2p-dev-wlanX, the name for the group interface is abbreviated to p2p-X (X being group index). When the P2P management interface starts with p2p-dev- use its postfix instead. So P2P management interface p2p-dev-wlan3 results in group interface name p2p-wlan3-0. Signed-hostap: Arend van Spriel <arend@broadcom.com>
2013-06-30 09:19:31 +02:00
#define P2P_MGMT_DEVICE_PREFIX "p2p-dev-"
P2P: Disallow GO CS immediately after GO Negotiation or invitation A newly created GO might move to another channel before the client was able to connect to it. This creates a situation where the client searches the GO on the channel agreed upon during GO Negotiation or invitation signaling, while the GO is on another channel. This in turn might lead to delayed connection or connection failure and group removal. Fix this by disallowing a GO CS as long as there is some activity that should delay the switch. If a GO move is not allowed, set a timeout to re-attempt the move. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:26 +02:00
/*
* How many seconds to wait to re-attempt to move GOs, in case previous attempt
* was not possible.
*/
#define P2P_RECONSIDER_GO_MOVE_DELAY 30
P2P: Move group removal reason to a function parameter wpa_s->removal_reason was set only when calling wpas_p2p_group_delete() and while couple of call places did not set this, it should really be set in each case. As such, it works better as a function parameter than a variable in struct wpa_supplicant. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-11 11:41:31 +02:00
enum p2p_group_removal_reason {
P2P_GROUP_REMOVAL_UNKNOWN,
P2P_GROUP_REMOVAL_SILENT,
P2P_GROUP_REMOVAL_FORMATION_FAILED,
P2P_GROUP_REMOVAL_REQUESTED,
P2P_GROUP_REMOVAL_IDLE_TIMEOUT,
P2P_GROUP_REMOVAL_UNAVAILABLE,
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
P2P_GROUP_REMOVAL_GO_ENDING_SESSION,
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
P2P_GROUP_REMOVAL_PSK_FAILURE,
P2P: Move a GO from its operating frequency Upon any change in the currently used channels evaluate if a GO should move to a different operating frequency, where the possible scenarios: 1. The frequency that the GO is currently using is no longer valid, due to regulatory reasons, and thus the GO must be moved to some other frequency. 2. Due to Multi Concurrent Channel (MCC) policy considerations, it would be preferable, based on configuration settings, to prefer Same Channel Mode (SCM) over concurrent operation in multiple channels. The supported policies: - prefer SCM: prefer moving the GO to a frequency used by some other interface. - prefer SCM if Peer supports: prefer moving the GO to a frequency used by some other station interface iff the other station interface is using a frequency that is common between the local and the peer device (based on the GO Negotiation/Invitation signaling). - Stay on the current frequency. Currently, the GO transition to another frequency is handled by a complete tear down and re-setup of the GO. Still need to add CSA flow to the considerations. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:19 +02:00
P2P_GROUP_REMOVAL_FREQ_CONFLICT,
P2P_GROUP_REMOVAL_GO_LEAVE_CHANNEL
P2P: Move group removal reason to a function parameter wpa_s->removal_reason was set only when calling wpas_p2p_group_delete() and while couple of call places did not set this, it should really be set in each case. As such, it works better as a function parameter than a variable in struct wpa_supplicant. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-11 11:41:31 +02:00
};
P2P: Allow multiple scan runs to find GO for p2p_connect join If the GO is not found, we cannot send Provisioning Discovery Request frame and cannot really connect anyway. Since the Provisioning Discovery is a mandatory part, it is better to continue join-scan until the GO is found instead of moving to the next step where normal connection scan is used (PD would not be used from there). Use a limit of 10 scan attempts for p2p_connect join to avoid getting in infinite loop trying to join. If the GO is not found with those scans, indicate failure (P2P-GROUP-FORMATION-FAILURE) and stop the join attempt.
2010-11-15 15:15:38 +01:00
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
static void wpas_p2p_long_listen_timeout(void *eloop_ctx, void *timeout_ctx);
static struct wpa_supplicant *
wpas_p2p_get_group_iface(struct wpa_supplicant *wpa_s, int addr_allocated,
int go);
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 00:44:29 +02:00
static int wpas_p2p_join_start(struct wpa_supplicant *wpa_s, int freq,
const u8 *ssid, size_t ssid_len);
P2PS: Add channel policy to PD Request Add operating channel selection and channel list processing similar to that done when building GO Negotiation Request, i.e., consider the currently used channels, configured channels, etc. P2PS introduces a flow where a responder needs to provide channel data without being previously aware of the current constraints, i.e., the channels currently in use by other interfaces. To handle this, extend the get_group_capability() callback to also handle channel selection aspects of group capabilities. In case there is an active P2P GO that is going to be used for the P2PS PD, force its current operating frequency in the PD attributes. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-10-08 11:35:58 +02:00
static int wpas_p2p_setup_freqs(struct wpa_supplicant *wpa_s, int freq,
int *force_freq, int *pref_freq, int go,
unsigned int *pref_freq_list,
unsigned int *num_pref_freq);
P2P: Limit join-a-group scans based on SSID from invitation If we already know the SSID of the P2P group we are trying to join, use that SSID to limit scan responses and BSS selection since we do not really look for any other network in this case. In addition, this can fix cases where the peer has just changed its SSID (e.g., started a new group) and there may be multiple BSS entries for the same BSSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2014-01-13 20:39:06 +01:00
static void wpas_p2p_join_scan_req(struct wpa_supplicant *wpa_s, int freq,
const u8 *ssid, size_t ssid_len);
P2P: Run a scan before provision discovery in p2p_connect join This is needed to make sure we have fresh BSS information for the GO.
2010-06-27 01:20:57 +02:00
static void wpas_p2p_join_scan(void *eloop_ctx, void *timeout_ctx);
P2P: Add command for pre-authorizing an invitation to an active group This is mainly designed for testing and allows p2p_connect join auth to be used to accept a specific invitation to an active group that may be received in the future.
2010-06-27 09:11:42 +02:00
static int wpas_p2p_join(struct wpa_supplicant *wpa_s, const u8 *iface_addr,
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
const u8 *dev_addr, enum p2p_wps_method wps_method,
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 00:44:29 +02:00
int auto_join, int freq,
const u8 *ssid, size_t ssid_len);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
static int wpas_p2p_create_iface(struct wpa_supplicant *wpa_s);
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
static void wpas_p2p_cross_connect_setup(struct wpa_supplicant *wpa_s);
P2P: Add mechanism for timing out idle groups A new configuration parameter, p2p_group_idle, can now be used to set idle timeout value for P2P groups in seconds (0 = no timeout). If set, this values is used to remove P2P group (both GO and P2P client) interfaces after the group has been idle (no clients/GO seen) for the configuration duration. The P2P-GROUP-REMOVED event is now indicating the reason for group removal when known. For example: P2P-GROUP-REMOVED wlan0 GO reason=REQUESTED P2P-GROUP-REMOVED wlan1 client reason=IDLE
2010-10-25 17:24:15 +02:00
static void wpas_p2p_group_idle_timeout(void *eloop_ctx, void *timeout_ctx);
static void wpas_p2p_set_group_idle_timeout(struct wpa_supplicant *wpa_s);
P2P: Cancel group formation timeout on group removal (on client) Group formation timeout is normally canceled when 4-way handshake is completed (WPA_COMPLETED -> wpas_p2p_completed). However, it is possible for the GO to stop the group before this happens (i.e., send Deauthentication frame with reason code 3 before 4-way handshake is completed). This resulted in the group getting removed, but the group formation timeout left behind. The unexpected timeout may then result in undesired termination of the following operation. Fix this by canceling the group formation timeout in wpas_p2p_group_delete() similarly to how group idle timeout was canceled there. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-10 22:36:52 +01:00
static void wpas_p2p_group_formation_timeout(void *eloop_ctx,
void *timeout_ctx);
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
static void wpas_p2p_group_freq_conflict(void *eloop_ctx, void *timeout_ctx);
P2P: Fix P2P_CONNECT-auto fallback to GO Neg with group interface If a separate P2P group interface was used, P2P_CONNECT-auto fallback to GO Negotiation could result in use of freed memory and segmentation fault. This happened in cases where the peer GO was found in some old scans, but not in the first scan triggered by the P2P_CONNECT-auto command ("P2P: Peer was found running GO in older scan -> try to join the group" shows up in the debug log). In addition, the GO would still need to reply to PD Request to allow this code path to be triggered. When five scans for the GO were completed in this sequence, the P2P group interface was removed as part of falling back to GO Negotiation. However, that ended up dereferencing the freed wpa_s instance at the end of scan event processing. Fix this by reordering code a bit and breaking out from EVENT_SCAN_RESULTS processing if the interface could have been removed. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 10:38:56 +01:00
static int wpas_p2p_fallback_to_go_neg(struct wpa_supplicant *wpa_s,
int group_added);
P2P: Remove unreachable code in wpas_p2p_stop_find() Commit 152cff6ba6d6ac206b93a2202eab57f0a36c26cb ('P2P: Remove WPA_DRIVER_FLAGS_P2P_MGMT option') removed the only non-zero return from wpas_p2p_stop_find_oper(), but did not remove the useless return value or the return check in wpas_p2p_stop_find(). Clean these up by removing unreachable code and useless return value. Signed-off-by: Eduardo Abinader <eduardo.abinader@openbossa.org>
2014-08-01 18:31:07 +02:00
static void wpas_p2p_stop_find_oper(struct wpa_supplicant *wpa_s);
wpa_supplicant: Complete radio works on disable event While testing rfkill blocking of a scanning interface, it was seen that the ongoing scan never completes. This happens since EVENT_SCAN_RESULTS is discarded on a disabled interface. Fix this and also other possible radio work completion issues by removing all the radio works (including started) of the disabled interface. To be able to remove already started radio works, make their callbacks be reentrant with deinit flag (when the work is started), so each radio work should be able to handle its own termination. Signed-hostap: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2014-02-13 10:24:00 +01:00
static void wpas_stop_listen(void *ctx);
Remove leftover timeouts on cleanup Signed-off-by: Alexandru Costache <alexandru.costache.100@gmail.com>
2014-05-12 18:14:55 +02:00
static void wpas_p2p_psk_failure_removal(void *eloop_ctx, void *timeout_ctx);
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 void wpas_p2p_group_deinit(struct wpa_supplicant *wpa_s);
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
static int wpas_p2p_add_group_interface(struct wpa_supplicant *wpa_s,
enum wpa_driver_if_type type);
P2P: Fix group interface addition failure properly for concurrent case It was possible for a P2P group formation failure to result in a concurrent station mode operation getting disconnected in the specific error case where group interface addition fails after a successful GO Negotiation. Fix this by skipping the wpas_p2p_group_delete() call in this specific case since the group interface does not exists anymore at the point wpas_group_formation_completed() gets called. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-06-15 22:34:11 +02:00
static void wpas_p2p_group_formation_failed(struct wpa_supplicant *wpa_s,
int already_deleted);
P2P: Consider channel optimizations for additional cases Re-factor the code, so channel optimizations would be also triggered upon the following changes: channel updates from the kernel, disallow_freq interface, etc. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:25 +02:00
static void wpas_p2p_optimize_listen_channel(struct wpa_supplicant *wpa_s,
struct wpa_used_freq_data *freqs,
unsigned int num);
P2P: Move a GO from its operating frequency Upon any change in the currently used channels evaluate if a GO should move to a different operating frequency, where the possible scenarios: 1. The frequency that the GO is currently using is no longer valid, due to regulatory reasons, and thus the GO must be moved to some other frequency. 2. Due to Multi Concurrent Channel (MCC) policy considerations, it would be preferable, based on configuration settings, to prefer Same Channel Mode (SCM) over concurrent operation in multiple channels. The supported policies: - prefer SCM: prefer moving the GO to a frequency used by some other interface. - prefer SCM if Peer supports: prefer moving the GO to a frequency used by some other station interface iff the other station interface is using a frequency that is common between the local and the peer device (based on the GO Negotiation/Invitation signaling). - Stay on the current frequency. Currently, the GO transition to another frequency is handled by a complete tear down and re-setup of the GO. Still need to add CSA flow to the considerations. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:19 +02:00
static void wpas_p2p_move_go(void *eloop_ctx, void *timeout_ctx);
P2P: Move a GO to a frequency that is also supported by the client A P2P GO interface that was instantiated after a GO Negotiation or Invitation holds the intersection of frequencies between the GO and the client. In case the GO is going to move to another frequency, allow it to move only to a frequency that is also supported by the client. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:21 +02:00
static int wpas_p2p_go_is_peer_freq(struct wpa_supplicant *wpa_s, int freq);
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 void
wpas_p2p_consider_moving_gos(struct wpa_supplicant *wpa_s,
struct wpa_used_freq_data *freqs, unsigned int num,
enum wpas_p2p_channel_update_trig trig);
P2P: Disallow GO CS immediately after GO Negotiation or invitation A newly created GO might move to another channel before the client was able to connect to it. This creates a situation where the client searches the GO on the channel agreed upon during GO Negotiation or invitation signaling, while the GO is on another channel. This in turn might lead to delayed connection or connection failure and group removal. Fix this by disallowing a GO CS as long as there is some activity that should delay the switch. If a GO move is not allowed, set a timeout to re-attempt the move. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:26 +02:00
static void wpas_p2p_reconsider_moving_go(void *eloop_ctx, void *timeout_ctx);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
/*
* Get the number of concurrent channels that the HW can operate, but that are
* currently not in use by any of the wpa_supplicant interfaces.
*/
static int wpas_p2p_num_unused_channels(struct wpa_supplicant *wpa_s)
{
int *freqs;
P2P: Add more debug prints for frequency selection This prints out get_shared_radio_freqs() results and related information from P2P operations to make debug logs more helpful for figuring out issues related to multi-channel concurrency. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-05 10:07:51 +01:00
int num, unused;
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
freqs = os_calloc(wpa_s->num_multichan_concurrent, sizeof(int));
if (!freqs)
return -1;
num = get_shared_radio_freqs(wpa_s, freqs,
wpa_s->num_multichan_concurrent);
os_free(freqs);
P2P: Add more debug prints for frequency selection This prints out get_shared_radio_freqs() results and related information from P2P operations to make debug logs more helpful for figuring out issues related to multi-channel concurrency. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-05 10:07:51 +01:00
unused = wpa_s->num_multichan_concurrent - num;
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: num_unused_channels: %d", unused);
return unused;
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
}
/*
* Get the frequencies that are currently in use by one or more of the virtual
* interfaces, and that are also valid for P2P operation.
*/
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
static unsigned int
wpas_p2p_valid_oper_freqs(struct wpa_supplicant *wpa_s,
struct wpa_used_freq_data *p2p_freqs,
unsigned int len)
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
{
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
struct wpa_used_freq_data *freqs;
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
unsigned int num, i, j;
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
freqs = os_calloc(wpa_s->num_multichan_concurrent,
sizeof(struct wpa_used_freq_data));
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
if (!freqs)
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
return 0;
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
num = get_shared_radio_freqs_data(wpa_s, freqs,
wpa_s->num_multichan_concurrent);
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
os_memset(p2p_freqs, 0, sizeof(struct wpa_used_freq_data) * len);
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
for (i = 0, j = 0; i < num && j < len; i++) {
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
if (p2p_supported_freq(wpa_s->global->p2p, freqs[i].freq))
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
p2p_freqs[j++] = freqs[i];
}
os_free(freqs);
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
dump_freq_data(wpa_s, "valid for P2P", p2p_freqs, j);
P2P: Add more debug prints for frequency selection This prints out get_shared_radio_freqs() results and related information from P2P operations to make debug logs more helpful for figuring out issues related to multi-channel concurrency. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-05 10:07:51 +01:00
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
return j;
}
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
static void wpas_p2p_set_own_freq_preference(struct wpa_supplicant *wpa_s,
int freq)
{
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
return;
P2P: Fix wpas_p2p_set_own_freq_preference() to use P2P mgmt interface wpas_p2p_set_own_freq_preference() accessed wpa_s->parent->conf to test if p2p_ignore_shared_freq is set, but wpa_s->parent is not necessarily the interface used to manage the P2P Device operations. Fix this by accessing the configuration file of the interface initialized to manage the P2P Device operations. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-05-12 16:39:59 +02:00
/* Use the wpa_s used to control the P2P Device operation */
wpa_s = wpa_s->global->p2p_init_wpa_s;
if (wpa_s->conf->p2p_ignore_shared_freq &&
P2P: Optimize default case for own freq preference setting There is no need to use wpas_p2p_num_unused_channels() here in the default configuration of p2p_ignore_sahred_freq=0, so re-order the conditions to skip that operation. This is a bit more efficient and the debug log is also a bit cleaner in the default case. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-19 11:29:25 +01:00
freq > 0 && wpa_s->num_multichan_concurrent > 1 &&
wpas_p2p_num_unused_channels(wpa_s) > 0) {
P2P: Fix p2p_ignore_shared_freq=1 during invitation processing p2p_ignore_shared_freq=1 was supposed to allow a MCC-capable device to ignore a preference for using the same channel on multiple interfaces. However, it was not used during processing of an Invitation Request. Fix that case to use channel preference instead of channel forcing if free channels are available. This allows p2p_ignore_shared_freq=1 case to ignore the preference. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-19 11:15:45 +01:00
wpa_printf(MSG_DEBUG, "P2P: Ignore own channel preference %d MHz due to p2p_ignore_shared_freq=1 configuration",
freq);
P2P: Allow shared interface channel preference to be ignored p2p_ignore_shared_freq=1 in the configuration file (or "SET p2p_ignore_shared_freq 1" on control interface) can now be used to configure wpa_supplicant to ignore the preference on shared operating channel when the driver support multi-channel concurrency. The default behavior is to try to start any new P2P group on an operating channel that is already in use on another virtual interface to avoid extra cost from hopping between multiple channels. If this new parameter is set to 1, such preference is not used and instead, the channel for the new P2P group is selected based on other preferences while ignoring operating channels of any concurrent connection. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-14 15:32:35 +01:00
freq = 0;
P2P: Fix p2p_ignore_shared_freq=1 during invitation processing p2p_ignore_shared_freq=1 was supposed to allow a MCC-capable device to ignore a preference for using the same channel on multiple interfaces. However, it was not used during processing of an Invitation Request. Fix that case to use channel preference instead of channel forcing if free channels are available. This allows p2p_ignore_shared_freq=1 case to ignore the preference. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-19 11:15:45 +01:00
}
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
p2p_set_own_freq_preference(wpa_s->global->p2p, freq);
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
static void wpas_p2p_scan_res_handler(struct wpa_supplicant *wpa_s,
struct wpa_scan_results *scan_res)
{
size_t i;
Use radio work for P2P scan requests Avoid concurrent P2P scan requests with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 10:57:57 +01:00
if (wpa_s->p2p_scan_work) {
struct wpa_radio_work *work = wpa_s->p2p_scan_work;
wpa_s->p2p_scan_work = NULL;
radio_work_done(work);
}
P2P: Handle P2P-not-supported without segfaults Previous code was assuming that the P2P module is always initialized. However, that is not the case anymore with drivers that do not support P2P. Add verification of whether P2P is enabled before trying to execute P2P commands.
2011-02-24 20:13:30 +01:00
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return;
wpa_printf(MSG_DEBUG, "P2P: Scan results received (%d BSS)",
(int) scan_res->num);
for (i = 0; i < scan_res->num; i++) {
struct wpa_scan_res *bss = scan_res->res[i];
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 time_tmp_age, entry_ts;
P2P: Allow GO to be discovered based on Beacon frame This fixes some P2P-join-a-group cases where GO may have been discovered based on passive scan or non-P2P scan. P2P IEs may have been received from a Beacon frame in such a case and that information can be used to create a P2P peer entry, e.g., to allow provision discovery exchange to be completed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-14 18:25:28 +02:00
const u8 *ies;
size_t ies_len;
Use more accurate timestamps for scan results For various P2P use cases, it is useful to have more accurate timestamp for the peer information update. This commit improves scan result handling by using a single timestamp that is taken immediately after fetching the results from the driver and then using that value to calculate the time when the driver last updated the BSS entry. In addition, more debug information is added for P2P peer updates to be able to clearly see how old information is being used here. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-12 18:14:32 +01:00
time_tmp_age.sec = bss->age / 1000;
time_tmp_age.usec = (bss->age % 1000) * 1000;
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
os_reltime_sub(&scan_res->fetch_time, &time_tmp_age, &entry_ts);
P2P: Allow GO to be discovered based on Beacon frame This fixes some P2P-join-a-group cases where GO may have been discovered based on passive scan or non-P2P scan. P2P IEs may have been received from a Beacon frame in such a case and that information can be used to create a P2P peer entry, e.g., to allow provision discovery exchange to be completed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-14 18:25:28 +02:00
ies = (const u8 *) (bss + 1);
ies_len = bss->ie_len;
if (bss->beacon_ie_len > 0 &&
!wpa_scan_get_vendor_ie(bss, P2P_IE_VENDOR_TYPE) &&
wpa_scan_get_vendor_ie_beacon(bss, P2P_IE_VENDOR_TYPE)) {
wpa_printf(MSG_DEBUG, "P2P: Use P2P IE(s) from Beacon frame since no P2P IE(s) in Probe Response frames received for "
MACSTR, MAC2STR(bss->bssid));
ies = ies + ies_len;
ies_len = bss->beacon_ie_len;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (p2p_scan_res_handler(wpa_s->global->p2p, bss->bssid,
Use more accurate timestamps for scan results For various P2P use cases, it is useful to have more accurate timestamp for the peer information update. This commit improves scan result handling by using a single timestamp that is taken immediately after fetching the results from the driver and then using that value to calculate the time when the driver last updated the BSS entry. In addition, more debug information is added for P2P peer updates to be able to clearly see how old information is being used here. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-12 18:14:32 +01:00
bss->freq, &entry_ts, bss->level,
P2P: Allow GO to be discovered based on Beacon frame This fixes some P2P-join-a-group cases where GO may have been discovered based on passive scan or non-P2P scan. P2P IEs may have been received from a Beacon frame in such a case and that information can be used to create a P2P peer entry, e.g., to allow provision discovery exchange to be completed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-14 18:25:28 +02:00
ies, ies_len) > 0)
P2P: Do not skip call to p2p_scan_res_handled() Even if p2p_scan_res_handler() returns 1 to indicate that scan result iteration should be stopped, the p2p_scan_res_handled() needs to be called to clear p2p_scan_running and to get a callback that will start any operations that were delayed because of the running scan.
2010-11-05 17:17:42 +01:00
break;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
p2p_scan_res_handled(wpa_s->global->p2p);
}
Use radio work for P2P scan requests Avoid concurrent P2P scan requests with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 10:57:57 +01:00
static void wpas_p2p_trigger_scan_cb(struct wpa_radio_work *work, int deinit)
{
struct wpa_supplicant *wpa_s = work->wpa_s;
struct wpa_driver_scan_params *params = work->ctx;
int ret;
if (deinit) {
wpa_supplicant: Complete radio works on disable event While testing rfkill blocking of a scanning interface, it was seen that the ongoing scan never completes. This happens since EVENT_SCAN_RESULTS is discarded on a disabled interface. Fix this and also other possible radio work completion issues by removing all the radio works (including started) of the disabled interface. To be able to remove already started radio works, make their callbacks be reentrant with deinit flag (when the work is started), so each radio work should be able to handle its own termination. Signed-hostap: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2014-02-13 10:24:00 +01:00
if (!work->started) {
wpa_scan_free_params(params);
return;
}
wpa_s->p2p_scan_work = NULL;
Use radio work for P2P scan requests Avoid concurrent P2P scan requests with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 10:57:57 +01:00
return;
}
ret = wpa_drv_scan(wpa_s, params);
wpa_scan_free_params(params);
work->ctx = NULL;
if (ret) {
radio_work_done(work);
P2P: Set p2p_scan_running based on driver scan request result With the radio work interface, the actual request to start p2p_scan operation is scheduled from a radio work and hence the initial return value cannot provide the real result of the driver operation to trigger a scan. Introduce a new notification API to indicate the scan trigger status based on which the p2p_scan_running instance can be set using the real return value from the driver operation. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-30 11:50:22 +01:00
p2p_notify_scan_trigger_status(wpa_s->global->p2p, ret);
Use radio work for P2P scan requests Avoid concurrent P2P scan requests with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 10:57:57 +01:00
return;
}
P2P: Set p2p_scan_running based on driver scan request result With the radio work interface, the actual request to start p2p_scan operation is scheduled from a radio work and hence the initial return value cannot provide the real result of the driver operation to trigger a scan. Introduce a new notification API to indicate the scan trigger status based on which the p2p_scan_running instance can be set using the real return value from the driver operation. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-30 11:50:22 +01:00
p2p_notify_scan_trigger_status(wpa_s->global->p2p, ret);
Use radio work for P2P scan requests Avoid concurrent P2P scan requests with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 10:57:57 +01:00
os_get_reltime(&wpa_s->scan_trigger_time);
wpa_s->scan_res_handler = wpas_p2p_scan_res_handler;
wpa_s->own_scan_requested = 1;
wpa_s->p2p_scan_work = work;
}
P2P: Search all 2.4 GHz social channels regardless of disallow_freq Commit 1595eb93aee0239de51f1090d4528e4b2cfe3add ('P2P: Add support for 60 GHz social channel') had an unintended change to how P2P search scans 2.4 GHz social channels. Use of p2p_supported_freq() to filter the list of social channels ended up using the disallow_freq setting to remove social channels from the P2P search scans. This is not desired since peers need to be found on any of the social channels even if those channels have been disabled from P2P operating channel use. Restore the previous behavior by included all the 2.4 GHz social channels in P2P search scans if the driver indicated support for the 2.4 GHz band. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-22 19:02:48 +02:00
static int wpas_p2p_search_social_channel(struct wpa_supplicant *wpa_s,
int freq)
{
if (wpa_s->global->p2p_24ghz_social_channels &&
(freq == 2412 || freq == 2437 || freq == 2462)) {
/*
* Search all social channels regardless of whether these have
* been disabled for P2P operating channel use to avoid missing
* peers.
*/
return 1;
}
return p2p_supported_freq(wpa_s->global->p2p, freq);
}
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
static int wpas_p2p_scan(void *ctx, enum p2p_scan_type type, int freq,
unsigned int num_req_dev_types,
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
const u8 *req_dev_types, const u8 *dev_id, u16 pw_id)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct wpa_supplicant *wpa_s = ctx;
Use radio work for P2P scan requests Avoid concurrent P2P scan requests with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 10:57:57 +01:00
struct wpa_driver_scan_params *params = NULL;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
struct wpabuf *wps_ie, *ies;
P2P: Add support for 60 GHz social channel Support 60 GHz band in P2P module by selecting random social channel from all supported social channels in 2.4 GHz and 60 GHz bands. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-09-25 11:42:07 +02:00
unsigned int num_channels = 0;
int social_channels_freq[] = { 2412, 2437, 2462, 60480 };
P2P: Provide mechanism for figuring out p2p_scan_ie() buffer need The new function, p2p_scan_ie_buf_len(), can be used to figure out how large a buffer needs to be allocated for p2p_scan_ie() use. This makes it easier to add new data into the buffer without forcing all callers to be updated to use a larger buffer.
2011-04-28 15:14:35 +02:00
size_t ielen;
P2P: Add support for 60 GHz social channel Support 60 GHz band in P2P module by selecting random social channel from all supported social channels in 2.4 GHz and 60 GHz bands. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-09-25 11:42:07 +02:00
u8 *n, i;
P2P: Add Dev Info attribute to Probe Request frames in 60 GHz When building P2P IE for Probe Request frames in P2P scan, add the device information attribute if the 60 GHz band is included in the scan, since this is required by the P2P specification. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-02-20 15:45:58 +01:00
unsigned int bands;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Handle P2P-not-supported without segfaults Previous code was assuming that the P2P module is always initialized. However, that is not the case anymore with drivers that do not support P2P. Add verification of whether P2P is enabled before trying to execute P2P commands.
2011-02-24 20:13:30 +01:00
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
return -1;
Use radio work for P2P scan requests Avoid concurrent P2P scan requests with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 10:57:57 +01:00
if (wpa_s->p2p_scan_work) {
wpa_dbg(wpa_s, MSG_INFO, "P2P: Reject scan trigger since one is already pending");
return -1;
P2P: Allow scan operations during p2p_find Previously, all station mode scan operations were either skipped or delayed while any P2P operation was in progress. To make concurrent operations easier to use, reduce this limitation by allowing a scan operation to be completed in the middle of a p2p_find. In addition, allow station mode association to be completed. When the station mode operation is run to its completion (scan results not acted on, connection to an AP completed, connection failed), resume the p2p_find operation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-23 18:42:53 +02:00
}
Use radio work for P2P scan requests Avoid concurrent P2P scan requests with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 10:57:57 +01:00
params = os_zalloc(sizeof(*params));
if (params == NULL)
return -1;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/* P2P Wildcard SSID */
Use radio work for P2P scan requests Avoid concurrent P2P scan requests with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 10:57:57 +01:00
params->num_ssids = 1;
n = os_malloc(P2P_WILDCARD_SSID_LEN);
if (n == NULL)
goto fail;
os_memcpy(n, P2P_WILDCARD_SSID, P2P_WILDCARD_SSID_LEN);
params->ssids[0].ssid = n;
params->ssids[0].ssid_len = P2P_WILDCARD_SSID_LEN;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_s->wps->dev.p2p = 1;
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
wps_ie = wps_build_probe_req_ie(pw_id, &wpa_s->wps->dev,
wpa_s->wps->uuid, WPS_REQ_ENROLLEE,
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
num_req_dev_types, req_dev_types);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (wps_ie == NULL)
Use radio work for P2P scan requests Avoid concurrent P2P scan requests with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 10:57:57 +01:00
goto fail;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
switch (type) {
case P2P_SCAN_SOCIAL:
P2P: Add support for 60 GHz social channel Support 60 GHz band in P2P module by selecting random social channel from all supported social channels in 2.4 GHz and 60 GHz bands. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-09-25 11:42:07 +02:00
params->freqs = os_calloc(ARRAY_SIZE(social_channels_freq) + 1,
sizeof(int));
Use radio work for P2P scan requests Avoid concurrent P2P scan requests with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 10:57:57 +01:00
if (params->freqs == NULL)
goto fail;
P2P: Add support for 60 GHz social channel Support 60 GHz band in P2P module by selecting random social channel from all supported social channels in 2.4 GHz and 60 GHz bands. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-09-25 11:42:07 +02:00
for (i = 0; i < ARRAY_SIZE(social_channels_freq); i++) {
P2P: Search all 2.4 GHz social channels regardless of disallow_freq Commit 1595eb93aee0239de51f1090d4528e4b2cfe3add ('P2P: Add support for 60 GHz social channel') had an unintended change to how P2P search scans 2.4 GHz social channels. Use of p2p_supported_freq() to filter the list of social channels ended up using the disallow_freq setting to remove social channels from the P2P search scans. This is not desired since peers need to be found on any of the social channels even if those channels have been disabled from P2P operating channel use. Restore the previous behavior by included all the 2.4 GHz social channels in P2P search scans if the driver indicated support for the 2.4 GHz band. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-22 19:02:48 +02:00
if (wpas_p2p_search_social_channel(
wpa_s, social_channels_freq[i]))
P2P: Add support for 60 GHz social channel Support 60 GHz band in P2P module by selecting random social channel from all supported social channels in 2.4 GHz and 60 GHz bands. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-09-25 11:42:07 +02:00
params->freqs[num_channels++] =
social_channels_freq[i];
}
params->freqs[num_channels++] = 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
break;
case P2P_SCAN_FULL:
break;
P2P: Restore P2P_SCAN_SPECIFIC This reverts commit 3df2f4fe99e18f7fb449477a63d13abb3ad4c891 ('P2P: Remove unused P2P_SCAN_SPECIFIC') with a modification to fit the current code base. Signed-off-by: Daichi Ueura <daichi.ueura@sonymobile.com>
2014-11-05 12:35:08 +01:00
case P2P_SCAN_SPECIFIC:
params->freqs = os_calloc(2, sizeof(int));
if (params->freqs == NULL)
goto fail;
params->freqs[0] = freq;
params->freqs[1] = 0;
break;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
case P2P_SCAN_SOCIAL_PLUS_ONE:
P2P: Add support for 60 GHz social channel Support 60 GHz band in P2P module by selecting random social channel from all supported social channels in 2.4 GHz and 60 GHz bands. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-09-25 11:42:07 +02:00
params->freqs = os_calloc(ARRAY_SIZE(social_channels_freq) + 2,
sizeof(int));
Use radio work for P2P scan requests Avoid concurrent P2P scan requests with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 10:57:57 +01:00
if (params->freqs == NULL)
goto fail;
P2P: Add support for 60 GHz social channel Support 60 GHz band in P2P module by selecting random social channel from all supported social channels in 2.4 GHz and 60 GHz bands. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-09-25 11:42:07 +02:00
for (i = 0; i < ARRAY_SIZE(social_channels_freq); i++) {
P2P: Search all 2.4 GHz social channels regardless of disallow_freq Commit 1595eb93aee0239de51f1090d4528e4b2cfe3add ('P2P: Add support for 60 GHz social channel') had an unintended change to how P2P search scans 2.4 GHz social channels. Use of p2p_supported_freq() to filter the list of social channels ended up using the disallow_freq setting to remove social channels from the P2P search scans. This is not desired since peers need to be found on any of the social channels even if those channels have been disabled from P2P operating channel use. Restore the previous behavior by included all the 2.4 GHz social channels in P2P search scans if the driver indicated support for the 2.4 GHz band. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-22 19:02:48 +02:00
if (wpas_p2p_search_social_channel(
wpa_s, social_channels_freq[i]))
P2P: Add support for 60 GHz social channel Support 60 GHz band in P2P module by selecting random social channel from all supported social channels in 2.4 GHz and 60 GHz bands. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-09-25 11:42:07 +02:00
params->freqs[num_channels++] =
social_channels_freq[i];
}
if (p2p_supported_freq(wpa_s->global->p2p, freq))
params->freqs[num_channels++] = freq;
params->freqs[num_channels++] = 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
break;
}
P2P: Change order of P2P IE and frequencies set up When setting up parameters for P2P scan, calculate the frequencies for the scan before calculating the scan IE. This is because the scan IE calculation may need information about the scan frequencies in use. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-02-20 12:28:27 +01:00
ielen = p2p_scan_ie_buf_len(wpa_s->global->p2p);
ies = wpabuf_alloc(wpabuf_len(wps_ie) + ielen);
if (ies == NULL) {
wpabuf_free(wps_ie);
goto fail;
}
wpabuf_put_buf(ies, wps_ie);
wpabuf_free(wps_ie);
P2P: Add Dev Info attribute to Probe Request frames in 60 GHz When building P2P IE for Probe Request frames in P2P scan, add the device information attribute if the 60 GHz band is included in the scan, since this is required by the P2P specification. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-02-20 15:45:58 +01:00
bands = wpas_get_bands(wpa_s, params->freqs);
p2p_scan_ie(wpa_s->global->p2p, ies, dev_id, bands);
P2P: Change order of P2P IE and frequencies set up When setting up parameters for P2P scan, calculate the frequencies for the scan before calculating the scan IE. This is because the scan IE calculation may need information about the scan frequencies in use. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-02-20 12:28:27 +01:00
params->p2p_probe = 1;
n = os_malloc(wpabuf_len(ies));
if (n == NULL) {
wpabuf_free(ies);
goto fail;
}
os_memcpy(n, wpabuf_head(ies), wpabuf_len(ies));
params->extra_ies = n;
params->extra_ies_len = wpabuf_len(ies);
wpabuf_free(ies);
wpa_supplicant: Complete radio works on disable event While testing rfkill blocking of a scanning interface, it was seen that the ongoing scan never completes. This happens since EVENT_SCAN_RESULTS is discarded on a disabled interface. Fix this and also other possible radio work completion issues by removing all the radio works (including started) of the disabled interface. To be able to remove already started radio works, make their callbacks be reentrant with deinit flag (when the work is started), so each radio work should be able to handle its own termination. Signed-hostap: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2014-02-13 10:24:00 +01:00
radio_remove_works(wpa_s, "p2p-scan", 0);
Use radio work for P2P scan requests Avoid concurrent P2P scan requests with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 10:57:57 +01:00
if (radio_add_work(wpa_s, 0, "p2p-scan", 0, wpas_p2p_trigger_scan_cb,
params) < 0)
goto fail;
return 0;
P2P: Do not leave P2P scan handler registered if scan fails If the initial attempt to start a scan for p2p_find fails, an error is reported. However, the P2P scan handler and search state was left behind. That can result in unexpected behavior when the next non-P2P scan results are indicated. Avoid this by clearing the P2P search state on failure.
2011-09-29 15:52:23 +02:00
Use radio work for P2P scan requests Avoid concurrent P2P scan requests with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 10:57:57 +01:00
fail:
wpa_scan_free_params(params);
return -1;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
static enum wpa_driver_if_type wpas_p2p_if_type(int p2p_group_interface)
{
switch (p2p_group_interface) {
case P2P_GROUP_INTERFACE_PENDING:
return WPA_IF_P2P_GROUP;
case P2P_GROUP_INTERFACE_GO:
return WPA_IF_P2P_GO;
case P2P_GROUP_INTERFACE_CLIENT:
return WPA_IF_P2P_CLIENT;
}
return WPA_IF_P2P_GROUP;
}
P2P: Do not start multiple copies of same persistent group When running p2p_group_add persistent=<id>, verify whether the requested group is already running and if so, do not try to start another copy of it.
2010-11-19 11:57:36 +01:00
static struct wpa_supplicant * wpas_get_p2p_group(struct wpa_supplicant *wpa_s,
const u8 *ssid,
size_t ssid_len, int *go)
{
struct wpa_ssid *s;
for (wpa_s = wpa_s->global->ifaces; wpa_s; wpa_s = wpa_s->next) {
for (s = wpa_s->conf->ssid; s; s = s->next) {
if (s->disabled != 0 || !s->p2p_group ||
s->ssid_len != ssid_len ||
os_memcmp(ssid, s->ssid, ssid_len) != 0)
continue;
if (s->mode == WPAS_MODE_P2P_GO &&
s != wpa_s->current_ssid)
continue;
if (go)
*go = s->mode == WPAS_MODE_P2P_GO;
return wpa_s;
}
}
return NULL;
}
P2P: Fix group interface removal through interface ctrl_iface It was possible to issue the P2P_GROUP_REMOVE command through the per-interface control interface. This resulted in freed memory getting accessed when trying to send the control interface response to the operation that ended up deleting the group interface. Fix this by postponing the removal operation until the caller has returned. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-18 15:20:51 +02:00
static void run_wpas_p2p_disconnect(void *eloop_ctx, void *timeout_ctx)
{
struct wpa_supplicant *wpa_s = eloop_ctx;
wpa_printf(MSG_DEBUG,
"P2P: Complete previously requested removal of %s",
wpa_s->ifname);
wpas_p2p_disconnect(wpa_s);
}
static int wpas_p2p_disconnect_safely(struct wpa_supplicant *wpa_s,
struct wpa_supplicant *calling_wpa_s)
{
P2P: Do not call wpas_p2p_disconnect_safely() if no match is found In theory, wpas_p2p_disconnect_safely() could have dereferenced the wpa_s == NULL argument, but in practice, it won't due to the calling_wpa_s == wpa_s check and wpas_p2p_disconnect() accepting NULL. Anyway, it is cleaner to add an explicit check for this. (CID 74492) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-28 00:47:17 +01:00
if (calling_wpa_s == wpa_s && wpa_s &&
P2P: Fix group interface removal through interface ctrl_iface It was possible to issue the P2P_GROUP_REMOVE command through the per-interface control interface. This resulted in freed memory getting accessed when trying to send the control interface response to the operation that ended up deleting the group interface. Fix this by postponing the removal operation until the caller has returned. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-18 15:20:51 +02:00
wpa_s->p2p_group_interface != NOT_P2P_GROUP_INTERFACE) {
/*
* The calling wpa_s instance is going to be removed. Do that
* from an eloop callback to keep the instance available until
* the caller has returned. This my be needed, e.g., to provide
* control interface responses on the per-interface socket.
*/
if (eloop_register_timeout(0, 0, run_wpas_p2p_disconnect,
wpa_s, NULL) < 0)
return -1;
return 0;
}
return wpas_p2p_disconnect(wpa_s);
}
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
/* Determine total number of clients in active groups where we are the GO */
static unsigned int p2p_group_go_member_count(struct wpa_supplicant *wpa_s)
{
unsigned int count = 0;
struct wpa_ssid *s;
for (wpa_s = wpa_s->global->ifaces; wpa_s; wpa_s = wpa_s->next) {
for (s = wpa_s->conf->ssid; s; s = s->next) {
wpa_printf(MSG_DEBUG,
"P2P: sup:%p ssid:%p disabled:%d p2p:%d mode:%d",
wpa_s, s, s->disabled, s->p2p_group,
s->mode);
if (!s->disabled && s->p2p_group &&
s->mode == WPAS_MODE_P2P_GO) {
count += p2p_get_group_num_members(
wpa_s->p2p_group);
}
}
}
return count;
}
P2PS: Re-factor wpas_p2p_get_go_group() and wpas_p2p_group_go_ssid() Re-factor wpas_p2p_get_go_group() to: 1. Skip the dedicated P2P Device management interface if it is used. 2. Instead of iterating all the interface configured networks, only access the current_ssid pointer to check if the current interface is acting as a persistent P2P GO. To avoid code duplication, also re-factor wpas_p2p_group_go_ssid() to call wpas_p2p_get_go_group(). Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-09-24 19:37:56 +02:00
static unsigned int p2p_is_active_persistent_group(struct wpa_supplicant *wpa_s)
{
return !wpa_s->p2p_mgmt && wpa_s->current_ssid &&
!wpa_s->current_ssid->disabled &&
wpa_s->current_ssid->p2p_group &&
wpa_s->current_ssid->p2p_persistent_group;
}
static unsigned int p2p_is_active_persistent_go(struct wpa_supplicant *wpa_s)
{
return p2p_is_active_persistent_group(wpa_s) &&
wpa_s->current_ssid->mode == WPAS_MODE_P2P_GO;
}
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
/* Find an interface for a P2P group where we are the GO */
static struct wpa_supplicant *
wpas_p2p_get_go_group(struct wpa_supplicant *wpa_s)
{
struct wpa_supplicant *save = NULL;
if (!wpa_s)
return NULL;
for (wpa_s = wpa_s->global->ifaces; wpa_s; wpa_s = wpa_s->next) {
P2PS: Re-factor wpas_p2p_get_go_group() and wpas_p2p_group_go_ssid() Re-factor wpas_p2p_get_go_group() to: 1. Skip the dedicated P2P Device management interface if it is used. 2. Instead of iterating all the interface configured networks, only access the current_ssid pointer to check if the current interface is acting as a persistent P2P GO. To avoid code duplication, also re-factor wpas_p2p_group_go_ssid() to call wpas_p2p_get_go_group(). Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-09-24 19:37:56 +02:00
if (!p2p_is_active_persistent_go(wpa_s))
continue;
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
P2PS: Re-factor wpas_p2p_get_go_group() and wpas_p2p_group_go_ssid() Re-factor wpas_p2p_get_go_group() to: 1. Skip the dedicated P2P Device management interface if it is used. 2. Instead of iterating all the interface configured networks, only access the current_ssid pointer to check if the current interface is acting as a persistent P2P GO. To avoid code duplication, also re-factor wpas_p2p_group_go_ssid() to call wpas_p2p_get_go_group(). Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-09-24 19:37:56 +02:00
/* Prefer a group with connected clients */
if (p2p_get_group_num_members(wpa_s->p2p_group))
return wpa_s;
save = wpa_s;
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
}
/* No group with connected clients, so pick the one without (if any) */
return save;
}
P2PS: Re-factor p2ps_group_capability() The code was iterating all the interfaces, and for each interface iterated all the network blocks to count active P2P GO and P2P Client interfaces. Change the code to reuse wpas_p2p_get_go_group() to get a P2P GO interface and add wpas_p2p_get_cli_group() and use it to find a P2P Client interface, and use these objects when evaluating the group capability. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-09-24 19:37:57 +02:00
static unsigned int p2p_is_active_persistent_cli(struct wpa_supplicant *wpa_s)
{
return p2p_is_active_persistent_group(wpa_s) &&
wpa_s->current_ssid->mode == WPAS_MODE_INFRA;
}
/* Find an interface for a P2P group where we are the P2P Client */
static struct wpa_supplicant *
wpas_p2p_get_cli_group(struct wpa_supplicant *wpa_s)
{
for (wpa_s = wpa_s->global->ifaces; wpa_s; wpa_s = wpa_s->next) {
if (p2p_is_active_persistent_cli(wpa_s))
return wpa_s;
}
return NULL;
}
P2PS: Add P2PS attributes into PD Request if requested This adds a data structure for storing P2PS PD information and code to add the related attributes into PD Request. The actual operation to trigger this behavior will be added in a separate commit. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 09:38:56 +01:00
/* Find a persistent group where we are the GO */
static struct wpa_ssid *
wpas_p2p_get_persistent_go(struct wpa_supplicant *wpa_s)
{
struct wpa_ssid *s;
for (s = wpa_s->conf->ssid; s; s = s->next) {
if (s->disabled == 2 && s->mode == WPAS_MODE_P2P_GO)
return s;
}
return NULL;
}
P2PS: Add channel policy to PD Request Add operating channel selection and channel list processing similar to that done when building GO Negotiation Request, i.e., consider the currently used channels, configured channels, etc. P2PS introduces a flow where a responder needs to provide channel data without being previously aware of the current constraints, i.e., the channels currently in use by other interfaces. To handle this, extend the get_group_capability() callback to also handle channel selection aspects of group capabilities. In case there is an active P2P GO that is going to be used for the P2PS PD, force its current operating frequency in the PD attributes. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-10-08 11:35:58 +02:00
static u8 p2ps_group_capability(void *ctx, u8 incoming, u8 role,
unsigned int *force_freq,
unsigned int *pref_freq)
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
{
P2PS: Re-factor p2ps_group_capability() The code was iterating all the interfaces, and for each interface iterated all the network blocks to count active P2P GO and P2P Client interfaces. Change the code to reuse wpas_p2p_get_go_group() to get a P2P GO interface and add wpas_p2p_get_cli_group() and use it to find a P2P Client interface, and use these objects when evaluating the group capability. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-09-24 19:37:57 +02:00
struct wpa_supplicant *wpa_s = ctx;
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 wpa_ssid *s;
u8 conncap = P2PS_SETUP_NONE;
unsigned int owned_members = 0;
P2PS: Re-factor p2ps_group_capability() The code was iterating all the interfaces, and for each interface iterated all the network blocks to count active P2P GO and P2P Client interfaces. Change the code to reuse wpas_p2p_get_go_group() to get a P2P GO interface and add wpas_p2p_get_cli_group() and use it to find a P2P Client interface, and use these objects when evaluating the group capability. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-09-24 19:37:57 +02:00
struct wpa_supplicant *go_wpa_s, *cli_wpa_s;
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 wpa_ssid *persistent_go;
int p2p_no_group_iface;
P2PS: Add channel policy to PD Request Add operating channel selection and channel list processing similar to that done when building GO Negotiation Request, i.e., consider the currently used channels, configured channels, etc. P2PS introduces a flow where a responder needs to provide channel data without being previously aware of the current constraints, i.e., the channels currently in use by other interfaces. To handle this, extend the get_group_capability() callback to also handle channel selection aspects of group capabilities. In case there is an active P2P GO that is going to be used for the P2PS PD, force its current operating frequency in the PD attributes. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-10-08 11:35:58 +02:00
unsigned int pref_freq_list[P2P_MAX_PREF_CHANNELS], size;
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
wpa_printf(MSG_DEBUG, "P2P: Conncap - in:%d role:%d", incoming, role);
P2PS: Add channel policy to PD Request Add operating channel selection and channel list processing similar to that done when building GO Negotiation Request, i.e., consider the currently used channels, configured channels, etc. P2PS introduces a flow where a responder needs to provide channel data without being previously aware of the current constraints, i.e., the channels currently in use by other interfaces. To handle this, extend the get_group_capability() callback to also handle channel selection aspects of group capabilities. In case there is an active P2P GO that is going to be used for the P2PS PD, force its current operating frequency in the PD attributes. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-10-08 11:35:58 +02:00
if (force_freq)
*force_freq = 0;
if (pref_freq)
*pref_freq = 0;
size = P2P_MAX_PREF_CHANNELS;
if (force_freq && pref_freq &&
!wpas_p2p_setup_freqs(wpa_s, 0, (int *) force_freq,
(int *) pref_freq, 0, pref_freq_list, &size))
wpas_p2p_set_own_freq_preference(wpa_s,
*force_freq ? *force_freq :
*pref_freq);
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
/*
* For non-concurrent capable devices:
* If persistent_go, then no new.
* If GO, then no client.
* If client, then no GO.
*/
go_wpa_s = wpas_p2p_get_go_group(wpa_s);
P2PS: Re-factor p2ps_group_capability() The code was iterating all the interfaces, and for each interface iterated all the network blocks to count active P2P GO and P2P Client interfaces. Change the code to reuse wpas_p2p_get_go_group() to get a P2P GO interface and add wpas_p2p_get_cli_group() and use it to find a P2P Client interface, and use these objects when evaluating the group capability. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-09-24 19:37:57 +02:00
if (go_wpa_s)
owned_members = p2p_get_group_num_members(go_wpa_s->p2p_group);
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
persistent_go = wpas_p2p_get_persistent_go(wpa_s);
P2PS: Use wpas_p2p_create_iface() to check if dedicated iface is needed Call wpas_p2p_create_iface() instead of just checking p2p_no_group_iface config value. Not doing so, resulted in an incorrect behavior when the driver sets WPA_DRIVER_FLAGS_DEDICATED_P2P_DEVICE flag. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com>
2015-07-02 09:45:03 +02:00
p2p_no_group_iface = !wpas_p2p_create_iface(wpa_s);
P2PS: Re-factor p2ps_group_capability() The code was iterating all the interfaces, and for each interface iterated all the network blocks to count active P2P GO and P2P Client interfaces. Change the code to reuse wpas_p2p_get_go_group() to get a P2P GO interface and add wpas_p2p_get_cli_group() and use it to find a P2P Client interface, and use these objects when evaluating the group capability. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-09-24 19:37:57 +02:00
cli_wpa_s = wpas_p2p_get_cli_group(wpa_s);
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
P2PS: Re-factor p2ps_group_capability() The code was iterating all the interfaces, and for each interface iterated all the network blocks to count active P2P GO and P2P Client interfaces. Change the code to reuse wpas_p2p_get_go_group() to get a P2P GO interface and add wpas_p2p_get_cli_group() and use it to find a P2P Client interface, and use these objects when evaluating the group capability. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-09-24 19:37:57 +02:00
wpa_printf(MSG_DEBUG,
"P2P: GO(iface)=%p members=%u CLI(iface)=%p persistent(ssid)=%p",
go_wpa_s, owned_members, cli_wpa_s, persistent_go);
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
/* If not concurrent, restrict our choices */
if (p2p_no_group_iface) {
wpa_printf(MSG_DEBUG, "P2P: p2p_no_group_iface");
P2PS: Re-factor p2ps_group_capability() The code was iterating all the interfaces, and for each interface iterated all the network blocks to count active P2P GO and P2P Client interfaces. Change the code to reuse wpas_p2p_get_go_group() to get a P2P GO interface and add wpas_p2p_get_cli_group() and use it to find a P2P Client interface, and use these objects when evaluating the group capability. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-09-24 19:37:57 +02:00
if (cli_wpa_s)
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
return P2PS_SETUP_NONE;
if (go_wpa_s) {
if (role == P2PS_SETUP_CLIENT ||
incoming == P2PS_SETUP_GROUP_OWNER ||
p2p_client_limit_reached(go_wpa_s->p2p_group))
return P2PS_SETUP_NONE;
return P2PS_SETUP_GROUP_OWNER;
}
if (persistent_go) {
if (role == P2PS_SETUP_NONE || role == P2PS_SETUP_NEW) {
if (!incoming)
return P2PS_SETUP_GROUP_OWNER |
P2PS_SETUP_CLIENT;
if (incoming == P2PS_SETUP_NEW) {
u8 r;
if (os_get_random(&r, sizeof(r)) < 0 ||
(r & 1))
return P2PS_SETUP_CLIENT;
return P2PS_SETUP_GROUP_OWNER;
}
}
}
}
/* If a required role has been specified, handle it here */
if (role && role != P2PS_SETUP_NEW) {
switch (incoming) {
P2PS: Change connection capability handling Change the connection capability handling so that in case there are no active roles, the peer has an active GO, and the advertisement supports operation as a client, the returned connection capability is set to client. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-09-24 19:37:58 +02:00
case P2PS_SETUP_GROUP_OWNER | P2PS_SETUP_NEW:
case P2PS_SETUP_GROUP_OWNER | P2PS_SETUP_CLIENT:
/*
* Peer has an active GO, so if the role allows it and
* we do not have any active roles, become client.
*/
if ((role & P2PS_SETUP_CLIENT) && !go_wpa_s &&
!cli_wpa_s)
return P2PS_SETUP_CLIENT;
/* fall through */
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
case P2PS_SETUP_NONE:
case P2PS_SETUP_NEW:
conncap = role;
goto grp_owner;
case P2PS_SETUP_GROUP_OWNER:
/*
* Must be a complimentary role - cannot be a client to
* more than one peer.
*/
P2PS: Re-factor p2ps_group_capability() The code was iterating all the interfaces, and for each interface iterated all the network blocks to count active P2P GO and P2P Client interfaces. Change the code to reuse wpas_p2p_get_go_group() to get a P2P GO interface and add wpas_p2p_get_cli_group() and use it to find a P2P Client interface, and use these objects when evaluating the group capability. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-09-24 19:37:57 +02:00
if (incoming == role || cli_wpa_s)
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
return P2PS_SETUP_NONE;
return P2PS_SETUP_CLIENT;
case P2PS_SETUP_CLIENT:
/* Must be a complimentary role */
if (incoming != role) {
conncap = P2PS_SETUP_GROUP_OWNER;
goto grp_owner;
}
default:
return P2PS_SETUP_NONE;
}
}
/*
* For now, we only will support ownership of one group, and being a
* client of one group. Therefore, if we have either an existing GO
* group, or an existing client group, we will not do a new GO
* negotiation, but rather try to re-use the existing groups.
*/
switch (incoming) {
case P2PS_SETUP_NONE:
case P2PS_SETUP_NEW:
P2PS: Re-factor p2ps_group_capability() The code was iterating all the interfaces, and for each interface iterated all the network blocks to count active P2P GO and P2P Client interfaces. Change the code to reuse wpas_p2p_get_go_group() to get a P2P GO interface and add wpas_p2p_get_cli_group() and use it to find a P2P Client interface, and use these objects when evaluating the group capability. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-09-24 19:37:57 +02:00
if (cli_wpa_s)
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
conncap = P2PS_SETUP_GROUP_OWNER;
else if (!owned_members)
conncap = P2PS_SETUP_NEW;
else if (incoming == P2PS_SETUP_NONE)
conncap = P2PS_SETUP_GROUP_OWNER | P2PS_SETUP_CLIENT;
else
conncap = P2PS_SETUP_CLIENT;
break;
case P2PS_SETUP_CLIENT:
conncap = P2PS_SETUP_GROUP_OWNER;
break;
case P2PS_SETUP_GROUP_OWNER:
P2PS: Re-factor p2ps_group_capability() The code was iterating all the interfaces, and for each interface iterated all the network blocks to count active P2P GO and P2P Client interfaces. Change the code to reuse wpas_p2p_get_go_group() to get a P2P GO interface and add wpas_p2p_get_cli_group() and use it to find a P2P Client interface, and use these objects when evaluating the group capability. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-09-24 19:37:57 +02:00
if (!cli_wpa_s)
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
conncap = P2PS_SETUP_CLIENT;
break;
case P2PS_SETUP_GROUP_OWNER | P2PS_SETUP_NEW:
case P2PS_SETUP_GROUP_OWNER | P2PS_SETUP_CLIENT:
P2PS: Re-factor p2ps_group_capability() The code was iterating all the interfaces, and for each interface iterated all the network blocks to count active P2P GO and P2P Client interfaces. Change the code to reuse wpas_p2p_get_go_group() to get a P2P GO interface and add wpas_p2p_get_cli_group() and use it to find a P2P Client interface, and use these objects when evaluating the group capability. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-09-24 19:37:57 +02:00
if (cli_wpa_s)
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
conncap = P2PS_SETUP_GROUP_OWNER;
else {
u8 r;
if (os_get_random(&r, sizeof(r)) < 0 ||
(r & 1))
conncap = P2PS_SETUP_CLIENT;
else
conncap = P2PS_SETUP_GROUP_OWNER;
}
break;
default:
return P2PS_SETUP_NONE;
}
grp_owner:
if ((conncap & P2PS_SETUP_GROUP_OWNER) ||
(!incoming && (conncap & P2PS_SETUP_NEW))) {
if (go_wpa_s && p2p_client_limit_reached(go_wpa_s->p2p_group))
conncap &= ~P2PS_SETUP_GROUP_OWNER;
s = wpas_p2p_get_persistent_go(wpa_s);
P2PS: Re-factor p2ps_group_capability() The code was iterating all the interfaces, and for each interface iterated all the network blocks to count active P2P GO and P2P Client interfaces. Change the code to reuse wpas_p2p_get_go_group() to get a P2P GO interface and add wpas_p2p_get_cli_group() and use it to find a P2P Client interface, and use these objects when evaluating the group capability. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-09-24 19:37:57 +02:00
if (!s && !go_wpa_s && p2p_no_group_iface) {
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
p2p_set_intended_addr(wpa_s->global->p2p,
P2P: Support dedicated P2P_DEVICE without separate group interface Add support for drivers with dedicated P2P_DEVICE interface, but without group interface concurrency (only a single netdev is used). With such devices, wpa_supplicant tried to use the p2p_dev interface instead of the group interface and most P2P operations failed. Extend wpa_supplicant to use the primary interface instead of a separate group interface in such cases. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2p_mgmt ?
wpa_s->parent->own_addr :
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
wpa_s->own_addr);
P2PS: Re-factor p2ps_group_capability() The code was iterating all the interfaces, and for each interface iterated all the network blocks to count active P2P GO and P2P Client interfaces. Change the code to reuse wpas_p2p_get_go_group() to get a P2P GO interface and add wpas_p2p_get_cli_group() and use it to find a P2P Client interface, and use these objects when evaluating the group capability. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-09-24 19:37:57 +02:00
} else if (!s && !go_wpa_s) {
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
if (wpas_p2p_add_group_interface(wpa_s,
WPA_IF_P2P_GO) < 0) {
wpa_printf(MSG_ERROR,
"P2P: Failed to allocate a new interface for the group");
return P2PS_SETUP_NONE;
}
P2PS: Do not remove pending interface on p2p_stop_find The pending interface created during provision discovery should not be removed on stopping p2p_find. This pending interface has to be used after completing GO negotiation. Earlier the pending interface is created just before GO negotiation so there was no problem. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-30 13:27:38 +01:00
wpa_s->global->pending_group_iface_for_p2ps = 1;
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
p2p_set_intended_addr(wpa_s->global->p2p,
wpa_s->pending_interface_addr);
}
}
return conncap;
}
P2P: Move group removal reason to a function parameter wpa_s->removal_reason was set only when calling wpas_p2p_group_delete() and while couple of call places did not set this, it should really be set in each case. As such, it works better as a function parameter than a variable in struct wpa_supplicant. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-11 11:41:31 +02:00
static int wpas_p2p_group_delete(struct wpa_supplicant *wpa_s,
enum p2p_group_removal_reason removal_reason)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct wpa_ssid *ssid;
char *gtype;
P2P: Add mechanism for timing out idle groups A new configuration parameter, p2p_group_idle, can now be used to set idle timeout value for P2P groups in seconds (0 = no timeout). If set, this values is used to remove P2P group (both GO and P2P client) interfaces after the group has been idle (no clients/GO seen) for the configuration duration. The P2P-GROUP-REMOVED event is now indicating the reason for group removal when known. For example: P2P-GROUP-REMOVED wlan0 GO reason=REQUESTED P2P-GROUP-REMOVED wlan1 client reason=IDLE
2010-10-25 17:24:15 +02:00
const char *reason;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
ssid = wpa_s->current_ssid;
if (ssid == NULL) {
/*
* The current SSID was not known, but there may still be a
P2P: Fix p2p_group_idle in no-group-interface P2P client case Commit 30ee769235f3170d9bf6b62c11c6e018e97deb84 started skipping P2P group removal if wpa_s->current_ssid is not set and commit 0d30cc240fa36905b034dc9676f9d8da0ac18e56 started clearing wpa_s->current_ssid on disconnection. This combination broke p2p_group_idle timeout on P2P client interface in a case where no separate P2P group interface is used and when the disconnection is triggered by something else than an explicit indication of GO terminating the group. Fix this by relaxing network block matching rules when figuring out whether any of the configured network blocks could be in P2P use. The p2p_group flag alone should be enough for this since temporary P2P group network blocks are removed once the P2P group is terminated. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-23 19:28:03 +02:00
* pending P2P group interface waiting for provisioning or a
* P2P group that is trying to reconnect.
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
*/
ssid = wpa_s->conf->ssid;
while (ssid) {
P2P: Fix network removal on P2P connect to select correct block If wpa_s->current_ssid is not set (e.g., after disconnection that did not result in immediate group removal), an incorrect group could have been removed since the network block iteration here could select the network block that is used to store persistent group credentials. Fix this by verifying that disabled != 2 to avoid picking the network block that could not have been the temporary P2P group. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-10-05 19:37:49 +02:00
if (ssid->p2p_group && ssid->disabled != 2)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
break;
ssid = ssid->next;
}
P2P: Do not fail p2p_group_remove just based on current_ssid The wpa_s->current_ssid pointer may get cleared, e.g., when disconnected. Commit 30ee769235f3170d9bf6b62c11c6e018e97deb84 made wpas_p2p_group_delete() exit early before removing a P2P interface in this type of case. That can cause number of issues from p2p_group_remove command failing to busy loop when terminating wpa_supplicant if there is a P2P group interface in client mode and that interface happens to be in disconnected state. Fix these issues by allowing wpas_p2p_group_delete() remove the P2P group interface regardless of whether wpa_s->currnt_ssid is set. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-31 20:35:32 +02:00
if (ssid == NULL &&
wpa_s->p2p_group_interface == NOT_P2P_GROUP_INTERFACE)
{
P2P: p2p_group_remove should fail on non-P2P interface p2p_group_remove should only attempt to remove P2P group interfaces and fail on non-P2P group interfaces. Signed-hostap: Michael Naumov <michael.naumov@intel.com> Signed-hostap: Nirav Shah <nirav.j2.shah@intel.com>
2012-08-11 11:06:23 +02:00
wpa_printf(MSG_ERROR, "P2P: P2P group interface "
"not found");
return -1;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
if (wpa_s->p2p_group_interface == P2P_GROUP_INTERFACE_GO)
gtype = "GO";
else if (wpa_s->p2p_group_interface == P2P_GROUP_INTERFACE_CLIENT ||
(ssid && ssid->mode == WPAS_MODE_INFRA)) {
wpa_s->reassociate = 0;
wpa_s->disconnected = 1;
gtype = "client";
} else
gtype = "GO";
P2P: Deauth p2p client just after dbus notify Currently to signal PropertiesChanged upon group client removal (group property), wpa_supplicant dbus uses wpa_s members like go_dev_addr and current_ssid, for instance. Thus, deferring p2p client deauth to after dbus notify, but keeping the same order as before, solves the issue, as wpa_s is not yet completely deinitialized. Signed-off-by: Eduardo Abinader <eduardo.abinader@openbossa.org>
2014-08-21 05:30:24 +02:00
if (removal_reason != P2P_GROUP_REMOVAL_SILENT && ssid)
wpas_notify_p2p_group_removed(wpa_s, ssid, gtype);
P2P: Report group removal reason PSK_FAILURE in timeout case It was possible for group formation timeout to be the trigger for detecting the second PSK/4-way handshake failure. If that happened, the special reason=PSK_FAILURE was not used in the P2P-GROUP-REMOVED event even though P2P-PERSISTENT-PSK-FAIL did get reported. Fix this special case by replacing the reason code with PSK_FAILURE if the PSK failure timeout gets registed as part of the disconnection processing in the formation timeout handler. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-10 00:31:57 +02:00
if (os_strcmp(gtype, "client") == 0) {
P2P: Deauth p2p client just after dbus notify Currently to signal PropertiesChanged upon group client removal (group property), wpa_supplicant dbus uses wpa_s members like go_dev_addr and current_ssid, for instance. Thus, deferring p2p client deauth to after dbus notify, but keeping the same order as before, solves the issue, as wpa_s is not yet completely deinitialized. Signed-off-by: Eduardo Abinader <eduardo.abinader@openbossa.org>
2014-08-21 05:30:24 +02:00
wpa_supplicant_deauthenticate(wpa_s, WLAN_REASON_DEAUTH_LEAVING);
P2P: Report group removal reason PSK_FAILURE in timeout case It was possible for group formation timeout to be the trigger for detecting the second PSK/4-way handshake failure. If that happened, the special reason=PSK_FAILURE was not used in the P2P-GROUP-REMOVED event even though P2P-PERSISTENT-PSK-FAIL did get reported. Fix this special case by replacing the reason code with PSK_FAILURE if the PSK failure timeout gets registed as part of the disconnection processing in the formation timeout handler. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-10 00:31:57 +02:00
if (eloop_is_timeout_registered(wpas_p2p_psk_failure_removal,
wpa_s, NULL)) {
wpa_printf(MSG_DEBUG,
"P2P: PSK failure removal was scheduled, so use PSK failure as reason for group removal");
removal_reason = P2P_GROUP_REMOVAL_PSK_FAILURE;
eloop_cancel_timeout(wpas_p2p_psk_failure_removal,
wpa_s, NULL);
}
}
P2P: Deauth p2p client just after dbus notify Currently to signal PropertiesChanged upon group client removal (group property), wpa_supplicant dbus uses wpa_s members like go_dev_addr and current_ssid, for instance. Thus, deferring p2p client deauth to after dbus notify, but keeping the same order as before, solves the issue, as wpa_s is not yet completely deinitialized. Signed-off-by: Eduardo Abinader <eduardo.abinader@openbossa.org>
2014-08-21 05:30:24 +02:00
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
if (wpa_s->cross_connect_in_use) {
wpa_s->cross_connect_in_use = 0;
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_msg_global(wpa_s->p2pdev, MSG_INFO,
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
P2P_EVENT_CROSS_CONNECT_DISABLE "%s %s",
wpa_s->ifname, wpa_s->cross_connect_uplink);
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
}
P2P: Move group removal reason to a function parameter wpa_s->removal_reason was set only when calling wpas_p2p_group_delete() and while couple of call places did not set this, it should really be set in each case. As such, it works better as a function parameter than a variable in struct wpa_supplicant. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-11 11:41:31 +02:00
switch (removal_reason) {
P2P: Add mechanism for timing out idle groups A new configuration parameter, p2p_group_idle, can now be used to set idle timeout value for P2P groups in seconds (0 = no timeout). If set, this values is used to remove P2P group (both GO and P2P client) interfaces after the group has been idle (no clients/GO seen) for the configuration duration. The P2P-GROUP-REMOVED event is now indicating the reason for group removal when known. For example: P2P-GROUP-REMOVED wlan0 GO reason=REQUESTED P2P-GROUP-REMOVED wlan1 client reason=IDLE
2010-10-25 17:24:15 +02:00
case P2P_GROUP_REMOVAL_REQUESTED:
reason = " reason=REQUESTED";
break;
P2P: Move group removal reason to a function parameter wpa_s->removal_reason was set only when calling wpas_p2p_group_delete() and while couple of call places did not set this, it should really be set in each case. As such, it works better as a function parameter than a variable in struct wpa_supplicant. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-11 11:41:31 +02:00
case P2P_GROUP_REMOVAL_FORMATION_FAILED:
reason = " reason=FORMATION_FAILED";
break;
P2P: Add mechanism for timing out idle groups A new configuration parameter, p2p_group_idle, can now be used to set idle timeout value for P2P groups in seconds (0 = no timeout). If set, this values is used to remove P2P group (both GO and P2P client) interfaces after the group has been idle (no clients/GO seen) for the configuration duration. The P2P-GROUP-REMOVED event is now indicating the reason for group removal when known. For example: P2P-GROUP-REMOVED wlan0 GO reason=REQUESTED P2P-GROUP-REMOVED wlan1 client reason=IDLE
2010-10-25 17:24:15 +02:00
case P2P_GROUP_REMOVAL_IDLE_TIMEOUT:
reason = " reason=IDLE";
break;
P2P: Remove P2P group on driver resource becoming unavailable Add a new driver event, EVENT_INTERFACE_UNAVAILABLE, for indicating that the driver is not able to continue operating the virtual interface in its current mode anymore, e.g., due to operating channel for GO interface forced to a DFS channel by another virtual interface. When this happens for a P2P group interface, the P2P group will be terminated and P2P-GROUP-REMOVED event shows the reason for this as follows: P2P-GROUP-REMOVED wlan0 GO reason=UNAVAILABLE
2010-10-25 18:16:11 +02:00
case P2P_GROUP_REMOVAL_UNAVAILABLE:
reason = " reason=UNAVAILABLE";
break;
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
case P2P_GROUP_REMOVAL_GO_ENDING_SESSION:
reason = " reason=GO_ENDING_SESSION";
break;
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
case P2P_GROUP_REMOVAL_PSK_FAILURE:
reason = " reason=PSK_FAILURE";
break;
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
case P2P_GROUP_REMOVAL_FREQ_CONFLICT:
reason = " reason=FREQ_CONFLICT";
break;
P2P: Add mechanism for timing out idle groups A new configuration parameter, p2p_group_idle, can now be used to set idle timeout value for P2P groups in seconds (0 = no timeout). If set, this values is used to remove P2P group (both GO and P2P client) interfaces after the group has been idle (no clients/GO seen) for the configuration duration. The P2P-GROUP-REMOVED event is now indicating the reason for group removal when known. For example: P2P-GROUP-REMOVED wlan0 GO reason=REQUESTED P2P-GROUP-REMOVED wlan1 client reason=IDLE
2010-10-25 17:24:15 +02:00
default:
reason = "";
break;
}
P2P: Move group removal reason to a function parameter wpa_s->removal_reason was set only when calling wpas_p2p_group_delete() and while couple of call places did not set this, it should really be set in each case. As such, it works better as a function parameter than a variable in struct wpa_supplicant. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-11 11:41:31 +02:00
if (removal_reason != P2P_GROUP_REMOVAL_SILENT) {
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_msg_global(wpa_s->p2pdev, MSG_INFO,
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
P2P_EVENT_GROUP_REMOVED "%s %s%s",
wpa_s->ifname, gtype, reason);
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
}
P2P: Add group removed notification Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-24 21:27:23 +01:00
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
if (eloop_cancel_timeout(wpas_p2p_group_freq_conflict, wpa_s, NULL) > 0)
wpa_printf(MSG_DEBUG, "P2P: Cancelled P2P group freq_conflict timeout");
P2P: Add more debug on group idle timeout This makes it easier to debug issues with P2P group idle timeout. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-19 17:16:34 +01:00
if (eloop_cancel_timeout(wpas_p2p_group_idle_timeout, wpa_s, NULL) > 0)
wpa_printf(MSG_DEBUG, "P2P: Cancelled P2P group idle timeout");
P2P: Cancel group formation timeout on group removal (on client) Group formation timeout is normally canceled when 4-way handshake is completed (WPA_COMPLETED -> wpas_p2p_completed). However, it is possible for the GO to stop the group before this happens (i.e., send Deauthentication frame with reason code 3 before 4-way handshake is completed). This resulted in the group getting removed, but the group formation timeout left behind. The unexpected timeout may then result in undesired termination of the following operation. Fix this by canceling the group formation timeout in wpas_p2p_group_delete() similarly to how group idle timeout was canceled there. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-10 22:36:52 +01:00
if (eloop_cancel_timeout(wpas_p2p_group_formation_timeout,
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev, NULL) > 0) {
P2P: Cancel group formation timeout on group removal (on client) Group formation timeout is normally canceled when 4-way handshake is completed (WPA_COMPLETED -> wpas_p2p_completed). However, it is possible for the GO to stop the group before this happens (i.e., send Deauthentication frame with reason code 3 before 4-way handshake is completed). This resulted in the group getting removed, but the group formation timeout left behind. The unexpected timeout may then result in undesired termination of the following operation. Fix this by canceling the group formation timeout in wpas_p2p_group_delete() similarly to how group idle timeout was canceled there. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-10 22:36:52 +01:00
wpa_printf(MSG_DEBUG, "P2P: Cancelled P2P group formation "
"timeout");
P2P: Clear p2p_in_provisioning flag on group removal Commit 77dfafd07d3a0335e250b8ffaf74fe7b3714b0bc cancels group formation timeout on group removal case but failed to reset the p2p_in_provisioning flag. This can lead to repeated p2p_find failures if the group gets removed before completion of the WPS provisioning step (e.g., GO tears down the group). Fix this by clearing p2p_pin_provisioning when cancelling group formation. Signed-hostap: Vivek Natarajan <nataraja@qca.qualcomm.com>
2013-03-11 19:47:24 +01:00
wpa_s->p2p_in_provisioning = 0;
P2P: Cancel group formation when deleting a group during group formation Otherwise P2P remains in provisioning state and continues to skip extended listening forever. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
2015-07-30 12:14:24 +02:00
wpas_p2p_group_formation_failed(wpa_s, 1);
P2P: Clear p2p_in_provisioning flag on group removal Commit 77dfafd07d3a0335e250b8ffaf74fe7b3714b0bc cancels group formation timeout on group removal case but failed to reset the p2p_in_provisioning flag. This can lead to repeated p2p_find failures if the group gets removed before completion of the WPS provisioning step (e.g., GO tears down the group). Fix this by clearing p2p_pin_provisioning when cancelling group formation. Signed-hostap: Vivek Natarajan <nataraja@qca.qualcomm.com>
2013-03-11 19:47:24 +01:00
}
P2P: Fix group idle timer cancellation on group removal The wpas_p2p_group_idle_timeout was getting cancelled in the beginning of wpas_p2p_group_delete(). However, in the case of P2P client role, this function called wpa_supplicant_deauthenticate() next and that ended up changing state to WPA_DISCONNECTED which resulted in wpas_p2p_notif_disconnected() rescheduling the timeout. This left the unexpected timeout behind after the group was removed. If another group operation was started within P2P_MAX_CLIENT_IDLE (10) seconds, that timeout could end up terminating the group while it was still being set up. Fix this by reordering wpas_p2p_group_delete() to cancel the group idle timeout only after having called wpa_supplicant_deauthenticate(). The group idle timeout is still rescheduled, but it gets removed immediately afterwards when the actual group information is being cleared. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-19 17:10:20 +01:00
P2P: Optimize scan for GO during persistent group invocation Scan for GO on the negotiated operating channel for few iterations before searching on all the supported channels during persistent group reinvocation. In addition, use the already known SSID of the group in the scans. These optimizations reduce group formation time. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-21 13:56:02 +01:00
wpa_s->p2p_in_invitation = 0;
P2P: Move a GO from its operating frequency Upon any change in the currently used channels evaluate if a GO should move to a different operating frequency, where the possible scenarios: 1. The frequency that the GO is currently using is no longer valid, due to regulatory reasons, and thus the GO must be moved to some other frequency. 2. Due to Multi Concurrent Channel (MCC) policy considerations, it would be preferable, based on configuration settings, to prefer Same Channel Mode (SCM) over concurrent operation in multiple channels. The supported policies: - prefer SCM: prefer moving the GO to a frequency used by some other interface. - prefer SCM if Peer supports: prefer moving the GO to a frequency used by some other station interface iff the other station interface is using a frequency that is common between the local and the peer device (based on the GO Negotiation/Invitation signaling). - Stay on the current frequency. Currently, the GO transition to another frequency is handled by a complete tear down and re-setup of the GO. Still need to add CSA flow to the considerations. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:19 +02:00
eloop_cancel_timeout(wpas_p2p_move_go, wpa_s, NULL);
P2P: Disallow GO CS immediately after GO Negotiation or invitation A newly created GO might move to another channel before the client was able to connect to it. This creates a situation where the client searches the GO on the channel agreed upon during GO Negotiation or invitation signaling, while the GO is on another channel. This in turn might lead to delayed connection or connection failure and group removal. Fix this by disallowing a GO CS as long as there is some activity that should delay the switch. If a GO move is not allowed, set a timeout to re-attempt the move. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:26 +02:00
eloop_cancel_timeout(wpas_p2p_reconsider_moving_go, wpa_s, NULL);
P2P: Optimize scan for GO during persistent group invocation Scan for GO on the negotiated operating channel for few iterations before searching on all the supported channels during persistent group reinvocation. In addition, use the already known SSID of the group in the scans. These optimizations reduce group formation time. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-21 13:56:02 +01:00
P2P: Make sure wait for the first client gets stopped If a group was removed before the wait for the first client had timed out and the client had not yet connected, p2p_go_wait_client could have been left set and with that, scan operations could be unnecessarily delayed. This fixes some undesired delays from commit c1c0b35fea656345b672984910cc3b93938bc5e5. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-06 07:15:28 +02:00
/*
* Make sure wait for the first client does not remain active after the
* group has been removed.
*/
wpa_s->global->p2p_go_wait_client.sec = 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (wpa_s->p2p_group_interface != NOT_P2P_GROUP_INTERFACE) {
struct wpa_global *global;
char *ifname;
enum wpa_driver_if_type type;
wpa_printf(MSG_DEBUG, "P2P: Remove group interface %s",
wpa_s->ifname);
global = wpa_s->global;
ifname = os_strdup(wpa_s->ifname);
type = wpas_p2p_if_type(wpa_s->p2p_group_interface);
P2P: Fix group interface removal through interface ctrl_iface It was possible to issue the P2P_GROUP_REMOVE command through the per-interface control interface. This resulted in freed memory getting accessed when trying to send the control interface response to the operation that ended up deleting the group interface. Fix this by postponing the removal operation until the caller has returned. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-18 15:20:51 +02:00
eloop_cancel_timeout(run_wpas_p2p_disconnect, wpa_s, NULL);
Let wpa_supplicant_deinit_iface() know that process is terminating This will be needed to be able to move ctrl_iface TERMINATING event to the end of interface removal. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-01-29 19:15:48 +01:00
wpa_supplicant_remove_iface(wpa_s->global, wpa_s, 0);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_s = global->ifaces;
if (wpa_s && ifname)
wpa_drv_if_remove(wpa_s, type, ifname);
os_free(ifname);
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
return 1;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Support dedicated P2P_DEVICE without separate group interface Add support for drivers with dedicated P2P_DEVICE interface, but without group interface concurrency (only a single netdev is used). With such devices, wpa_supplicant tried to use the p2p_dev interface instead of the group interface and most P2P operations failed. Extend wpa_supplicant to use the primary interface instead of a separate group interface in such cases. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
/*
* The primary interface was used for P2P group operations, so
* need to reset its p2pdev.
*/
wpa_s->p2pdev = wpa_s->parent;
P2P: Clear p2p_group_formation and p2p_in_provisioning on group removal Commit 41f853235fe1d1fad1acecc0ee5dfe81c872c6b2 extends group formation timeout for the first data connection to complete and resets p2p_go_group_formation_completed flag due to which p2p_in_provisioning and p2p_group_formation flags are not cleared when wpas_group_formation_completed() is called. This can result in both station scan and p2p_find failures in the case where separate P2P group interface is not used and the client does not complete 4-way handshake. Fix this by clearing p2p_group_formation and p2p_in_provisioning when such a P2P group is deleted. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-06 02:54:52 +02:00
if (!wpa_s->p2p_go_group_formation_completed) {
wpa_s->global->p2p_group_formation = NULL;
wpa_s->p2p_in_provisioning = 0;
}
P2P: Clear pending group formation data on group removal It was possible for the wpa_s->show_group_started and wpa_s->go_params to be left set when a P2P group was removed before group formation had completed. In case a separate P2P group interface was not used, this could rsult in all future scans using the hardcoded DIRECT-* SSID and as such, not find the network they were trying to find. Fix this by clearing these P2P parameters on group removal. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-01 09:31:55 +01:00
wpa_s->show_group_started = 0;
os_free(wpa_s->go_params);
wpa_s->go_params = NULL;
P2P: Save group common frequencies Once a P2P GO interface is configured, save the group common frequencies, as this can be useful later for channel selection considerations during channel switch, etc. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-07-07 13:20:59 +02:00
os_free(wpa_s->p2p_group_common_freqs);
wpa_s->p2p_group_common_freqs = NULL;
wpa_s->p2p_group_common_freqs_num = 0;
P2P: Send received Presence Response information to ctrl_iface monitors The P2P_PRESENCE_REQ command did not give any easily available indication of the response received from the GO. Make this more useful by providing such response (if received) as a ctrl_iface monitor event (P2P-PRESENCE-RESPONSE). Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-01 17:44:44 +01:00
wpa_s->waiting_presence_resp = 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_printf(MSG_DEBUG, "P2P: Remove temporary group network");
if (ssid && (ssid->p2p_group ||
ssid->mode == WPAS_MODE_P2P_GROUP_FORMATION ||
(ssid->key_mgmt & WPA_KEY_MGMT_WPS))) {
int id = ssid->id;
Clear WPA and EAPOL state machine config pointer on network removal Make sure that the WPA and EAPOL state machines do not hold a pointer to a network configuration that is about to be freed. This can fix potential issues with references to freed memory.
2011-06-27 18:02:24 +02:00
if (ssid == wpa_s->current_ssid) {
wpa_sm_set_config(wpa_s->wpa, NULL);
eapol_sm_notify_config(wpa_s->eapol, NULL, NULL);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_s->current_ssid = NULL;
Clear WPA and EAPOL state machine config pointer on network removal Make sure that the WPA and EAPOL state machines do not hold a pointer to a network configuration that is about to be freed. This can fix potential issues with references to freed memory.
2011-06-27 18:02:24 +02:00
}
P2P: Update D-Bus network object semantics during group formation Do not emit network objects during P2P group formation since such network objects can confuse certain apps. Instead, a persistent group object is created to allow apps to keep track of persistent groups. Persistent group objects only represent the info needed to recreate the group. Also fixes a minor bug in the handling of persistent group objects during WPS operations. Signed-off-by: Jayant Sane <jayant.sane@intel.com>
2011-06-23 20:25:13 +02:00
/*
* Networks objects created during any P2P activities are not
* exposed out as they might/will confuse certain non-P2P aware
* applications since these network objects won't behave like
* regular ones.
*
* Likewise, we don't send out network removed signals for such
* network objects.
*/
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_config_remove_network(wpa_s->conf, id);
wpa_supplicant_clear_status(wpa_s);
Stop sched_scan in number of cases where it should not be running When a P2P group is removed, we better not leave possibly started sched_scan running. This could happen when a separate group interface was not used. In addition, it looks safer to explicitly stop sched_scan before starting P2P Listen or Find operations to make sure the offloaded scanning is not running when doing similar P2P operations. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-01-23 17:26:09 +01:00
wpa_supplicant_cancel_sched_scan(wpa_s);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
} else {
wpa_printf(MSG_DEBUG, "P2P: Temporary group network not "
"found");
}
P2P: Add deinit_p2p_cli op to clear P2P client driver state On P2P group removal, the GO is deinitialized correctly (and the vif mode is set back to sta in case of nl80211), but the P2P client mode wasn't deinitialized, and the nl80211 vif stays in P2P client mode. Add a new deinit_p2p_cli op (similar to deinit_ap), which currently only sets the interface back to station mode. Signed-hostap: Eliad Peller <eliad@wizery.com> intended-for: hostap-1
2012-04-01 20:41:23 +02:00
if (wpa_s->ap_iface)
wpa_supplicant_ap_deinit(wpa_s);
else
wpa_drv_deinit_p2p_cli(wpa_s);
P2P: p2p_group_remove should fail on non-P2P interface p2p_group_remove should only attempt to remove P2P group interfaces and fail on non-P2P group interfaces. Signed-hostap: Michael Naumov <michael.naumov@intel.com> Signed-hostap: Nirav Shah <nirav.j2.shah@intel.com>
2012-08-11 11:06:23 +02:00
P2P: Do not clear wpa_s->go_dev_addr before group removal This variable is needed to figure out whether a wpa_supplicant interface is for a P2P group that is (or was) connected to a specific GO. The previous implementation was able to find such a case only when there was an association with the GO. However, this may be needed even if there is a temporary disconnection from the GO. Keep the GO device address information over such temporary disconnections and only remove it on group termination. This fixes an issue with D-Bus Peer PropertiesChanged signals for the Groups property in case a P2P group gets removed due to group idle timeout instead of explicit group termination command (local request) or GO notification. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-08-02 18:25:41 +02:00
os_memset(wpa_s->go_dev_addr, 0, ETH_ALEN);
P2P: p2p_group_remove should fail on non-P2P interface p2p_group_remove should only attempt to remove P2P group interfaces and fail on non-P2P group interfaces. Signed-hostap: Michael Naumov <michael.naumov@intel.com> Signed-hostap: Nirav Shah <nirav.j2.shah@intel.com>
2012-08-11 11:06:23 +02:00
return 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
static int wpas_p2p_persistent_group(struct wpa_supplicant *wpa_s,
u8 *go_dev_addr,
const u8 *ssid, size_t ssid_len)
{
struct wpa_bss *bss;
const u8 *bssid;
struct wpabuf *p2p;
u8 group_capab;
const u8 *addr;
if (wpa_s->go_params)
bssid = wpa_s->go_params->peer_interface_addr;
else
bssid = wpa_s->bssid;
bss = wpa_bss_get(wpa_s, bssid, ssid, ssid_len);
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 00:44:29 +02:00
if (bss == NULL && wpa_s->go_params &&
!is_zero_ether_addr(wpa_s->go_params->peer_device_addr))
bss = wpa_bss_get_p2p_dev_addr(
wpa_s, wpa_s->go_params->peer_device_addr);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (bss == NULL) {
u8 iface_addr[ETH_ALEN];
if (p2p_get_interface_addr(wpa_s->global->p2p, bssid,
iface_addr) == 0)
bss = wpa_bss_get(wpa_s, iface_addr, ssid, ssid_len);
}
if (bss == NULL) {
wpa_printf(MSG_DEBUG, "P2P: Could not figure out whether "
"group is persistent - BSS " MACSTR " not found",
MAC2STR(bssid));
return 0;
}
p2p = wpa_bss_get_vendor_ie_multi(bss, P2P_IE_VENDOR_TYPE);
P2P: Allow persistent group determination based on Beacon frame P2P IE may be available from a Beacon frame from a GO even if we have not yet received a Probe Response frame with P2P IE from that GO. Since all the needed information for determining the GO's P2P Device Address and group capabilities are available, use that information instead of displaying incomplete group information. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-14 18:28:00 +02:00
if (p2p == NULL)
p2p = wpa_bss_get_vendor_ie_multi_beacon(bss,
P2P_IE_VENDOR_TYPE);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (p2p == NULL) {
wpa_printf(MSG_DEBUG, "P2P: Could not figure out whether "
"group is persistent - BSS " MACSTR
" did not include P2P IE", MAC2STR(bssid));
wpa_hexdump(MSG_DEBUG, "P2P: Probe Response IEs",
(u8 *) (bss + 1), bss->ie_len);
wpa_hexdump(MSG_DEBUG, "P2P: Beacon IEs",
((u8 *) bss + 1) + bss->ie_len,
bss->beacon_ie_len);
return 0;
}
group_capab = p2p_get_group_capab(p2p);
addr = p2p_get_go_dev_addr(p2p);
wpa_printf(MSG_DEBUG, "P2P: Checking whether group is persistent: "
"group_capab=0x%x", group_capab);
if (addr) {
os_memcpy(go_dev_addr, addr, ETH_ALEN);
wpa_printf(MSG_DEBUG, "P2P: GO Device Address " MACSTR,
MAC2STR(addr));
} else
os_memset(go_dev_addr, 0, ETH_ALEN);
wpabuf_free(p2p);
wpa_printf(MSG_DEBUG, "P2P: BSS " MACSTR " group_capab=0x%x "
"go_dev_addr=" MACSTR,
MAC2STR(bssid), group_capab, MAC2STR(go_dev_addr));
P2P: Fix D-Bus persistent parameter in group started event wpas_p2p_persistent_group() returns non-zero for persistent groups. This value happens to be 2 instead of 1 due to the P2P_GROUP_CAPAB_PERSISTENT_GROUP value. This ended up with D-Bus code trying to encode 2 as a DBUS_TYPE_BOOLEAN value which results in an assert from the library. Fix this by modifying wpas_p2p_persistent_group() to return 0 or 1 instead of 0 or an arbitrary non-zero. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-08-02 22:47:38 +02:00
return !!(group_capab & P2P_GROUP_CAPAB_PERSISTENT_GROUP);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Add group started notification Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:35:37 +02:00
static int wpas_p2p_store_persistent_group(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid,
const u8 *go_dev_addr)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct wpa_ssid *s;
int changed = 0;
wpa_printf(MSG_DEBUG, "P2P: Storing credentials for a persistent "
"group (GO Dev Addr " MACSTR ")", MAC2STR(go_dev_addr));
for (s = wpa_s->conf->ssid; s; s = s->next) {
if (s->disabled == 2 &&
os_memcmp(go_dev_addr, s->bssid, ETH_ALEN) == 0 &&
s->ssid_len == ssid->ssid_len &&
os_memcmp(ssid->ssid, s->ssid, ssid->ssid_len) == 0)
break;
}
if (s) {
wpa_printf(MSG_DEBUG, "P2P: Update existing persistent group "
"entry");
if (ssid->passphrase && !s->passphrase)
changed = 1;
else if (ssid->passphrase && s->passphrase &&
os_strcmp(ssid->passphrase, s->passphrase) != 0)
changed = 1;
} else {
wpa_printf(MSG_DEBUG, "P2P: Create a new persistent group "
"entry");
changed = 1;
s = wpa_config_add_network(wpa_s->conf);
if (s == NULL)
P2P: Add group started notification Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:35:37 +02:00
return -1;
P2P: Update D-Bus network object semantics during group formation Do not emit network objects during P2P group formation since such network objects can confuse certain apps. Instead, a persistent group object is created to allow apps to keep track of persistent groups. Persistent group objects only represent the info needed to recreate the group. Also fixes a minor bug in the handling of persistent group objects during WPS operations. Signed-off-by: Jayant Sane <jayant.sane@intel.com>
2011-06-23 20:25:13 +02:00
/*
* Instead of network_added we emit persistent_group_added
* notification. Also to keep the defense checks in
* persistent_group obj registration method, we set the
* relevant flags in s to designate it as a persistent group.
*/
s->p2p_group = 1;
s->p2p_persistent_group = 1;
wpas_notify_persistent_group_added(wpa_s, s);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_config_set_network_defaults(s);
}
s->p2p_group = 1;
s->p2p_persistent_group = 1;
s->disabled = 2;
s->bssid_set = 1;
os_memcpy(s->bssid, go_dev_addr, ETH_ALEN);
s->mode = ssid->mode;
s->auth_alg = WPA_AUTH_ALG_OPEN;
s->key_mgmt = WPA_KEY_MGMT_PSK;
s->proto = WPA_PROTO_RSN;
P2P: Fix persistent group for 60 GHz networks Fix two problems with storage of 60 GHz P2P persistent groups: 1. pbss flag was not stored in the network block. 2. When recreating the persistent group from storage, in addition to the missing pbss flag, the pairwise_cipher and group_cipher were initialized to CCMP which does not work in 60 GHz since the default in 60 GHz should be GCMP. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-03-23 17:44:10 +01:00
s->pbss = ssid->pbss;
s->pairwise_cipher = ssid->pbss ? WPA_CIPHER_GCMP : WPA_CIPHER_CCMP;
DBus: Publish provisioned keys in network properties When the network was provisioned, we need to get the keys to be able to reconnect without new provisioning. To be able to publish those keys but not normally configured ones, add a new attribute to struct wpa_ssid indicating whether or not keys may be exported. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-02 16:00:12 +01:00
s->export_keys = 1;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (ssid->passphrase) {
os_free(s->passphrase);
s->passphrase = os_strdup(ssid->passphrase);
}
if (ssid->psk_set) {
s->psk_set = 1;
os_memcpy(s->psk, ssid->psk, 32);
}
if (s->passphrase && !s->psk_set)
wpa_config_update_psk(s);
if (s->ssid == NULL || s->ssid_len < ssid->ssid_len) {
os_free(s->ssid);
s->ssid = os_malloc(ssid->ssid_len);
}
if (s->ssid) {
s->ssid_len = ssid->ssid_len;
os_memcpy(s->ssid, ssid->ssid, s->ssid_len);
}
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
if (ssid->mode == WPAS_MODE_P2P_GO && wpa_s->global->add_psk) {
dl_list_add(&s->psk_list, &wpa_s->global->add_psk->list);
wpa_s->global->add_psk = NULL;
changed = 1;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (changed && wpa_s->conf->update_config &&
wpa_config_write(wpa_s->confname, wpa_s->conf)) {
wpa_printf(MSG_DEBUG, "P2P: Failed to update configuration");
}
P2P: Add group started notification Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:35:37 +02:00
return s->id;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
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
static void wpas_p2p_add_persistent_group_client(struct wpa_supplicant *wpa_s,
const u8 *addr)
{
struct wpa_ssid *ssid, *s;
u8 *n;
size_t i;
Improve p2p_client_list updates in configuration file This list can get truncated due to too many addresses getting added. Reorder the entries in a way that allows the most recently added values to be maintained in the list and use better debug/error messages when parsing the value. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-08-23 22:56:51 +02:00
int found = 0;
P2P: Fix wpas_p2p_add_persistent_group_client() to use P2P mgmt interface The function used wpa_s->parent->conf to iterate the P2P networks and update the configuration file. However, wpa_s->parent is not necessarily the interface used to manage the P2P Device operations. Fix this by accessing the configuration file of the interface initialized to managed the P2P Device operations. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-05-12 16:40:00 +02:00
struct wpa_supplicant *p2p_wpa_s = wpa_s->global->p2p_init_wpa_s;
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
ssid = wpa_s->current_ssid;
if (ssid == NULL || ssid->mode != WPAS_MODE_P2P_GO ||
!ssid->p2p_persistent_group)
return;
P2P: Fix wpas_p2p_add_persistent_group_client() to use P2P mgmt interface The function used wpa_s->parent->conf to iterate the P2P networks and update the configuration file. However, wpa_s->parent is not necessarily the interface used to manage the P2P Device operations. Fix this by accessing the configuration file of the interface initialized to managed the P2P Device operations. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-05-12 16:40:00 +02:00
for (s = p2p_wpa_s->conf->ssid; s; s = s->next) {
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
if (s->disabled != 2 || s->mode != WPAS_MODE_P2P_GO)
continue;
if (s->ssid_len == ssid->ssid_len &&
os_memcmp(s->ssid, ssid->ssid, s->ssid_len) == 0)
break;
}
if (s == NULL)
return;
for (i = 0; s->p2p_client_list && i < s->num_p2p_clients; i++) {
Add address masks to BSSID lists In many applications it is useful not just to enumerate a group of well known access points, but to use a address/mask notation to match an entire set of addresses (ca:ff:ee:00:00:00/ff:ff:ff:00:00:00). This change expands the data structures used by MAC lists to include a mask indicating the significant (non-masked) portions of an address and extends the list parser to recognize mask suffixes. Signed-off-by: Stefan Tomanek <stefan.tomanek@wertarbyte.de>
2015-01-05 21:10:16 +01:00
if (os_memcmp(s->p2p_client_list + i * 2 * ETH_ALEN, addr,
Improve p2p_client_list updates in configuration file This list can get truncated due to too many addresses getting added. Reorder the entries in a way that allows the most recently added values to be maintained in the list and use better debug/error messages when parsing the value. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-08-23 22:56:51 +02:00
ETH_ALEN) != 0)
continue;
if (i == s->num_p2p_clients - 1)
return; /* already the most recent entry */
/* move the entry to mark it most recent */
Add address masks to BSSID lists In many applications it is useful not just to enumerate a group of well known access points, but to use a address/mask notation to match an entire set of addresses (ca:ff:ee:00:00:00/ff:ff:ff:00:00:00). This change expands the data structures used by MAC lists to include a mask indicating the significant (non-masked) portions of an address and extends the list parser to recognize mask suffixes. Signed-off-by: Stefan Tomanek <stefan.tomanek@wertarbyte.de>
2015-01-05 21:10:16 +01:00
os_memmove(s->p2p_client_list + i * 2 * ETH_ALEN,
s->p2p_client_list + (i + 1) * 2 * ETH_ALEN,
(s->num_p2p_clients - i - 1) * 2 * ETH_ALEN);
Improve p2p_client_list updates in configuration file This list can get truncated due to too many addresses getting added. Reorder the entries in a way that allows the most recently added values to be maintained in the list and use better debug/error messages when parsing the value. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-08-23 22:56:51 +02:00
os_memcpy(s->p2p_client_list +
Add address masks to BSSID lists In many applications it is useful not just to enumerate a group of well known access points, but to use a address/mask notation to match an entire set of addresses (ca:ff:ee:00:00:00/ff:ff:ff:00:00:00). This change expands the data structures used by MAC lists to include a mask indicating the significant (non-masked) portions of an address and extends the list parser to recognize mask suffixes. Signed-off-by: Stefan Tomanek <stefan.tomanek@wertarbyte.de>
2015-01-05 21:10:16 +01:00
(s->num_p2p_clients - 1) * 2 * ETH_ALEN, addr,
ETH_ALEN);
os_memset(s->p2p_client_list +
(s->num_p2p_clients - 1) * 2 * ETH_ALEN + ETH_ALEN,
0xff, ETH_ALEN);
Improve p2p_client_list updates in configuration file This list can get truncated due to too many addresses getting added. Reorder the entries in a way that allows the most recently added values to be maintained in the list and use better debug/error messages when parsing the value. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-08-23 22:56:51 +02:00
found = 1;
break;
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
}
P2P: Limit maximum number of stored P2P clients to 100 This limits the maximum size of the p2p_client_list parameter that is maintained at the GO for a persistent group. In other words, only the 100 most recently seen P2P clients are kept in the list. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-08-23 23:23:44 +02:00
if (!found && s->num_p2p_clients < P2P_MAX_STORED_CLIENTS) {
Improve p2p_client_list updates in configuration file This list can get truncated due to too many addresses getting added. Reorder the entries in a way that allows the most recently added values to be maintained in the list and use better debug/error messages when parsing the value. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-08-23 22:56:51 +02:00
n = os_realloc_array(s->p2p_client_list,
Add address masks to BSSID lists In many applications it is useful not just to enumerate a group of well known access points, but to use a address/mask notation to match an entire set of addresses (ca:ff:ee:00:00:00/ff:ff:ff:00:00:00). This change expands the data structures used by MAC lists to include a mask indicating the significant (non-masked) portions of an address and extends the list parser to recognize mask suffixes. Signed-off-by: Stefan Tomanek <stefan.tomanek@wertarbyte.de>
2015-01-05 21:10:16 +01:00
s->num_p2p_clients + 1, 2 * ETH_ALEN);
Improve p2p_client_list updates in configuration file This list can get truncated due to too many addresses getting added. Reorder the entries in a way that allows the most recently added values to be maintained in the list and use better debug/error messages when parsing the value. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-08-23 22:56:51 +02:00
if (n == NULL)
return;
Add address masks to BSSID lists In many applications it is useful not just to enumerate a group of well known access points, but to use a address/mask notation to match an entire set of addresses (ca:ff:ee:00:00:00/ff:ff:ff:00:00:00). This change expands the data structures used by MAC lists to include a mask indicating the significant (non-masked) portions of an address and extends the list parser to recognize mask suffixes. Signed-off-by: Stefan Tomanek <stefan.tomanek@wertarbyte.de>
2015-01-05 21:10:16 +01:00
os_memcpy(n + s->num_p2p_clients * 2 * ETH_ALEN, addr,
ETH_ALEN);
os_memset(n + s->num_p2p_clients * 2 * ETH_ALEN + ETH_ALEN,
0xff, ETH_ALEN);
Improve p2p_client_list updates in configuration file This list can get truncated due to too many addresses getting added. Reorder the entries in a way that allows the most recently added values to be maintained in the list and use better debug/error messages when parsing the value. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-08-23 22:56:51 +02:00
s->p2p_client_list = n;
s->num_p2p_clients++;
P2P: Add explicit check for ssid->p2p_client_list != NULL This would not really be needed since these functions check the pointer above. However, this seems to be too difficult for some static analyzer, so add the extra check to avoid false reports. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-07-02 23:53:13 +02:00
} else if (!found && s->p2p_client_list) {
P2P: Limit maximum number of stored P2P clients to 100 This limits the maximum size of the p2p_client_list parameter that is maintained at the GO for a persistent group. In other words, only the 100 most recently seen P2P clients are kept in the list. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-08-23 23:23:44 +02:00
/* Not enough room for an additional entry - drop the oldest
* entry */
os_memmove(s->p2p_client_list,
Add address masks to BSSID lists In many applications it is useful not just to enumerate a group of well known access points, but to use a address/mask notation to match an entire set of addresses (ca:ff:ee:00:00:00/ff:ff:ff:00:00:00). This change expands the data structures used by MAC lists to include a mask indicating the significant (non-masked) portions of an address and extends the list parser to recognize mask suffixes. Signed-off-by: Stefan Tomanek <stefan.tomanek@wertarbyte.de>
2015-01-05 21:10:16 +01:00
s->p2p_client_list + 2 * ETH_ALEN,
(s->num_p2p_clients - 1) * 2 * ETH_ALEN);
P2P: Limit maximum number of stored P2P clients to 100 This limits the maximum size of the p2p_client_list parameter that is maintained at the GO for a persistent group. In other words, only the 100 most recently seen P2P clients are kept in the list. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-08-23 23:23:44 +02:00
os_memcpy(s->p2p_client_list +
Add address masks to BSSID lists In many applications it is useful not just to enumerate a group of well known access points, but to use a address/mask notation to match an entire set of addresses (ca:ff:ee:00:00:00/ff:ff:ff:00:00:00). This change expands the data structures used by MAC lists to include a mask indicating the significant (non-masked) portions of an address and extends the list parser to recognize mask suffixes. Signed-off-by: Stefan Tomanek <stefan.tomanek@wertarbyte.de>
2015-01-05 21:10:16 +01:00
(s->num_p2p_clients - 1) * 2 * ETH_ALEN,
P2P: Limit maximum number of stored P2P clients to 100 This limits the maximum size of the p2p_client_list parameter that is maintained at the GO for a persistent group. In other words, only the 100 most recently seen P2P clients are kept in the list. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-08-23 23:23:44 +02:00
addr, ETH_ALEN);
Add address masks to BSSID lists In many applications it is useful not just to enumerate a group of well known access points, but to use a address/mask notation to match an entire set of addresses (ca:ff:ee:00:00:00/ff:ff:ff:00:00:00). This change expands the data structures used by MAC lists to include a mask indicating the significant (non-masked) portions of an address and extends the list parser to recognize mask suffixes. Signed-off-by: Stefan Tomanek <stefan.tomanek@wertarbyte.de>
2015-01-05 21:10:16 +01:00
os_memset(s->p2p_client_list +
(s->num_p2p_clients - 1) * 2 * ETH_ALEN + ETH_ALEN,
0xff, ETH_ALEN);
Improve p2p_client_list updates in configuration file This list can get truncated due to too many addresses getting added. Reorder the entries in a way that allows the most recently added values to be maintained in the list and use better debug/error messages when parsing the value. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-08-23 22:56:51 +02:00
}
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
P2P: Fix wpas_p2p_add_persistent_group_client() to use P2P mgmt interface The function used wpa_s->parent->conf to iterate the P2P networks and update the configuration file. However, wpa_s->parent is not necessarily the interface used to manage the P2P Device operations. Fix this by accessing the configuration file of the interface initialized to managed the P2P Device operations. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-05-12 16:40:00 +02:00
if (p2p_wpa_s->conf->update_config &&
wpa_config_write(p2p_wpa_s->confname, p2p_wpa_s->conf))
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
wpa_printf(MSG_DEBUG, "P2P: Failed to update configuration");
}
P2P: Use a helper function for P2P_EVENT_GROUP_STARTED events This makes it easier to change the event message message for indication when P2P group has stated and removes some duplicated code. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-07-26 12:09:17 +02:00
static void wpas_p2p_group_started(struct wpa_supplicant *wpa_s,
int go, struct wpa_ssid *ssid, int freq,
const u8 *psk, const char *passphrase,
const u8 *go_dev_addr, int persistent,
const char *extra)
{
const char *ssid_txt;
char psk_txt[65];
if (psk)
wpa_snprintf_hex(psk_txt, sizeof(psk_txt), psk, 32);
else
psk_txt[0] = '\0';
if (ssid)
ssid_txt = wpa_ssid_txt(ssid->ssid, ssid->ssid_len);
else
ssid_txt = "";
if (passphrase && passphrase[0] == '\0')
passphrase = NULL;
P2P: Remove PSK/passphrase from P2P-GROUP-STARTED debug log entry The PSK/passphrase are needed for the control interface events since the upper layer UI component is required by the specification to be able to make this available for manual configuration. However, this is not needed in the INFO verbosity level debug entry, so split the event generation into two parts. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-07-26 12:11:34 +02:00
/*
* Include PSK/passphrase only in the control interface message and
* leave it out from the debug log entry.
*/
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_msg_global_ctrl(wpa_s->p2pdev, MSG_INFO,
P2P: Remove PSK/passphrase from P2P-GROUP-STARTED debug log entry The PSK/passphrase are needed for the control interface events since the upper layer UI component is required by the specification to be able to make this available for manual configuration. However, this is not needed in the INFO verbosity level debug entry, so split the event generation into two parts. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-07-26 12:11:34 +02:00
P2P_EVENT_GROUP_STARTED
"%s %s ssid=\"%s\" freq=%d%s%s%s%s%s go_dev_addr="
MACSTR "%s%s",
wpa_s->ifname, go ? "GO" : "client", ssid_txt, freq,
psk ? " psk=" : "", psk_txt,
passphrase ? " passphrase=\"" : "",
passphrase ? passphrase : "",
passphrase ? "\"" : "",
MAC2STR(go_dev_addr),
persistent ? " [PERSISTENT]" : "", extra);
wpa_printf(MSG_INFO, P2P_EVENT_GROUP_STARTED
"%s %s ssid=\"%s\" freq=%d go_dev_addr=" MACSTR "%s%s",
wpa_s->ifname, go ? "GO" : "client", ssid_txt, freq,
MAC2STR(go_dev_addr), persistent ? " [PERSISTENT]" : "",
extra);
P2P: Use a helper function for P2P_EVENT_GROUP_STARTED events This makes it easier to change the event message message for indication when P2P group has stated and removes some duplicated code. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-07-26 12:09:17 +02:00
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
static void wpas_group_formation_completed(struct wpa_supplicant *wpa_s,
P2P: Fix group interface addition failure properly for concurrent case It was possible for a P2P group formation failure to result in a concurrent station mode operation getting disconnected in the specific error case where group interface addition fails after a successful GO Negotiation. Fix this by skipping the wpas_p2p_group_delete() call in this specific case since the group interface does not exists anymore at the point wpas_group_formation_completed() gets called. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-06-15 22:34:11 +02:00
int success, int already_deleted)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct wpa_ssid *ssid;
int client;
int persistent;
u8 go_dev_addr[ETH_ALEN];
/*
* This callback is likely called for the main interface. Update wpa_s
* to use the group interface if a new interface was created for the
* group.
*/
if (wpa_s->global->p2p_group_formation)
wpa_s = wpa_s->global->p2p_group_formation;
P2P: Extend group formation timeout on GO to first data connection Previously, GO considered the group to be fully formed at the completed of WPS provisioning step. This would leave the group running until idle timeout (which may not be enabled) or explicit removal if the client fails to connect for any reason. Since the client is expected to connect immediately after the WPS provisioning step, extend group formation timeout to cover that period until the first successfully completed data connection. This allows the GO to remove the group automatically if the client devices does not connect within P2P_MAX_INITIAL_CONN_WAIT_GO (10) seconds. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-26 19:32:44 +02:00
if (wpa_s->p2p_go_group_formation_completed) {
wpa_s->global->p2p_group_formation = NULL;
wpa_s->p2p_in_provisioning = 0;
}
P2P: Clear p2p_in_invitation on cancel Commit 41d5ce9e0b7b37dd84fbf3c1aa5ed571c32321d4 added scan optimizations for P2P invitation cases. However, it left a path where the invitation state was not cleared and as such, introduced potential issues for following scans that ended up getting incorrectly optimized for a single channel regardless of parameters. Fix this by clearing p2p_in_invitation more carefully, especially on p2p_cancel command. p2p_cancel is now also run from the FLUSH command to avoid issues with hwsim test cases (e.g., persistent_group_per_sta_psk followed by ap_open_tdls resulted in an error due to p2p_in_invitation remaining set after FLUSH). Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-04-07 11:26:04 +02:00
wpa_s->p2p_in_invitation = 0;
P2P: Handle improper WPS termination on GO during group formation A P2P Client may be able to connect to the GO even if the WPS provisioning step has not terminated cleanly (e.g., P2P Client does not send WSC_Done). Such group formation attempt missed the event notification about started group on the GO and also did not set the internal state corresponding to the successful group formation. This commit addresses the missing part by completing GO side group formation on a successful first data connection if WPS does not complete cleanly. Also, this commit reorders the STA authorization indications to ensure that the group formation success notification is given prior to the first STA connection to handle such scenarios. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-01 14:36:53 +02:00
wpa_s->group_formation_reported = 1;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (!success) {
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_msg_global(wpa_s->p2pdev, MSG_INFO,
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
P2P_EVENT_GROUP_FORMATION_FAILURE);
P2P: Add D-Bus signal GroupFormationFailure This is similar to the control interface event P2P-GROUP-FORMATION-FAILURE. Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>
2015-08-20 12:58:33 +02:00
wpas_notify_p2p_group_formation_failure(wpa_s, "");
P2P: Fix group interface addition failure properly for concurrent case It was possible for a P2P group formation failure to result in a concurrent station mode operation getting disconnected in the specific error case where group interface addition fails after a successful GO Negotiation. Fix this by skipping the wpas_p2p_group_delete() call in this specific case since the group interface does not exists anymore at the point wpas_group_formation_completed() gets called. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-06-15 22:34:11 +02:00
if (already_deleted)
return;
P2P: Move group removal reason to a function parameter wpa_s->removal_reason was set only when calling wpas_p2p_group_delete() and while couple of call places did not set this, it should really be set in each case. As such, it works better as a function parameter than a variable in struct wpa_supplicant. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-11 11:41:31 +02:00
wpas_p2p_group_delete(wpa_s,
P2P_GROUP_REMOVAL_FORMATION_FAILED);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return;
}
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_msg_global(wpa_s->p2pdev, MSG_INFO,
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
P2P_EVENT_GROUP_FORMATION_SUCCESS);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
ssid = wpa_s->current_ssid;
if (ssid && ssid->mode == WPAS_MODE_P2P_GROUP_FORMATION) {
ssid->mode = WPAS_MODE_P2P_GO;
p2p_group_notif_formation_done(wpa_s->p2p_group);
wpa_supplicant_ap_mac_addr_filter(wpa_s, NULL);
}
persistent = 0;
if (ssid) {
client = ssid->mode == WPAS_MODE_INFRA;
if (ssid->mode == WPAS_MODE_P2P_GO) {
persistent = ssid->p2p_persistent_group;
P2P: Use global->p2p_dev_addr instead of parent->own_addr Start using global->p2p_dev_addr more consistently as the P2P Device Address. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-25 22:58:03 +01:00
os_memcpy(go_dev_addr, wpa_s->global->p2p_dev_addr,
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
ETH_ALEN);
} else
persistent = wpas_p2p_persistent_group(wpa_s,
go_dev_addr,
ssid->ssid,
ssid->ssid_len);
} else {
client = wpa_s->p2p_group_interface ==
P2P_GROUP_INTERFACE_CLIENT;
P2P: Clear go_dev_addr for group started events if it is not known Better make sure the address value included in the event message gets cleared in case the GO Device Address is not known for some reason. Previously, this could potentially have been some random data from stack should we ever hit the case where wpa_s->current_ssid is not set (which should not really happen in normal use cases).
2011-04-13 21:03:52 +02:00
os_memset(go_dev_addr, 0, ETH_ALEN);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
wpa_s->show_group_started = 0;
if (client) {
/*
* Indicate event only after successfully completed 4-way
* handshake, i.e., when the interface is ready for data
* packets.
*/
wpa_s->show_group_started = 1;
} else {
P2P: Use a helper function for P2P_EVENT_GROUP_STARTED events This makes it easier to change the event message message for indication when P2P group has stated and removes some duplicated code. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-07-26 12:09:17 +02:00
wpas_p2p_group_started(wpa_s, 1, ssid,
ssid ? ssid->frequency : 0,
ssid && ssid->passphrase == NULL &&
ssid->psk_set ? ssid->psk : NULL,
ssid ? ssid->passphrase : NULL,
go_dev_addr, persistent, "");
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
wpas_p2p_cross_connect_setup(wpa_s);
P2P: Add mechanism for timing out idle groups A new configuration parameter, p2p_group_idle, can now be used to set idle timeout value for P2P groups in seconds (0 = no timeout). If set, this values is used to remove P2P group (both GO and P2P client) interfaces after the group has been idle (no clients/GO seen) for the configuration duration. The P2P-GROUP-REMOVED event is now indicating the reason for group removal when known. For example: P2P-GROUP-REMOVED wlan0 GO reason=REQUESTED P2P-GROUP-REMOVED wlan1 client reason=IDLE
2010-10-25 17:24:15 +02:00
wpas_p2p_set_group_idle_timeout(wpa_s);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
if (persistent)
D-Bus: Indicate whether created group is persistent or not This adds an extra parameter in GroupStarted signal to indicate whether the created group is Persistent or not. It is similar to the [PERSISTENT] tag which comes in P2P-GROUP-STARTED over the control interface. Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>
2016-05-30 09:38:31 +02:00
wpas_p2p_store_persistent_group(wpa_s->p2pdev,
ssid, go_dev_addr);
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
else {
os_free(wpa_s->global->add_psk);
wpa_s->global->add_psk = NULL;
}
D-Bus: Indicate whether created group is persistent or not This adds an extra parameter in GroupStarted signal to indicate whether the created group is Persistent or not. It is similar to the [PERSISTENT] tag which comes in P2P-GROUP-STARTED over the control interface. Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>
2016-05-30 09:38:31 +02:00
P2P: Postpone concurrent scans when waiting for first client as GO Previously, concurrent station mode scans were postponed during an ongoing P2P group formation up to the point of completed WPS provisioning step. This would allow a scan to be started before the P2P client has completed association for the data connection if a scan request were timed to hit the window between the provisioning step and the following association. Avoid this by extending P2P-in-progress state to continue until the first data connection has been completed as part of group formation. Use a ten second timeout for this to avoid leaving scans disabled indefinitely if the client fails to connect completely. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-27 11:23:10 +02:00
if (!client) {
D-Bus: Indicate whether created group is persistent or not This adds an extra parameter in GroupStarted signal to indicate whether the created group is Persistent or not. It is similar to the [PERSISTENT] tag which comes in P2P-GROUP-STARTED over the control interface. Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>
2016-05-30 09:38:31 +02:00
wpas_notify_p2p_group_started(wpa_s, ssid, persistent, 0);
P2P: Use monotonic time for GO client waiting GO activation can fail if the first client doesn't connect within a certain time, but this should not be dependent on wall time -- use monotonic time instead. While at it, use os_reltime_expired(). Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-12-16 21:08:40 +01:00
os_get_reltime(&wpa_s->global->p2p_go_wait_client);
P2P: Postpone concurrent scans when waiting for first client as GO Previously, concurrent station mode scans were postponed during an ongoing P2P group formation up to the point of completed WPS provisioning step. This would allow a scan to be started before the P2P client has completed association for the data connection if a scan request were timed to hit the window between the provisioning step and the following association. Avoid this by extending P2P-in-progress state to continue until the first data connection has been completed as part of group formation. Use a ten second timeout for this to avoid leaving scans disabled indefinitely if the client fails to connect completely. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-27 11:23:10 +02:00
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Use radio work to protect offchannel Action frame exchanges Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-07 08:39:30 +01:00
struct send_action_work {
unsigned int freq;
u8 dst[ETH_ALEN];
u8 src[ETH_ALEN];
u8 bssid[ETH_ALEN];
size_t len;
unsigned int wait_time;
u8 buf[0];
};
P2P: Add more debug prints for Action frame TX clearing steps This makes it easier to analyze debug logs for issues related to multiple pending Action TX frames. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-15 20:20:22 +02:00
static void wpas_p2p_free_send_action_work(struct wpa_supplicant *wpa_s)
{
struct send_action_work *awork = wpa_s->p2p_send_action_work->ctx;
wpa_printf(MSG_DEBUG,
"P2P: Free Action frame radio work @%p (freq=%u dst="
MACSTR " src=" MACSTR " bssid=" MACSTR " wait_time=%u)",
wpa_s->p2p_send_action_work, awork->freq,
MAC2STR(awork->dst), MAC2STR(awork->src),
MAC2STR(awork->bssid), awork->wait_time);
wpa_hexdump(MSG_DEBUG, "P2P: Freeing pending Action frame",
awork->buf, awork->len);
os_free(awork);
wpa_s->p2p_send_action_work->ctx = NULL;
radio_work_done(wpa_s->p2p_send_action_work);
wpa_s->p2p_send_action_work = NULL;
}
P2P: Use radio work to protect offchannel Action frame exchanges Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-07 08:39:30 +01:00
static void wpas_p2p_send_action_work_timeout(void *eloop_ctx,
void *timeout_ctx)
{
struct wpa_supplicant *wpa_s = eloop_ctx;
if (!wpa_s->p2p_send_action_work)
return;
wpa_printf(MSG_DEBUG, "P2P: Send Action frame radio work timed out");
P2P: Add more debug prints for Action frame TX clearing steps This makes it easier to analyze debug logs for issues related to multiple pending Action TX frames. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-15 20:20:22 +02:00
wpas_p2p_free_send_action_work(wpa_s);
P2P: Use radio work to protect offchannel Action frame exchanges Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-07 08:39:30 +01:00
}
P2P: Cancel pending action TX radio work on p2p_cancel When p2p_cancel is invoked while the GO Negotiation Action TX was pending, the p2p_send_action_work was not getting cleared. Signed-off-by: Jithu Jance <jithu@broadcom.com>
2014-07-29 15:04:32 +02:00
static void wpas_p2p_action_tx_clear(struct wpa_supplicant *wpa_s)
P2P: Skip extra remain-on-channel if oper channel matches There is no need to separately move to the correct channel for transmitting an Action frame that is using the group interface (i.e., source address is P2P Interface Address). This removes extra latency from P2P Action frame operations within a P2P group.
2010-11-02 18:35:40 +01:00
{
P2P: Use radio work to protect offchannel Action frame exchanges Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-07 08:39:30 +01:00
if (wpa_s->p2p_send_action_work) {
struct send_action_work *awork;
P2P: Add more debug prints for Action frame TX clearing steps This makes it easier to analyze debug logs for issues related to multiple pending Action TX frames. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-15 20:20:22 +02:00
P2P: Use radio work to protect offchannel Action frame exchanges Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-07 08:39:30 +01:00
awork = wpa_s->p2p_send_action_work->ctx;
P2P: Add more debug prints for Action frame TX clearing steps This makes it easier to analyze debug logs for issues related to multiple pending Action TX frames. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-15 20:20:22 +02:00
wpa_printf(MSG_DEBUG,
"P2P: Clear Action TX work @%p (wait_time=%u)",
wpa_s->p2p_send_action_work, awork->wait_time);
P2P: Use radio work to protect offchannel Action frame exchanges Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-07 08:39:30 +01:00
if (awork->wait_time == 0) {
P2P: Add more debug prints for Action frame TX clearing steps This makes it easier to analyze debug logs for issues related to multiple pending Action TX frames. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-10-15 20:20:22 +02:00
wpas_p2p_free_send_action_work(wpa_s);
P2P: Use radio work to protect offchannel Action frame exchanges Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-07 08:39:30 +01:00
} else {
/*
* In theory, this should not be needed, but number of
* places in the P2P code is still using non-zero wait
* time for the last Action frame in the sequence and
* some of these do not call send_action_done().
*/
eloop_cancel_timeout(wpas_p2p_send_action_work_timeout,
wpa_s, NULL);
eloop_register_timeout(
0, awork->wait_time * 1000,
wpas_p2p_send_action_work_timeout,
wpa_s, NULL);
}
}
P2P: Cancel pending action TX radio work on p2p_cancel When p2p_cancel is invoked while the GO Negotiation Action TX was pending, the p2p_send_action_work was not getting cleared. Signed-off-by: Jithu Jance <jithu@broadcom.com>
2014-07-29 15:04:32 +02:00
}
static void wpas_p2p_send_action_tx_status(struct wpa_supplicant *wpa_s,
unsigned int freq,
const u8 *dst, const u8 *src,
const u8 *bssid,
const u8 *data, size_t data_len,
enum offchannel_send_action_result
result)
{
enum p2p_send_action_result res = P2P_SEND_ACTION_SUCCESS;
wpas_p2p_action_tx_clear(wpa_s);
P2P: Use radio work to protect offchannel Action frame exchanges Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-07 08:39:30 +01:00
P2P: Handle P2P-not-supported without segfaults Previous code was assuming that the P2P module is always initialized. However, that is not the case anymore with drivers that do not support P2P. Add verification of whether P2P is enabled before trying to execute P2P commands.
2011-02-24 20:13:30 +01:00
if (wpa_s->global->p2p == NULL || wpa_s->global->p2p_disabled)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return;
GAS: Use off-channel operations for requests This separates off-channel Action frame TX/RX from P2P into a generic implementation that can now be used both for P2P and GAS needs.
2011-09-29 18:22:08 +02:00
switch (result) {
case OFFCHANNEL_SEND_ACTION_SUCCESS:
res = P2P_SEND_ACTION_SUCCESS;
break;
case OFFCHANNEL_SEND_ACTION_NO_ACK:
res = P2P_SEND_ACTION_NO_ACK;
break;
case OFFCHANNEL_SEND_ACTION_FAILED:
res = P2P_SEND_ACTION_FAILED;
break;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
GAS: Use off-channel operations for requests This separates off-channel Action frame TX/RX from P2P into a generic implementation that can now be used both for P2P and GAS needs.
2011-09-29 18:22:08 +02:00
p2p_send_action_cb(wpa_s->global->p2p, freq, dst, src, bssid, res);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Wait for PD-before-join response Even though the Provision Discovery Response frame from PD-before-join does not really provide any additional information, it can be better to wait for it before starting the join operation. This adds a minimal extra latency in the most common case and cleans up the sequence of driver operations and debug log by avoiding potential processing of the Provision Discovery Response while already running a scan for the actual connection. If transmission of Provision Discovery Request fails, join operation is started without the additional wait. In addition, a new timeout is used to start the join if Provision Discovery Response is lost for any reason. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-02-05 19:52:24 +01:00
if (result != OFFCHANNEL_SEND_ACTION_SUCCESS &&
wpa_s->pending_pd_before_join &&
GAS: Use off-channel operations for requests This separates off-channel Action frame TX/RX from P2P into a generic implementation that can now be used both for P2P and GAS needs.
2011-09-29 18:22:08 +02:00
(os_memcmp(dst, wpa_s->pending_join_dev_addr, ETH_ALEN) == 0 ||
P2P: Retry PD Request in join-a-running-group case The GO may be in sleep when we send a PD Request frame to indicate that we are about to join a running group. Previously, this frame was not retried more than normal low level retries. This can result in the GO not getting the frame especially in cases where concurrent multi-channel operations or aggressive sleep schedule is used since most drivers do not yet synchronize with the GO's NoA before association. Increase the likelihood of the GO receiving the PD Request frame by retransmitting it similarly to the PD-for-GO-Negotiation case. Start the actual join operation only after these retries have failed to get an acknowledgment from the GO to give the connection attempt a chance to succeed if the driver implements better NoA synchronization for it. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-22 23:53:42 +01:00
os_memcmp(dst, wpa_s->pending_join_iface_addr, ETH_ALEN) == 0) &&
wpa_s->p2p_fallback_to_go_neg) {
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_s->pending_pd_before_join = 0;
P2P: Retry PD Request in join-a-running-group case The GO may be in sleep when we send a PD Request frame to indicate that we are about to join a running group. Previously, this frame was not retried more than normal low level retries. This can result in the GO not getting the frame especially in cases where concurrent multi-channel operations or aggressive sleep schedule is used since most drivers do not yet synchronize with the GO's NoA before association. Increase the likelihood of the GO receiving the PD Request frame by retransmitting it similarly to the PD-for-GO-Negotiation case. Start the actual join operation only after these retries have failed to get an acknowledgment from the GO to give the connection attempt a chance to succeed if the driver implements better NoA synchronization for it. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-22 23:53:42 +01:00
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: No ACK for PD Req "
"during p2p_connect-auto");
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_msg_global(wpa_s->p2pdev, MSG_INFO,
P2P: Add event messages for P2P_CONNECT-fallback-to-GO-Neg This makes it easier for upper layer programs to follow progress of P2P_CONNECT-auto operation. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 11:04:15 +01:00
P2P_EVENT_FALLBACK_TO_GO_NEG
"reason=no-ACK-to-PD-Req");
P2P: Retry PD Request in join-a-running-group case The GO may be in sleep when we send a PD Request frame to indicate that we are about to join a running group. Previously, this frame was not retried more than normal low level retries. This can result in the GO not getting the frame especially in cases where concurrent multi-channel operations or aggressive sleep schedule is used since most drivers do not yet synchronize with the GO's NoA before association. Increase the likelihood of the GO receiving the PD Request frame by retransmitting it similarly to the PD-for-GO-Negotiation case. Start the actual join operation only after these retries have failed to get an acknowledgment from the GO to give the connection attempt a chance to succeed if the driver implements better NoA synchronization for it. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-22 23:53:42 +01:00
wpas_p2p_fallback_to_go_neg(wpa_s, 0);
return;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
}
P2P: Use radio work to protect offchannel Action frame exchanges Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-07 08:39:30 +01:00
static void wpas_send_action_cb(struct wpa_radio_work *work, int deinit)
{
struct wpa_supplicant *wpa_s = work->wpa_s;
struct send_action_work *awork = work->ctx;
if (deinit) {
wpa_supplicant: Complete radio works on disable event While testing rfkill blocking of a scanning interface, it was seen that the ongoing scan never completes. This happens since EVENT_SCAN_RESULTS is discarded on a disabled interface. Fix this and also other possible radio work completion issues by removing all the radio works (including started) of the disabled interface. To be able to remove already started radio works, make their callbacks be reentrant with deinit flag (when the work is started), so each radio work should be able to handle its own termination. Signed-hostap: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2014-02-13 10:24:00 +01:00
if (work->started) {
eloop_cancel_timeout(wpas_p2p_send_action_work_timeout,
wpa_s, NULL);
wpa_s->p2p_send_action_work = NULL;
offchannel_send_action_done(wpa_s);
}
P2P: Use radio work to protect offchannel Action frame exchanges Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-07 08:39:30 +01:00
os_free(awork);
return;
}
if (offchannel_send_action(wpa_s, awork->freq, awork->dst, awork->src,
awork->bssid, awork->buf, awork->len,
awork->wait_time,
wpas_p2p_send_action_tx_status, 1) < 0) {
os_free(awork);
radio_work_done(work);
return;
}
wpa_s->p2p_send_action_work = work;
}
static int wpas_send_action_work(struct wpa_supplicant *wpa_s,
unsigned int freq, const u8 *dst,
const u8 *src, const u8 *bssid, const u8 *buf,
size_t len, unsigned int wait_time)
{
struct send_action_work *awork;
if (wpa_s->p2p_send_action_work) {
wpa_printf(MSG_DEBUG, "P2P: Cannot schedule new p2p-send-action work since one is already pending");
return -1;
}
awork = os_zalloc(sizeof(*awork) + len);
if (awork == NULL)
return -1;
awork->freq = freq;
os_memcpy(awork->dst, dst, ETH_ALEN);
os_memcpy(awork->src, src, ETH_ALEN);
os_memcpy(awork->bssid, bssid, ETH_ALEN);
awork->len = len;
awork->wait_time = wait_time;
os_memcpy(awork->buf, buf, len);
if (radio_add_work(wpa_s, freq, "p2p-send-action", 0,
wpas_send_action_cb, awork) < 0) {
os_free(awork);
return -1;
}
return 0;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
static int wpas_send_action(void *ctx, unsigned int freq, const u8 *dst,
const u8 *src, const u8 *bssid, const u8 *buf,
size_t len, unsigned int wait_time)
{
struct wpa_supplicant *wpa_s = ctx;
P2P: Use radio work to protect offchannel Action frame exchanges Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-07 08:39:30 +01:00
int listen_freq = -1, send_freq = -1;
if (wpa_s->p2p_listen_work)
listen_freq = wpa_s->p2p_listen_work->freq;
if (wpa_s->p2p_send_action_work)
send_freq = wpa_s->p2p_send_action_work->freq;
if (listen_freq != (int) freq && send_freq != (int) freq) {
wpa_printf(MSG_DEBUG, "P2P: Schedule new radio work for Action frame TX (listen_freq=%d send_freq=%d)",
listen_freq, send_freq);
return wpas_send_action_work(wpa_s, freq, dst, src, bssid, buf,
len, wait_time);
}
wpa_printf(MSG_DEBUG, "P2P: Use ongoing radio work for Action frame TX");
GAS: Use off-channel operations for requests This separates off-channel Action frame TX/RX from P2P into a generic implementation that can now be used both for P2P and GAS needs.
2011-09-29 18:22:08 +02:00
return offchannel_send_action(wpa_s, freq, dst, src, bssid, buf, len,
wait_time,
Add no_cck parameter for send_action() driver_ops This can be used to apply the no-CCK rule conditionally depending on which frame is being sent. The no-CCK rule applies only for P2P management frames while SA Query and FT use cases do not have similar restrictions. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-10-29 20:49:46 +02:00
wpas_p2p_send_action_tx_status, 1);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
static void wpas_send_action_done(void *ctx)
{
struct wpa_supplicant *wpa_s = ctx;
P2P: Use radio work to protect offchannel Action frame exchanges Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-07 08:39:30 +01:00
if (wpa_s->p2p_send_action_work) {
eloop_cancel_timeout(wpas_p2p_send_action_work_timeout,
wpa_s, NULL);
os_free(wpa_s->p2p_send_action_work->ctx);
radio_work_done(wpa_s->p2p_send_action_work);
wpa_s->p2p_send_action_work = NULL;
}
GAS: Use off-channel operations for requests This separates off-channel Action frame TX/RX from P2P into a generic implementation that can now be used both for P2P and GAS needs.
2011-09-29 18:22:08 +02:00
offchannel_send_action_done(wpa_s);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
static int wpas_copy_go_neg_results(struct wpa_supplicant *wpa_s,
struct p2p_go_neg_results *params)
{
if (wpa_s->go_params == NULL) {
wpa_s->go_params = os_malloc(sizeof(*params));
if (wpa_s->go_params == NULL)
return -1;
}
os_memcpy(wpa_s->go_params, params, sizeof(*params));
return 0;
}
static void wpas_start_wps_enrollee(struct wpa_supplicant *wpa_s,
struct p2p_go_neg_results *res)
{
P2P: Handle improper WPS termination on GO during group formation A P2P Client may be able to connect to the GO even if the WPS provisioning step has not terminated cleanly (e.g., P2P Client does not send WSC_Done). Such group formation attempt missed the event notification about started group on the GO and also did not set the internal state corresponding to the successful group formation. This commit addresses the missing part by completing GO side group formation on a successful first data connection if WPS does not complete cleanly. Also, this commit reorders the STA authorization indications to ensure that the group formation success notification is given prior to the first STA connection to handle such scenarios. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-01 14:36:53 +02:00
wpa_s->group_formation_reported = 0;
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 00:44:29 +02:00
wpa_printf(MSG_DEBUG, "P2P: Start WPS Enrollee for peer " MACSTR
P2P NFC: Static handover with NFC Tag on client This adds a new P2P Invitation mechanism to invite a P2P Device with an NFC Tag to an already operating group when the GO with NFC Device reads the NFC Tag. The P2P Device with the NFC Tag will then accept invitation and connect to the group automatically using its OOB Device Password. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 18:45:04 +02:00
" dev_addr " MACSTR " wps_method %d",
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 00:44:29 +02:00
MAC2STR(res->peer_interface_addr),
P2P NFC: Static handover with NFC Tag on client This adds a new P2P Invitation mechanism to invite a P2P Device with an NFC Tag to an already operating group when the GO with NFC Device reads the NFC Tag. The P2P Device with the NFC Tag will then accept invitation and connect to the group automatically using its OOB Device Password. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 18:45:04 +02:00
MAC2STR(res->peer_device_addr), res->wps_method);
P2P: Use SSID from GO Negotiation to limit WPS provisioning step In order to avoid picking incorrect SSID from old scan results, use SSID from GO Negotiation to select the AP.
2010-08-05 18:15:11 +02:00
wpa_hexdump_ascii(MSG_DEBUG, "P2P: Start WPS Enrollee for SSID",
res->ssid, res->ssid_len);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_supplicant_ap_deinit(wpa_s);
wpas_copy_go_neg_results(wpa_s, res);
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
if (res->wps_method == WPS_PBC) {
P2P: Limit p2p_connect .. pbc join based on BSSID Allow only the expected P2P Interface Address as the BSSID for the AP to avoid selecting incorrect BSS should there be another device that is advertising active PBC mode before the target P2P GO does.
2010-10-12 15:56:17 +02:00
wpas_wps_start_pbc(wpa_s, res->peer_interface_addr, 1);
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
#ifdef CONFIG_WPS_NFC
} else if (res->wps_method == WPS_NFC) {
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 00:44:29 +02:00
wpas_wps_start_nfc(wpa_s, res->peer_device_addr,
res->peer_interface_addr,
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev->p2p_oob_dev_pw,
wpa_s->p2pdev->p2p_oob_dev_pw_id, 1,
wpa_s->p2pdev->p2p_oob_dev_pw_id ==
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
DEV_PW_NFC_CONNECTION_HANDOVER ?
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev->p2p_peer_oob_pubkey_hash :
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
NULL,
WPS NFC: Use BSSID and AP Channel from handover select These optional attributes, if present, can be used to speed up the initial connection by using a single channel scan. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-28 16:48:35 +01:00
NULL, 0, 0);
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
#endif /* CONFIG_WPS_NFC */
} else {
P2P: Set Device Password ID in WPS M1/M2 per new rules If the P2P client (WPS Enrollee) uses a PIN from the GO (Registrar), Device Password ID in M1 & M2 is set to Registrar-specified.
2010-06-27 07:49:41 +02:00
u16 dev_pw_id = DEV_PW_DEFAULT;
P2PS: WPS changes needed for P2PS default PIN This provides additional WPS definitions and rules for negotiating use of P2PS default PIN configuration method. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-09-11 17:27:44 +02:00
if (wpa_s->p2p_wps_method == WPS_P2PS)
dev_pw_id = DEV_PW_P2PS_DEFAULT;
P2P: Set Device Password ID in WPS M1/M2 per new rules If the P2P client (WPS Enrollee) uses a PIN from the GO (Registrar), Device Password ID in M1 & M2 is set to Registrar-specified.
2010-06-27 07:49:41 +02:00
if (wpa_s->p2p_wps_method == WPS_PIN_KEYPAD)
dev_pw_id = DEV_PW_REGISTRAR_SPECIFIED;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpas_wps_start_pin(wpa_s, res->peer_interface_addr,
P2P: Set Device Password ID in WPS M1/M2 per new rules If the P2P client (WPS Enrollee) uses a PIN from the GO (Registrar), Device Password ID in M1 & M2 is set to Registrar-specified.
2010-06-27 07:49:41 +02:00
wpa_s->p2p_pin, 1, dev_pw_id);
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
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
static void wpas_p2p_add_psk_list(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid)
{
struct wpa_ssid *persistent;
struct psk_list_entry *psk;
struct hostapd_data *hapd;
if (!wpa_s->ap_iface)
return;
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
persistent = wpas_p2p_get_persistent(wpa_s->p2pdev, NULL, ssid->ssid,
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
ssid->ssid_len);
if (persistent == NULL)
return;
hapd = wpa_s->ap_iface->bss[0];
dl_list_for_each(psk, &persistent->psk_list, struct psk_list_entry,
list) {
struct hostapd_wpa_psk *hpsk;
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Add persistent group PSK entry for "
MACSTR " psk=%d",
MAC2STR(psk->addr), psk->p2p);
hpsk = os_zalloc(sizeof(*hpsk));
if (hpsk == NULL)
break;
os_memcpy(hpsk->psk, psk->psk, PMK_LEN);
if (psk->p2p)
os_memcpy(hpsk->p2p_dev_addr, psk->addr, ETH_ALEN);
else
os_memcpy(hpsk->addr, psk->addr, ETH_ALEN);
hpsk->next = hapd->conf->ssid.wpa_psk;
hapd->conf->ssid.wpa_psk = hpsk;
}
}
P2P: Save group common frequencies Once a P2P GO interface is configured, save the group common frequencies, as this can be useful later for channel selection considerations during channel switch, etc. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-07-07 13:20:59 +02:00
static void p2p_go_dump_common_freqs(struct wpa_supplicant *wpa_s)
{
unsigned int i;
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Common group frequencies (len=%u):",
wpa_s->p2p_group_common_freqs_num);
for (i = 0; i < wpa_s->p2p_group_common_freqs_num; i++)
wpa_dbg(wpa_s, MSG_DEBUG, "freq[%u]: %d",
i, wpa_s->p2p_group_common_freqs[i]);
}
static void p2p_go_save_group_common_freqs(struct wpa_supplicant *wpa_s,
struct p2p_go_neg_results *params)
{
unsigned int i, len = int_array_len(wpa_s->go_params->freq_list);
wpa_s->p2p_group_common_freqs_num = 0;
os_free(wpa_s->p2p_group_common_freqs);
wpa_s->p2p_group_common_freqs = os_calloc(len, sizeof(int));
if (!wpa_s->p2p_group_common_freqs)
return;
for (i = 0; i < len; i++) {
if (!wpa_s->go_params->freq_list[i])
break;
wpa_s->p2p_group_common_freqs[i] =
wpa_s->go_params->freq_list[i];
}
wpa_s->p2p_group_common_freqs_num = i;
}
P2PS: Callback to remove stale persistent groups When the peer device is trying to form a new group despite having old persistent group with same roles, remove the stale persistent group. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:38:17 +01:00
static void p2p_config_write(struct wpa_supplicant *wpa_s)
{
#ifndef CONFIG_NO_CONFIG_WRITE
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
if (wpa_s->p2pdev->conf->update_config &&
wpa_config_write(wpa_s->p2pdev->confname, wpa_s->p2pdev->conf))
P2PS: Callback to remove stale persistent groups When the peer device is trying to form a new group despite having old persistent group with same roles, remove the stale persistent group. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:38:17 +01:00
wpa_printf(MSG_DEBUG, "P2P: Failed to update configuration");
#endif /* CONFIG_NO_CONFIG_WRITE */
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
static void p2p_go_configured(void *ctx, void *data)
{
struct wpa_supplicant *wpa_s = ctx;
struct p2p_go_neg_results *params = data;
struct wpa_ssid *ssid;
P2P: Make p2p_go_configured() more robust against unexpected calls A hwsim test sequence was able to hit a SIGSEGV in p2p_go_save_group_common_freqs() called by p2p_go_configured() callback in a case where a non-P2P AP mode operation is started in wpa_supplicant (wpas_ap_wep test case). This callback should not have happened for non-P2P case and the debug logs did not make it clear how this could happen. In addition, it is unclear how this could be reproduced. To avoid this type of issues, clear the wpa_s->ap_configured_cb pointer as soon as the first call to the function happens. In addition, verify that wpa_s->go_params is available before processing the GO configured callback. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-11-30 00:25:24 +01:00
wpa_s->ap_configured_cb = NULL;
wpa_s->ap_configured_cb_ctx = NULL;
wpa_s->ap_configured_cb_data = NULL;
if (!wpa_s->go_params) {
wpa_printf(MSG_ERROR,
"P2P: p2p_go_configured() called with wpa_s->go_params == NULL");
return;
}
P2P: Save group common frequencies Once a P2P GO interface is configured, save the group common frequencies, as this can be useful later for channel selection considerations during channel switch, etc. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-07-07 13:20:59 +02:00
p2p_go_save_group_common_freqs(wpa_s, params);
p2p_go_dump_common_freqs(wpa_s);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
ssid = wpa_s->current_ssid;
if (ssid && ssid->mode == WPAS_MODE_P2P_GO) {
wpa_printf(MSG_DEBUG, "P2P: Group setup without provisioning");
P2P: Make sure wpa_s->global->p2p_group_formation gets cleared This pointer is now used in number of places to check whether an interface is in P2P Group Formation, so we better make sure it gets cleared when group formation has been completed. This was done in only some of the cases.
2010-11-18 11:41:27 +01:00
if (wpa_s->global->p2p_group_formation == wpa_s)
wpa_s->global->p2p_group_formation = NULL;
P2P: Use a helper function for P2P_EVENT_GROUP_STARTED events This makes it easier to change the event message message for indication when P2P group has stated and removes some duplicated code. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-07-26 12:09:17 +02:00
wpas_p2p_group_started(wpa_s, 1, ssid, ssid->frequency,
params->passphrase[0] == '\0' ?
params->psk : NULL,
params->passphrase,
wpa_s->global->p2p_dev_addr,
params->persistent_group, "");
P2P: Handle improper WPS termination on GO during group formation A P2P Client may be able to connect to the GO even if the WPS provisioning step has not terminated cleanly (e.g., P2P Client does not send WSC_Done). Such group formation attempt missed the event notification about started group on the GO and also did not set the internal state corresponding to the successful group formation. This commit addresses the missing part by completing GO side group formation on a successful first data connection if WPS does not complete cleanly. Also, this commit reorders the STA authorization indications to ensure that the group formation success notification is given prior to the first STA connection to handle such scenarios. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-01 14:36:53 +02:00
wpa_s->group_formation_reported = 1;
P2P: Add group started notification Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:35:37 +02:00
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
if (wpa_s->p2pdev->p2ps_method_config_any) {
if (is_zero_ether_addr(wpa_s->p2pdev->p2ps_join_addr)) {
P2PS: Authorize any peer for P2PS method if interface address not known When P2PS PD with default P2PS method is done, the peer that becomes GO should authorize the client. However, P2PS specification doesn't require the client to include its intended interface address in PD Request/Response. As a result, the P2P Client's interface address may not be known and any address may need to be authorized. Previously, client's P2P Device Address was used for authorization, which is not correct when a dedicated interface is used for P2P Client. This is not resulting in a connection failure, however it causes a significant delay (until WPS_PIN_TIME_IGNORE_SEL_REG elapses). Fix this by authorizing the intended interface address, if known; or any address, if not known. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2015-07-30 08:00:06 +02:00
wpa_dbg(wpa_s, MSG_DEBUG,
"P2PS: Setting default PIN for ANY");
wpa_supplicant_ap_wps_pin(wpa_s, NULL,
"12345670", NULL, 0,
0);
} else {
wpa_dbg(wpa_s, MSG_DEBUG,
"P2PS: Setting default PIN for " MACSTR,
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
MAC2STR(wpa_s->p2pdev->p2ps_join_addr));
P2PS: Authorize any peer for P2PS method if interface address not known When P2PS PD with default P2PS method is done, the peer that becomes GO should authorize the client. However, P2PS specification doesn't require the client to include its intended interface address in PD Request/Response. As a result, the P2P Client's interface address may not be known and any address may need to be authorized. Previously, client's P2P Device Address was used for authorization, which is not correct when a dedicated interface is used for P2P Client. This is not resulting in a connection failure, however it causes a significant delay (until WPS_PIN_TIME_IGNORE_SEL_REG elapses). Fix this by authorizing the intended interface address, if known; or any address, if not known. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2015-07-30 08:00:06 +02:00
wpa_supplicant_ap_wps_pin(
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s, wpa_s->p2pdev->p2ps_join_addr,
P2PS: Authorize any peer for P2PS method if interface address not known When P2PS PD with default P2PS method is done, the peer that becomes GO should authorize the client. However, P2PS specification doesn't require the client to include its intended interface address in PD Request/Response. As a result, the P2P Client's interface address may not be known and any address may need to be authorized. Previously, client's P2P Device Address was used for authorization, which is not correct when a dedicated interface is used for P2P Client. This is not resulting in a connection failure, however it causes a significant delay (until WPS_PIN_TIME_IGNORE_SEL_REG elapses). Fix this by authorizing the intended interface address, if known; or any address, if not known. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2015-07-30 08:00:06 +02:00
"12345670", NULL, 0, 0);
}
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev->p2ps_method_config_any = 0;
P2PS: Start WPS registrar upon GO formation If P2PS config method is used for provisioning, upon forming a new GO, start WPS registrar for the provisioned peer automatically. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-15 12:40:31 +01:00
}
P2P: Use monotonic time for GO client waiting GO activation can fail if the first client doesn't connect within a certain time, but this should not be dependent on wall time -- use monotonic time instead. While at it, use os_reltime_expired(). Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-12-16 21:08:40 +01:00
os_get_reltime(&wpa_s->global->p2p_go_wait_client);
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
if (params->persistent_group) {
D-Bus: Indicate whether created group is persistent or not This adds an extra parameter in GroupStarted signal to indicate whether the created group is Persistent or not. It is similar to the [PERSISTENT] tag which comes in P2P-GROUP-STARTED over the control interface. Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>
2016-05-30 09:38:31 +02:00
wpas_p2p_store_persistent_group(
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev, ssid,
P2P: Use global->p2p_dev_addr instead of parent->own_addr Start using global->p2p_dev_addr more consistently as the P2P Device Address. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-25 22:58:03 +01:00
wpa_s->global->p2p_dev_addr);
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
wpas_p2p_add_psk_list(wpa_s, ssid);
}
D-Bus: Indicate whether created group is persistent or not This adds an extra parameter in GroupStarted signal to indicate whether the created group is Persistent or not. It is similar to the [PERSISTENT] tag which comes in P2P-GROUP-STARTED over the control interface. Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>
2016-05-30 09:38:31 +02:00
wpas_notify_p2p_group_started(wpa_s, ssid,
params->persistent_group, 0);
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
wpas_p2p_cross_connect_setup(wpa_s);
P2P: Add mechanism for timing out idle groups A new configuration parameter, p2p_group_idle, can now be used to set idle timeout value for P2P groups in seconds (0 = no timeout). If set, this values is used to remove P2P group (both GO and P2P client) interfaces after the group has been idle (no clients/GO seen) for the configuration duration. The P2P-GROUP-REMOVED event is now indicating the reason for group removal when known. For example: P2P-GROUP-REMOVED wlan0 GO reason=REQUESTED P2P-GROUP-REMOVED wlan1 client reason=IDLE
2010-10-25 17:24:15 +02:00
wpas_p2p_set_group_idle_timeout(wpa_s);
P2P: Use group formation timeout on persistent group GO Previously, GO considered the group to be fully re-invoked after starting beaconing on successful invitation exchange. This would leave the group running until idle timeout (which may not be enabled) or explicit removal if the client fails to connect for any reason. Since the client is expected to connect immediately after the invitation exchange that ends with status=0 (i.e., either client initiated the exchange or it responded with success), extend group formation timeout to cover that period until the first successfully completed data connection. This allows the GO to remove the group automatically if the client devices does not connect within P2P_MAX_INITIAL_CONN_WAIT_GO_REINVOKE (15) seconds. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-26 20:24:09 +02:00
if (wpa_s->p2p_first_connection_timeout) {
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P: Start group formation timeout of %d seconds until first data connection on GO",
wpa_s->p2p_first_connection_timeout);
wpa_s->p2p_go_group_formation_completed = 0;
wpa_s->global->p2p_group_formation = wpa_s;
eloop_cancel_timeout(wpas_p2p_group_formation_timeout,
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev, NULL);
P2P: Use group formation timeout on persistent group GO Previously, GO considered the group to be fully re-invoked after starting beaconing on successful invitation exchange. This would leave the group running until idle timeout (which may not be enabled) or explicit removal if the client fails to connect for any reason. Since the client is expected to connect immediately after the invitation exchange that ends with status=0 (i.e., either client initiated the exchange or it responded with success), extend group formation timeout to cover that period until the first successfully completed data connection. This allows the GO to remove the group automatically if the client devices does not connect within P2P_MAX_INITIAL_CONN_WAIT_GO_REINVOKE (15) seconds. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-26 20:24:09 +02:00
eloop_register_timeout(
wpa_s->p2p_first_connection_timeout, 0,
wpas_p2p_group_formation_timeout,
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev, NULL);
P2P: Use group formation timeout on persistent group GO Previously, GO considered the group to be fully re-invoked after starting beaconing on successful invitation exchange. This would leave the group running until idle timeout (which may not be enabled) or explicit removal if the client fails to connect for any reason. Since the client is expected to connect immediately after the invitation exchange that ends with status=0 (i.e., either client initiated the exchange or it responded with success), extend group formation timeout to cover that period until the first successfully completed data connection. This allows the GO to remove the group automatically if the client devices does not connect within P2P_MAX_INITIAL_CONN_WAIT_GO_REINVOKE (15) seconds. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-26 20:24:09 +02:00
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return;
}
wpa_printf(MSG_DEBUG, "P2P: Setting up WPS for GO provisioning");
if (wpa_supplicant_ap_mac_addr_filter(wpa_s,
params->peer_interface_addr)) {
wpa_printf(MSG_DEBUG, "P2P: Failed to setup MAC address "
"filtering");
return;
}
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
if (params->wps_method == WPS_PBC) {
P2P: Allow WPS_PBC command on GO to select on P2P Device Address An optional parameter, p2p_dev_addr, can now be given to WPS_PBC command on P2P GO to indicate that only the P2P device with the specified P2P Device Address is allowed to connect using PBC. If any other device tries to use PBC, a session overlap is indicated and the negotiation is rejected with M2D. The command format for specifying the address is "WPS_PBC p2p_dev_addr=<address>", e.g., WPS_PBC p2p_dev_addr=02:03:04:05:06:07 In addition, show the PBC session overlap indication as a WPS failure event on an AP/GO interface. This particular new case shows up as "WPS-FAIL msg=4 config_error=12".
2011-02-07 17:28:36 +01:00
wpa_supplicant_ap_wps_pbc(wpa_s, params->peer_interface_addr,
Skip WPS PBC overlap detection if P2P address is the same WPS overlap detection can detect false overlap if a P2P peer changes UUID while authentication is ongoing. Changing UUID is of course wrong but this is what some popular devices do so we need to work around it in order to keep compatibility with these devices. There already is a mechanism in WPS registrar to skip overlap detection if P2P addresses of two sessions match but it wasn't really triggered because the address wasn't filled in in the caller function. Let's fill in this address and also clean up WPS PBC sessions on WSC process completion if UUID was changed. Signed-hostap: Vitaly Wool<vitalywool@gmail.com>
2011-12-11 11:03:18 +01:00
params->peer_device_addr);
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
#ifdef CONFIG_WPS_NFC
} else if (params->wps_method == WPS_NFC) {
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
if (wpa_s->p2pdev->p2p_oob_dev_pw_id !=
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
DEV_PW_NFC_CONNECTION_HANDOVER &&
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
!wpa_s->p2pdev->p2p_oob_dev_pw) {
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
wpa_printf(MSG_DEBUG, "P2P: No NFC Dev Pw known");
return;
}
wpas_ap_wps_add_nfc_pw(
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s, wpa_s->p2pdev->p2p_oob_dev_pw_id,
wpa_s->p2pdev->p2p_oob_dev_pw,
wpa_s->p2pdev->p2p_peer_oob_pk_hash_known ?
wpa_s->p2pdev->p2p_peer_oob_pubkey_hash : NULL);
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
#endif /* CONFIG_WPS_NFC */
} else if (wpa_s->p2p_pin[0])
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_supplicant_ap_wps_pin(wpa_s, params->peer_interface_addr,
WPS: Allow PIN timeout to be specified with wpa_supplicant AP/GO Extend the wpa_cli wps_pin command to support specification of the PIN expiration time in seconds similarly to hostapd_cli wps_pin command when using wpa_supplicant for AP mode (including P2P GO). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-10-10 16:22:35 +02:00
wpa_s->p2p_pin, NULL, 0, 0);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
os_free(wpa_s->go_params);
wpa_s->go_params = NULL;
}
static void wpas_start_wps_go(struct wpa_supplicant *wpa_s,
struct p2p_go_neg_results *params,
int group_formation)
{
struct wpa_ssid *ssid;
P2P: Add more debug prints for GO start routines This makes it easier to debug issues in starting GO mode. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-24 00:05:51 +02:00
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Starting GO");
if (wpas_copy_go_neg_results(wpa_s, params) < 0) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Could not copy GO Negotiation "
"results");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return;
P2P: Add more debug prints for GO start routines This makes it easier to debug issues in starting GO mode. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-24 00:05:51 +02:00
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
ssid = wpa_config_add_network(wpa_s->conf);
P2P: Add more debug prints for GO start routines This makes it easier to debug issues in starting GO mode. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-24 00:05:51 +02:00
if (ssid == NULL) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Could not add network for GO");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return;
P2P: Add more debug prints for GO start routines This makes it easier to debug issues in starting GO mode. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-24 00:05:51 +02:00
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Clear show_group_started on GO start The show_group_started variable could be left to 1 based on an earlier failed attempt to start P2P client operation. This can result in unexpected P2P-GROUP-STARTED event when a GO is started without group formation (e.g., re-invoke a persistent group or start an autonomous GO). Avoid this by explicitly clearing show_group_start when setting up the GO. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-12-01 09:46:06 +01:00
wpa_s->show_group_started = 0;
P2P: Clear p2p_go_group_formation_completed on GO start Previously, this variable did not necessarily get cleared between group formations and could result in some of the workaround operations from not being executed after the first group formation when using the same interface for all P2P groups. Fix this by clearing the variable whenever starting the GO to make sure it is used consistently for each group formation. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-10 14:53:22 +02:00
wpa_s->p2p_go_group_formation_completed = 0;
P2P: Handle improper WPS termination on GO during group formation A P2P Client may be able to connect to the GO even if the WPS provisioning step has not terminated cleanly (e.g., P2P Client does not send WSC_Done). Such group formation attempt missed the event notification about started group on the GO and also did not set the internal state corresponding to the successful group formation. This commit addresses the missing part by completing GO side group formation on a successful first data connection if WPS does not complete cleanly. Also, this commit reorders the STA authorization indications to ensure that the group formation success notification is given prior to the first STA connection to handle such scenarios. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-01 14:36:53 +02:00
wpa_s->group_formation_reported = 0;
P2P: Do not clear wpa_s->go_dev_addr before group removal This variable is needed to figure out whether a wpa_supplicant interface is for a P2P group that is (or was) connected to a specific GO. The previous implementation was able to find such a case only when there was an association with the GO. However, this may be needed even if there is a temporary disconnection from the GO. Keep the GO device address information over such temporary disconnections and only remove it on group termination. This fixes an issue with D-Bus Peer PropertiesChanged signals for the Groups property in case a P2P group gets removed due to group idle timeout instead of explicit group termination command (local request) or GO notification. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-08-02 18:25:41 +02:00
os_memset(wpa_s->go_dev_addr, 0, ETH_ALEN);
P2P: Clear show_group_started on GO start The show_group_started variable could be left to 1 based on an earlier failed attempt to start P2P client operation. This can result in unexpected P2P-GROUP-STARTED event when a GO is started without group formation (e.g., re-invoke a persistent group or start an autonomous GO). Avoid this by explicitly clearing show_group_start when setting up the GO. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-12-01 09:46:06 +01:00
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_config_set_network_defaults(ssid);
ssid->temporary = 1;
ssid->p2p_group = 1;
ssid->p2p_persistent_group = params->persistent_group;
ssid->mode = group_formation ? WPAS_MODE_P2P_GROUP_FORMATION :
WPAS_MODE_P2P_GO;
ssid->frequency = params->freq;
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
ssid->ht40 = params->ht40;
P2P: Add VHT parameter to P2P operations Add the option to ask for VHT operation similarly to the way ht40 is configured - either by adding 'vht' param to the relevant p2p_* commands or by configuring p2p_go_vht=1 in the configuration file. This patch only adds the configuration option (e.g., via control interface). The actual handling of the VHT parameter (asking the driver to use VHT, etc.) will be done by the following patch. Signed-hostap: Eliad Peller <eliadx.peller@intel.com>
2013-10-27 18:46:17 +01:00
ssid->vht = params->vht;
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
ssid->max_oper_chwidth = params->max_oper_chwidth;
ssid->vht_center_freq2 = params->vht_center_freq2;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
ssid->ssid = os_zalloc(params->ssid_len + 1);
if (ssid->ssid) {
os_memcpy(ssid->ssid, params->ssid, params->ssid_len);
ssid->ssid_len = params->ssid_len;
}
ssid->auth_alg = WPA_AUTH_ALG_OPEN;
ssid->key_mgmt = WPA_KEY_MGMT_PSK;
ssid->proto = WPA_PROTO_RSN;
ssid->pairwise_cipher = WPA_CIPHER_CCMP;
P2P: Support GCMP as part of 60 GHz support Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-26 13:04:29 +01:00
ssid->group_cipher = WPA_CIPHER_CCMP;
if (params->freq > 56160) {
/*
* Enable GCMP instead of CCMP as pairwise_cipher and
* group_cipher in 60 GHz.
*/
ssid->pairwise_cipher = WPA_CIPHER_GCMP;
ssid->group_cipher = WPA_CIPHER_GCMP;
wpa_supplicant: Basic support for PBSS/PCP PBSS (Personal Basic Service Set) is a new BSS type for DMG networks. It is similar to infrastructure BSS, having an AP-like entity called PCP (PBSS Control Point), but it has few differences. PBSS support is mandatory for IEEE 802.11ad devices. Add a new "pbss" argument to network block. The argument is used in the following scenarios: 1. When network has mode=2 (AP), when pbss flag is set will start as a PCP instead of an AP. 2. When network has mode=0 (station), when pbss flag is set will connect to PCP instead of AP. The function wpa_scan_res_match() was modified to match BSS according to the pbss flag in the network block (wpa_ssid structure). When pbss flag is set it will match only PCPs, and when it is clear it will match only APs. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-02-08 11:30:04 +01:00
/* P2P GO in 60 GHz is always a PCP (PBSS) */
ssid->pbss = 1;
P2P: Support GCMP as part of 60 GHz support Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-26 13:04:29 +01:00
}
P2P: Allow PSK to be used instead of passphrase for persistent GO This continues optimizations for use of CPU heavy pbkdf2_sha1() in GO setup after the earlier commit 30c371e8a54c3b1bece6366ff0666da15d63e45e by allowing PSK to be used instead of passphrase when creating persistent group information manually for the GO. It should be noted that this would not meet the requirements in the P2P specification (GO shall maintain the passphrase), so this should be used only when there is no need to allow manual configuration of legacy STAs using the passphrase. Signed-hostap: Masashi Honma <masashi.honma@gmail.com>
2012-12-25 13:15:07 +01:00
if (os_strlen(params->passphrase) > 0) {
ssid->passphrase = os_strdup(params->passphrase);
if (ssid->passphrase == NULL) {
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
wpa_msg_global(wpa_s, MSG_ERROR,
"P2P: Failed to copy passphrase for GO");
P2P: Allow PSK to be used instead of passphrase for persistent GO This continues optimizations for use of CPU heavy pbkdf2_sha1() in GO setup after the earlier commit 30c371e8a54c3b1bece6366ff0666da15d63e45e by allowing PSK to be used instead of passphrase when creating persistent group information manually for the GO. It should be noted that this would not meet the requirements in the P2P specification (GO shall maintain the passphrase), so this should be used only when there is no need to allow manual configuration of legacy STAs using the passphrase. Signed-hostap: Masashi Honma <masashi.honma@gmail.com>
2012-12-25 13:15:07 +01:00
wpa_config_remove_network(wpa_s->conf, ssid->id);
return;
}
} else
ssid->passphrase = NULL;
P2P: Reduce redundant PSK generation for GO The PSK generation done by pbkdf2_sha1() is one of the longest CPU time users according to our profiling from boot to GO started. So I have reduced some steps. I could boot a GO by this command sequence. ------------- add_net set_network 0 ssid '"DIRECT-XX"' set_network 0 psk '"123456789012345678901234567890123456789012345678901234567890123"' set_network 0 proto RSN set_network 0 key_mgmt WPA-PSK set_network 0 pairwise CCMP set_network 0 auth_alg OPEN set_network 0 mode 3 set_network 0 disabled 2 p2p_group_add persistent=0 freq=2412 ------------- By this sequence, pbkdf2_sha1() was called three times and the function calculates the same value each time. Reduce number of calls to pbkdf2_sha1() from 3 to 1 by caching the previous result. Signed-hostap: Masashi Honma <masashi.honma at gmail.com>
2012-11-11 10:39:24 +01:00
ssid->psk_set = params->psk_set;
if (ssid->psk_set)
os_memcpy(ssid->psk, params->psk, sizeof(ssid->psk));
P2P: Be more careful with wpa_config_update_psk() call Commit bb4d4deb4bbb7b094faa16fa41f1f49b062cbf22 introduced a code path that could potentially end up calling wpa_config_update_psk() with NULL passphrase. While that may not happen in practice, it is better to make sure it doesn't happen since that function will dereference the passphrase pointer unconditionally. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-25 18:35:15 +01:00
else if (ssid->passphrase)
P2P: Reduce redundant PSK generation for GO The PSK generation done by pbkdf2_sha1() is one of the longest CPU time users according to our profiling from boot to GO started. So I have reduced some steps. I could boot a GO by this command sequence. ------------- add_net set_network 0 ssid '"DIRECT-XX"' set_network 0 psk '"123456789012345678901234567890123456789012345678901234567890123"' set_network 0 proto RSN set_network 0 key_mgmt WPA-PSK set_network 0 pairwise CCMP set_network 0 auth_alg OPEN set_network 0 mode 3 set_network 0 disabled 2 p2p_group_add persistent=0 freq=2412 ------------- By this sequence, pbkdf2_sha1() was called three times and the function calculates the same value each time. Reduce number of calls to pbkdf2_sha1() from 3 to 1 by caching the previous result. Signed-hostap: Masashi Honma <masashi.honma at gmail.com>
2012-11-11 10:39:24 +01:00
wpa_config_update_psk(ssid);
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
ssid->ap_max_inactivity = wpa_s->p2pdev->conf->p2p_go_max_inactivity;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_s->ap_configured_cb = p2p_go_configured;
wpa_s->ap_configured_cb_ctx = wpa_s;
wpa_s->ap_configured_cb_data = wpa_s->go_params;
P2P: Make sure GO start does not miss connect_without_scan It looks like there was a possible sequence for wpa_s->scan_req to be MANUAL_SCAN_REQ at the moment a GO is to be started. This could result in the "Request scan (that will be skipped) to start GO" to actually not skip the scan and end up stuck waiting for something external to trigger a scan before the GO could be started. Fix this by clearing wpa_s->scan_req when deciding to start the GO. This issue could be hit at least by first enabling autoscan and then issuing P2P_GROUP_ADD. Other sequences that set wpa_s->scan_req to MANUAL_SCAN_REQ without going through wpa_supplicant_scan() to clear it immediately could also have similar effect (and there is even a small window for the wpa_supplicant_scan() call to happen only after the P2P_GROUP_ADD command is processed, so this could potentially have happened even with SCAN + P2P_GROUP_ADD). Signed-off-by: Jouni Malinen <j@w1.fi>
2014-05-14 01:13:18 +02:00
wpa_s->scan_req = NORMAL_SCAN_REQ;
P2P: Start GO without extra scan step There are some corner cases, where the wpa_supplicant_req_scan() call may end up scheduling a scan even if we are about to start a GO. Avoid this by explicitly marking the GO network to be selected for the next connection.
2011-06-21 10:47:03 +02:00
wpa_s->connect_without_scan = ssid;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_s->reassociate = 1;
wpa_s->disconnected = 0;
P2P: Add more debug prints for GO start routines This makes it easier to debug issues in starting GO mode. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-24 00:05:51 +02:00
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Request scan (that will be skipped) to "
"start GO)");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_supplicant_req_scan(wpa_s, 0, 0);
}
static void wpas_p2p_clone_config(struct wpa_supplicant *dst,
const struct wpa_supplicant *src)
{
struct wpa_config *d;
const struct wpa_config *s;
d = dst->conf;
s = src->conf;
P2P: Copy config from p2pdev when not using dedicated group interface When the P2P Device interface is used and an existing interface is used for P2P GO/Client, the P2P Device configuration was not cloned to the configuration of the existing interface. Thus, configuration parameters such as idle_group_time, etc., were not propagated to the P2P GO/Client interface. Handle this by copying all configuration parameters of the P2P device interface to the reused interface, with the following exceptions: 1. Copy the NFC key data only if it was not set in the configuration file. 2. The WPS string fields are set only if they were not previously set in the configuration of the destination interface (based on the assumption that these fields should be identical among all interfaces). Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2016-04-07 12:32:08 +02:00
#define C(n) \
do { \
if (s->n && !d->n) \
d->n = os_strdup(s->n); \
} while (0)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
C(device_name);
C(manufacturer);
C(model_name);
C(model_number);
C(serial_number);
C(config_methods);
#undef C
P2P: Add mechanism for timing out idle groups A new configuration parameter, p2p_group_idle, can now be used to set idle timeout value for P2P groups in seconds (0 = no timeout). If set, this values is used to remove P2P group (both GO and P2P client) interfaces after the group has been idle (no clients/GO seen) for the configuration duration. The P2P-GROUP-REMOVED event is now indicating the reason for group removal when known. For example: P2P-GROUP-REMOVED wlan0 GO reason=REQUESTED P2P-GROUP-REMOVED wlan1 client reason=IDLE
2010-10-25 17:24:15 +02:00
WPS: Store (secondary) device type as binary Instead of converting back and forth from the string representation, always use the binary representation internally. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-17 17:50:22 +01:00
os_memcpy(d->device_type, s->device_type, WPS_DEV_TYPE_LEN);
os_memcpy(d->sec_device_type, s->sec_device_type,
sizeof(d->sec_device_type));
d->num_sec_device_types = s->num_sec_device_types;
P2P: Add mechanism for timing out idle groups A new configuration parameter, p2p_group_idle, can now be used to set idle timeout value for P2P groups in seconds (0 = no timeout). If set, this values is used to remove P2P group (both GO and P2P client) interfaces after the group has been idle (no clients/GO seen) for the configuration duration. The P2P-GROUP-REMOVED event is now indicating the reason for group removal when known. For example: P2P-GROUP-REMOVED wlan0 GO reason=REQUESTED P2P-GROUP-REMOVED wlan1 client reason=IDLE
2010-10-25 17:24:15 +02:00
d->p2p_group_idle = s->p2p_group_idle;
P2P: Move a GO from its operating frequency Upon any change in the currently used channels evaluate if a GO should move to a different operating frequency, where the possible scenarios: 1. The frequency that the GO is currently using is no longer valid, due to regulatory reasons, and thus the GO must be moved to some other frequency. 2. Due to Multi Concurrent Channel (MCC) policy considerations, it would be preferable, based on configuration settings, to prefer Same Channel Mode (SCM) over concurrent operation in multiple channels. The supported policies: - prefer SCM: prefer moving the GO to a frequency used by some other interface. - prefer SCM if Peer supports: prefer moving the GO to a frequency used by some other station interface iff the other station interface is using a frequency that is common between the local and the peer device (based on the GO Negotiation/Invitation signaling). - Stay on the current frequency. Currently, the GO transition to another frequency is handled by a complete tear down and re-setup of the GO. Still need to add CSA flow to the considerations. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:19 +02:00
d->p2p_go_freq_change_policy = s->p2p_go_freq_change_policy;
P2P: Copy p2p_intra_bss setting to the group interface This is needed to allow p2p_intra_bss take effect when using separate group interfaces.
2010-11-04 15:53:09 +01:00
d->p2p_intra_bss = s->p2p_intra_bss;
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
d->persistent_reconnect = s->persistent_reconnect;
P2P: Clone max_sta_num parameter for group interfaces This is needed to allow the max_sta_num parameter set in the main configuration file to apply to dynamically created P2P group interfaces. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-05-03 15:41:15 +02:00
d->max_num_sta = s->max_num_sta;
Allow pbc_in_m1 workaround to be enabled in wpa_supplicant AP mode This workaround for Windows 7 WPS probing mechanism was previously allowed only with hostapd, but the same interoperability issue can happen with wpa_supplicant AP/GO mode. Allow the workaround to be enabled in wpa_supplicant configuration for these uses. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-03 15:51:04 +02:00
d->pbc_in_m1 = s->pbc_in_m1;
Add ignore_old_scan_res configuration parameter This can be used to configure wpa_supplicant to ignore old scan results from the driver cache in cases where such results were not updated after the scan trigger from wpa_supplicant. This can be useful in some cases where the driver may cache information for a significant time and the AP configuration is changing. Many such cases are for testing scripts, but this could potentially be useful for some WPS use cases, too. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-03-31 16:52:23 +02:00
d->ignore_old_scan_res = s->ignore_old_scan_res;
P2P: Clone beacon_int when initializing new group interface Signed-hostap: Ilan Peer <ilan.peer@intel.com>
2013-05-04 10:25:29 +02:00
d->beacon_int = s->beacon_int;
P2P: Clone dtim_period to a new interface Cloning dtim_period is needed for P2P GO. Signed-hostap: David Spinadel <david.spinadel@intel.com>
2014-01-22 15:05:44 +01:00
d->dtim_period = s->dtim_period;
P2P: Allow configuring CTWindow when working as GO Read p2p_go_ctwindow (0-127 TUs) from the config file, and pass it to the driver on GO start. Use p2p_go_ctwindow=0 (no CTWindow) by default. Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
2015-02-18 03:35:12 +01:00
d->p2p_go_ctwindow = s->p2p_go_ctwindow;
P2P: Allow separate interface GO to disconnect low-ack STAs Propagate the disassoc_low_ack setting from the main P2P interface to the group interface. Signed-hostap: Arik Nemtsov <arik@wizery.com>
2013-08-25 08:28:50 +02:00
d->disassoc_low_ack = s->disassoc_low_ack;
P2P: Clone 'disable_scan_offload' parameter for p2p group Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-10-03 01:14:55 +02:00
d->disable_scan_offload = s->disable_scan_offload;
Add passive_scan configuration parameter This new wpa_supplicant configuration parameter can be used to force passive scanning to be used for most scanning cases at the cost of increased latency and less reliably scans. This may be of use for both testing purposes and somewhat increased privacy due to no Probe Request frames with fixed MAC address being sent out. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-01-22 19:50:01 +01:00
d->passive_scan = s->passive_scan;
P2P NFC: Copy DH parameters to a separate group interface The DH public and private key needs to be copied for the separate group interface if that is used for a P2P group. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-11 16:01:49 +02:00
P2P: Support dedicated P2P_DEVICE without separate group interface Add support for drivers with dedicated P2P_DEVICE interface, but without group interface concurrency (only a single netdev is used). With such devices, wpa_supplicant tried to use the p2p_dev interface instead of the group interface and most P2P operations failed. Extend wpa_supplicant to use the primary interface instead of a separate group interface in such cases. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
if (s->wps_nfc_dh_privkey && s->wps_nfc_dh_pubkey &&
P2P: Copy config from p2pdev when not using dedicated group interface When the P2P Device interface is used and an existing interface is used for P2P GO/Client, the P2P Device configuration was not cloned to the configuration of the existing interface. Thus, configuration parameters such as idle_group_time, etc., were not propagated to the P2P GO/Client interface. Handle this by copying all configuration parameters of the P2P device interface to the reused interface, with the following exceptions: 1. Copy the NFC key data only if it was not set in the configuration file. 2. The WPS string fields are set only if they were not previously set in the configuration of the destination interface (based on the assumption that these fields should be identical among all interfaces). Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2016-04-07 12:32:08 +02:00
!d->wps_nfc_pw_from_config) {
wpabuf_free(d->wps_nfc_dh_privkey);
wpabuf_free(d->wps_nfc_dh_pubkey);
P2P: Support dedicated P2P_DEVICE without separate group interface Add support for drivers with dedicated P2P_DEVICE interface, but without group interface concurrency (only a single netdev is used). With such devices, wpa_supplicant tried to use the p2p_dev interface instead of the group interface and most P2P operations failed. Extend wpa_supplicant to use the primary interface instead of a separate group interface in such cases. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
d->wps_nfc_dh_privkey = wpabuf_dup(s->wps_nfc_dh_privkey);
d->wps_nfc_dh_pubkey = wpabuf_dup(s->wps_nfc_dh_pubkey);
}
P2P: Copy config from p2pdev when not using dedicated group interface When the P2P Device interface is used and an existing interface is used for P2P GO/Client, the P2P Device configuration was not cloned to the configuration of the existing interface. Thus, configuration parameters such as idle_group_time, etc., were not propagated to the P2P GO/Client interface. Handle this by copying all configuration parameters of the P2P device interface to the reused interface, with the following exceptions: 1. Copy the NFC key data only if it was not set in the configuration file. 2. The WPS string fields are set only if they were not previously set in the configuration of the destination interface (based on the assumption that these fields should be identical among all interfaces). Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2016-04-07 12:32:08 +02:00
d->p2p_cli_probe = s->p2p_cli_probe;
P2P: Support dedicated P2P_DEVICE without separate group interface Add support for drivers with dedicated P2P_DEVICE interface, but without group interface concurrency (only a single netdev is used). With such devices, wpa_supplicant tried to use the p2p_dev interface instead of the group interface and most P2P operations failed. Extend wpa_supplicant to use the primary interface instead of a separate group interface in such cases. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
}
P2P: Derive group interface name bit more sensibly The interface name for the P2P group interface is derived from the P2P management interface. When the P2P management interface is a P2P Device interface, i.e., p2p-dev-wlanX, the name for the group interface is abbreviated to p2p-X (X being group index). When the P2P management interface starts with p2p-dev- use its postfix instead. So P2P management interface p2p-dev-wlan3 results in group interface name p2p-wlan3-0. Signed-hostap: Arend van Spriel <arend@broadcom.com>
2013-06-30 09:19:31 +02:00
static void wpas_p2p_get_group_ifname(struct wpa_supplicant *wpa_s,
char *ifname, size_t len)
{
char *ifname_ptr = wpa_s->ifname;
if (os_strncmp(wpa_s->ifname, P2P_MGMT_DEVICE_PREFIX,
os_strlen(P2P_MGMT_DEVICE_PREFIX)) == 0) {
ifname_ptr = os_strrchr(wpa_s->ifname, '-') + 1;
}
os_snprintf(ifname, len, "p2p-%s-%d", ifname_ptr, wpa_s->p2p_group_idx);
if (os_strlen(ifname) >= IFNAMSIZ &&
os_strlen(wpa_s->ifname) < IFNAMSIZ) {
Check os_snprintf() result more consistently While these are using practically large enoungh buffer sizes, it is better to be more consistent with checking os_snprintf() return value. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-06 20:40:31 +01:00
int res;
P2P: Derive group interface name bit more sensibly The interface name for the P2P group interface is derived from the P2P management interface. When the P2P management interface is a P2P Device interface, i.e., p2p-dev-wlanX, the name for the group interface is abbreviated to p2p-X (X being group index). When the P2P management interface starts with p2p-dev- use its postfix instead. So P2P management interface p2p-dev-wlan3 results in group interface name p2p-wlan3-0. Signed-hostap: Arend van Spriel <arend@broadcom.com>
2013-06-30 09:19:31 +02:00
/* Try to avoid going over the IFNAMSIZ length limit */
Check os_snprintf() result more consistently While these are using practically large enoungh buffer sizes, it is better to be more consistent with checking os_snprintf() return value. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-06 20:40:31 +01:00
res = os_snprintf(ifname, len, "p2p-%d", wpa_s->p2p_group_idx);
if (os_snprintf_error(len, res) && len)
ifname[len - 1] = '\0';
P2P: Derive group interface name bit more sensibly The interface name for the P2P group interface is derived from the P2P management interface. When the P2P management interface is a P2P Device interface, i.e., p2p-dev-wlanX, the name for the group interface is abbreviated to p2p-X (X being group index). When the P2P management interface starts with p2p-dev- use its postfix instead. So P2P management interface p2p-dev-wlan3 results in group interface name p2p-wlan3-0. Signed-hostap: Arend van Spriel <arend@broadcom.com>
2013-06-30 09:19:31 +02:00
}
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
static int wpas_p2p_add_group_interface(struct wpa_supplicant *wpa_s,
enum wpa_driver_if_type type)
{
char ifname[120], force_ifname[120];
if (wpa_s->pending_interface_name[0]) {
wpa_printf(MSG_DEBUG, "P2P: Pending virtual interface exists "
"- skip creation of a new one");
if (is_zero_ether_addr(wpa_s->pending_interface_addr)) {
wpa_printf(MSG_DEBUG, "P2P: Pending virtual address "
"unknown?! ifname='%s'",
wpa_s->pending_interface_name);
return -1;
}
return 0;
}
P2P: Derive group interface name bit more sensibly The interface name for the P2P group interface is derived from the P2P management interface. When the P2P management interface is a P2P Device interface, i.e., p2p-dev-wlanX, the name for the group interface is abbreviated to p2p-X (X being group index). When the P2P management interface starts with p2p-dev- use its postfix instead. So P2P management interface p2p-dev-wlan3 results in group interface name p2p-wlan3-0. Signed-hostap: Arend van Spriel <arend@broadcom.com>
2013-06-30 09:19:31 +02:00
wpas_p2p_get_group_ifname(wpa_s, ifname, sizeof(ifname));
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
force_ifname[0] = '\0';
wpa_printf(MSG_DEBUG, "P2P: Create a new interface %s for the group",
ifname);
wpa_s->p2p_group_idx++;
wpa_s->pending_interface_type = type;
if (wpa_drv_if_add(wpa_s, type, ifname, NULL, NULL, force_ifname,
nl80211: Extend bridge add/del operations for secondary BSSes Previously, only the main interface was added to a bridge. Extend this to apply to all configured BSSes.
2011-03-15 12:02:49 +01:00
wpa_s->pending_interface_addr, NULL) < 0) {
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_printf(MSG_ERROR, "P2P: Failed to create new group "
"interface");
return -1;
}
if (force_ifname[0]) {
wpa_printf(MSG_DEBUG, "P2P: Driver forced interface name %s",
force_ifname);
os_strlcpy(wpa_s->pending_interface_name, force_ifname,
sizeof(wpa_s->pending_interface_name));
} else
os_strlcpy(wpa_s->pending_interface_name, ifname,
sizeof(wpa_s->pending_interface_name));
wpa_printf(MSG_DEBUG, "P2P: Created pending virtual interface %s addr "
MACSTR, wpa_s->pending_interface_name,
MAC2STR(wpa_s->pending_interface_addr));
return 0;
}
static void wpas_p2p_remove_pending_group_interface(
struct wpa_supplicant *wpa_s)
{
if (!wpa_s->pending_interface_name[0] ||
is_zero_ether_addr(wpa_s->pending_interface_addr))
return; /* No pending virtual interface */
wpa_printf(MSG_DEBUG, "P2P: Removing pending group interface %s",
wpa_s->pending_interface_name);
wpa_drv_if_remove(wpa_s, wpa_s->pending_interface_type,
wpa_s->pending_interface_name);
os_memset(wpa_s->pending_interface_addr, 0, ETH_ALEN);
wpa_s->pending_interface_name[0] = '\0';
P2PS: Do not remove pending interface on p2p_stop_find The pending interface created during provision discovery should not be removed on stopping p2p_find. This pending interface has to be used after completing GO negotiation. Earlier the pending interface is created just before GO negotiation so there was no problem. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-30 13:27:38 +01:00
wpa_s->global->pending_group_iface_for_p2ps = 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
static struct wpa_supplicant *
wpas_p2p_init_group_interface(struct wpa_supplicant *wpa_s, int go)
{
struct wpa_interface iface;
struct wpa_supplicant *group_wpa_s;
if (!wpa_s->pending_interface_name[0]) {
wpa_printf(MSG_ERROR, "P2P: No pending group interface");
P2P: Try to re-create group interface if pending one is not available This is needed to work around cases where the pending interface gets removed, e.g., due to failed GO Negotiation. In such case, we may still accept new GO Negotiation to be completed, but the interface did not get created without a separate p2p_connect command. The current implementation is not ideal since the re-created interface may, at least in theory, get incorrect interface addrees. Though, this would likely require that the driver supported more than one P2P group interface and that the previous one was already taken into use for another group.
2010-10-18 16:00:50 +02:00
if (!wpas_p2p_create_iface(wpa_s))
return NULL;
/*
* Something has forced us to remove the pending interface; try
* to create a new one and hope for the best that we will get
* the same local address.
*/
if (wpas_p2p_add_group_interface(wpa_s, go ? WPA_IF_P2P_GO :
WPA_IF_P2P_CLIENT) < 0)
return NULL;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
os_memset(&iface, 0, sizeof(iface));
iface.ifname = wpa_s->pending_interface_name;
iface.driver = wpa_s->driver->name;
P2P: Do not add ctrl interface for P2P_DEVICE (p2p-dev-*) Adding a new wpa_supplicant control interface for the dedicated P2P_DEVICE would be quite confusing for programs that manage P2P operations. Remove this control interface and require the global control interface to be used since it will provide consistent interface for both the new dedicated P2P_DEVICE (non-netdev) and old style P2P management through a netdev. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-06-30 22:32:13 +02:00
if (wpa_s->conf->ctrl_interface == NULL &&
wpa_s->parent != wpa_s &&
wpa_s->p2p_mgmt &&
(wpa_s->drv_flags & WPA_DRIVER_FLAGS_DEDICATED_P2P_DEVICE))
iface.ctrl_interface = wpa_s->parent->conf->ctrl_interface;
else
iface.ctrl_interface = wpa_s->conf->ctrl_interface;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
iface.driver_param = wpa_s->conf->driver_param;
P2P: Fix interface deinit for failed group interface initialization wpa_supplicant_deinit_iface() ends up removing all P2P groups if the removed interface is the parent interface. This is correct behavior in general, but this resulted in issues in the new group interface initialization error path since wpa_s->parent was not assigned before hitting this check. Fix this by assigning wpa_s->parent as part of wpa_supplicant_add_iface(). Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-01 20:50:34 +01:00
group_wpa_s = wpa_supplicant_add_iface(wpa_s->global, &iface, wpa_s);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (group_wpa_s == NULL) {
wpa_printf(MSG_ERROR, "P2P: Failed to create new "
"wpa_supplicant interface");
return NULL;
}
wpa_s->pending_interface_name[0] = '\0';
group_wpa_s->p2p_group_interface = go ? P2P_GROUP_INTERFACE_GO :
P2P_GROUP_INTERFACE_CLIENT;
wpa_s->global->p2p_group_formation = group_wpa_s;
P2PS: Do not remove pending interface on p2p_stop_find The pending interface created during provision discovery should not be removed on stopping p2p_find. This pending interface has to be used after completing GO negotiation. Earlier the pending interface is created just before GO negotiation so there was no problem. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-30 13:27:38 +01:00
wpa_s->global->pending_group_iface_for_p2ps = 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpas_p2p_clone_config(group_wpa_s, wpa_s);
return group_wpa_s;
}
static void wpas_p2p_group_formation_timeout(void *eloop_ctx,
void *timeout_ctx)
{
struct wpa_supplicant *wpa_s = eloop_ctx;
wpa_printf(MSG_DEBUG, "P2P: Group Formation timed out");
P2P: Fix group interface addition failure properly for concurrent case It was possible for a P2P group formation failure to result in a concurrent station mode operation getting disconnected in the specific error case where group interface addition fails after a successful GO Negotiation. Fix this by skipping the wpas_p2p_group_delete() call in this specific case since the group interface does not exists anymore at the point wpas_group_formation_completed() gets called. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-06-15 22:34:11 +02:00
wpas_p2p_group_formation_failed(wpa_s, 0);
P2P: Report group formation failure on error to start GO mode There is no need to wait for the 15 second group formation timeout before indicating P2P group formation failure if GO mode cannot be started successfully for some reason. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-11 15:42:13 +02:00
}
P2P: Fix group interface addition failure properly for concurrent case It was possible for a P2P group formation failure to result in a concurrent station mode operation getting disconnected in the specific error case where group interface addition fails after a successful GO Negotiation. Fix this by skipping the wpas_p2p_group_delete() call in this specific case since the group interface does not exists anymore at the point wpas_group_formation_completed() gets called. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-06-15 22:34:11 +02:00
static void wpas_p2p_group_formation_failed(struct wpa_supplicant *wpa_s,
int already_deleted)
P2P: Report group formation failure on error to start GO mode There is no need to wait for the 15 second group formation timeout before indicating P2P group formation failure if GO mode cannot be started successfully for some reason. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-07-11 15:42:13 +02:00
{
eloop_cancel_timeout(wpas_p2p_group_formation_timeout,
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev, NULL);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (wpa_s->global->p2p)
p2p_group_formation_failed(wpa_s->global->p2p);
P2P: Fix group interface addition failure properly for concurrent case It was possible for a P2P group formation failure to result in a concurrent station mode operation getting disconnected in the specific error case where group interface addition fails after a successful GO Negotiation. Fix this by skipping the wpas_p2p_group_delete() call in this specific case since the group interface does not exists anymore at the point wpas_group_formation_completed() gets called. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-06-15 22:34:11 +02:00
wpas_group_formation_completed(wpa_s, 0, already_deleted);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Reject group formation on WPS provisioning failure There is no need to wait for the 15 second group formation timeout to clear the state if WPS failure is detected during P2P group formation. Allow the WPS exchange steps (WSC_NACK and EAP-Failure) to be completed and remove the group to get rid of the extra wait. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-06 16:56:50 +01:00
static void wpas_p2p_grpform_fail_after_wps(struct wpa_supplicant *wpa_s)
{
wpa_printf(MSG_DEBUG, "P2P: Reject group formation due to WPS provisioning failure");
eloop_cancel_timeout(wpas_p2p_group_formation_timeout,
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev, NULL);
P2P: Reject group formation on WPS provisioning failure There is no need to wait for the 15 second group formation timeout to clear the state if WPS failure is detected during P2P group formation. Allow the WPS exchange steps (WSC_NACK and EAP-Failure) to be completed and remove the group to get rid of the extra wait. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-06 16:56:50 +01:00
eloop_register_timeout(0, 0, wpas_p2p_group_formation_timeout,
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev, NULL);
P2P: Reject group formation on WPS provisioning failure There is no need to wait for the 15 second group formation timeout to clear the state if WPS failure is detected during P2P group formation. Allow the WPS exchange steps (WSC_NACK and EAP-Failure) to be completed and remove the group to get rid of the extra wait. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-06 16:56:50 +01:00
wpa_s->global->p2p_fail_on_wps_complete = 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
void wpas_p2p_ap_setup_failed(struct wpa_supplicant *wpa_s)
{
if (wpa_s->global->p2p_group_formation != wpa_s)
return;
/* Speed up group formation timeout since this cannot succeed */
eloop_cancel_timeout(wpas_p2p_group_formation_timeout,
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev, NULL);
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
eloop_register_timeout(0, 0, wpas_p2p_group_formation_timeout,
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev, NULL);
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
}
P2P: Remove WPA_DRIVER_FLAGS_P2P_MGMT option The option of handling upper layer P2P management operations within the driver/firmware was originally planned to be used with wpa_supplicant, but this has not really happened and there is no clear sign of this being needed in the near term either. This functionality has not been completed and it is certainly not being kept up-to-date or tested. As such, it is best to remove it for now and if this or something similar is needed in the future, it can be brought back once a clear need for it has been demonstrated first. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-29 17:20:47 +01:00
static void wpas_go_neg_completed(void *ctx, struct p2p_go_neg_results *res)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct wpa_supplicant *wpa_s = ctx;
P2P: Support dedicated P2P_DEVICE without separate group interface Add support for drivers with dedicated P2P_DEVICE interface, but without group interface concurrency (only a single netdev is used). With such devices, wpa_supplicant tried to use the p2p_dev interface instead of the group interface and most P2P operations failed. Extend wpa_supplicant to use the primary interface instead of a separate group interface in such cases. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
struct wpa_supplicant *group_wpa_s;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Cancel pending remain-on-channel request when stopping Listen If we have already asked the driver to start a new remain-on-channel, we need to cancel it even if the actual remain-on-channel has not yet started at the point when a new operation or timeout etc. triggers Listen state to be stopped.
2010-11-05 17:39:15 +01:00
if (wpa_s->off_channel_freq || wpa_s->roc_waiting_drv_freq) {
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_drv_cancel_remain_on_channel(wpa_s);
wpa_s->off_channel_freq = 0;
P2P: Do not schedule new remain-on-channel if waiting for drv event The driver event for remain-on-channel may be delayed in a way that allows management-frame-received event to be received before wpa_supplicant knows that the driver is actually already on the previously requested channel. We should not request a new remain-on-channel to send a response to just a frame if we are waiting for the driver to get to the same channel. Instead, just continue waiting for the driver event.
2010-06-24 06:51:38 +02:00
wpa_s->roc_waiting_drv_freq = 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
if (res->status) {
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
wpa_msg_global(wpa_s, MSG_INFO,
P2P_EVENT_GO_NEG_FAILURE "status=%d",
res->status);
P2P: Make GO negotiation peer and group information available over D-Bus The GO negotiation response is very cryptic at the moment. For a success message we only know on which interface the negotiation succeeded, not which peer. For a failure we know the interface also and a status code (number). It will be very useful for clients to know upon receipt of such a message which peer the negotiation occurred with. Now that the peer information is available and the API is changed already, the function composing the D-Bus message might as well include all GO negotiation information. This is done with a dict to make things easier on clients if this result information changes down the line. Signed-hostap: Reinette Chatre <reinette.chatre@intel.com> Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2011-12-18 15:52:33 +01:00
wpas_notify_p2p_go_neg_completed(wpa_s, res);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpas_p2p_remove_pending_group_interface(wpa_s);
return;
}
P2P: Inform driver of the operating channel following group formation Upon GO Negotiation completion, if the remote peer becomes GO, send a hint event over QCA vendor specific interface to inform the driver of the likely operating channel of the P2P GO. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-07-24 02:07:55 +02:00
if (!res->role_go) {
/* Inform driver of the operating channel of GO. */
wpa_drv_set_prob_oper_freq(wpa_s, res->freq);
}
P2P: Add optional "ht40" argument for p2p_connect This can be used to start negotiated GO in 40 MHz channel width in 5GHz band. Signed-hostap: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
2012-08-15 22:07:44 +02:00
if (wpa_s->p2p_go_ht40)
res->ht40 = 1;
P2P: Add VHT parameter to P2P operations Add the option to ask for VHT operation similarly to the way ht40 is configured - either by adding 'vht' param to the relevant p2p_* commands or by configuring p2p_go_vht=1 in the configuration file. This patch only adds the configuration option (e.g., via control interface). The actual handling of the VHT parameter (asking the driver to use VHT, etc.) will be done by the following patch. Signed-hostap: Eliad Peller <eliadx.peller@intel.com>
2013-10-27 18:46:17 +01:00
if (wpa_s->p2p_go_vht)
res->vht = 1;
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
res->max_oper_chwidth = wpa_s->p2p_go_max_oper_chwidth;
res->vht_center_freq2 = wpa_s->p2p_go_vht_center_freq2;
P2P: Add optional "ht40" argument for p2p_connect This can be used to start negotiated GO in 40 MHz channel width in 5GHz band. Signed-hostap: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
2012-08-15 22:07:44 +02:00
P2P: Add GO negotiation results into the P2P-GO-NEG-SUCCESS event This provides status information about the negotiated group to wpa_supplicant control interface monitors during group formation in a form that is easier to use than having to fetch the information separately. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-26 12:35:44 +02:00
wpa_msg_global(wpa_s, MSG_INFO, P2P_EVENT_GO_NEG_SUCCESS "role=%s "
"freq=%d ht40=%d peer_dev=" MACSTR " peer_iface=" MACSTR
" wps_method=%s",
res->role_go ? "GO" : "client", res->freq, res->ht40,
MAC2STR(res->peer_device_addr),
MAC2STR(res->peer_interface_addr),
p2p_wps_method_text(res->wps_method));
P2P: Make GO negotiation peer and group information available over D-Bus The GO negotiation response is very cryptic at the moment. For a success message we only know on which interface the negotiation succeeded, not which peer. For a failure we know the interface also and a status code (number). It will be very useful for clients to know upon receipt of such a message which peer the negotiation occurred with. Now that the peer information is available and the API is changed already, the function composing the D-Bus message might as well include all GO negotiation information. This is done with a dict to make things easier on clients if this result information changes down the line. Signed-hostap: Reinette Chatre <reinette.chatre@intel.com> Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2011-12-18 15:52:33 +01:00
wpas_notify_p2p_go_neg_completed(wpa_s, res);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Add option to force SSID/passphrase for GO Negotiation An existing persistent group information can now be used to force GO Negotiation to use the previously used SSID/passphrase from a persistent group if we become a GO. This can be used as an alternative to inviting a new P2P peer to join the group (i.e., use GO Negotiation with GO intent 15 instead of starting an autonomous GO and using invitation), e.g., in case a GO Negotiation Request is received from a peer while we are not running as a GO. The persistent group to use for parameters is indicated with persistent=<network id> parameter to p2p_connect. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-27 17:17:10 +02:00
if (res->role_go && wpa_s->p2p_persistent_id >= 0) {
struct wpa_ssid *ssid;
ssid = wpa_config_get_network(wpa_s->conf,
wpa_s->p2p_persistent_id);
if (ssid && ssid->disabled == 2 &&
ssid->mode == WPAS_MODE_P2P_GO && ssid->passphrase) {
size_t len = os_strlen(ssid->passphrase);
wpa_printf(MSG_DEBUG, "P2P: Override passphrase based "
"on requested persistent group");
os_memcpy(res->passphrase, ssid->passphrase, len);
res->passphrase[len] = '\0';
}
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (wpa_s->create_p2p_iface) {
P2P: Support dedicated P2P_DEVICE without separate group interface Add support for drivers with dedicated P2P_DEVICE interface, but without group interface concurrency (only a single netdev is used). With such devices, wpa_supplicant tried to use the p2p_dev interface instead of the group interface and most P2P operations failed. Extend wpa_supplicant to use the primary interface instead of a separate group interface in such cases. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
group_wpa_s =
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpas_p2p_init_group_interface(wpa_s, res->role_go);
if (group_wpa_s == NULL) {
wpas_p2p_remove_pending_group_interface(wpa_s);
P2P: Fix GO failed interface init Whenever an ongoing GO Neg has failed, due to interface init, the P2P Device should cancel timeouts and issue wpas_p2p_group_formation_failed, so the other peer detects faster group formation has failed. Signed-off-by: Eduardo Abinader <eduardo.abinader@openbossa.org>
2014-03-20 13:43:31 +01:00
eloop_cancel_timeout(wpas_p2p_long_listen_timeout,
wpa_s, NULL);
P2P: Fix group interface addition failure properly for concurrent case It was possible for a P2P group formation failure to result in a concurrent station mode operation getting disconnected in the specific error case where group interface addition fails after a successful GO Negotiation. Fix this by skipping the wpas_p2p_group_delete() call in this specific case since the group interface does not exists anymore at the point wpas_group_formation_completed() gets called. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-06-15 22:34:11 +02:00
wpas_p2p_group_formation_failed(wpa_s, 1);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return;
}
os_memset(wpa_s->pending_interface_addr, 0, ETH_ALEN);
wpa_s->pending_interface_name[0] = '\0';
} else {
P2P: Support dedicated P2P_DEVICE without separate group interface Add support for drivers with dedicated P2P_DEVICE interface, but without group interface concurrency (only a single netdev is used). With such devices, wpa_supplicant tried to use the p2p_dev interface instead of the group interface and most P2P operations failed. Extend wpa_supplicant to use the primary interface instead of a separate group interface in such cases. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
group_wpa_s = wpa_s->parent;
wpa_s->global->p2p_group_formation = group_wpa_s;
if (group_wpa_s != wpa_s)
P2P: Copy config from p2pdev when not using dedicated group interface When the P2P Device interface is used and an existing interface is used for P2P GO/Client, the P2P Device configuration was not cloned to the configuration of the existing interface. Thus, configuration parameters such as idle_group_time, etc., were not propagated to the P2P GO/Client interface. Handle this by copying all configuration parameters of the P2P device interface to the reused interface, with the following exceptions: 1. Copy the NFC key data only if it was not set in the configuration file. 2. The WPS string fields are set only if they were not previously set in the configuration of the destination interface (based on the assumption that these fields should be identical among all interfaces). Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2016-04-07 12:32:08 +02:00
wpas_p2p_clone_config(group_wpa_s, wpa_s);
P2P: Support dedicated P2P_DEVICE without separate group interface Add support for drivers with dedicated P2P_DEVICE interface, but without group interface concurrency (only a single netdev is used). With such devices, wpa_supplicant tried to use the p2p_dev interface instead of the group interface and most P2P operations failed. Extend wpa_supplicant to use the primary interface instead of a separate group interface in such cases. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Support dedicated P2P_DEVICE without separate group interface Add support for drivers with dedicated P2P_DEVICE interface, but without group interface concurrency (only a single netdev is used). With such devices, wpa_supplicant tried to use the p2p_dev interface instead of the group interface and most P2P operations failed. Extend wpa_supplicant to use the primary interface instead of a separate group interface in such cases. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
group_wpa_s->p2p_in_provisioning = 1;
group_wpa_s->p2pdev = wpa_s;
if (group_wpa_s != wpa_s) {
os_memcpy(group_wpa_s->p2p_pin, wpa_s->p2p_pin,
sizeof(group_wpa_s->p2p_pin));
group_wpa_s->p2p_wps_method = wpa_s->p2p_wps_method;
}
if (res->role_go) {
wpas_start_wps_go(group_wpa_s, res, 1);
} else {
os_get_reltime(&group_wpa_s->scan_min_time);
wpas_start_wps_enrollee(group_wpa_s, res);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
wpa_s->p2p_long_listen = 0;
eloop_cancel_timeout(wpas_p2p_long_listen_timeout, wpa_s, NULL);
eloop_cancel_timeout(wpas_p2p_group_formation_timeout, wpa_s, NULL);
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
eloop_register_timeout(15 + res->peer_config_timeout / 100,
(res->peer_config_timeout % 100) * 10000,
wpas_p2p_group_formation_timeout, wpa_s, NULL);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Add GO Intent of connecting device in GO Negotiation Request event Add GO Intent information of connecting device in GO Negotiation Request event which will help applications to decide its own GO intent value in advance and can avoid failure cases when both devices use GO Intent 15 depending on application requirement. Signed-off-by: Mayank Haarit <mayank.h@samsung.com>
2015-06-02 07:47:33 +02:00
static void wpas_go_neg_req_rx(void *ctx, const u8 *src, u16 dev_passwd_id,
u8 go_intent)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct wpa_supplicant *wpa_s = ctx;
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
wpa_msg_global(wpa_s, MSG_INFO, P2P_EVENT_GO_NEG_REQUEST MACSTR
P2P: Add GO Intent of connecting device in GO Negotiation Request event Add GO Intent information of connecting device in GO Negotiation Request event which will help applications to decide its own GO intent value in advance and can avoid failure cases when both devices use GO Intent 15 depending on application requirement. Signed-off-by: Mayank Haarit <mayank.h@samsung.com>
2015-06-02 07:47:33 +02:00
" dev_passwd_id=%u go_intent=%u", MAC2STR(src),
dev_passwd_id, go_intent);
P2P: Add wpas_notify_p2p_go_neg_req Add a notification for received GO negotiation requests. Signed-off-by: Konguraj(Raj) Kulanthaivel <konguraj.kulanthaivel@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-24 21:30:19 +01:00
P2P: Add GO Intent of connecting device in GO Negotiation Request event Add GO Intent information of connecting device in GO Negotiation Request event which will help applications to decide its own GO intent value in advance and can avoid failure cases when both devices use GO Intent 15 depending on application requirement. Signed-off-by: Mayank Haarit <mayank.h@samsung.com>
2015-06-02 07:47:33 +02:00
wpas_notify_p2p_go_neg_req(wpa_s, src, dev_passwd_id, go_intent);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Remove WPA_DRIVER_FLAGS_P2P_MGMT option The option of handling upper layer P2P management operations within the driver/firmware was originally planned to be used with wpa_supplicant, but this has not really happened and there is no clear sign of this being needed in the near term either. This functionality has not been completed and it is certainly not being kept up-to-date or tested. As such, it is best to remove it for now and if this or something similar is needed in the future, it can be brought back once a clear need for it has been demonstrated first. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-29 17:20:47 +01:00
static void wpas_dev_found(void *ctx, const u8 *addr,
const struct p2p_peer_info *info,
int new_device)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
Fix compiler warning with CONFIG_NO_STDOUT_DEBUG=y Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-11 17:19:24 +01:00
#ifndef CONFIG_NO_STDOUT_DEBUG
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
struct wpa_supplicant *wpa_s = ctx;
char devtype[WPS_DEV_TYPE_BUFSIZE];
P2P: Add wfd_dev_info= field for device found event This field allows adds enough information into the P2P-DEVICE-FOUND events to figure out if the peer supports Wi-Fi Display. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-11-25 23:56:38 +01:00
char *wfd_dev_info_hex = NULL;
#ifdef CONFIG_WIFI_DISPLAY
wfd_dev_info_hex = wifi_display_subelem_hex(info->wfd_subelems,
WFD_SUBELEM_DEVICE_INFO);
#endif /* CONFIG_WIFI_DISPLAY */
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
P2PS: Add Application Service Info to device found events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-09-11 17:18:50 +02:00
if (info->p2ps_instance) {
char str[256];
const u8 *buf = wpabuf_head(info->p2ps_instance);
size_t len = wpabuf_len(info->p2ps_instance);
while (len) {
u32 id;
u16 methods;
u8 str_len;
if (len < 4 + 2 + 1)
break;
id = WPA_GET_LE32(buf);
buf += sizeof(u32);
methods = WPA_GET_BE16(buf);
buf += sizeof(u16);
str_len = *buf++;
if (str_len > len - 4 - 2 - 1)
break;
os_memcpy(str, buf, str_len);
str[str_len] = '\0';
buf += str_len;
len -= str_len + sizeof(u32) + sizeof(u16) + sizeof(u8);
wpa_msg_global(wpa_s, MSG_INFO,
P2P_EVENT_DEVICE_FOUND MACSTR
" p2p_dev_addr=" MACSTR
" pri_dev_type=%s name='%s'"
" config_methods=0x%x"
" dev_capab=0x%x"
" group_capab=0x%x"
" adv_id=%x asp_svc=%s%s",
MAC2STR(addr),
MAC2STR(info->p2p_device_addr),
wps_dev_type_bin2str(
info->pri_dev_type,
devtype, sizeof(devtype)),
info->device_name, methods,
info->dev_capab, info->group_capab,
id, str,
info->vendor_elems ?
" vendor_elems=1" : "");
}
goto done;
}
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
wpa_msg_global(wpa_s, MSG_INFO, P2P_EVENT_DEVICE_FOUND MACSTR
" p2p_dev_addr=" MACSTR
" pri_dev_type=%s name='%s' config_methods=0x%x "
P2P: Add new=0/1 flag to P2P-DEVICE-FOUND events This information can be used to determine whether the event is generated for a new peer that was added or due to an update in the information for an existing peer. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-12 15:45:33 +02:00
"dev_capab=0x%x group_capab=0x%x%s%s%s new=%d",
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
MAC2STR(addr), MAC2STR(info->p2p_device_addr),
wps_dev_type_bin2str(info->pri_dev_type, devtype,
sizeof(devtype)),
P2P: Add wfd_dev_info= field for device found event This field allows adds enough information into the P2P-DEVICE-FOUND events to figure out if the peer supports Wi-Fi Display. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-11-25 23:56:38 +01:00
info->device_name, info->config_methods,
info->dev_capab, info->group_capab,
wfd_dev_info_hex ? " wfd_dev_info=0x" : "",
P2P: Make unrecognized vendor elements available in P2P_PEER This allows external programs to use vendor specific information from P2P peers without wpa_supplicant having to be able to parse and understand all such vendor specific elements. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-07-04 19:14:19 +02:00
wfd_dev_info_hex ? wfd_dev_info_hex : "",
P2P: Add new=0/1 flag to P2P-DEVICE-FOUND events This information can be used to determine whether the event is generated for a new peer that was added or due to an update in the information for an existing peer. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-12 15:45:33 +02:00
info->vendor_elems ? " vendor_elems=1" : "",
new_device);
P2P: Add notification for P2P device found Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-24 21:08:18 +01:00
P2PS: Add Application Service Info to device found events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-09-11 17:18:50 +02:00
done:
P2P: Add wfd_dev_info= field for device found event This field allows adds enough information into the P2P-DEVICE-FOUND events to figure out if the peer supports Wi-Fi Display. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-11-25 23:56:38 +01:00
os_free(wfd_dev_info_hex);
wpa_supplicant: Fix misplaced os_free os_free has wfd_dev_info_hex as an argument which is defined within CONFIG_NO_STDOUT_DEBUG Signed-hostap: Prashanth Kumar <prashanthkumar.kr@globaledgesoft.com>
2014-02-03 13:19:02 +01:00
#endif /* CONFIG_NO_STDOUT_DEBUG */
P2P: Add wfd_dev_info= field for device found event This field allows adds enough information into the P2P-DEVICE-FOUND events to figure out if the peer supports Wi-Fi Display. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-11-25 23:56:38 +01:00
P2P: Add notification for P2P device found Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-24 21:08:18 +01:00
wpas_notify_p2p_device_found(ctx, info->p2p_device_addr, new_device);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Add method to signal lost device This signal is used to notify users of the P2P state machine or wpa_supplicant of lost devices. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-24 21:22:16 +01:00
static void wpas_dev_lost(void *ctx, const u8 *dev_addr)
{
struct wpa_supplicant *wpa_s = ctx;
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
wpa_msg_global(wpa_s, MSG_INFO, P2P_EVENT_DEVICE_LOST
"p2p_dev_addr=" MACSTR, MAC2STR(dev_addr));
P2P: Notify device expiry via P2P-DEVICE-LOST event This patch will notify applications listening over control socket about the device expiry [from p2p peer list].
2011-10-28 21:13:18 +02:00
P2P: Add method to signal lost device This signal is used to notify users of the P2P state machine or wpa_supplicant of lost devices. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-24 21:22:16 +01:00
wpas_notify_p2p_device_lost(wpa_s, dev_addr);
}
P2P: Move p2p_find stopped event message into p2p_supplicant.c This removes wpa_ctrl.h dependency from src/p2p/* and makes the P2P events more consistent, i.e., everything that is aimed for upper layer processing from the wpa_supplicant control interfaces is generated in p2p_supplicant.c. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 15:06:40 +02:00
static void wpas_find_stopped(void *ctx)
{
struct wpa_supplicant *wpa_s = ctx;
P2P: Abort ongoing scan when p2p_find is stopped When p2p_find is stopped, send request to the driver in order to cancel an ongoing scan if there is one. Signed-off-by: Ben Rosenfeld <ben.rosenfeld@intel.com>
2016-02-29 13:30:04 +01:00
if (wpa_s->p2p_scan_work && wpas_abort_ongoing_scan(wpa_s) < 0)
wpa_printf(MSG_DEBUG, "P2P: Abort ongoing scan failed");
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
wpa_msg_global(wpa_s, MSG_INFO, P2P_EVENT_FIND_STOPPED);
P2P: Add D-Bus FindStopped to notify P2P-FIND-STOPPED event Add D-Bus notification mechanism of P2P-FIND-STOPPED event on fi.w1.wpa_supplicant1.Interface.P2PDevice interface. Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>
2015-05-13 14:03:48 +02:00
wpas_notify_p2p_find_stopped(wpa_s);
P2P: Move p2p_find stopped event message into p2p_supplicant.c This removes wpa_ctrl.h dependency from src/p2p/* and makes the P2P events more consistent, i.e., everything that is aimed for upper layer processing from the wpa_supplicant control interfaces is generated in p2p_supplicant.c. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 15:06:40 +02:00
}
Use radio work for P2P Listen requests Avoid concurrent P2P Listen operations with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-04 08:36:13 +01:00
struct wpas_p2p_listen_work {
unsigned int freq;
unsigned int duration;
struct wpabuf *probe_resp_ie;
};
static void wpas_p2p_listen_work_free(struct wpas_p2p_listen_work *lwork)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
Use radio work for P2P Listen requests Avoid concurrent P2P Listen operations with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-04 08:36:13 +01:00
if (lwork == NULL)
return;
wpabuf_free(lwork->probe_resp_ie);
os_free(lwork);
}
static void wpas_p2p_listen_work_done(struct wpa_supplicant *wpa_s)
{
struct wpas_p2p_listen_work *lwork;
if (!wpa_s->p2p_listen_work)
return;
lwork = wpa_s->p2p_listen_work->ctx;
wpas_p2p_listen_work_free(lwork);
radio_work_done(wpa_s->p2p_listen_work);
wpa_s->p2p_listen_work = NULL;
}
static void wpas_start_listen_cb(struct wpa_radio_work *work, int deinit)
{
struct wpa_supplicant *wpa_s = work->wpa_s;
struct wpas_p2p_listen_work *lwork = work->ctx;
Add test functionality to simulate driver increased ROC duration The extra_roc_dur parameter can now be used in CONFIG_TESTING_OPTIONS=y builds to simulate driver behavior where the ROC duration gets increased without user space request. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-25 20:25:00 +02:00
unsigned int duration;
Use radio work for P2P Listen requests Avoid concurrent P2P Listen operations with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-04 08:36:13 +01:00
if (deinit) {
wpa_supplicant: Complete radio works on disable event While testing rfkill blocking of a scanning interface, it was seen that the ongoing scan never completes. This happens since EVENT_SCAN_RESULTS is discarded on a disabled interface. Fix this and also other possible radio work completion issues by removing all the radio works (including started) of the disabled interface. To be able to remove already started radio works, make their callbacks be reentrant with deinit flag (when the work is started), so each radio work should be able to handle its own termination. Signed-hostap: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2014-02-13 10:24:00 +01:00
if (work->started) {
wpa_s->p2p_listen_work = NULL;
wpas_stop_listen(wpa_s);
}
Use radio work for P2P Listen requests Avoid concurrent P2P Listen operations with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-04 08:36:13 +01:00
wpas_p2p_listen_work_free(lwork);
return;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
Use radio work for P2P Listen requests Avoid concurrent P2P Listen operations with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-04 08:36:13 +01:00
wpa_s->p2p_listen_work = work;
wpa_drv_set_ap_wps_ie(wpa_s, NULL, lwork->probe_resp_ie, NULL);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (wpa_drv_probe_req_report(wpa_s, 1) < 0) {
wpa_printf(MSG_DEBUG, "P2P: Failed to request the driver to "
"report received Probe Request frames");
Use radio work for P2P Listen requests Avoid concurrent P2P Listen operations with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-04 08:36:13 +01:00
wpas_p2p_listen_work_done(wpa_s);
return;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
Use radio work for P2P Listen requests Avoid concurrent P2P Listen operations with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-04 08:36:13 +01:00
wpa_s->pending_listen_freq = lwork->freq;
wpa_s->pending_listen_duration = lwork->duration;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
Add test functionality to simulate driver increased ROC duration The extra_roc_dur parameter can now be used in CONFIG_TESTING_OPTIONS=y builds to simulate driver behavior where the ROC duration gets increased without user space request. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-25 20:25:00 +02:00
duration = lwork->duration;
#ifdef CONFIG_TESTING_OPTIONS
if (wpa_s->extra_roc_dur) {
wpa_printf(MSG_DEBUG, "TESTING: Increase ROC duration %u -> %u",
duration, duration + wpa_s->extra_roc_dur);
duration += wpa_s->extra_roc_dur;
}
#endif /* CONFIG_TESTING_OPTIONS */
if (wpa_drv_remain_on_channel(wpa_s, lwork->freq, duration) < 0) {
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_printf(MSG_DEBUG, "P2P: Failed to request the driver "
"to remain on channel (%u MHz) for Listen "
Use radio work for P2P Listen requests Avoid concurrent P2P Listen operations with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-04 08:36:13 +01:00
"state", lwork->freq);
wpas_p2p_listen_work_done(wpa_s);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_s->pending_listen_freq = 0;
Use radio work for P2P Listen requests Avoid concurrent P2P Listen operations with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-04 08:36:13 +01:00
return;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Clear off_channel_freq when requesting new remain-on-channel The driver may end up leaving the current channel when we request a new remain-on-channel and as such, it is better not assume we can start new operations like sending an Action frame on the previous off-channel.
2010-11-05 17:39:42 +01:00
wpa_s->off_channel_freq = 0;
Use radio work for P2P Listen requests Avoid concurrent P2P Listen operations with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-04 08:36:13 +01:00
wpa_s->roc_waiting_drv_freq = lwork->freq;
}
static int wpas_start_listen(void *ctx, unsigned int freq,
unsigned int duration,
const struct wpabuf *probe_resp_ie)
{
struct wpa_supplicant *wpa_s = ctx;
struct wpas_p2p_listen_work *lwork;
if (wpa_s->p2p_listen_work) {
wpa_printf(MSG_DEBUG, "P2P: Reject start_listen since p2p_listen_work already exists");
return -1;
}
lwork = os_zalloc(sizeof(*lwork));
if (lwork == NULL)
return -1;
lwork->freq = freq;
lwork->duration = duration;
if (probe_resp_ie) {
lwork->probe_resp_ie = wpabuf_dup(probe_resp_ie);
if (lwork->probe_resp_ie == NULL) {
wpas_p2p_listen_work_free(lwork);
return -1;
}
}
if (radio_add_work(wpa_s, freq, "p2p-listen", 0, wpas_start_listen_cb,
lwork) < 0) {
wpas_p2p_listen_work_free(lwork);
return -1;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return 0;
}
static void wpas_stop_listen(void *ctx)
{
struct wpa_supplicant *wpa_s = ctx;
P2P: Fix remain-on-channel abort race When the P2P state machine requests a remain- on-channel, there's a potential race where it can then request a stop before the r-o-c has actually started, in which case the stop will not be processed. Fix that. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2010-10-10 16:52:13 +02:00
if (wpa_s->off_channel_freq || wpa_s->roc_waiting_drv_freq) {
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_drv_cancel_remain_on_channel(wpa_s);
wpa_s->off_channel_freq = 0;
P2P: Do not schedule new remain-on-channel if waiting for drv event The driver event for remain-on-channel may be delayed in a way that allows management-frame-received event to be received before wpa_supplicant knows that the driver is actually already on the previously requested channel. We should not request a new remain-on-channel to send a response to just a frame if we are waiting for the driver to get to the same channel. Instead, just continue waiting for the driver event.
2010-06-24 06:51:38 +02:00
wpa_s->roc_waiting_drv_freq = 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Clear driver Probe Response IE on stop_listen Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-01 17:30:33 +01:00
wpa_drv_set_ap_wps_ie(wpa_s, NULL, NULL, NULL);
P2PS: Enable Probe Request frame processing by P2P Client 1. Add global p2p_cli_probe property to enable/disable Probe Request frame RX reporting for connected P2P Clients. The property can be set to 0 - disable or 1 - enable. The default value is 0. 2. Enable Probe Request frame RX reporting for P2P Client on WPA_COMPLETED state if p2p_cli_probe property is set to 1. Disable it when an interface state is changing to any other state. 3. Don't cancel Probe Request frame RX reporting on wpa_stop_listen for a connected P2P Client handling Probe Request frames. Signed-off-by: Max Stepanov <Max.Stepanov@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com>
2015-06-10 10:43:32 +02:00
/*
* Don't cancel Probe Request RX reporting for a connected P2P Client
* handling Probe Request frames.
*/
if (!wpa_s->p2p_cli_probe)
wpa_drv_probe_req_report(wpa_s, 0);
Use radio work for P2P Listen requests Avoid concurrent P2P Listen operations with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-04 08:36:13 +01:00
wpas_p2p_listen_work_done(wpa_s);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Specify frequency when sending Probe Response frame If the RX frequency of the Probe Request frame is known, specify it when sending the Probe Response frame. This is needed when the Probe Request frame is received on another virtual interface, for example, when a GO or P2PS client are discoverable on the group operating channel. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com>
2015-06-10 10:43:35 +02:00
static int wpas_send_probe_resp(void *ctx, const struct wpabuf *buf,
unsigned int freq)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct wpa_supplicant *wpa_s = ctx;
P2P: Specify frequency when sending Probe Response frame If the RX frequency of the Probe Request frame is known, specify it when sending the Probe Response frame. This is needed when the Probe Request frame is received on another virtual interface, for example, when a GO or P2PS client are discoverable on the group operating channel. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com>
2015-06-10 10:43:35 +02:00
return wpa_drv_send_mlme(wpa_s, wpabuf_head(buf), wpabuf_len(buf), 1,
freq);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
static void wpas_prov_disc_local_display(struct wpa_supplicant *wpa_s,
P2P: Use a variable for generated PIN to allow multiple uses In order to pass the same PIN to multiple notifications in the future, generate it centrally. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-02 16:12:37 +01:00
const u8 *peer, const char *params,
unsigned int generated_pin)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
wpa_msg_global(wpa_s, MSG_INFO, P2P_EVENT_PROV_DISC_SHOW_PIN MACSTR
" %08d%s", MAC2STR(peer), generated_pin, params);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
static void wpas_prov_disc_local_keypad(struct wpa_supplicant *wpa_s,
const u8 *peer, const char *params)
{
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
wpa_msg_global(wpa_s, MSG_INFO, P2P_EVENT_PROV_DISC_ENTER_PIN MACSTR
"%s", MAC2STR(peer), params);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Remove WPA_DRIVER_FLAGS_P2P_MGMT option The option of handling upper layer P2P management operations within the driver/firmware was originally planned to be used with wpa_supplicant, but this has not really happened and there is no clear sign of this being needed in the near term either. This functionality has not been completed and it is certainly not being kept up-to-date or tested. As such, it is best to remove it for now and if this or something similar is needed in the future, it can be brought back once a clear need for it has been demonstrated first. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-29 17:20:47 +01:00
static void wpas_prov_disc_req(void *ctx, const u8 *peer, u16 config_methods,
const u8 *dev_addr, const u8 *pri_dev_type,
const char *dev_name, u16 supp_config_methods,
u8 dev_capab, u8 group_capab, const u8 *group_id,
size_t group_id_len)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct wpa_supplicant *wpa_s = ctx;
char devtype[WPS_DEV_TYPE_BUFSIZE];
P2P: Add group ifname to P2P-PROV-DISC-* events If Provision Discovery Request is sent for GO role (i.e., P2P Group ID attribute is included), add the group interface name to the control interface event on the GO. This makes it easier to figure out which ctrl_iface needs to be used for wps_pbc/wps_pin command to authorize the joining P2P client. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-06 20:57:17 +01:00
char params[300];
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
u8 empty_dev_type[8];
P2P: Use a variable for generated PIN to allow multiple uses In order to pass the same PIN to multiple notifications in the future, generate it centrally. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-02 16:12:37 +01:00
unsigned int generated_pin = 0;
P2P: Add group ifname to P2P-PROV-DISC-* events If Provision Discovery Request is sent for GO role (i.e., P2P Group ID attribute is included), add the group interface name to the control interface event on the GO. This makes it easier to figure out which ctrl_iface needs to be used for wps_pbc/wps_pin command to authorize the joining P2P client. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-06 20:57:17 +01:00
struct wpa_supplicant *group = NULL;
Check os_snprintf() result more consistently While these are using practically large enoungh buffer sizes, it is better to be more consistent with checking os_snprintf() return value. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-06 20:40:31 +01:00
int res;
P2P: Add group ifname to P2P-PROV-DISC-* events If Provision Discovery Request is sent for GO role (i.e., P2P Group ID attribute is included), add the group interface name to the control interface event on the GO. This makes it easier to figure out which ctrl_iface needs to be used for wps_pbc/wps_pin command to authorize the joining P2P client. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-06 20:57:17 +01:00
if (group_id) {
for (group = wpa_s->global->ifaces; group; group = group->next)
{
struct wpa_ssid *s = group->current_ssid;
if (s != NULL &&
s->mode == WPAS_MODE_P2P_GO &&
group_id_len - ETH_ALEN == s->ssid_len &&
os_memcmp(group_id + ETH_ALEN, s->ssid,
s->ssid_len) == 0)
break;
}
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (pri_dev_type == NULL) {
os_memset(empty_dev_type, 0, sizeof(empty_dev_type));
pri_dev_type = empty_dev_type;
}
Check os_snprintf() result more consistently While these are using practically large enoungh buffer sizes, it is better to be more consistent with checking os_snprintf() return value. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-06 20:40:31 +01:00
res = os_snprintf(params, sizeof(params), " p2p_dev_addr=" MACSTR
" pri_dev_type=%s name='%s' config_methods=0x%x "
"dev_capab=0x%x group_capab=0x%x%s%s",
MAC2STR(dev_addr),
wps_dev_type_bin2str(pri_dev_type, devtype,
sizeof(devtype)),
dev_name, supp_config_methods, dev_capab, group_capab,
group ? " group=" : "",
group ? group->ifname : "");
if (os_snprintf_error(sizeof(params), res))
wpa_printf(MSG_DEBUG, "P2P: PD Request event truncated");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
params[sizeof(params) - 1] = '\0';
P2P: Use a variable for generated PIN to allow multiple uses In order to pass the same PIN to multiple notifications in the future, generate it centrally. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-02 16:12:37 +01:00
if (config_methods & WPS_CONFIG_DISPLAY) {
WPS: Use only os_get_random() for PIN generation Remove the fallback dependency on os_random() when generating a WPS pin. This is exceptionally unlikely to ever be called as the call to os_get_random() is unlikely to fail. The intention is to facilitate future removal of os_random() as it uses a low quality PRNG. Signed-off-by: Nick Lowe <nick.lowe@lugatech.com>
2016-02-09 15:47:47 +01:00
if (wps_generate_pin(&generated_pin) < 0) {
wpa_printf(MSG_DEBUG, "P2P: Could not generate PIN");
wpas_notify_p2p_provision_discovery(
wpa_s, peer, 0 /* response */,
P2P_PROV_DISC_INFO_UNAVAILABLE, 0, 0);
return;
}
P2P: Use a variable for generated PIN to allow multiple uses In order to pass the same PIN to multiple notifications in the future, generate it centrally. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-02 16:12:37 +01:00
wpas_prov_disc_local_display(wpa_s, peer, params,
generated_pin);
} else if (config_methods & WPS_CONFIG_KEYPAD)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpas_prov_disc_local_keypad(wpa_s, peer, params);
else if (config_methods & WPS_CONFIG_PUSHBUTTON)
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
wpa_msg_global(wpa_s, MSG_INFO, P2P_EVENT_PROV_DISC_PBC_REQ
MACSTR "%s", MAC2STR(peer), params);
P2P: Add wpas_notify_p2p_provision_discovery() Add a notification for P2P provision discovery status/result. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:31:56 +02:00
wpas_notify_p2p_provision_discovery(wpa_s, peer, 1 /* request */,
P2P_PROV_DISC_SUCCESS,
config_methods, generated_pin);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Remove WPA_DRIVER_FLAGS_P2P_MGMT option The option of handling upper layer P2P management operations within the driver/firmware was originally planned to be used with wpa_supplicant, but this has not really happened and there is no clear sign of this being needed in the near term either. This functionality has not been completed and it is certainly not being kept up-to-date or tested. As such, it is best to remove it for now and if this or something similar is needed in the future, it can be brought back once a clear need for it has been demonstrated first. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-29 17:20:47 +01:00
static void wpas_prov_disc_resp(void *ctx, const u8 *peer, u16 config_methods)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct wpa_supplicant *wpa_s = ctx;
P2P: Use a variable for generated PIN to allow multiple uses In order to pass the same PIN to multiple notifications in the future, generate it centrally. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-02 16:12:37 +01:00
unsigned int generated_pin = 0;
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
char params[20];
P2P: Use a variable for generated PIN to allow multiple uses In order to pass the same PIN to multiple notifications in the future, generate it centrally. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-02 16:12:37 +01:00
P2P: Skip event notification on PD Response in join-group case Provision Discovery is used as a notification to the GO in the case we are about join a running group. In such case, there is not much point in indicating the provision discovery response events to external programs especially when the PIN-to-be-displayed was different from the one returned for the p2p_connect command. Skip this confusing event completely for join-a-running-group case. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-02-05 19:20:36 +01:00
if (wpa_s->pending_pd_before_join &&
(os_memcmp(peer, wpa_s->pending_join_dev_addr, ETH_ALEN) == 0 ||
os_memcmp(peer, wpa_s->pending_join_iface_addr, ETH_ALEN) == 0)) {
wpa_s->pending_pd_before_join = 0;
wpa_printf(MSG_DEBUG, "P2P: Starting pending "
"join-existing-group operation");
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 00:44:29 +02:00
wpas_p2p_join_start(wpa_s, 0, NULL, 0);
P2P: Skip event notification on PD Response in join-group case Provision Discovery is used as a notification to the GO in the case we are about join a running group. In such case, there is not much point in indicating the provision discovery response events to external programs especially when the PIN-to-be-displayed was different from the one returned for the p2p_connect command. Skip this confusing event completely for join-a-running-group case. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-02-05 19:20:36 +01:00
return;
}
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
if (wpa_s->pending_pd_use == AUTO_PD_JOIN ||
Check os_snprintf() result more consistently While these are using practically large enoungh buffer sizes, it is better to be more consistent with checking os_snprintf() return value. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-06 20:40:31 +01:00
wpa_s->pending_pd_use == AUTO_PD_GO_NEG) {
int res;
res = os_snprintf(params, sizeof(params), " peer_go=%d",
wpa_s->pending_pd_use == AUTO_PD_JOIN);
if (os_snprintf_error(sizeof(params), res))
params[sizeof(params) - 1] = '\0';
} else
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
params[0] = '\0';
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (config_methods & WPS_CONFIG_DISPLAY)
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
wpas_prov_disc_local_keypad(wpa_s, peer, params);
P2P: Use a variable for generated PIN to allow multiple uses In order to pass the same PIN to multiple notifications in the future, generate it centrally. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-02 16:12:37 +01:00
else if (config_methods & WPS_CONFIG_KEYPAD) {
WPS: Use only os_get_random() for PIN generation Remove the fallback dependency on os_random() when generating a WPS pin. This is exceptionally unlikely to ever be called as the call to os_get_random() is unlikely to fail. The intention is to facilitate future removal of os_random() as it uses a low quality PRNG. Signed-off-by: Nick Lowe <nick.lowe@lugatech.com>
2016-02-09 15:47:47 +01:00
if (wps_generate_pin(&generated_pin) < 0) {
wpa_printf(MSG_DEBUG, "P2P: Could not generate PIN");
wpas_notify_p2p_provision_discovery(
wpa_s, peer, 0 /* response */,
P2P_PROV_DISC_INFO_UNAVAILABLE, 0, 0);
return;
}
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
wpas_prov_disc_local_display(wpa_s, peer, params,
generated_pin);
P2P: Use a variable for generated PIN to allow multiple uses In order to pass the same PIN to multiple notifications in the future, generate it centrally. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-02 16:12:37 +01:00
} else if (config_methods & WPS_CONFIG_PUSHBUTTON)
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
wpa_msg_global(wpa_s, MSG_INFO, P2P_EVENT_PROV_DISC_PBC_RESP
MACSTR "%s", MAC2STR(peer), params);
P2P: Fix connect-to-running-group if Action TX status is delayed The following operations (scan and associate) were not run if the Provisioning Discovery Response is received before the TX Action status.
2010-08-04 23:34:56 +02:00
P2P: Add wpas_notify_p2p_provision_discovery() Add a notification for P2P provision discovery status/result. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:31:56 +02:00
wpas_notify_p2p_provision_discovery(wpa_s, peer, 0 /* response */,
P2P_PROV_DISC_SUCCESS,
config_methods, generated_pin);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
Mark local functions static These functions are not used outside the file in which they are defined. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-11-18 20:53:36 +01:00
static void wpas_prov_disc_fail(void *ctx, const u8 *peer,
P2PS: Provision Discovery fail event This extends P2P-PROV-DISC-FAILURE with adv_id and deferred_session_resp in P2PS cases. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 12:51:09 +01:00
enum p2p_prov_disc_status status,
u32 adv_id, const u8 *adv_mac,
const char *deferred_session_resp)
P2P: Add wpas_notify_p2p_provision_discovery() Add a notification for P2P provision discovery status/result. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:31:56 +02:00
{
struct wpa_supplicant *wpa_s = ctx;
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
if (wpa_s->p2p_fallback_to_go_neg) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: PD for p2p_connect-auto "
"failed - fall back to GO Negotiation");
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_msg_global(wpa_s->p2pdev, MSG_INFO,
P2P: Add event messages for P2P_CONNECT-fallback-to-GO-Neg This makes it easier for upper layer programs to follow progress of P2P_CONNECT-auto operation. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 11:04:15 +01:00
P2P_EVENT_FALLBACK_TO_GO_NEG
"reason=PD-failed");
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
wpas_p2p_fallback_to_go_neg(wpa_s, 0);
return;
}
P2P: Retry PD Request in join-a-running-group case The GO may be in sleep when we send a PD Request frame to indicate that we are about to join a running group. Previously, this frame was not retried more than normal low level retries. This can result in the GO not getting the frame especially in cases where concurrent multi-channel operations or aggressive sleep schedule is used since most drivers do not yet synchronize with the GO's NoA before association. Increase the likelihood of the GO receiving the PD Request frame by retransmitting it similarly to the PD-for-GO-Negotiation case. Start the actual join operation only after these retries have failed to get an acknowledgment from the GO to give the connection attempt a chance to succeed if the driver implements better NoA synchronization for it. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-22 23:53:42 +01:00
if (status == P2P_PROV_DISC_TIMEOUT_JOIN) {
wpa_s->pending_pd_before_join = 0;
wpa_printf(MSG_DEBUG, "P2P: Starting pending "
"join-existing-group operation (no ACK for PD "
"Req attempts)");
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 00:44:29 +02:00
wpas_p2p_join_start(wpa_s, 0, NULL, 0);
P2P: Retry PD Request in join-a-running-group case The GO may be in sleep when we send a PD Request frame to indicate that we are about to join a running group. Previously, this frame was not retried more than normal low level retries. This can result in the GO not getting the frame especially in cases where concurrent multi-channel operations or aggressive sleep schedule is used since most drivers do not yet synchronize with the GO's NoA before association. Increase the likelihood of the GO receiving the PD Request frame by retransmitting it similarly to the PD-for-GO-Negotiation case. Start the actual join operation only after these retries have failed to get an acknowledgment from the GO to give the connection attempt a chance to succeed if the driver implements better NoA synchronization for it. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-22 23:53:42 +01:00
return;
}
P2PS: Provision Discovery fail event This extends P2P-PROV-DISC-FAILURE with adv_id and deferred_session_resp in P2PS cases. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 12:51:09 +01:00
if (adv_id && adv_mac && deferred_session_resp) {
wpa_msg_global(wpa_s, MSG_INFO, P2P_EVENT_PROV_DISC_FAILURE
" p2p_dev_addr=" MACSTR " status=%d adv_id=%x"
" deferred_session_resp='%s'",
MAC2STR(peer), status, adv_id,
deferred_session_resp);
} else if (adv_id && adv_mac) {
wpa_msg_global(wpa_s, MSG_INFO, P2P_EVENT_PROV_DISC_FAILURE
" p2p_dev_addr=" MACSTR " status=%d adv_id=%x",
MAC2STR(peer), status, adv_id);
} else {
wpa_msg_global(wpa_s, MSG_INFO, P2P_EVENT_PROV_DISC_FAILURE
" p2p_dev_addr=" MACSTR " status=%d",
MAC2STR(peer), status);
}
P2P: Add provision discovery failure event Add provisional discovery failure ctrl_iface event (P2P-PROV-DISC-FAILURE) to indicate to the application layer in case of PD failure. Signed-off-by: Deepthi Gowri <deepthi@codeaurora.org>
2012-04-17 18:44:13 +02:00
P2P: Add wpas_notify_p2p_provision_discovery() Add a notification for P2P provision discovery status/result. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:31:56 +02:00
wpas_notify_p2p_provision_discovery(wpa_s, peer, 0 /* response */,
status, 0, 0);
}
P2P: Move a GO to a frequency that is also supported by the client A P2P GO interface that was instantiated after a GO Negotiation or Invitation holds the intersection of frequencies between the GO and the client. In case the GO is going to move to another frequency, allow it to move only to a frequency that is also supported by the client. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:21 +02:00
static int freq_included(struct wpa_supplicant *wpa_s,
const struct p2p_channels *channels,
unsigned int freq)
P2P: Relax channel forcing for invitation processing with MCC support When STA interface is connected and P2P interface gets invited in a different channel from previous P2P group, the invitiation would fail because of no common channel found. Fix this by using different logic when device support multi channel concurrency. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-05-22 12:29:46 +02:00
{
P2P: Move a GO to a frequency that is also supported by the client A P2P GO interface that was instantiated after a GO Negotiation or Invitation holds the intersection of frequencies between the GO and the client. In case the GO is going to move to another frequency, allow it to move only to a frequency that is also supported by the client. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:21 +02:00
if ((channels == NULL || p2p_channels_includes_freq(channels, freq)) &&
wpas_p2p_go_is_peer_freq(wpa_s, freq))
return 1;
return 0;
P2P: Relax channel forcing for invitation processing with MCC support When STA interface is connected and P2P interface gets invited in a different channel from previous P2P group, the invitiation would fail because of no common channel found. Fix this by using different logic when device support multi channel concurrency. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-05-22 12:29:46 +02:00
}
P2P: Add a function to compute the group common freqs Add a function to compute the group common frequencies, and use it to update the group_common_frequencies as part of the channel switch flows. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:20 +02:00
static void wpas_p2p_go_update_common_freqs(struct wpa_supplicant *wpa_s)
{
unsigned int num = P2P_MAX_CHANNELS;
int *common_freqs;
int ret;
p2p_go_dump_common_freqs(wpa_s);
common_freqs = os_calloc(num, sizeof(int));
if (!common_freqs)
return;
ret = p2p_group_get_common_freqs(wpa_s->p2p_group, common_freqs, &num);
if (ret < 0) {
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P: Failed to get group common freqs");
os_free(common_freqs);
return;
}
os_free(wpa_s->p2p_group_common_freqs);
wpa_s->p2p_group_common_freqs = common_freqs;
wpa_s->p2p_group_common_freqs_num = num;
p2p_go_dump_common_freqs(wpa_s);
}
P2P: Move a GO from its operating frequency Upon any change in the currently used channels evaluate if a GO should move to a different operating frequency, where the possible scenarios: 1. The frequency that the GO is currently using is no longer valid, due to regulatory reasons, and thus the GO must be moved to some other frequency. 2. Due to Multi Concurrent Channel (MCC) policy considerations, it would be preferable, based on configuration settings, to prefer Same Channel Mode (SCM) over concurrent operation in multiple channels. The supported policies: - prefer SCM: prefer moving the GO to a frequency used by some other interface. - prefer SCM if Peer supports: prefer moving the GO to a frequency used by some other station interface iff the other station interface is using a frequency that is common between the local and the peer device (based on the GO Negotiation/Invitation signaling). - Stay on the current frequency. Currently, the GO transition to another frequency is handled by a complete tear down and re-setup of the GO. Still need to add CSA flow to the considerations. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:19 +02:00
/*
* Check if the given frequency is one of the possible operating frequencies
* set after the completion of the GO Negotiation.
*/
static int wpas_p2p_go_is_peer_freq(struct wpa_supplicant *wpa_s, int freq)
{
unsigned int i;
p2p_go_dump_common_freqs(wpa_s);
/* assume no restrictions */
if (!wpa_s->p2p_group_common_freqs_num)
return 1;
for (i = 0; i < wpa_s->p2p_group_common_freqs_num; i++) {
if (wpa_s->p2p_group_common_freqs[i] == freq)
return 1;
}
return 0;
}
P2P: Implement P2P_GO_FREQ_MOVE_SCM_ECSA policy Add new GO frequency move policy. The P2P_GO_FREQ_MOVE_SCM_ECSA prefers SCM if all the clients advertise eCSA support and the candidate frequency is one of the group common frequencies. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2015-09-08 11:46:20 +02:00
static int wpas_sta_check_ecsa(struct hostapd_data *hapd,
struct sta_info *sta, void *ctx)
{
int *ecsa_support = ctx;
*ecsa_support &= sta->ecsa_supported;
return 0;
}
/* Check if all the peers support eCSA */
static int wpas_p2p_go_clients_support_ecsa(struct wpa_supplicant *wpa_s)
{
int ecsa_support = 1;
ap_for_each_sta(wpa_s->ap_iface->bss[0], wpas_sta_check_ecsa,
&ecsa_support);
return ecsa_support;
}
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
/**
* Pick the best frequency to use from all the currently used frequencies.
*/
static int wpas_p2p_pick_best_used_freq(struct wpa_supplicant *wpa_s,
struct wpa_used_freq_data *freqs,
unsigned int num)
{
unsigned int i, c;
/* find a candidate freq that is supported by P2P */
for (c = 0; c < num; c++)
if (p2p_supported_freq(wpa_s->global->p2p, freqs[c].freq))
break;
if (c == num)
return 0;
/* once we have a candidate, try to find a 'better' one */
for (i = c + 1; i < num; i++) {
if (!p2p_supported_freq(wpa_s->global->p2p, freqs[i].freq))
continue;
/*
* 1. Infrastructure station interfaces have higher preference.
* 2. P2P Clients have higher preference.
* 3. All others.
*/
if (freqs[i].flags & WPA_FREQ_USED_BY_INFRA_STATION) {
c = i;
break;
}
if ((freqs[i].flags & WPA_FREQ_USED_BY_P2P_CLIENT))
c = i;
}
return freqs[c].freq;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
static u8 wpas_invitation_process(void *ctx, const u8 *sa, const u8 *bssid,
const u8 *go_dev_addr, const u8 *ssid,
size_t ssid_len, int *go, u8 *group_bssid,
P2P: Relax channel forcing for invitation processing with MCC support When STA interface is connected and P2P interface gets invited in a different channel from previous P2P group, the invitiation would fail because of no common channel found. Fix this by using different logic when device support multi channel concurrency. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-05-22 12:29:46 +02:00
int *force_freq, int persistent_group,
P2P NFC: Static handover with NFC Tag on client This adds a new P2P Invitation mechanism to invite a P2P Device with an NFC Tag to an already operating group when the GO with NFC Device reads the NFC Tag. The P2P Device with the NFC Tag will then accept invitation and connect to the group automatically using its OOB Device Password. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 18:45:04 +02:00
const struct p2p_channels *channels,
int dev_pw_id)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct wpa_supplicant *wpa_s = ctx;
struct wpa_ssid *s;
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
struct wpa_used_freq_data *freqs;
P2P: Accept invitations to already running persistent group We can automatically accept invitations that are for a persistent group that is already running. There is no need to confirm this separately or preparare a new group interface.
2010-11-19 11:58:31 +01:00
struct wpa_supplicant *grp;
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
int best_freq;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (!persistent_group) {
wpa_printf(MSG_DEBUG, "P2P: Invitation from " MACSTR
P2P: Limit join-a-group scans based on SSID from invitation If we already know the SSID of the P2P group we are trying to join, use that SSID to limit scan responses and BSS selection since we do not really look for any other network in this case. In addition, this can fix cases where the peer has just changed its SSID (e.g., started a new group) and there may be multiple BSS entries for the same BSSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2014-01-13 20:39:06 +01:00
" to join an active group (SSID: %s)",
MAC2STR(sa), wpa_ssid_txt(ssid, ssid_len));
P2P: Add command for pre-authorizing an invitation to an active group This is mainly designed for testing and allows p2p_connect join auth to be used to accept a specific invitation to an active group that may be received in the future.
2010-06-27 09:11:42 +02:00
if (!is_zero_ether_addr(wpa_s->p2p_auth_invite) &&
P2P: Allow pre-authorization of invitation to apply to src addr For client-invites-device case, the pre-authorization of an invitation to running group will need to allow Invitation Request from specified address, too. This is for testing uses only.
2010-07-02 07:57:03 +02:00
(os_memcmp(go_dev_addr, wpa_s->p2p_auth_invite, ETH_ALEN)
== 0 ||
os_memcmp(sa, wpa_s->p2p_auth_invite, ETH_ALEN) == 0)) {
P2P: Add command for pre-authorizing an invitation to an active group This is mainly designed for testing and allows p2p_connect join auth to be used to accept a specific invitation to an active group that may be received in the future.
2010-06-27 09:11:42 +02:00
wpa_printf(MSG_DEBUG, "P2P: Accept previously "
"authorized invitation");
goto accept_inv;
}
P2P NFC: Static handover with NFC Tag on client This adds a new P2P Invitation mechanism to invite a P2P Device with an NFC Tag to an already operating group when the GO with NFC Device reads the NFC Tag. The P2P Device with the NFC Tag will then accept invitation and connect to the group automatically using its OOB Device Password. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 18:45:04 +02:00
#ifdef CONFIG_WPS_NFC
P2P: Fix P2P invitation with NFC Use interface's own NFC configuration instead of parent's one to support a P2P device dedicated interface. Signed-off-by: David Spinadel <david.spinadel@intel.com>
2015-01-19 02:44:05 +01:00
if (dev_pw_id >= 0 && wpa_s->p2p_nfc_tag_enabled &&
dev_pw_id == wpa_s->p2p_oob_dev_pw_id) {
P2P NFC: Static handover with NFC Tag on client This adds a new P2P Invitation mechanism to invite a P2P Device with an NFC Tag to an already operating group when the GO with NFC Device reads the NFC Tag. The P2P Device with the NFC Tag will then accept invitation and connect to the group automatically using its OOB Device Password. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 18:45:04 +02:00
wpa_printf(MSG_DEBUG, "P2P: Accept invitation based on local enabled NFC Tag");
P2P: Fix P2P invitation with NFC Use interface's own NFC configuration instead of parent's one to support a P2P device dedicated interface. Signed-off-by: David Spinadel <david.spinadel@intel.com>
2015-01-19 02:44:05 +01:00
wpa_s->p2p_wps_method = WPS_NFC;
wpa_s->pending_join_wps_method = WPS_NFC;
os_memcpy(wpa_s->pending_join_dev_addr,
P2P NFC: Static handover with NFC Tag on client This adds a new P2P Invitation mechanism to invite a P2P Device with an NFC Tag to an already operating group when the GO with NFC Device reads the NFC Tag. The P2P Device with the NFC Tag will then accept invitation and connect to the group automatically using its OOB Device Password. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 18:45:04 +02:00
go_dev_addr, ETH_ALEN);
P2P: Fix P2P invitation with NFC Use interface's own NFC configuration instead of parent's one to support a P2P device dedicated interface. Signed-off-by: David Spinadel <david.spinadel@intel.com>
2015-01-19 02:44:05 +01:00
os_memcpy(wpa_s->pending_join_iface_addr,
P2P NFC: Static handover with NFC Tag on client This adds a new P2P Invitation mechanism to invite a P2P Device with an NFC Tag to an already operating group when the GO with NFC Device reads the NFC Tag. The P2P Device with the NFC Tag will then accept invitation and connect to the group automatically using its OOB Device Password. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 18:45:04 +02:00
bssid, ETH_ALEN);
goto accept_inv;
}
#endif /* CONFIG_WPS_NFC */
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/*
* Do not accept the invitation automatically; notify user and
* request approval.
*/
return P2P_SC_FAIL_INFO_CURRENTLY_UNAVAILABLE;
}
P2P: Accept invitations to already running persistent group We can automatically accept invitations that are for a persistent group that is already running. There is no need to confirm this separately or preparare a new group interface.
2010-11-19 11:58:31 +01:00
grp = wpas_get_p2p_group(wpa_s, ssid, ssid_len, go);
if (grp) {
wpa_printf(MSG_DEBUG, "P2P: Accept invitation to already "
"running persistent group");
if (*go)
os_memcpy(group_bssid, grp->own_addr, ETH_ALEN);
goto accept_inv;
}
P2P: Mark peer authorized for persistent group invitation When p2p_invite persistent=<id> is used to request a persistent group to be re-invoked, the peer may reply with status=1 (info not yet available) if upper layer processing of the invitiation is requested. The peer is ten expected to start another invitation exchanged within 120 seconds if the user authorizes the connection. Allow this process to be used more easily by automatically authorizing the peer that we tried to invite to use this second invitation sequence even if persistent_reconnect=0. For this mechanism to work, the device that starts the invitation needs to start listen mode to be able to receive the invitation request from the peer. At least for now, this is not done automatically, but future changes could potentially enable this automatically at least if there are no concurrent operations in progress. Example sequence on the initiator: cmd: P2P_INVITE persistent=1 peer=<addr> event: P2P-INVITATION-RESULT status=1 cmd: P2P_LISTEN 120 wait for peer to start another invitiation round.. group will be re-invoked automatically On the peer (with persistent_reconnect=0): event: P2P-INVITATION-RECEIVED sa=<addr> persistent=1 [freq=<MHz>] wait for user approval cmd: P2P_INVITE persistent=1 peer=<addr> group will be re-invoked automatically Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-01 20:32:33 +01:00
if (!is_zero_ether_addr(wpa_s->p2p_auth_invite) &&
os_memcmp(sa, wpa_s->p2p_auth_invite, ETH_ALEN) == 0) {
wpa_printf(MSG_DEBUG, "P2P: Accept previously initiated "
"invitation to re-invoke a persistent group");
P2P: Clear p2p_auth_invite after each persistent group invitation This makes the operations more consistent when going through multiple persistent group re-invocation sequences in a row. Each invitation needs to be accepted separately if persistent reconnect is not enabled. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-05-27 11:09:25 +02:00
os_memset(wpa_s->p2p_auth_invite, 0, ETH_ALEN);
P2P: Mark peer authorized for persistent group invitation When p2p_invite persistent=<id> is used to request a persistent group to be re-invoked, the peer may reply with status=1 (info not yet available) if upper layer processing of the invitiation is requested. The peer is ten expected to start another invitation exchanged within 120 seconds if the user authorizes the connection. Allow this process to be used more easily by automatically authorizing the peer that we tried to invite to use this second invitation sequence even if persistent_reconnect=0. For this mechanism to work, the device that starts the invitation needs to start listen mode to be able to receive the invitation request from the peer. At least for now, this is not done automatically, but future changes could potentially enable this automatically at least if there are no concurrent operations in progress. Example sequence on the initiator: cmd: P2P_INVITE persistent=1 peer=<addr> event: P2P-INVITATION-RESULT status=1 cmd: P2P_LISTEN 120 wait for peer to start another invitiation round.. group will be re-invoked automatically On the peer (with persistent_reconnect=0): event: P2P-INVITATION-RECEIVED sa=<addr> persistent=1 [freq=<MHz>] wait for user approval cmd: P2P_INVITE persistent=1 peer=<addr> group will be re-invoked automatically Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-01 20:32:33 +01:00
} else if (!wpa_s->conf->persistent_reconnect)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return P2P_SC_FAIL_INFO_CURRENTLY_UNAVAILABLE;
for (s = wpa_s->conf->ssid; s; s = s->next) {
if (s->disabled == 2 &&
os_memcmp(s->bssid, go_dev_addr, ETH_ALEN) == 0 &&
s->ssid_len == ssid_len &&
os_memcmp(ssid, s->ssid, ssid_len) == 0)
break;
}
if (!s) {
wpa_printf(MSG_DEBUG, "P2P: Invitation from " MACSTR
" requested reinvocation of an unknown group",
MAC2STR(sa));
return P2P_SC_FAIL_UNKNOWN_GROUP;
}
if (s->mode == WPAS_MODE_P2P_GO && !wpas_p2p_create_iface(wpa_s)) {
*go = 1;
if (wpa_s->wpa_state >= WPA_AUTHENTICATING) {
wpa_printf(MSG_DEBUG, "P2P: The only available "
"interface is already in use - reject "
"invitation");
return P2P_SC_FAIL_UNABLE_TO_ACCOMMODATE;
}
P2P: Support dedicated P2P_DEVICE without separate group interface Add support for drivers with dedicated P2P_DEVICE interface, but without group interface concurrency (only a single netdev is used). With such devices, wpa_supplicant tried to use the p2p_dev interface instead of the group interface and most P2P operations failed. Extend wpa_supplicant to use the primary interface instead of a separate group interface in such cases. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
if (wpa_s->p2p_mgmt)
os_memcpy(group_bssid, wpa_s->parent->own_addr,
ETH_ALEN);
else
os_memcpy(group_bssid, wpa_s->own_addr, ETH_ALEN);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
} else if (s->mode == WPAS_MODE_P2P_GO) {
*go = 1;
if (wpas_p2p_add_group_interface(wpa_s, WPA_IF_P2P_GO) < 0)
{
wpa_printf(MSG_ERROR, "P2P: Failed to allocate a new "
"interface address for the group");
return P2P_SC_FAIL_UNABLE_TO_ACCOMMODATE;
}
os_memcpy(group_bssid, wpa_s->pending_interface_addr,
ETH_ALEN);
}
P2P: Add command for pre-authorizing an invitation to an active group This is mainly designed for testing and allows p2p_connect join auth to be used to accept a specific invitation to an active group that may be received in the future.
2010-06-27 09:11:42 +02:00
accept_inv:
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
wpas_p2p_set_own_freq_preference(wpa_s, 0);
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
best_freq = 0;
freqs = os_calloc(wpa_s->num_multichan_concurrent,
sizeof(struct wpa_used_freq_data));
if (freqs) {
int num_channels = wpa_s->num_multichan_concurrent;
int num = wpas_p2p_valid_oper_freqs(wpa_s, freqs, num_channels);
best_freq = wpas_p2p_pick_best_used_freq(wpa_s, freqs, num);
os_free(freqs);
}
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
/* Get one of the frequencies currently in use */
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
if (best_freq > 0) {
P2P: Fix p2p_ignore_shared_freq=1 during invitation processing p2p_ignore_shared_freq=1 was supposed to allow a MCC-capable device to ignore a preference for using the same channel on multiple interfaces. However, it was not used during processing of an Invitation Request. Fix that case to use channel preference instead of channel forcing if free channels are available. This allows p2p_ignore_shared_freq=1 case to ignore the preference. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-19 11:15:45 +01:00
wpa_printf(MSG_DEBUG, "P2P: Trying to prefer a channel already used by one of the interfaces");
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
wpas_p2p_set_own_freq_preference(wpa_s, best_freq);
P2P: Fix p2p_ignore_shared_freq=1 during invitation processing p2p_ignore_shared_freq=1 was supposed to allow a MCC-capable device to ignore a preference for using the same channel on multiple interfaces. However, it was not used during processing of an Invitation Request. Fix that case to use channel preference instead of channel forcing if free channels are available. This allows p2p_ignore_shared_freq=1 case to ignore the preference. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-19 11:15:45 +01:00
if (wpa_s->num_multichan_concurrent < 2 ||
wpas_p2p_num_unused_channels(wpa_s) < 1) {
wpa_printf(MSG_DEBUG, "P2P: No extra channels available - trying to force channel to match a channel already used by one of the interfaces");
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
*force_freq = best_freq;
P2P: Fix p2p_ignore_shared_freq=1 during invitation processing p2p_ignore_shared_freq=1 was supposed to allow a MCC-capable device to ignore a preference for using the same channel on multiple interfaces. However, it was not used during processing of an Invitation Request. Fix that case to use channel preference instead of channel forcing if free channels are available. This allows p2p_ignore_shared_freq=1 case to ignore the preference. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-19 11:15:45 +01:00
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
if (*force_freq > 0 && wpa_s->num_multichan_concurrent > 1 &&
wpas_p2p_num_unused_channels(wpa_s) > 0) {
P2P: Relax channel forcing for invitation processing with MCC support When STA interface is connected and P2P interface gets invited in a different channel from previous P2P group, the invitiation would fail because of no common channel found. Fix this by using different logic when device support multi channel concurrency. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-05-22 12:29:46 +02:00
if (*go == 0) {
/* We are the client */
wpa_printf(MSG_DEBUG, "P2P: Peer was found to be "
"running a GO but we are capable of MCC, "
"figure out the best channel to use");
*force_freq = 0;
P2P: Move a GO to a frequency that is also supported by the client A P2P GO interface that was instantiated after a GO Negotiation or Invitation holds the intersection of frequencies between the GO and the client. In case the GO is going to move to another frequency, allow it to move only to a frequency that is also supported by the client. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:21 +02:00
} else if (!freq_included(wpa_s, channels, *force_freq)) {
P2P: Relax channel forcing for invitation processing with MCC support When STA interface is connected and P2P interface gets invited in a different channel from previous P2P group, the invitiation would fail because of no common channel found. Fix this by using different logic when device support multi channel concurrency. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-05-22 12:29:46 +02:00
/* We are the GO, and *force_freq is not in the
* intersection */
wpa_printf(MSG_DEBUG, "P2P: Forced GO freq %d MHz not "
"in intersection but we are capable of MCC, "
"figure out the best channel to use",
*force_freq);
*force_freq = 0;
}
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return P2P_SC_SUCCESS;
}
static void wpas_invitation_received(void *ctx, const u8 *sa, const u8 *bssid,
const u8 *ssid, size_t ssid_len,
const u8 *go_dev_addr, u8 status,
int op_freq)
{
struct wpa_supplicant *wpa_s = ctx;
struct wpa_ssid *s;
for (s = wpa_s->conf->ssid; s; s = s->next) {
if (s->disabled == 2 &&
s->ssid_len == ssid_len &&
os_memcmp(ssid, s->ssid, ssid_len) == 0)
break;
}
if (status == P2P_SC_SUCCESS) {
wpa_printf(MSG_DEBUG, "P2P: Invitation from peer " MACSTR
P2P: Limit join-a-group scans based on SSID from invitation If we already know the SSID of the P2P group we are trying to join, use that SSID to limit scan responses and BSS selection since we do not really look for any other network in this case. In addition, this can fix cases where the peer has just changed its SSID (e.g., started a new group) and there may be multiple BSS entries for the same BSSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2014-01-13 20:39:06 +01:00
" was accepted; op_freq=%d MHz, SSID=%s",
MAC2STR(sa), op_freq, wpa_ssid_txt(ssid, ssid_len));
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (s) {
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
int go = s->mode == WPAS_MODE_P2P_GO;
P2P: Trigger event when invitation is accepted Trigger an event when wpa_supplicant accepts an invitation to re-invoke a persistent group. Previously wpa_supplicant entered group formation without triggering any specific events and it could confuse clients, especially when operating with a driver that does not support concurrency between P2P and infrastructure connection. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-04-10 16:10:22 +02:00
if (go) {
wpa_msg_global(wpa_s, MSG_INFO,
P2P_EVENT_INVITATION_ACCEPTED
"sa=" MACSTR
" persistent=%d freq=%d",
MAC2STR(sa), s->id, op_freq);
} else {
wpa_msg_global(wpa_s, MSG_INFO,
P2P_EVENT_INVITATION_ACCEPTED
"sa=" MACSTR
" persistent=%d",
MAC2STR(sa), s->id);
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpas_p2p_group_add_persistent(
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
wpa_s, s, go, 0, op_freq, 0, 0, 0, 0, NULL,
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
go ? P2P_MAX_INITIAL_CONN_WAIT_GO_REINVOKE : 0,
1);
P2P: Fix invitation_received callback to use NULL bssid (if not known) Previously, the storage buffer for the Group BSSID was returned regardless of whether it was included in the invitation or not.
2010-09-07 16:35:42 +02:00
} else if (bssid) {
P2P: Set user_initiated_pd separately from the join parameter p2p_prov_disc_req() used the join parameter to figure out whether the PD request was a user initiated or not. This does not cover all use cases of PD, so add a separate parameter to allow caller to indicate whether the user requested the operation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-22 23:48:58 +01:00
wpa_s->user_initiated_pd = 0;
P2P: Trigger event when invitation is accepted Trigger an event when wpa_supplicant accepts an invitation to re-invoke a persistent group. Previously wpa_supplicant entered group formation without triggering any specific events and it could confuse clients, especially when operating with a driver that does not support concurrency between P2P and infrastructure connection. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-04-10 16:10:22 +02:00
wpa_msg_global(wpa_s, MSG_INFO,
P2P_EVENT_INVITATION_ACCEPTED
"sa=" MACSTR " go_dev_addr=" MACSTR
" bssid=" MACSTR " unknown-network",
MAC2STR(sa), MAC2STR(go_dev_addr),
MAC2STR(bssid));
P2P: Add command for pre-authorizing an invitation to an active group This is mainly designed for testing and allows p2p_connect join auth to be used to accept a specific invitation to an active group that may be received in the future.
2010-06-27 09:11:42 +02:00
wpas_p2p_join(wpa_s, bssid, go_dev_addr,
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 00:44:29 +02:00
wpa_s->p2p_wps_method, 0, op_freq,
P2P: Limit join-a-group scans based on SSID from invitation If we already know the SSID of the P2P group we are trying to join, use that SSID to limit scan responses and BSS selection since we do not really look for any other network in this case. In addition, this can fix cases where the peer has just changed its SSID (e.g., started a new group) and there may be multiple BSS entries for the same BSSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2014-01-13 20:39:06 +01:00
ssid, ssid_len);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
return;
}
if (status != P2P_SC_FAIL_INFO_CURRENTLY_UNAVAILABLE) {
wpa_printf(MSG_DEBUG, "P2P: Invitation from peer " MACSTR
" was rejected (status %u)", MAC2STR(sa), status);
return;
}
if (!s) {
if (bssid) {
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
wpa_msg_global(wpa_s, MSG_INFO,
P2P_EVENT_INVITATION_RECEIVED
"sa=" MACSTR " go_dev_addr=" MACSTR
" bssid=" MACSTR " unknown-network",
MAC2STR(sa), MAC2STR(go_dev_addr),
MAC2STR(bssid));
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
} else {
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
wpa_msg_global(wpa_s, MSG_INFO,
P2P_EVENT_INVITATION_RECEIVED
"sa=" MACSTR " go_dev_addr=" MACSTR
" unknown-network",
MAC2STR(sa), MAC2STR(go_dev_addr));
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
D-Bus: Add InvitationReceived Signal This is equivalent to the P2P_EVENT_INVITATION_RECEIVED signal on the control interface. It can be used to sent the Invitation Received signal to applications written using D-Bus. Signed-off-by: Maneesh Jain <maneesh.jain@samsung.com>
2015-06-18 06:16:34 +02:00
wpas_notify_p2p_invitation_received(wpa_s, sa, go_dev_addr,
bssid, 0, op_freq);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return;
}
P2P: Indicate frequency for upper layer invitation processing When a device that is a GO in a persistent group receives an Invitation Request from a P2P client and persistent_reconnect=0, upper layer is notified of this with P2P-INVITATION-RECEIVED event. The upper layer is supposed to run another invitation exchange is this case, but if that does not happen and the GO is started without successful (status=0) invitation exchange, the operating channel for the group may end up getting set in a way that the P2P client is not able to support. Provide optional freq parameter in the P2P-INVITATION-RECEIVED event on the GO side. If this parameter is received and the upper layer decides to issue P2P_GROUP_ADD command, that command should include this freq parameter to make sure the operating channel gets selected from the set that the peer can support. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-01 20:27:31 +01:00
if (s->mode == WPAS_MODE_P2P_GO && op_freq) {
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
wpa_msg_global(wpa_s, MSG_INFO, P2P_EVENT_INVITATION_RECEIVED
"sa=" MACSTR " persistent=%d freq=%d",
MAC2STR(sa), s->id, op_freq);
P2P: Indicate frequency for upper layer invitation processing When a device that is a GO in a persistent group receives an Invitation Request from a P2P client and persistent_reconnect=0, upper layer is notified of this with P2P-INVITATION-RECEIVED event. The upper layer is supposed to run another invitation exchange is this case, but if that does not happen and the GO is started without successful (status=0) invitation exchange, the operating channel for the group may end up getting set in a way that the P2P client is not able to support. Provide optional freq parameter in the P2P-INVITATION-RECEIVED event on the GO side. If this parameter is received and the upper layer decides to issue P2P_GROUP_ADD command, that command should include this freq parameter to make sure the operating channel gets selected from the set that the peer can support. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-01 20:27:31 +01:00
} else {
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
wpa_msg_global(wpa_s, MSG_INFO, P2P_EVENT_INVITATION_RECEIVED
"sa=" MACSTR " persistent=%d",
MAC2STR(sa), s->id);
P2P: Indicate frequency for upper layer invitation processing When a device that is a GO in a persistent group receives an Invitation Request from a P2P client and persistent_reconnect=0, upper layer is notified of this with P2P-INVITATION-RECEIVED event. The upper layer is supposed to run another invitation exchange is this case, but if that does not happen and the GO is started without successful (status=0) invitation exchange, the operating channel for the group may end up getting set in a way that the P2P client is not able to support. Provide optional freq parameter in the P2P-INVITATION-RECEIVED event on the GO side. If this parameter is received and the upper layer decides to issue P2P_GROUP_ADD command, that command should include this freq parameter to make sure the operating channel gets selected from the set that the peer can support. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-01 20:27:31 +01:00
}
D-Bus: Add InvitationReceived Signal This is equivalent to the P2P_EVENT_INVITATION_RECEIVED signal on the control interface. It can be used to sent the Invitation Received signal to applications written using D-Bus. Signed-off-by: Maneesh Jain <maneesh.jain@samsung.com>
2015-06-18 06:16:34 +02:00
wpas_notify_p2p_invitation_received(wpa_s, sa, go_dev_addr, bssid,
s->id, op_freq);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Remove persistent group peer if it rejects invitation If a peer replies to persistent group invitation with status code 8 (unknown group), remove the peer from the p2p_client_list if we are the GO or remove the persistent group if we are the P2P client since it looks like that the peer has dropped persistent group credentials and the provisioning step needs to be executed again. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-15 15:31:31 +01:00
static void wpas_remove_persistent_peer(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid,
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
const u8 *peer, int inv)
P2P: Remove persistent group peer if it rejects invitation If a peer replies to persistent group invitation with status code 8 (unknown group), remove the peer from the p2p_client_list if we are the GO or remove the persistent group if we are the P2P client since it looks like that the peer has dropped persistent group credentials and the provisioning step needs to be executed again. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-15 15:31:31 +01:00
{
size_t i;
P2P: Fix wpas_remove_persistent_peer() to use P2P mgmt interface The function used wpa_s->parent->conf to iterate the P2P networks and update the configuration file. However, wpa_s->parent is not necessarily the interface used to manage the P2P Device operations. Fix this by accessing the configuration file of the interface initialized to manage the P2P Device operations. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-05-12 16:40:01 +02:00
struct wpa_supplicant *p2p_wpa_s = wpa_s->global->p2p_init_wpa_s;
P2P: Remove persistent group peer if it rejects invitation If a peer replies to persistent group invitation with status code 8 (unknown group), remove the peer from the p2p_client_list if we are the GO or remove the persistent group if we are the P2P client since it looks like that the peer has dropped persistent group credentials and the provisioning step needs to be executed again. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-15 15:31:31 +01:00
if (ssid == NULL)
return;
for (i = 0; ssid->p2p_client_list && i < ssid->num_p2p_clients; i++) {
Add address masks to BSSID lists In many applications it is useful not just to enumerate a group of well known access points, but to use a address/mask notation to match an entire set of addresses (ca:ff:ee:00:00:00/ff:ff:ff:00:00:00). This change expands the data structures used by MAC lists to include a mask indicating the significant (non-masked) portions of an address and extends the list parser to recognize mask suffixes. Signed-off-by: Stefan Tomanek <stefan.tomanek@wertarbyte.de>
2015-01-05 21:10:16 +01:00
if (os_memcmp(ssid->p2p_client_list + i * 2 * ETH_ALEN, peer,
P2P: Remove persistent group peer if it rejects invitation If a peer replies to persistent group invitation with status code 8 (unknown group), remove the peer from the p2p_client_list if we are the GO or remove the persistent group if we are the P2P client since it looks like that the peer has dropped persistent group credentials and the provisioning step needs to be executed again. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-15 15:31:31 +01:00
ETH_ALEN) == 0)
break;
}
P2P: Add explicit check for ssid->p2p_client_list != NULL This would not really be needed since these functions check the pointer above. However, this seems to be too difficult for some static analyzer, so add the extra check to avoid false reports. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-07-02 23:53:13 +02:00
if (i >= ssid->num_p2p_clients || !ssid->p2p_client_list) {
P2P: Remove persistent group peer if it rejects invitation If a peer replies to persistent group invitation with status code 8 (unknown group), remove the peer from the p2p_client_list if we are the GO or remove the persistent group if we are the P2P client since it looks like that the peer has dropped persistent group credentials and the provisioning step needs to be executed again. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-15 15:31:31 +01:00
if (ssid->mode != WPAS_MODE_P2P_GO &&
os_memcmp(ssid->bssid, peer, ETH_ALEN) == 0) {
wpa_printf(MSG_DEBUG, "P2P: Remove persistent group %d "
"due to invitation result", ssid->id);
wpas_notify_network_removed(wpa_s, ssid);
wpa_config_remove_network(wpa_s->conf, ssid->id);
return;
}
return; /* Peer not found in client list */
}
wpa_printf(MSG_DEBUG, "P2P: Remove peer " MACSTR " from persistent "
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
"group %d client list%s",
MAC2STR(peer), ssid->id,
inv ? " due to invitation result" : "");
Add address masks to BSSID lists In many applications it is useful not just to enumerate a group of well known access points, but to use a address/mask notation to match an entire set of addresses (ca:ff:ee:00:00:00/ff:ff:ff:00:00:00). This change expands the data structures used by MAC lists to include a mask indicating the significant (non-masked) portions of an address and extends the list parser to recognize mask suffixes. Signed-off-by: Stefan Tomanek <stefan.tomanek@wertarbyte.de>
2015-01-05 21:10:16 +01:00
os_memmove(ssid->p2p_client_list + i * 2 * ETH_ALEN,
ssid->p2p_client_list + (i + 1) * 2 * ETH_ALEN,
(ssid->num_p2p_clients - i - 1) * 2 * ETH_ALEN);
P2P: Remove persistent group peer if it rejects invitation If a peer replies to persistent group invitation with status code 8 (unknown group), remove the peer from the p2p_client_list if we are the GO or remove the persistent group if we are the P2P client since it looks like that the peer has dropped persistent group credentials and the provisioning step needs to be executed again. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-15 15:31:31 +01:00
ssid->num_p2p_clients--;
P2P: Fix wpas_remove_persistent_peer() to use P2P mgmt interface The function used wpa_s->parent->conf to iterate the P2P networks and update the configuration file. However, wpa_s->parent is not necessarily the interface used to manage the P2P Device operations. Fix this by accessing the configuration file of the interface initialized to manage the P2P Device operations. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-05-12 16:40:01 +02:00
if (p2p_wpa_s->conf->update_config &&
wpa_config_write(p2p_wpa_s->confname, p2p_wpa_s->conf))
P2P: Remove persistent group peer if it rejects invitation If a peer replies to persistent group invitation with status code 8 (unknown group), remove the peer from the p2p_client_list if we are the GO or remove the persistent group if we are the P2P client since it looks like that the peer has dropped persistent group credentials and the provisioning step needs to be executed again. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-15 15:31:31 +01:00
wpa_printf(MSG_DEBUG, "P2P: Failed to update configuration");
}
static void wpas_remove_persistent_client(struct wpa_supplicant *wpa_s,
const u8 *peer)
{
struct wpa_ssid *ssid;
wpa_s = wpa_s->global->p2p_invite_group;
if (wpa_s == NULL)
return; /* No known invitation group */
ssid = wpa_s->current_ssid;
if (ssid == NULL || ssid->mode != WPAS_MODE_P2P_GO ||
!ssid->p2p_persistent_group)
return; /* Not operating as a GO in persistent group */
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
ssid = wpas_p2p_get_persistent(wpa_s->p2pdev, peer,
P2P: Remove persistent group peer if it rejects invitation If a peer replies to persistent group invitation with status code 8 (unknown group), remove the peer from the p2p_client_list if we are the GO or remove the persistent group if we are the P2P client since it looks like that the peer has dropped persistent group credentials and the provisioning step needs to be executed again. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-15 15:31:31 +01:00
ssid->ssid, ssid->ssid_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
wpas_remove_persistent_peer(wpa_s, ssid, peer, 1);
P2P: Remove persistent group peer if it rejects invitation If a peer replies to persistent group invitation with status code 8 (unknown group), remove the peer from the p2p_client_list if we are the GO or remove the persistent group if we are the P2P client since it looks like that the peer has dropped persistent group credentials and the provisioning step needs to be executed again. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-15 15:31:31 +01:00
}
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
static void wpas_invitation_result(void *ctx, int status, const u8 *bssid,
P2P: Remove persistent group peer if it rejects invitation If a peer replies to persistent group invitation with status code 8 (unknown group), remove the peer from the p2p_client_list if we are the GO or remove the persistent group if we are the P2P client since it looks like that the peer has dropped persistent group credentials and the provisioning step needs to be executed again. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-15 15:31:31 +01:00
const struct p2p_channels *channels,
P2P: Optimize scan for GO during persistent group invocation Scan for GO on the negotiated operating channel for few iterations before searching on all the supported channels during persistent group reinvocation. In addition, use the already known SSID of the group in the scans. These optimizations reduce group formation time. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-21 13:56:02 +01:00
const u8 *peer, int neg_freq,
int peer_oper_freq)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct wpa_supplicant *wpa_s = ctx;
struct wpa_ssid *ssid;
P2P: Optimize scan for GO during persistent group invocation Scan for GO on the negotiated operating channel for few iterations before searching on all the supported channels during persistent group reinvocation. In addition, use the already known SSID of the group in the scans. These optimizations reduce group formation time. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-21 13:56:02 +01:00
int freq;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (bssid) {
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
wpa_msg_global(wpa_s, MSG_INFO, P2P_EVENT_INVITATION_RESULT
"status=%d " MACSTR,
status, MAC2STR(bssid));
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
} else {
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
wpa_msg_global(wpa_s, MSG_INFO, P2P_EVENT_INVITATION_RESULT
"status=%d ", status);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Add invitation result notification Add a notification function for the result of an invitation. Signed-off-by: Jean-Michel Bachot <jean-michelx.bachot@linux.intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-24 21:40:21 +01:00
wpas_notify_p2p_invitation_result(wpa_s, status, bssid);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Remove persistent group peer if it rejects invitation If a peer replies to persistent group invitation with status code 8 (unknown group), remove the peer from the p2p_client_list if we are the GO or remove the persistent group if we are the P2P client since it looks like that the peer has dropped persistent group credentials and the provisioning step needs to be executed again. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-15 15:31:31 +01:00
wpa_printf(MSG_DEBUG, "P2P: Invitation result - status=%d peer=" MACSTR,
status, MAC2STR(peer));
if (wpa_s->pending_invite_ssid_id == -1) {
P2P: Set p2p_go_wait_client in invitation_result() cb When an invitation to join an existing group is accepted by the peer device, set p2p_go_wait_client to the current time so that wpas_p2p_in_progress() would return != 0, thus preventing P2P CSA, scanning etc., that would interfere with the peer device connection. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-11-22 14:57:50 +01:00
struct wpa_supplicant *group_if =
wpa_s->global->p2p_invite_group;
P2P: Remove persistent group peer if it rejects invitation If a peer replies to persistent group invitation with status code 8 (unknown group), remove the peer from the p2p_client_list if we are the GO or remove the persistent group if we are the P2P client since it looks like that the peer has dropped persistent group credentials and the provisioning step needs to be executed again. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-15 15:31:31 +01:00
if (status == P2P_SC_FAIL_UNKNOWN_GROUP)
wpas_remove_persistent_client(wpa_s, peer);
P2P: Set p2p_go_wait_client in invitation_result() cb When an invitation to join an existing group is accepted by the peer device, set p2p_go_wait_client to the current time so that wpas_p2p_in_progress() would return != 0, thus preventing P2P CSA, scanning etc., that would interfere with the peer device connection. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-11-22 14:57:50 +01:00
/*
* Invitation to an active group. If this is successful and we
* are the GO, set the client wait to postpone some concurrent
* operations and to allow provisioning and connection to happen
* more quickly.
*/
if (status == P2P_SC_SUCCESS &&
group_if && group_if->current_ssid &&
P2P: Add a testing option to force P2P GO CSA Add a testing option to force a P2P GO CSA on successful invitation to join an active P2P GO. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-11-22 14:57:51 +01:00
group_if->current_ssid->mode == WPAS_MODE_P2P_GO) {
P2P: Set p2p_go_wait_client in invitation_result() cb When an invitation to join an existing group is accepted by the peer device, set p2p_go_wait_client to the current time so that wpas_p2p_in_progress() would return != 0, thus preventing P2P CSA, scanning etc., that would interfere with the peer device connection. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-11-22 14:57:50 +01:00
os_get_reltime(&wpa_s->global->p2p_go_wait_client);
P2P: Add a testing option to force P2P GO CSA Add a testing option to force a P2P GO CSA on successful invitation to join an active P2P GO. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-11-22 14:57:51 +01:00
#ifdef CONFIG_TESTING_OPTIONS
if (group_if->p2p_go_csa_on_inv) {
wpa_printf(MSG_DEBUG,
"Testing: force P2P GO CSA after invitation");
eloop_cancel_timeout(
wpas_p2p_reconsider_moving_go,
wpa_s, NULL);
eloop_register_timeout(
0, 50000,
wpas_p2p_reconsider_moving_go,
wpa_s, NULL);
}
#endif /* CONFIG_TESTING_OPTIONS */
}
P2P: Set p2p_go_wait_client in invitation_result() cb When an invitation to join an existing group is accepted by the peer device, set p2p_go_wait_client to the current time so that wpas_p2p_in_progress() would return != 0, thus preventing P2P CSA, scanning etc., that would interfere with the peer device connection. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-11-22 14:57:50 +01:00
return;
P2P: Remove persistent group peer if it rejects invitation If a peer replies to persistent group invitation with status code 8 (unknown group), remove the peer from the p2p_client_list if we are the GO or remove the persistent group if we are the P2P client since it looks like that the peer has dropped persistent group credentials and the provisioning step needs to be executed again. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-15 15:31:31 +01:00
}
P2P: Stop early when processing not-persistent invitation result
2010-06-27 09:27:08 +02:00
P2P: Mark peer authorized for persistent group invitation When p2p_invite persistent=<id> is used to request a persistent group to be re-invoked, the peer may reply with status=1 (info not yet available) if upper layer processing of the invitiation is requested. The peer is ten expected to start another invitation exchanged within 120 seconds if the user authorizes the connection. Allow this process to be used more easily by automatically authorizing the peer that we tried to invite to use this second invitation sequence even if persistent_reconnect=0. For this mechanism to work, the device that starts the invitation needs to start listen mode to be able to receive the invitation request from the peer. At least for now, this is not done automatically, but future changes could potentially enable this automatically at least if there are no concurrent operations in progress. Example sequence on the initiator: cmd: P2P_INVITE persistent=1 peer=<addr> event: P2P-INVITATION-RESULT status=1 cmd: P2P_LISTEN 120 wait for peer to start another invitiation round.. group will be re-invoked automatically On the peer (with persistent_reconnect=0): event: P2P-INVITATION-RECEIVED sa=<addr> persistent=1 [freq=<MHz>] wait for user approval cmd: P2P_INVITE persistent=1 peer=<addr> group will be re-invoked automatically Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-01 20:32:33 +01:00
if (status == P2P_SC_FAIL_INFO_CURRENTLY_UNAVAILABLE) {
wpa_printf(MSG_DEBUG, "P2P: Waiting for peer to start another "
"invitation exchange to indicate readiness for "
"re-invocation");
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (status != P2P_SC_SUCCESS) {
P2P: Remove persistent group peer if it rejects invitation If a peer replies to persistent group invitation with status code 8 (unknown group), remove the peer from the p2p_client_list if we are the GO or remove the persistent group if we are the P2P client since it looks like that the peer has dropped persistent group credentials and the provisioning step needs to be executed again. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-15 15:31:31 +01:00
if (status == P2P_SC_FAIL_UNKNOWN_GROUP) {
ssid = wpa_config_get_network(
wpa_s->conf, wpa_s->pending_invite_ssid_id);
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
wpas_remove_persistent_peer(wpa_s, ssid, peer, 1);
P2P: Remove persistent group peer if it rejects invitation If a peer replies to persistent group invitation with status code 8 (unknown group), remove the peer from the p2p_client_list if we are the GO or remove the persistent group if we are the P2P client since it looks like that the peer has dropped persistent group credentials and the provisioning step needs to be executed again. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-15 15:31:31 +01:00
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpas_p2p_remove_pending_group_interface(wpa_s);
return;
}
ssid = wpa_config_get_network(wpa_s->conf,
wpa_s->pending_invite_ssid_id);
if (ssid == NULL) {
wpa_printf(MSG_ERROR, "P2P: Could not find persistent group "
"data matching with invitation");
return;
}
P2P: Improve robustness against lost ctrl::ack frames P2P includes two use cases where one of the devices is going to start a group and likely change channels immediately after processing a frame. This operation may be fast enough to make the device leave the current channel before the peer has completed layer 2 retransmission of the frame in case the ctrl::ack frame was lost. This can result in the peer not getting TX status success notification. For GO Negotiation Confirm frame, p2p_go_neg_conf_cb() has a workaround that ignores the TX status failure and will continue with the group formation with the assumption that the peer actually received the frame even though we did not receive ctrl::ack. For Invitation Response frame to re-invoke a persistent group, no such workaround is used in p2p_invitation_resp_cb(). Consequently, TX status failure due to lost ctrl::ack frame results in one of the peers not starting the group. Increase the likelihood of layer 2 retransmission getting acknowledged and ctrl::ack being received by waiting a short duration after having processed the GO Negotiation Confirm and Invitation Response frames for the re-invocation case. For the former, use 20 ms wait since this case has been worked around in deployed devices. For the latter, use 50 ms wait to get even higher likelihood of getting ctrl::ack through since deployed devices (and the current wpa_supplicant implementation) do not have a workaround to ignore TX status failure. 20 ms is long enough to include at least couple of retries and that should increase likelihood of getting ctrl::ack through quite a bit. The longer 50 ms wait is likely to include full set of layer 2 retries. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-10-13 16:33:16 +02:00
/*
* The peer could have missed our ctrl::ack frame for Invitation
* Response and continue retransmitting the frame. To reduce the
* likelihood of the peer not getting successful TX status for the
* Invitation Response frame, wait a short time here before starting
* the persistent group so that we will remain on the current channel to
* acknowledge any possible retransmission from the peer.
*/
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: 50 ms wait on current channel before "
"starting persistent group");
os_sleep(0, 50000);
P2P: Optimize scan for GO during persistent group invocation Scan for GO on the negotiated operating channel for few iterations before searching on all the supported channels during persistent group reinvocation. In addition, use the already known SSID of the group in the scans. These optimizations reduce group formation time. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-21 13:56:02 +01:00
if (neg_freq > 0 && ssid->mode == WPAS_MODE_P2P_GO &&
P2P: Move a GO to a frequency that is also supported by the client A P2P GO interface that was instantiated after a GO Negotiation or Invitation holds the intersection of frequencies between the GO and the client. In case the GO is going to move to another frequency, allow it to move only to a frequency that is also supported by the client. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:21 +02:00
freq_included(wpa_s, channels, neg_freq))
P2P: Optimize scan for GO during persistent group invocation Scan for GO on the negotiated operating channel for few iterations before searching on all the supported channels during persistent group reinvocation. In addition, use the already known SSID of the group in the scans. These optimizations reduce group formation time. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-21 13:56:02 +01:00
freq = neg_freq;
else if (peer_oper_freq > 0 && ssid->mode != WPAS_MODE_P2P_GO &&
P2P: Move a GO to a frequency that is also supported by the client A P2P GO interface that was instantiated after a GO Negotiation or Invitation holds the intersection of frequencies between the GO and the client. In case the GO is going to move to another frequency, allow it to move only to a frequency that is also supported by the client. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:21 +02:00
freq_included(wpa_s, channels, peer_oper_freq))
P2P: Optimize scan for GO during persistent group invocation Scan for GO on the negotiated operating channel for few iterations before searching on all the supported channels during persistent group reinvocation. In addition, use the already known SSID of the group in the scans. These optimizations reduce group formation time. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-21 13:56:02 +01:00
freq = peer_oper_freq;
else
freq = 0;
wpa_printf(MSG_DEBUG, "P2P: Persistent group invitation success - op_freq=%d MHz SSID=%s",
freq, wpa_ssid_txt(ssid->ssid, ssid->ssid_len));
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpas_p2p_group_add_persistent(wpa_s, ssid,
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
ssid->mode == WPAS_MODE_P2P_GO,
Fix persistent P2P connection failure in case channel list changes P2P persistent connection may fail due to 802.11d channel change event invalidating support of the operating frequency sent in the invitation request, before receiving the invitation response. If the operating frequency is invalid at the time the invitation response is processed and there is no forced frequency provided by user, allow frequency re-selection. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2014-01-27 15:46:02 +01:00
wpa_s->p2p_persistent_go_freq,
P2P: Optimize scan for GO during persistent group invocation Scan for GO on the negotiated operating channel for few iterations before searching on all the supported channels during persistent group reinvocation. In addition, use the already known SSID of the group in the scans. These optimizations reduce group formation time. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-21 13:56:02 +01:00
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
wpa_s->p2p_go_vht_center_freq2,
P2P: Add VHT parameter to P2P operations Add the option to ask for VHT operation similarly to the way ht40 is configured - either by adding 'vht' param to the relevant p2p_* commands or by configuring p2p_go_vht=1 in the configuration file. This patch only adds the configuration option (e.g., via control interface). The actual handling of the VHT parameter (asking the driver to use VHT, etc.) will be done by the following patch. Signed-hostap: Eliad Peller <eliadx.peller@intel.com>
2013-10-27 18:46:17 +01:00
wpa_s->p2p_go_ht40, wpa_s->p2p_go_vht,
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
wpa_s->p2p_go_max_oper_chwidth,
P2P: Add VHT parameter to P2P operations Add the option to ask for VHT operation similarly to the way ht40 is configured - either by adding 'vht' param to the relevant p2p_* commands or by configuring p2p_go_vht=1 in the configuration file. This patch only adds the configuration option (e.g., via control interface). The actual handling of the VHT parameter (asking the driver to use VHT, etc.) will be done by the following patch. Signed-hostap: Eliad Peller <eliadx.peller@intel.com>
2013-10-27 18:46:17 +01:00
channels,
P2P: Use group formation timeout on persistent group GO Previously, GO considered the group to be fully re-invoked after starting beaconing on successful invitation exchange. This would leave the group running until idle timeout (which may not be enabled) or explicit removal if the client fails to connect for any reason. Since the client is expected to connect immediately after the invitation exchange that ends with status=0 (i.e., either client initiated the exchange or it responded with success), extend group formation timeout to cover that period until the first successfully completed data connection. This allows the GO to remove the group automatically if the client devices does not connect within P2P_MAX_INITIAL_CONN_WAIT_GO_REINVOKE (15) seconds. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-26 20:24:09 +02:00
ssid->mode == WPAS_MODE_P2P_GO ?
P2P_MAX_INITIAL_CONN_WAIT_GO_REINVOKE :
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
0, 1);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Allow channels to be removed from P2P use A list of disallowed frequencies for P2P channel list can now be configured with P2P_SET disallow_freq. The frequencies (or frequency pairs) are comma separated. For example: wpa_cli p2p_set disallow_freq 2462,5000-6000 The allowed P2P channel list is constructed by removing explicitly disallowed channels from the channel list received from the driver. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-17 21:57:13 +01:00
static int wpas_p2p_disallowed_freq(struct wpa_global *global,
unsigned int freq)
{
P2P: Apply unsafe frequency rules to available channels This adds a QCA vendor specific nl80211 event to allow the driver to indicate a list of frequency ranges that should be avoided due to interference or possible known co-existance constraints. Such frequencies are marked as not allowed for P2P use to force groups to be formed on different channels. If a P2P GO is operating on a channel that the driver recommended not to use, a notification about this is sent on the control interface and upper layer code may decide to tear down the group and optionally restart it on another channel. As a TODO item, this could also be changed to use CSA to avoid removing the group. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2014-01-24 15:14:29 +01:00
if (freq_range_list_includes(&global->p2p_go_avoid_freq, freq))
return 1;
Make frequency range list routines more general This allows the frequency range list implementation to be shared for other purposes. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-22 18:10:56 +02:00
return freq_range_list_includes(&global->p2p_disallow_freq, freq);
P2P: Allow channels to be removed from P2P use A list of disallowed frequencies for P2P channel list can now be configured with P2P_SET disallow_freq. The frequencies (or frequency pairs) are comma separated. For example: wpa_cli p2p_set disallow_freq 2462,5000-6000 The allowed P2P channel list is constructed by removing explicitly disallowed channels from the channel list received from the driver. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-17 21:57:13 +01:00
}
static void wpas_p2p_add_chan(struct p2p_reg_class *reg, u8 chan)
{
reg->channel[reg->channels] = chan;
reg->channels++;
}
P2P: Set channel list per channel instead of per band This makes the channel list match with driver capabilities without having to do workaround like disabling channels 12-14.
2010-10-15 17:51:37 +02:00
static int wpas_p2p_default_channels(struct wpa_supplicant *wpa_s,
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
struct p2p_channels *chan,
struct p2p_channels *cli_chan)
P2P: Set channel list per channel instead of per band This makes the channel list match with driver capabilities without having to do workaround like disabling channels 12-14.
2010-10-15 17:51:37 +02:00
{
int i, cla = 0;
P2P: Search all 2.4 GHz social channels regardless of disallow_freq Commit 1595eb93aee0239de51f1090d4528e4b2cfe3add ('P2P: Add support for 60 GHz social channel') had an unintended change to how P2P search scans 2.4 GHz social channels. Use of p2p_supported_freq() to filter the list of social channels ended up using the disallow_freq setting to remove social channels from the P2P search scans. This is not desired since peers need to be found on any of the social channels even if those channels have been disabled from P2P operating channel use. Restore the previous behavior by included all the 2.4 GHz social channels in P2P search scans if the driver indicated support for the 2.4 GHz band. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-22 19:02:48 +02:00
wpa_s->global->p2p_24ghz_social_channels = 1;
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
os_memset(cli_chan, 0, sizeof(*cli_chan));
P2P: Set channel list per channel instead of per band This makes the channel list match with driver capabilities without having to do workaround like disabling channels 12-14.
2010-10-15 17:51:37 +02:00
wpa_printf(MSG_DEBUG, "P2P: Enable operating classes for 2.4 GHz "
"band");
/* Operating class 81 - 2.4 GHz band channels 1..13 */
chan->reg_class[cla].reg_class = 81;
P2P: Allow channels to be removed from P2P use A list of disallowed frequencies for P2P channel list can now be configured with P2P_SET disallow_freq. The frequencies (or frequency pairs) are comma separated. For example: wpa_cli p2p_set disallow_freq 2462,5000-6000 The allowed P2P channel list is constructed by removing explicitly disallowed channels from the channel list received from the driver. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-17 21:57:13 +01:00
chan->reg_class[cla].channels = 0;
for (i = 0; i < 11; i++) {
if (!wpas_p2p_disallowed_freq(wpa_s->global, 2412 + i * 5))
wpas_p2p_add_chan(&chan->reg_class[cla], i + 1);
}
if (chan->reg_class[cla].channels)
cla++;
P2P: Set channel list per channel instead of per band This makes the channel list match with driver capabilities without having to do workaround like disabling channels 12-14.
2010-10-15 17:51:37 +02:00
wpa_printf(MSG_DEBUG, "P2P: Enable operating classes for lower 5 GHz "
"band");
/* Operating class 115 - 5 GHz, channels 36-48 */
chan->reg_class[cla].reg_class = 115;
P2P: Allow channels to be removed from P2P use A list of disallowed frequencies for P2P channel list can now be configured with P2P_SET disallow_freq. The frequencies (or frequency pairs) are comma separated. For example: wpa_cli p2p_set disallow_freq 2462,5000-6000 The allowed P2P channel list is constructed by removing explicitly disallowed channels from the channel list received from the driver. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-17 21:57:13 +01:00
chan->reg_class[cla].channels = 0;
if (!wpas_p2p_disallowed_freq(wpa_s->global, 5000 + 36 * 5))
wpas_p2p_add_chan(&chan->reg_class[cla], 36);
if (!wpas_p2p_disallowed_freq(wpa_s->global, 5000 + 40 * 5))
wpas_p2p_add_chan(&chan->reg_class[cla], 40);
if (!wpas_p2p_disallowed_freq(wpa_s->global, 5000 + 44 * 5))
wpas_p2p_add_chan(&chan->reg_class[cla], 44);
if (!wpas_p2p_disallowed_freq(wpa_s->global, 5000 + 48 * 5))
wpas_p2p_add_chan(&chan->reg_class[cla], 48);
if (chan->reg_class[cla].channels)
cla++;
P2P: Set channel list per channel instead of per band This makes the channel list match with driver capabilities without having to do workaround like disabling channels 12-14.
2010-10-15 17:51:37 +02:00
wpa_printf(MSG_DEBUG, "P2P: Enable operating classes for higher 5 GHz "
"band");
/* Operating class 124 - 5 GHz, channels 149,153,157,161 */
chan->reg_class[cla].reg_class = 124;
P2P: Allow channels to be removed from P2P use A list of disallowed frequencies for P2P channel list can now be configured with P2P_SET disallow_freq. The frequencies (or frequency pairs) are comma separated. For example: wpa_cli p2p_set disallow_freq 2462,5000-6000 The allowed P2P channel list is constructed by removing explicitly disallowed channels from the channel list received from the driver. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-17 21:57:13 +01:00
chan->reg_class[cla].channels = 0;
if (!wpas_p2p_disallowed_freq(wpa_s->global, 5000 + 149 * 5))
wpas_p2p_add_chan(&chan->reg_class[cla], 149);
if (!wpas_p2p_disallowed_freq(wpa_s->global, 5000 + 153 * 5))
wpas_p2p_add_chan(&chan->reg_class[cla], 153);
if (!wpas_p2p_disallowed_freq(wpa_s->global, 5000 + 156 * 5))
wpas_p2p_add_chan(&chan->reg_class[cla], 157);
if (!wpas_p2p_disallowed_freq(wpa_s->global, 5000 + 161 * 5))
wpas_p2p_add_chan(&chan->reg_class[cla], 161);
if (chan->reg_class[cla].channels)
cla++;
P2P: Set channel list per channel instead of per band This makes the channel list match with driver capabilities without having to do workaround like disabling channels 12-14.
2010-10-15 17:51:37 +02:00
chan->reg_classes = cla;
return 0;
}
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
enum chan_allowed {
wpa_supplicant: Use the 'no_ir' notation Use the 'no_ir' notation instead of the 'passive scan' and 'no_ibss' notations to match the earlier change in nl80211. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-07-07 13:20:54 +02:00
NOT_ALLOWED, NO_IR, ALLOWED
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
};
P2P: Allow channels to be removed from P2P use A list of disallowed frequencies for P2P channel list can now be configured with P2P_SET disallow_freq. The frequencies (or frequency pairs) are comma separated. For example: wpa_cli p2p_set disallow_freq 2462,5000-6000 The allowed P2P channel list is constructed by removing explicitly disallowed channels from the channel list received from the driver. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-17 21:57:13 +01:00
static int has_channel(struct wpa_global *global,
struct hostapd_hw_modes *mode, u8 chan, int *flags)
P2P: Set channel list per channel instead of per band This makes the channel list match with driver capabilities without having to do workaround like disabling channels 12-14.
2010-10-15 17:51:37 +02:00
{
int i;
P2P: Allow channels to be removed from P2P use A list of disallowed frequencies for P2P channel list can now be configured with P2P_SET disallow_freq. The frequencies (or frequency pairs) are comma separated. For example: wpa_cli p2p_set disallow_freq 2462,5000-6000 The allowed P2P channel list is constructed by removing explicitly disallowed channels from the channel list received from the driver. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-17 21:57:13 +01:00
unsigned int freq;
freq = (mode->mode == HOSTAPD_MODE_IEEE80211A ? 5000 : 2407) +
chan * 5;
if (wpas_p2p_disallowed_freq(global, freq))
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
return NOT_ALLOWED;
P2P: Set channel list per channel instead of per band This makes the channel list match with driver capabilities without having to do workaround like disabling channels 12-14.
2010-10-15 17:51:37 +02:00
for (i = 0; i < mode->num_channels; i++) {
if (mode->channels[i].chan == chan) {
P2P: Add HT40 operating classes based on driver channel flags This allows P2P to negotiate HT40 channels. For now, only 5 GHz HT40 operating classes are enabled.
2010-11-12 17:14:12 +01:00
if (flags)
*flags = mode->channels[i].flag;
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
if (mode->channels[i].flag &
(HOSTAPD_CHAN_DISABLED |
HOSTAPD_CHAN_RADAR))
return NOT_ALLOWED;
wpa_supplicant: Use the 'no_ir' notation Use the 'no_ir' notation instead of the 'passive scan' and 'no_ibss' notations to match the earlier change in nl80211. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-07-07 13:20:54 +02:00
if (mode->channels[i].flag & HOSTAPD_CHAN_NO_IR)
return NO_IR;
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
return ALLOWED;
P2P: Set channel list per channel instead of per band This makes the channel list match with driver capabilities without having to do workaround like disabling channels 12-14.
2010-10-15 17:51:37 +02:00
}
}
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
return NOT_ALLOWED;
P2P: Set channel list per channel instead of per band This makes the channel list match with driver capabilities without having to do workaround like disabling channels 12-14.
2010-10-15 17:51:37 +02:00
}
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
static int wpas_p2p_get_center_80mhz(struct wpa_supplicant *wpa_s,
struct hostapd_hw_modes *mode,
u8 channel)
{
u8 center_channels[] = { 42, 58, 106, 122, 138, 155 };
unsigned int i;
if (mode->mode != HOSTAPD_MODE_IEEE80211A)
return 0;
for (i = 0; i < ARRAY_SIZE(center_channels); i++)
/*
* In 80 MHz, the bandwidth "spans" 12 channels (e.g., 36-48),
* so the center channel is 6 channels away from the start/end.
*/
if (channel >= center_channels[i] - 6 &&
channel <= center_channels[i] + 6)
return center_channels[i];
return 0;
}
static enum chan_allowed wpas_p2p_verify_80mhz(struct wpa_supplicant *wpa_s,
struct hostapd_hw_modes *mode,
u8 channel, u8 bw)
{
u8 center_chan;
int i, flags;
enum chan_allowed res, ret = ALLOWED;
center_chan = wpas_p2p_get_center_80mhz(wpa_s, mode, channel);
if (!center_chan)
return NOT_ALLOWED;
if (center_chan >= 58 && center_chan <= 138)
return NOT_ALLOWED; /* Do not allow DFS channels for P2P */
/* check all the channels are available */
for (i = 0; i < 4; i++) {
int adj_chan = center_chan - 6 + i * 4;
res = has_channel(wpa_s->global, mode, adj_chan, &flags);
if (res == NOT_ALLOWED)
return NOT_ALLOWED;
wpa_supplicant: Use the 'no_ir' notation Use the 'no_ir' notation instead of the 'passive scan' and 'no_ibss' notations to match the earlier change in nl80211. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-07-07 13:20:54 +02:00
if (res == NO_IR)
ret = NO_IR;
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
if (i == 0 && !(flags & HOSTAPD_CHAN_VHT_10_70))
return NOT_ALLOWED;
if (i == 1 && !(flags & HOSTAPD_CHAN_VHT_30_50))
return NOT_ALLOWED;
if (i == 2 && !(flags & HOSTAPD_CHAN_VHT_50_30))
return NOT_ALLOWED;
if (i == 3 && !(flags & HOSTAPD_CHAN_VHT_70_10))
return NOT_ALLOWED;
}
return ret;
}
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
static int wpas_p2p_get_center_160mhz(struct wpa_supplicant *wpa_s,
struct hostapd_hw_modes *mode,
u8 channel)
{
u8 center_channels[] = { 50, 114 };
unsigned int i;
if (mode->mode != HOSTAPD_MODE_IEEE80211A)
return 0;
for (i = 0; i < ARRAY_SIZE(center_channels); i++)
/*
* In 160 MHz, the bandwidth "spans" 28 channels (e.g., 36-64),
* so the center channel is 14 channels away from the start/end.
*/
if (channel >= center_channels[i] - 14 &&
channel <= center_channels[i] + 14)
return center_channels[i];
return 0;
}
static enum chan_allowed wpas_p2p_verify_160mhz(struct wpa_supplicant *wpa_s,
struct hostapd_hw_modes *mode,
u8 channel, u8 bw)
{
u8 center_chan;
int i, flags;
enum chan_allowed res, ret = ALLOWED;
center_chan = wpas_p2p_get_center_160mhz(wpa_s, mode, channel);
if (!center_chan)
return NOT_ALLOWED;
/* VHT 160 MHz uses DFS channels in most countries. */
/* Check all the channels are available */
for (i = 0; i < 8; i++) {
int adj_chan = center_chan - 14 + i * 4;
res = has_channel(wpa_s->global, mode, adj_chan, &flags);
if (res == NOT_ALLOWED)
return NOT_ALLOWED;
if (res == NO_IR)
ret = NO_IR;
if (i == 0 && !(flags & HOSTAPD_CHAN_VHT_10_150))
return NOT_ALLOWED;
if (i == 1 && !(flags & HOSTAPD_CHAN_VHT_30_130))
return NOT_ALLOWED;
if (i == 2 && !(flags & HOSTAPD_CHAN_VHT_50_110))
return NOT_ALLOWED;
if (i == 3 && !(flags & HOSTAPD_CHAN_VHT_70_90))
return NOT_ALLOWED;
if (i == 4 && !(flags & HOSTAPD_CHAN_VHT_90_70))
return NOT_ALLOWED;
if (i == 5 && !(flags & HOSTAPD_CHAN_VHT_110_50))
return NOT_ALLOWED;
if (i == 6 && !(flags & HOSTAPD_CHAN_VHT_130_30))
return NOT_ALLOWED;
if (i == 7 && !(flags & HOSTAPD_CHAN_VHT_150_10))
return NOT_ALLOWED;
}
return ret;
}
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
static enum chan_allowed wpas_p2p_verify_channel(struct wpa_supplicant *wpa_s,
struct hostapd_hw_modes *mode,
u8 channel, u8 bw)
P2P: Move channel validation into a separate function Signed-hostap: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
2012-08-15 21:44:34 +02:00
{
P2P: Avoid compiler warning in p2p_supplicant.c Initialize flag variable explicitly to avoid [-Wmaybeuninitialized] compiler warning in wpas_p2p_verify_channel(). Signed-hostap: Max Stepanov <Max.Stepanov@intel.com>
2014-02-10 11:55:05 +01:00
int flag = 0;
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
enum chan_allowed res, res2;
res2 = res = has_channel(wpa_s->global, mode, channel, &flag);
if (bw == BW40MINUS) {
if (!(flag & HOSTAPD_CHAN_HT40MINUS))
return NOT_ALLOWED;
res2 = has_channel(wpa_s->global, mode, channel - 4, NULL);
} else if (bw == BW40PLUS) {
if (!(flag & HOSTAPD_CHAN_HT40PLUS))
return NOT_ALLOWED;
res2 = has_channel(wpa_s->global, mode, channel + 4, NULL);
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
} else if (bw == BW80) {
res2 = wpas_p2p_verify_80mhz(wpa_s, mode, channel, bw);
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
} else if (bw == BW160) {
res2 = wpas_p2p_verify_160mhz(wpa_s, mode, channel, bw);
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
}
if (res == NOT_ALLOWED || res2 == NOT_ALLOWED)
return NOT_ALLOWED;
wpa_supplicant: Use the 'no_ir' notation Use the 'no_ir' notation instead of the 'passive scan' and 'no_ibss' notations to match the earlier change in nl80211. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-07-07 13:20:54 +02:00
if (res == NO_IR || res2 == NO_IR)
return NO_IR;
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
return res;
P2P: Move channel validation into a separate function Signed-hostap: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
2012-08-15 21:44:34 +02:00
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
static int wpas_p2p_setup_channels(struct wpa_supplicant *wpa_s,
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
struct p2p_channels *chan,
struct p2p_channels *cli_chan)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
wpa_supplicant: Unify hardware feature data The hardware feature data is required in several different places throughout the code. Previously, the data was acquired and freed on demand, but with this patch wpa_supplicant will keep a single copy around at runtime for everyone to use. Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
2011-10-23 10:58:54 +02:00
struct hostapd_hw_modes *mode;
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
int cla, op, cli_cla;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_supplicant: Unify hardware feature data The hardware feature data is required in several different places throughout the code. Previously, the data was acquired and freed on demand, but with this patch wpa_supplicant will keep a single copy around at runtime for everyone to use. Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
2011-10-23 10:58:54 +02:00
if (wpa_s->hw.modes == NULL) {
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_printf(MSG_DEBUG, "P2P: Driver did not support fetching "
"of all supported channels; assume dualband "
"support");
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
return wpas_p2p_default_channels(wpa_s, chan, cli_chan);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
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
cla = cli_cla = 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
MBO: Add global operating class definitions Add definitions for global operating classes. These definitions will be used to construct supported operating classes information element. The operating classes definitions used locally for P2P module will be removed and included in the general operating classes definitions. Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2016-02-15 15:53:32 +01:00
for (op = 0; global_op_class[op].op_class; op++) {
const struct oper_class_map *o = &global_op_class[op];
P2P: Set channel list per channel instead of per band This makes the channel list match with driver capabilities without having to do workaround like disabling channels 12-14.
2010-10-15 17:51:37 +02:00
u8 ch;
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
struct p2p_reg_class *reg = NULL, *cli_reg = NULL;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
MBO: Add global operating class definitions Add definitions for global operating classes. These definitions will be used to construct supported operating classes information element. The operating classes definitions used locally for P2P module will be removed and included in the general operating classes definitions. Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2016-02-15 15:53:32 +01:00
if (o->p2p == NO_P2P_SUPP)
continue;
wpa_supplicant: Unify hardware feature data The hardware feature data is required in several different places throughout the code. Previously, the data was acquired and freed on demand, but with this patch wpa_supplicant will keep a single copy around at runtime for everyone to use. Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
2011-10-23 10:58:54 +02:00
mode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes, o->mode);
P2P: Set channel list per channel instead of per band This makes the channel list match with driver capabilities without having to do workaround like disabling channels 12-14.
2010-10-15 17:51:37 +02:00
if (mode == NULL)
continue;
P2P: Search all 2.4 GHz social channels regardless of disallow_freq Commit 1595eb93aee0239de51f1090d4528e4b2cfe3add ('P2P: Add support for 60 GHz social channel') had an unintended change to how P2P search scans 2.4 GHz social channels. Use of p2p_supported_freq() to filter the list of social channels ended up using the disallow_freq setting to remove social channels from the P2P search scans. This is not desired since peers need to be found on any of the social channels even if those channels have been disabled from P2P operating channel use. Restore the previous behavior by included all the 2.4 GHz social channels in P2P search scans if the driver indicated support for the 2.4 GHz band. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-22 19:02:48 +02:00
if (mode->mode == HOSTAPD_MODE_IEEE80211G)
wpa_s->global->p2p_24ghz_social_channels = 1;
P2P: Set channel list per channel instead of per band This makes the channel list match with driver capabilities without having to do workaround like disabling channels 12-14.
2010-10-15 17:51:37 +02:00
for (ch = o->min_chan; ch <= o->max_chan; ch += o->inc) {
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
enum chan_allowed res;
res = wpas_p2p_verify_channel(wpa_s, mode, ch, o->bw);
if (res == ALLOWED) {
if (reg == NULL) {
wpa_printf(MSG_DEBUG, "P2P: Add operating class %u",
o->op_class);
reg = &chan->reg_class[cla];
cla++;
reg->reg_class = o->op_class;
}
reg->channel[reg->channels] = ch;
reg->channels++;
wpa_supplicant: Use the 'no_ir' notation Use the 'no_ir' notation instead of the 'passive scan' and 'no_ibss' notations to match the earlier change in nl80211. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-07-07 13:20:54 +02:00
} else if (res == NO_IR &&
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
wpa_s->conf->p2p_add_cli_chan) {
if (cli_reg == NULL) {
wpa_printf(MSG_DEBUG, "P2P: Add operating class %u (client only)",
o->op_class);
cli_reg = &cli_chan->reg_class[cli_cla];
cli_cla++;
cli_reg->reg_class = o->op_class;
}
cli_reg->channel[cli_reg->channels] = ch;
cli_reg->channels++;
P2P: Set channel list per channel instead of per band This makes the channel list match with driver capabilities without having to do workaround like disabling channels 12-14.
2010-10-15 17:51:37 +02:00
}
}
if (reg) {
wpa_hexdump(MSG_DEBUG, "P2P: Channels",
reg->channel, reg->channels);
}
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
if (cli_reg) {
wpa_hexdump(MSG_DEBUG, "P2P: Channels (client only)",
cli_reg->channel, cli_reg->channels);
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Set channel list per channel instead of per band This makes the channel list match with driver capabilities without having to do workaround like disabling channels 12-14.
2010-10-15 17:51:37 +02:00
chan->reg_classes = cla;
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
cli_chan->reg_classes = cli_cla;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return 0;
}
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 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
int op;
enum chan_allowed ret;
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
MBO: Add global operating class definitions Add definitions for global operating classes. These definitions will be used to construct supported operating classes information element. The operating classes definitions used locally for P2P module will be removed and included in the general operating classes definitions. Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2016-02-15 15:53:32 +01:00
for (op = 0; global_op_class[op].op_class; op++) {
const struct oper_class_map *o = &global_op_class[op];
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
u8 ch;
MBO: Add global operating class definitions Add definitions for global operating classes. These definitions will be used to construct supported operating classes information element. The operating classes definitions used locally for P2P module will be removed and included in the general operating classes definitions. Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2016-02-15 15:53:32 +01:00
if (o->p2p == NO_P2P_SUPP)
continue;
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
for (ch = o->min_chan; ch <= o->max_chan; ch += o->inc) {
if (o->mode != HOSTAPD_MODE_IEEE80211A ||
P2P: Fix secondary channel selection for HT40 wpas_p2p_get_ht40_mode() used blacklist approach (bw != BW20) to find the relevant op_class, but didn't take into account other non-BW40 cases, like BW80, that had been added to the bw enum after the initial implementation. Fix this by looking for the specific BW40 bw cases. Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
2015-06-17 15:18:14 +02:00
(o->bw != BW40PLUS && o->bw != BW40MINUS) ||
ch != channel)
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
continue;
ret = wpas_p2p_verify_channel(wpa_s, mode, ch, o->bw);
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
if (ret == ALLOWED)
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
return (o->bw == BW40MINUS) ? -1 : 1;
}
}
return 0;
}
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)
{
if (!wpas_p2p_verify_channel(wpa_s, mode, channel, BW80))
return 0;
return wpas_p2p_get_center_80mhz(wpa_s, mode, 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)
{
if (!wpas_p2p_verify_channel(wpa_s, mode, channel, BW160))
return 0;
return wpas_p2p_get_center_160mhz(wpa_s, mode, channel);
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
static int wpas_get_noa(void *ctx, const u8 *interface_addr, u8 *buf,
size_t buf_len)
{
struct wpa_supplicant *wpa_s = ctx;
for (wpa_s = wpa_s->global->ifaces; wpa_s; wpa_s = wpa_s->next) {
if (os_memcmp(wpa_s->own_addr, interface_addr, ETH_ALEN) == 0)
break;
}
if (wpa_s == NULL)
return -1;
return wpa_drv_get_noa(wpa_s, buf, buf_len);
}
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)
P2P: Do not expire peer entry if we are connected to the peer Even though we may not update P2P peer entry while connected to the peer as a P2P client, we should not be expiring a P2P peer entry while that peer is the GO in a group where we are connected as a P2P client. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-01-25 16:27:47 +01:00
{
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
for (wpa_s = wpa_s->global->ifaces; wpa_s; wpa_s = wpa_s->next) {
struct wpa_ssid *s = wpa_s->current_ssid;
if (s == NULL)
continue;
if (s->mode != WPAS_MODE_P2P_GO &&
s->mode != WPAS_MODE_AP &&
s->mode != WPAS_MODE_P2P_GROUP_FORMATION)
continue;
if (s->ssid_len != ssid_len ||
P2P: Use ssid instead of wpa_ssid to find GO iface In order to find a GO interface, there has to be a comparison among two SSIDs, instead of a wpa_ssid and a ssid. Signed-off-by: Eduardo Abinader <eduardo.abinader@openbossa.org>
2014-08-08 12:51:23 +02:00
os_memcmp(ssid, s->ssid, ssid_len) != 0)
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
continue;
return wpa_s;
}
return NULL;
}
P2P: Do not expire peer entry if we are connected to the peer Even though we may not update P2P peer entry while connected to the peer as a P2P client, we should not be expiring a P2P peer entry while that peer is the GO in a group where we are connected as a P2P client. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-01-25 16:27:47 +01:00
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_client_iface(struct wpa_supplicant *wpa_s,
const u8 *peer_dev_addr)
{
P2P: Do not expire peer entry if we are connected to the peer Even though we may not update P2P peer entry while connected to the peer as a P2P client, we should not be expiring a P2P peer entry while that peer is the GO in a group where we are connected as a P2P client. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-01-25 16:27:47 +01:00
for (wpa_s = wpa_s->global->ifaces; wpa_s; wpa_s = wpa_s->next) {
struct wpa_ssid *ssid = wpa_s->current_ssid;
P2P: Do not clear wpa_s->go_dev_addr before group removal This variable is needed to figure out whether a wpa_supplicant interface is for a P2P group that is (or was) connected to a specific GO. The previous implementation was able to find such a case only when there was an association with the GO. However, this may be needed even if there is a temporary disconnection from the GO. Keep the GO device address information over such temporary disconnections and only remove it on group termination. This fixes an issue with D-Bus Peer PropertiesChanged signals for the Groups property in case a P2P group gets removed due to group idle timeout instead of explicit group termination command (local request) or GO notification. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-08-02 18:25:41 +02:00
if (ssid && (ssid->mode != WPAS_MODE_INFRA || !ssid->p2p_group))
P2P: Do not expire peer entry if we are connected to the peer Even though we may not update P2P peer entry while connected to the peer as a P2P client, we should not be expiring a P2P peer entry while that peer is the GO in a group where we are connected as a P2P client. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-01-25 16:27:47 +01:00
continue;
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
if (os_memcmp(wpa_s->go_dev_addr, peer_dev_addr, ETH_ALEN) == 0)
return wpa_s;
P2P: Do not expire peer entry if we are connected to the peer Even though we may not update P2P peer entry while connected to the peer as a P2P client, we should not be expiring a P2P peer entry while that peer is the GO in a group where we are connected as a P2P client. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-01-25 16:27:47 +01:00
}
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
return NULL;
}
static int wpas_go_connected(void *ctx, const u8 *dev_addr)
{
struct wpa_supplicant *wpa_s = ctx;
return wpas_get_p2p_client_iface(wpa_s, dev_addr) != NULL;
P2P: Do not expire peer entry if we are connected to the peer Even though we may not update P2P peer entry while connected to the peer as a P2P client, we should not be expiring a P2P peer entry while that peer is the GO in a group where we are connected as a P2P client. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-01-25 16:27:47 +01:00
}
P2P: Extend the listen time based on the active concurrent session A P2P Device while in the Listen state waiting to respond for the obtained group negotiation request shall give a fair chance for other concurrent sessions to use the shared radio by inducing an idle time between the successive listen states. However, if there are no concurrent operations, this idle time can be reduced. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2014-01-20 21:55:09 +01:00
static int wpas_is_concurrent_session_active(void *ctx)
{
struct wpa_supplicant *wpa_s = ctx;
struct wpa_supplicant *ifs;
for (ifs = wpa_s->global->ifaces; ifs; ifs = ifs->next) {
if (ifs == wpa_s)
continue;
if (ifs->wpa_state > WPA_ASSOCIATED)
return 1;
}
return 0;
}
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
static void wpas_p2p_debug_print(void *ctx, int level, const char *msg)
{
struct wpa_supplicant *wpa_s = ctx;
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
wpa_msg_global(wpa_s, level, "P2P: %s", msg);
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
}
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: 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 wpa_interface iface;
struct wpa_supplicant *p2pdev_wpa_s;
char ifname[100];
char force_name[100];
int ret;
Check os_snprintf() result more consistently While these are using practically large enoungh buffer sizes, it is better to be more consistent with checking os_snprintf() return value. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-06 20:40:31 +01:00
ret = os_snprintf(ifname, sizeof(ifname), P2P_MGMT_DEVICE_PREFIX "%s",
wpa_s->ifname);
if (os_snprintf_error(sizeof(ifname), ret))
return -1;
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
force_name[0] = '\0';
wpa_s->pending_interface_type = WPA_IF_P2P_DEVICE;
ret = wpa_drv_if_add(wpa_s, WPA_IF_P2P_DEVICE, ifname, NULL, NULL,
force_name, wpa_s->pending_interface_addr, NULL);
if (ret < 0) {
wpa_printf(MSG_DEBUG, "P2P: Failed to create P2P Device interface");
return ret;
}
os_strlcpy(wpa_s->pending_interface_name, ifname,
sizeof(wpa_s->pending_interface_name));
os_memset(&iface, 0, sizeof(iface));
iface.p2p_mgmt = 1;
iface.ifname = wpa_s->pending_interface_name;
iface.driver = wpa_s->driver->name;
iface.driver_param = wpa_s->conf->driver_param;
wpa_supplicant: Add a configuration file for the P2P_DEVICE parameters Add an option to specify a configuration file that can be used to hold the P2P_DEVICE configuration parameters. If this option is not used, the P2P_DEVICE configuration parameters will be read from interface configuration file. Note that it is advised to use this option in some cases such as: If a P2P_DEVICE is supported by the driver, the wpa_supplicant creates a dedicated P2P Device interface, where the configuration file used for the main interface is used. As a consequence, if the configuration file includes network definition etc., the wpa_supplicant will try to perform station specific flows on the P2P Device interface which will fail. If a P2P_DEVICE is supported by the driver and update_config is used, the P2P Device configuration data will override the main interface configuration data. Signed-hostap: Ilan Peer <ilan.peer@intel.com>
2013-09-02 14:41:00 +02:00
/*
* If a P2P Device configuration file was given, use it as the interface
* configuration file (instead of using parent's configuration file.
*/
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
if (conf_p2p_dev) {
iface.confname = conf_p2p_dev;
wpa_supplicant: Add a configuration file for the P2P_DEVICE parameters Add an option to specify a configuration file that can be used to hold the P2P_DEVICE configuration parameters. If this option is not used, the P2P_DEVICE configuration parameters will be read from interface configuration file. Note that it is advised to use this option in some cases such as: If a P2P_DEVICE is supported by the driver, the wpa_supplicant creates a dedicated P2P Device interface, where the configuration file used for the main interface is used. As a consequence, if the configuration file includes network definition etc., the wpa_supplicant will try to perform station specific flows on the P2P Device interface which will fail. If a P2P_DEVICE is supported by the driver and update_config is used, the P2P Device configuration data will override the main interface configuration data. Signed-hostap: Ilan Peer <ilan.peer@intel.com>
2013-09-02 14:41:00 +02:00
iface.ctrl_interface = NULL;
} else {
iface.confname = wpa_s->confname;
iface.ctrl_interface = wpa_s->conf->ctrl_interface;
}
P2P: Fix interface deinit for failed group interface initialization wpa_supplicant_deinit_iface() ends up removing all P2P groups if the removed interface is the parent interface. This is correct behavior in general, but this resulted in issues in the new group interface initialization error path since wpa_s->parent was not assigned before hitting this check. Fix this by assigning wpa_s->parent as part of wpa_supplicant_add_iface(). Signed-off-by: Jouni Malinen <j@w1.fi>
2015-03-01 20:50:34 +01:00
p2pdev_wpa_s = wpa_supplicant_add_iface(wpa_s->global, &iface, wpa_s);
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
if (!p2pdev_wpa_s) {
wpa_printf(MSG_DEBUG, "P2P: Failed to add P2P Device interface");
return -1;
}
P2P: Support dedicated P2P_DEVICE without separate group interface Add support for drivers with dedicated P2P_DEVICE interface, but without group interface concurrency (only a single netdev is used). With such devices, wpa_supplicant tried to use the p2p_dev interface instead of the group interface and most P2P operations failed. Extend wpa_supplicant to use the primary interface instead of a separate group interface in such cases. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
p2pdev_wpa_s->p2pdev = p2pdev_wpa_s;
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
wpa_s->pending_interface_name[0] = '\0';
return 0;
}
P2P: Send received Presence Response information to ctrl_iface monitors The P2P_PRESENCE_REQ command did not give any easily available indication of the response received from the GO. Make this more useful by providing such response (if received) as a ctrl_iface monitor event (P2P-PRESENCE-RESPONSE). Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-01 17:44:44 +01:00
static void wpas_presence_resp(void *ctx, const u8 *src, u8 status,
const u8 *noa, size_t noa_len)
{
struct wpa_supplicant *wpa_s, *intf = ctx;
char hex[100];
for (wpa_s = intf->global->ifaces; wpa_s; wpa_s = wpa_s->next) {
if (wpa_s->waiting_presence_resp)
break;
}
if (!wpa_s) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: No group interface was waiting for presence response");
return;
}
wpa_s->waiting_presence_resp = 0;
wpa_snprintf_hex(hex, sizeof(hex), noa, noa_len);
wpa_msg(wpa_s, MSG_INFO, P2P_EVENT_PRESENCE_RESPONSE "src=" MACSTR
" status=%u noa=%s", MAC2STR(src), status, hex);
}
P2PS: Add P2PS attributes into PD Request if requested This adds a data structure for storing P2PS PD information and code to add the related attributes into PD Request. The actual operation to trigger this behavior will be added in a separate commit. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 09:38:56 +01:00
static int wpas_get_persistent_group(void *ctx, const u8 *addr, const u8 *ssid,
size_t ssid_len, u8 *go_dev_addr,
P2PS: Add intended iface address during PD for persistent group When persistent group is used and the peer is GO in this group, intended interface attribute should be added to PD request/response. Not doing so violates the spec. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Reviewed-by: Max Stepanov <Max.Stepanov@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com>
2015-07-02 09:45:05 +02:00
u8 *ret_ssid, size_t *ret_ssid_len,
u8 *intended_iface_addr)
P2PS: Add P2PS attributes into PD Request if requested This adds a data structure for storing P2PS PD information and code to add the related attributes into PD Request. The actual operation to trigger this behavior will be added in a separate commit. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 09:38:56 +01:00
{
struct wpa_supplicant *wpa_s = ctx;
struct wpa_ssid *s;
s = wpas_p2p_get_persistent(wpa_s, addr, ssid, ssid_len);
if (s) {
os_memcpy(ret_ssid, s->ssid, s->ssid_len);
*ret_ssid_len = s->ssid_len;
os_memcpy(go_dev_addr, s->bssid, ETH_ALEN);
P2PS: Add intended iface address during PD for persistent group When persistent group is used and the peer is GO in this group, intended interface attribute should be added to PD request/response. Not doing so violates the spec. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Reviewed-by: Max Stepanov <Max.Stepanov@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com>
2015-07-02 09:45:05 +02:00
if (s->mode != WPAS_MODE_P2P_GO) {
os_memset(intended_iface_addr, 0, ETH_ALEN);
} else if (wpas_p2p_create_iface(wpa_s)) {
if (wpas_p2p_add_group_interface(wpa_s, WPA_IF_P2P_GO))
return 0;
os_memcpy(intended_iface_addr,
wpa_s->pending_interface_addr, ETH_ALEN);
} else {
os_memcpy(intended_iface_addr, wpa_s->own_addr,
ETH_ALEN);
}
P2PS: Add P2PS attributes into PD Request if requested This adds a data structure for storing P2PS PD information and code to add the related attributes into PD Request. The actual operation to trigger this behavior will be added in a separate commit. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 09:38:56 +01:00
return 1;
}
return 0;
}
static int wpas_get_go_info(void *ctx, u8 *intended_addr,
P2PS: Add channel policy to PD Request Add operating channel selection and channel list processing similar to that done when building GO Negotiation Request, i.e., consider the currently used channels, configured channels, etc. P2PS introduces a flow where a responder needs to provide channel data without being previously aware of the current constraints, i.e., the channels currently in use by other interfaces. To handle this, extend the get_group_capability() callback to also handle channel selection aspects of group capabilities. In case there is an active P2P GO that is going to be used for the P2PS PD, force its current operating frequency in the PD attributes. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-10-08 11:35:58 +02:00
u8 *ssid, size_t *ssid_len, int *group_iface,
unsigned int *freq)
P2PS: Add P2PS attributes into PD Request if requested This adds a data structure for storing P2PS PD information and code to add the related attributes into PD Request. The actual operation to trigger this behavior will be added in a separate commit. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 09:38:56 +01:00
{
struct wpa_supplicant *wpa_s = ctx;
P2PS: Add channel policy to PD Request Add operating channel selection and channel list processing similar to that done when building GO Negotiation Request, i.e., consider the currently used channels, configured channels, etc. P2PS introduces a flow where a responder needs to provide channel data without being previously aware of the current constraints, i.e., the channels currently in use by other interfaces. To handle this, extend the get_group_capability() callback to also handle channel selection aspects of group capabilities. In case there is an active P2P GO that is going to be used for the P2PS PD, force its current operating frequency in the PD attributes. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-10-08 11:35:58 +02:00
struct wpa_supplicant *go;
P2PS: Add P2PS attributes into PD Request if requested This adds a data structure for storing P2PS PD information and code to add the related attributes into PD Request. The actual operation to trigger this behavior will be added in a separate commit. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 09:38:56 +01:00
struct wpa_ssid *s;
P2PS: Set intended interface address correctly for new group If a device may be an explicit GO, it adds the GO details in the PD Request. First, we try to reuse an active GO. If it is not present, we try to reuse a non-active persistent group. In the latter case, if a dedicated P2P interface is needed, the intended address should be that of the pending interface. However, the wpas_get_go_info() provided the ssid->bssid address, which is the address of the P2P device. This might result in an incorrect intended interface attribute in the PD Request in case a separate group interface is used. Fix this by setting group_iface variable to true only if a dedicated interface should be used and set the attribute accordingly. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Reviewed-by: Max Stepanov <Max.Stepanov@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com>
2015-07-02 09:45:07 +02:00
/*
* group_iface will be set to 1 only if a dedicated interface for P2P
* role is required. First, we try to reuse an active GO. However,
* if it is not present, we will try to reactivate an existing
* persistent group and set group_iface to 1, so the caller will know
* that the pending interface should be used.
*/
*group_iface = 0;
P2PS: Add channel policy to PD Request Add operating channel selection and channel list processing similar to that done when building GO Negotiation Request, i.e., consider the currently used channels, configured channels, etc. P2PS introduces a flow where a responder needs to provide channel data without being previously aware of the current constraints, i.e., the channels currently in use by other interfaces. To handle this, extend the get_group_capability() callback to also handle channel selection aspects of group capabilities. In case there is an active P2P GO that is going to be used for the P2PS PD, force its current operating frequency in the PD attributes. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-10-08 11:35:58 +02:00
if (freq)
*freq = 0;
go = wpas_p2p_get_go_group(wpa_s);
if (!go) {
P2PS: Add P2PS attributes into PD Request if requested This adds a data structure for storing P2PS PD information and code to add the related attributes into PD Request. The actual operation to trigger this behavior will be added in a separate commit. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 09:38:56 +01:00
s = wpas_p2p_get_persistent_go(wpa_s);
P2PS: Set intended interface address correctly for new group If a device may be an explicit GO, it adds the GO details in the PD Request. First, we try to reuse an active GO. If it is not present, we try to reuse a non-active persistent group. In the latter case, if a dedicated P2P interface is needed, the intended address should be that of the pending interface. However, the wpas_get_go_info() provided the ssid->bssid address, which is the address of the P2P device. This might result in an incorrect intended interface attribute in the PD Request in case a separate group interface is used. Fix this by setting group_iface variable to true only if a dedicated interface should be used and set the attribute accordingly. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Reviewed-by: Max Stepanov <Max.Stepanov@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com>
2015-07-02 09:45:07 +02:00
*group_iface = wpas_p2p_create_iface(wpa_s);
P2PS: Add P2PS attributes into PD Request if requested This adds a data structure for storing P2PS PD information and code to add the related attributes into PD Request. The actual operation to trigger this behavior will be added in a separate commit. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 09:38:56 +01:00
if (s)
P2PS: Add channel policy to PD Request Add operating channel selection and channel list processing similar to that done when building GO Negotiation Request, i.e., consider the currently used channels, configured channels, etc. P2PS introduces a flow where a responder needs to provide channel data without being previously aware of the current constraints, i.e., the channels currently in use by other interfaces. To handle this, extend the get_group_capability() callback to also handle channel selection aspects of group capabilities. In case there is an active P2P GO that is going to be used for the P2PS PD, force its current operating frequency in the PD attributes. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-10-08 11:35:58 +02:00
os_memcpy(intended_addr, s->bssid, ETH_ALEN);
P2PS: Set intended interface address correctly for new group If a device may be an explicit GO, it adds the GO details in the PD Request. First, we try to reuse an active GO. If it is not present, we try to reuse a non-active persistent group. In the latter case, if a dedicated P2P interface is needed, the intended address should be that of the pending interface. However, the wpas_get_go_info() provided the ssid->bssid address, which is the address of the P2P device. This might result in an incorrect intended interface attribute in the PD Request in case a separate group interface is used. Fix this by setting group_iface variable to true only if a dedicated interface should be used and set the attribute accordingly. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Reviewed-by: Max Stepanov <Max.Stepanov@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com>
2015-07-02 09:45:07 +02:00
else
return 0;
P2PS: Add channel policy to PD Request Add operating channel selection and channel list processing similar to that done when building GO Negotiation Request, i.e., consider the currently used channels, configured channels, etc. P2PS introduces a flow where a responder needs to provide channel data without being previously aware of the current constraints, i.e., the channels currently in use by other interfaces. To handle this, extend the get_group_capability() callback to also handle channel selection aspects of group capabilities. In case there is an active P2P GO that is going to be used for the P2PS PD, force its current operating frequency in the PD attributes. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-10-08 11:35:58 +02:00
} else {
s = go->current_ssid;
os_memcpy(intended_addr, go->own_addr, ETH_ALEN);
if (freq)
*freq = go->assoc_freq;
P2PS: Add P2PS attributes into PD Request if requested This adds a data structure for storing P2PS PD information and code to add the related attributes into PD Request. The actual operation to trigger this behavior will be added in a separate commit. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 09:38:56 +01:00
}
os_memcpy(ssid, s->ssid, s->ssid_len);
*ssid_len = s->ssid_len;
return 1;
}
P2PS: Callback to remove stale persistent groups When the peer device is trying to form a new group despite having old persistent group with same roles, remove the stale persistent group. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:38:17 +01:00
static int wpas_remove_stale_groups(void *ctx, const u8 *peer, const u8 *go,
const u8 *ssid, size_t ssid_len)
{
struct wpa_supplicant *wpa_s = ctx;
struct wpa_ssid *s;
int save_config = 0;
size_t i;
/* Start with our first choice of Persistent Groups */
while ((s = wpas_p2p_get_persistent(wpa_s, peer, NULL, 0))) {
if (go && ssid && ssid_len &&
s->ssid_len == ssid_len &&
os_memcmp(go, s->bssid, ETH_ALEN) == 0 &&
os_memcmp(ssid, s->ssid, ssid_len) == 0)
break;
/* Remove stale persistent group */
if (s->mode != WPAS_MODE_P2P_GO || s->num_p2p_clients <= 1) {
wpa_config_remove_network(wpa_s->conf, s->id);
save_config = 1;
continue;
}
for (i = 0; i < s->num_p2p_clients; i++) {
if (os_memcmp(s->p2p_client_list + i * 2 * ETH_ALEN,
peer, ETH_ALEN) != 0)
continue;
os_memmove(s->p2p_client_list + i * 2 * ETH_ALEN,
s->p2p_client_list + (i + 1) * 2 * ETH_ALEN,
(s->num_p2p_clients - i - 1) * 2 * ETH_ALEN);
break;
}
s->num_p2p_clients--;
save_config = 1;
}
if (save_config)
p2p_config_write(wpa_s);
/* Return TRUE if valid SSID remains */
return s != NULL;
}
P2PS: Add feature capability to PD events Report the feature capability on P2PS-PROV-START and P2PS-PROV-DONE ctrl-iface events. A feature capability value is specified as 'feature_cap=<hex>' event parameter, where <val> is a hexadecimal string of feature capability bytes in a PD Response frame. 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:23 +02:00
static void wpas_p2ps_get_feat_cap_str(char *buf, size_t buf_len,
const u8 *feat_cap, size_t feat_cap_len)
{
static const char pref[] = " feature_cap=";
int ret;
buf[0] = '\0';
/*
* We expect a feature capability to contain at least one byte to be
* reported. The string buffer provided by the caller function is
* expected to be big enough to contain all bytes of the attribute for
* known specifications. This function truncates the reported bytes if
* the feature capability data exceeds the string buffer size.
*/
if (!feat_cap || !feat_cap_len || buf_len < sizeof(pref) + 2)
return;
os_memcpy(buf, pref, sizeof(pref));
ret = wpa_snprintf_hex(&buf[sizeof(pref) - 1],
buf_len - sizeof(pref) + 1,
feat_cap, feat_cap_len);
if (ret != (2 * (int) feat_cap_len))
wpa_printf(MSG_WARNING, "P2PS feature_cap bytes truncated");
}
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
static void wpas_p2ps_prov_complete(void *ctx, u8 status, const u8 *dev,
const u8 *adv_mac, const u8 *ses_mac,
const u8 *grp_mac, u32 adv_id, u32 ses_id,
u8 conncap, int passwd_id,
const u8 *persist_ssid,
size_t persist_ssid_size, int response_done,
P2PS: Add feature capability to PD events Report the feature capability on P2PS-PROV-START and P2PS-PROV-DONE ctrl-iface events. A feature capability value is specified as 'feature_cap=<hex>' event parameter, where <val> is a hexadecimal string of feature capability bytes in a PD Response frame. 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:23 +02:00
int prov_start, const char *session_info,
P2PS: Indicate the chosen operating frequency On successful P2P PD, report the chosen frequency in case the local device is going to be the P2P GO, so in can later be used to instantiate the new P2P GO, etc. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-10-08 11:36:01 +02:00
const u8 *feat_cap, size_t feat_cap_len,
P2PS: Add group SSID, if known, to the P2PS-PROV-DONE event The new optional group_ssid=<hexdump> argument in the P2PS-PROV-DONE event can be used to help in identifying the exact group if there have been multiple groups with the same P2P Interface Address in short period of time. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-12-30 17:59:03 +01:00
unsigned int freq,
const u8 *group_ssid, size_t group_ssid_len)
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
{
struct wpa_supplicant *wpa_s = ctx;
u8 mac[ETH_ALEN];
P2PS: Fix persistent group reporting in wpas_p2ps_prov_complete() When one peer doesn't include a persistent group info in PD Request the other peer shouldn't report a persistent group usage with this peer even if such a persistent group exists locally. This condition could be violated in the previous implementation. In case a local persistent group exists and the wpas_p2ps_prov_complete() function is called with persist_ssid parameter set to NULL, wpa_supplicant reported P2PS-PROV-DONE with persist=<idx> instead of conncap=<role> parameter. This happened because the wpas_p2p_get_persistent() function was called without verification whether the persist_ssid was set to NULL. In this case the wpas_p2p_get_persistent() returns the first existing persistent group matching the P2P Device Address without verifying the group's SSID. After that the group ID is used as persist=<idx> parameter of P2PS-PROV-DONE event. Fix the issue by adding persist_ssid and persist_ssid_size verification as a condition for the wpas_p2p_get_persistent() call. Signed-off-by: Max Stepanov <Max.Stepanov@intel.com>
2015-10-08 11:36:03 +02:00
struct wpa_ssid *persistent_go, *stale, *s = NULL;
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
int save_config = 0;
struct wpa_supplicant *go_wpa_s;
P2PS: Add feature capability to PD events Report the feature capability on P2PS-PROV-START and P2PS-PROV-DONE ctrl-iface events. A feature capability value is specified as 'feature_cap=<hex>' event parameter, where <val> is a hexadecimal string of feature capability bytes in a PD Response frame. 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:23 +02:00
char feat_cap_str[256];
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
if (!dev)
return;
os_memset(mac, 0, ETH_ALEN);
if (!adv_mac)
adv_mac = mac;
if (!ses_mac)
ses_mac = mac;
if (!grp_mac)
grp_mac = mac;
P2PS: Add feature capability to PD events Report the feature capability on P2PS-PROV-START and P2PS-PROV-DONE ctrl-iface events. A feature capability value is specified as 'feature_cap=<hex>' event parameter, where <val> is a hexadecimal string of feature capability bytes in a PD Response frame. 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:23 +02:00
wpas_p2ps_get_feat_cap_str(feat_cap_str, sizeof(feat_cap_str),
feat_cap, feat_cap_len);
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
if (prov_start) {
if (session_info == NULL) {
wpa_msg_global(wpa_s, MSG_INFO,
P2P_EVENT_P2PS_PROVISION_START MACSTR
" adv_id=%x conncap=%x"
" adv_mac=" MACSTR
" session=%x mac=" MACSTR
P2PS: Add feature capability to PD events Report the feature capability on P2PS-PROV-START and P2PS-PROV-DONE ctrl-iface events. A feature capability value is specified as 'feature_cap=<hex>' event parameter, where <val> is a hexadecimal string of feature capability bytes in a PD Response frame. 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:23 +02:00
" dev_passwd_id=%d%s",
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
MAC2STR(dev), adv_id, conncap,
MAC2STR(adv_mac),
ses_id, MAC2STR(ses_mac),
P2PS: Add feature capability to PD events Report the feature capability on P2PS-PROV-START and P2PS-PROV-DONE ctrl-iface events. A feature capability value is specified as 'feature_cap=<hex>' event parameter, where <val> is a hexadecimal string of feature capability bytes in a PD Response frame. 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:23 +02:00
passwd_id, feat_cap_str);
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
} else {
wpa_msg_global(wpa_s, MSG_INFO,
P2P_EVENT_P2PS_PROVISION_START MACSTR
" adv_id=%x conncap=%x"
" adv_mac=" MACSTR
" session=%x mac=" MACSTR
P2PS: Add feature capability to PD events Report the feature capability on P2PS-PROV-START and P2PS-PROV-DONE ctrl-iface events. A feature capability value is specified as 'feature_cap=<hex>' event parameter, where <val> is a hexadecimal string of feature capability bytes in a PD Response frame. 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:23 +02:00
" dev_passwd_id=%d info='%s'%s",
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
MAC2STR(dev), adv_id, conncap,
MAC2STR(adv_mac),
ses_id, MAC2STR(ses_mac),
P2PS: Add feature capability to PD events Report the feature capability on P2PS-PROV-START and P2PS-PROV-DONE ctrl-iface events. A feature capability value is specified as 'feature_cap=<hex>' event parameter, where <val> is a hexadecimal string of feature capability bytes in a PD Response frame. 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:23 +02:00
passwd_id, session_info, feat_cap_str);
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
}
return;
}
go_wpa_s = wpas_p2p_get_go_group(wpa_s);
persistent_go = wpas_p2p_get_persistent_go(wpa_s);
if (status && status != P2P_SC_SUCCESS_DEFERRED) {
if (go_wpa_s && !p2p_group_go_member_count(wpa_s))
wpas_p2p_group_remove(wpa_s, go_wpa_s->ifname);
if (persistent_go && !persistent_go->num_p2p_clients) {
/* remove empty persistent GO */
wpa_config_remove_network(wpa_s->conf,
persistent_go->id);
}
wpa_msg_global(wpa_s, MSG_INFO,
P2P_EVENT_P2PS_PROVISION_DONE MACSTR
" status=%d"
" adv_id=%x adv_mac=" MACSTR
P2PS: Add feature capability to PD events Report the feature capability on P2PS-PROV-START and P2PS-PROV-DONE ctrl-iface events. A feature capability value is specified as 'feature_cap=<hex>' event parameter, where <val> is a hexadecimal string of feature capability bytes in a PD Response frame. 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:23 +02:00
" session=%x mac=" MACSTR "%s",
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
MAC2STR(dev), status,
adv_id, MAC2STR(adv_mac),
P2PS: Add feature capability to PD events Report the feature capability on P2PS-PROV-START and P2PS-PROV-DONE ctrl-iface events. A feature capability value is specified as 'feature_cap=<hex>' event parameter, where <val> is a hexadecimal string of feature capability bytes in a PD Response frame. 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:23 +02:00
ses_id, MAC2STR(ses_mac), feat_cap_str);
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
return;
}
/* Clean up stale persistent groups with this device */
P2PS: Fix persistent group reporting in wpas_p2ps_prov_complete() When one peer doesn't include a persistent group info in PD Request the other peer shouldn't report a persistent group usage with this peer even if such a persistent group exists locally. This condition could be violated in the previous implementation. In case a local persistent group exists and the wpas_p2ps_prov_complete() function is called with persist_ssid parameter set to NULL, wpa_supplicant reported P2PS-PROV-DONE with persist=<idx> instead of conncap=<role> parameter. This happened because the wpas_p2p_get_persistent() function was called without verification whether the persist_ssid was set to NULL. In this case the wpas_p2p_get_persistent() returns the first existing persistent group matching the P2P Device Address without verifying the group's SSID. After that the group ID is used as persist=<idx> parameter of P2PS-PROV-DONE event. Fix the issue by adding persist_ssid and persist_ssid_size verification as a condition for the wpas_p2p_get_persistent() call. Signed-off-by: Max Stepanov <Max.Stepanov@intel.com>
2015-10-08 11:36:03 +02:00
if (persist_ssid && persist_ssid_size)
s = wpas_p2p_get_persistent(wpa_s, dev, persist_ssid,
persist_ssid_size);
P2PS: Add PD Response validation Validate the PD Response frame contents more thoroughly when it is used for P2PS. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Reviewed-by: Max Stepanov <Max.Stepanov@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com>
2015-07-02 09:45:06 +02:00
if (persist_ssid && s && s->mode != WPAS_MODE_P2P_GO &&
P2PS: Clean up intended interface address passing to p2ps_prov_complete Use NULL to indicate if the address is not available instead of fixed 00:00:00:00:00:00. wpas_p2ps_prov_complete() already had code for converting NULL to that all zeros address for event messages. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-08-06 19:43:25 +02:00
is_zero_ether_addr(grp_mac)) {
P2PS: Add PD Response validation Validate the PD Response frame contents more thoroughly when it is used for P2PS. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Reviewed-by: Max Stepanov <Max.Stepanov@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com>
2015-07-02 09:45:06 +02:00
wpa_dbg(wpa_s, MSG_ERROR,
"P2P: Peer device is a GO in a persistent group, but it did not provide the intended MAC address");
return;
}
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
for (;;) {
stale = wpas_p2p_get_persistent(wpa_s, dev, NULL, 0);
if (!stale)
break;
if (s && s->ssid_len == stale->ssid_len &&
os_memcmp(stale->bssid, s->bssid, ETH_ALEN) == 0 &&
os_memcmp(stale->ssid, s->ssid, s->ssid_len) == 0)
break;
/* Remove stale persistent group */
if (stale->mode != WPAS_MODE_P2P_GO ||
stale->num_p2p_clients <= 1) {
wpa_config_remove_network(wpa_s->conf, stale->id);
} else {
size_t i;
for (i = 0; i < stale->num_p2p_clients; i++) {
if (os_memcmp(stale->p2p_client_list +
i * ETH_ALEN,
dev, ETH_ALEN) == 0) {
os_memmove(stale->p2p_client_list +
i * ETH_ALEN,
stale->p2p_client_list +
(i + 1) * ETH_ALEN,
(stale->num_p2p_clients -
i - 1) * ETH_ALEN);
break;
}
}
stale->num_p2p_clients--;
}
save_config = 1;
}
if (save_config)
p2p_config_write(wpa_s);
if (s) {
if (go_wpa_s && !p2p_group_go_member_count(wpa_s))
wpas_p2p_group_remove(wpa_s, go_wpa_s->ifname);
if (persistent_go && s != persistent_go &&
!persistent_go->num_p2p_clients) {
/* remove empty persistent GO */
wpa_config_remove_network(wpa_s->conf,
persistent_go->id);
/* Save config */
}
wpa_msg_global(wpa_s, MSG_INFO,
P2P_EVENT_P2PS_PROVISION_DONE MACSTR
" status=%d"
" adv_id=%x adv_mac=" MACSTR
" session=%x mac=" MACSTR
P2PS: Add feature capability to PD events Report the feature capability on P2PS-PROV-START and P2PS-PROV-DONE ctrl-iface events. A feature capability value is specified as 'feature_cap=<hex>' event parameter, where <val> is a hexadecimal string of feature capability bytes in a PD Response frame. 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:23 +02:00
" persist=%d%s",
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
MAC2STR(dev), status,
adv_id, MAC2STR(adv_mac),
P2PS: Add feature capability to PD events Report the feature capability on P2PS-PROV-START and P2PS-PROV-DONE ctrl-iface events. A feature capability value is specified as 'feature_cap=<hex>' event parameter, where <val> is a hexadecimal string of feature capability bytes in a PD Response frame. 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:23 +02:00
ses_id, MAC2STR(ses_mac), s->id, feat_cap_str);
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
return;
}
if (conncap == P2PS_SETUP_GROUP_OWNER) {
P2PS: Fix P2PS-PROV-DONE event on GO If after P2PS PD the device should become a GO it sends P2PS-PROV-DONE event which contains the GO interface name. If the GO isn't running yet the device may use pending interface name. However, when the GO is started, pending interface name will be removed. Fix the GO interface name in P2PS-PROV-DONE event by copying the interface name instead of saving the pointer. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com>
2015-07-02 09:45:04 +02:00
/*
* We need to copy the interface name. Simply saving a
* pointer isn't enough, since if we use pending_interface_name
* it will be overwritten when the group is added.
*/
char go_ifname[100];
go_ifname[0] = '\0';
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
if (!go_wpa_s) {
wpa_s->global->pending_p2ps_group = 1;
P2PS: Indicate the chosen operating frequency On successful P2P PD, report the chosen frequency in case the local device is going to be the P2P GO, so in can later be used to instantiate the new P2P GO, etc. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-10-08 11:36:01 +02:00
wpa_s->global->pending_p2ps_group_freq = freq;
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
P2PS: Use wpas_p2p_create_iface() to check if dedicated iface is needed Call wpas_p2p_create_iface() instead of just checking p2p_no_group_iface config value. Not doing so, resulted in an incorrect behavior when the driver sets WPA_DRIVER_FLAGS_DEDICATED_P2P_DEVICE flag. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com>
2015-07-02 09:45:03 +02:00
if (!wpas_p2p_create_iface(wpa_s))
P2PS: Fix P2PS-PROV-DONE event on GO If after P2PS PD the device should become a GO it sends P2PS-PROV-DONE event which contains the GO interface name. If the GO isn't running yet the device may use pending interface name. However, when the GO is started, pending interface name will be removed. Fix the GO interface name in P2PS-PROV-DONE event by copying the interface name instead of saving the pointer. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com>
2015-07-02 09:45:04 +02:00
os_memcpy(go_ifname, wpa_s->ifname,
sizeof(go_ifname));
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
else if (wpa_s->pending_interface_name[0])
P2PS: Fix P2PS-PROV-DONE event on GO If after P2PS PD the device should become a GO it sends P2PS-PROV-DONE event which contains the GO interface name. If the GO isn't running yet the device may use pending interface name. However, when the GO is started, pending interface name will be removed. Fix the GO interface name in P2PS-PROV-DONE event by copying the interface name instead of saving the pointer. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com>
2015-07-02 09:45:04 +02:00
os_memcpy(go_ifname,
wpa_s->pending_interface_name,
sizeof(go_ifname));
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
P2PS: Fix P2PS-PROV-DONE event on GO If after P2PS PD the device should become a GO it sends P2PS-PROV-DONE event which contains the GO interface name. If the GO isn't running yet the device may use pending interface name. However, when the GO is started, pending interface name will be removed. Fix the GO interface name in P2PS-PROV-DONE event by copying the interface name instead of saving the pointer. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com>
2015-07-02 09:45:04 +02:00
if (!go_ifname[0]) {
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
wpas_p2ps_prov_complete(
wpa_s, P2P_SC_FAIL_UNKNOWN_GROUP,
dev, adv_mac, ses_mac,
P2PS: Clean up intended interface address passing to p2ps_prov_complete Use NULL to indicate if the address is not available instead of fixed 00:00:00:00:00:00. wpas_p2ps_prov_complete() already had code for converting NULL to that all zeros address for event messages. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-08-06 19:43:25 +02:00
grp_mac, adv_id, ses_id, 0, 0,
P2PS: Add group SSID, if known, to the P2PS-PROV-DONE event The new optional group_ssid=<hexdump> argument in the P2PS-PROV-DONE event can be used to help in identifying the exact group if there have been multiple groups with the same P2P Interface Address in short period of time. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-12-30 17:59:03 +01:00
NULL, 0, 0, 0, NULL, NULL, 0, 0,
NULL, 0);
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
return;
}
/* If PD Resp complete, start up the GO */
if (response_done && persistent_go) {
wpas_p2p_group_add_persistent(
wpa_s, persistent_go,
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
0, 0, freq, 0, 0, 0, 0, NULL,
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
persistent_go->mode ==
WPAS_MODE_P2P_GO ?
P2P_MAX_INITIAL_CONN_WAIT_GO_REINVOKE :
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
0, 0);
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
} else if (response_done) {
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
wpas_p2p_group_add(wpa_s, 1, freq, 0, 0, 0, 0);
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
}
P2PS: Start WPS registrar upon GO formation If P2PS config method is used for provisioning, upon forming a new GO, start WPS registrar for the provisioned peer automatically. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-15 12:40:31 +01:00
if (passwd_id == DEV_PW_P2PS_DEFAULT) {
P2PS: Authorize any peer for P2PS method if interface address not known When P2PS PD with default P2PS method is done, the peer that becomes GO should authorize the client. However, P2PS specification doesn't require the client to include its intended interface address in PD Request/Response. As a result, the P2P Client's interface address may not be known and any address may need to be authorized. Previously, client's P2P Device Address was used for authorization, which is not correct when a dedicated interface is used for P2P Client. This is not resulting in a connection failure, however it causes a significant delay (until WPS_PIN_TIME_IGNORE_SEL_REG elapses). Fix this by authorizing the intended interface address, if known; or any address, if not known. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2015-07-30 08:00:06 +02:00
os_memcpy(wpa_s->p2ps_join_addr, grp_mac,
ETH_ALEN);
wpa_s->p2ps_method_config_any = 1;
P2PS: Start WPS registrar upon GO formation If P2PS config method is used for provisioning, upon forming a new GO, start WPS registrar for the provisioned peer automatically. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-15 12:40:31 +01:00
}
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
} else if (passwd_id == DEV_PW_P2PS_DEFAULT) {
P2PS: Fix P2PS-PROV-DONE event on GO If after P2PS PD the device should become a GO it sends P2PS-PROV-DONE event which contains the GO interface name. If the GO isn't running yet the device may use pending interface name. However, when the GO is started, pending interface name will be removed. Fix the GO interface name in P2PS-PROV-DONE event by copying the interface name instead of saving the pointer. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com>
2015-07-02 09:45:04 +02:00
os_memcpy(go_ifname, go_wpa_s->ifname,
sizeof(go_ifname));
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
P2PS: Authorize any peer for P2PS method if interface address not known When P2PS PD with default P2PS method is done, the peer that becomes GO should authorize the client. However, P2PS specification doesn't require the client to include its intended interface address in PD Request/Response. As a result, the P2P Client's interface address may not be known and any address may need to be authorized. Previously, client's P2P Device Address was used for authorization, which is not correct when a dedicated interface is used for P2P Client. This is not resulting in a connection failure, however it causes a significant delay (until WPS_PIN_TIME_IGNORE_SEL_REG elapses). Fix this by authorizing the intended interface address, if known; or any address, if not known. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2015-07-30 08:00:06 +02:00
if (is_zero_ether_addr(grp_mac)) {
wpa_dbg(go_wpa_s, MSG_DEBUG,
"P2P: Setting PIN-1 for ANY");
wpa_supplicant_ap_wps_pin(go_wpa_s, NULL,
"12345670", NULL, 0,
0);
} else {
wpa_dbg(go_wpa_s, MSG_DEBUG,
"P2P: Setting PIN-1 for " MACSTR,
MAC2STR(grp_mac));
wpa_supplicant_ap_wps_pin(go_wpa_s, grp_mac,
"12345670", NULL, 0,
0);
}
P2PS: Start WPS registrar upon GO formation If P2PS config method is used for provisioning, upon forming a new GO, start WPS registrar for the provisioned peer automatically. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-15 12:40:31 +01:00
P2PS: Authorize any peer for P2PS method if interface address not known When P2PS PD with default P2PS method is done, the peer that becomes GO should authorize the client. However, P2PS specification doesn't require the client to include its intended interface address in PD Request/Response. As a result, the P2P Client's interface address may not be known and any address may need to be authorized. Previously, client's P2P Device Address was used for authorization, which is not correct when a dedicated interface is used for P2P Client. This is not resulting in a connection failure, however it causes a significant delay (until WPS_PIN_TIME_IGNORE_SEL_REG elapses). Fix this by authorizing the intended interface address, if known; or any address, if not known. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2015-07-30 08:00:06 +02:00
os_memcpy(wpa_s->p2ps_join_addr, grp_mac, ETH_ALEN);
wpa_s->p2ps_method_config_any = 1;
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
}
wpa_msg_global(wpa_s, MSG_INFO,
P2P_EVENT_P2PS_PROVISION_DONE MACSTR
" status=%d conncap=%x"
" adv_id=%x adv_mac=" MACSTR
" session=%x mac=" MACSTR
P2PS: Add feature capability to PD events Report the feature capability on P2PS-PROV-START and P2PS-PROV-DONE ctrl-iface events. A feature capability value is specified as 'feature_cap=<hex>' event parameter, where <val> is a hexadecimal string of feature capability bytes in a PD Response frame. 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:23 +02:00
" dev_passwd_id=%d go=%s%s",
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
MAC2STR(dev), status, conncap,
adv_id, MAC2STR(adv_mac),
ses_id, MAC2STR(ses_mac),
P2PS: Add feature capability to PD events Report the feature capability on P2PS-PROV-START and P2PS-PROV-DONE ctrl-iface events. A feature capability value is specified as 'feature_cap=<hex>' event parameter, where <val> is a hexadecimal string of feature capability bytes in a PD Response frame. 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:23 +02:00
passwd_id, go_ifname, feat_cap_str);
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
return;
}
if (go_wpa_s && !p2p_group_go_member_count(wpa_s))
wpas_p2p_group_remove(wpa_s, go_wpa_s->ifname);
if (persistent_go && !persistent_go->num_p2p_clients) {
/* remove empty persistent GO */
wpa_config_remove_network(wpa_s->conf, persistent_go->id);
}
if (conncap == P2PS_SETUP_CLIENT) {
P2PS: Add group SSID, if known, to the P2PS-PROV-DONE event The new optional group_ssid=<hexdump> argument in the P2PS-PROV-DONE event can be used to help in identifying the exact group if there have been multiple groups with the same P2P Interface Address in short period of time. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-12-30 17:59:03 +01:00
char ssid_hex[32 * 2 + 1];
if (group_ssid)
wpa_snprintf_hex(ssid_hex, sizeof(ssid_hex),
group_ssid, group_ssid_len);
else
ssid_hex[0] = '\0';
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
wpa_msg_global(wpa_s, MSG_INFO,
P2P_EVENT_P2PS_PROVISION_DONE MACSTR
" status=%d conncap=%x"
" adv_id=%x adv_mac=" MACSTR
" session=%x mac=" MACSTR
P2PS: Add group SSID, if known, to the P2PS-PROV-DONE event The new optional group_ssid=<hexdump> argument in the P2PS-PROV-DONE event can be used to help in identifying the exact group if there have been multiple groups with the same P2P Interface Address in short period of time. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-12-30 17:59:03 +01:00
" dev_passwd_id=%d join=" MACSTR "%s%s%s",
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
MAC2STR(dev), status, conncap,
adv_id, MAC2STR(adv_mac),
ses_id, MAC2STR(ses_mac),
P2PS: Add group SSID, if known, to the P2PS-PROV-DONE event The new optional group_ssid=<hexdump> argument in the P2PS-PROV-DONE event can be used to help in identifying the exact group if there have been multiple groups with the same P2P Interface Address in short period of time. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-12-30 17:59:03 +01:00
passwd_id, MAC2STR(grp_mac), feat_cap_str,
group_ssid ? " group_ssid=" : "", ssid_hex);
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
} else {
wpa_msg_global(wpa_s, MSG_INFO,
P2P_EVENT_P2PS_PROVISION_DONE MACSTR
" status=%d conncap=%x"
" adv_id=%x adv_mac=" MACSTR
" session=%x mac=" MACSTR
P2PS: Add feature capability to PD events Report the feature capability on P2PS-PROV-START and P2PS-PROV-DONE ctrl-iface events. A feature capability value is specified as 'feature_cap=<hex>' event parameter, where <val> is a hexadecimal string of feature capability bytes in a PD Response frame. 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:23 +02:00
" dev_passwd_id=%d%s",
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
MAC2STR(dev), status, conncap,
adv_id, MAC2STR(adv_mac),
ses_id, MAC2STR(ses_mac),
P2PS: Add feature capability to PD events Report the feature capability on P2PS-PROV-START and P2PS-PROV-DONE ctrl-iface events. A feature capability value is specified as 'feature_cap=<hex>' event parameter, where <val> is a hexadecimal string of feature capability bytes in a PD Response frame. 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:23 +02:00
passwd_id, feat_cap_str);
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
}
}
P2P: Refrain from performing extended listen during P2P connection Do not perform extended listen period operations when either a P2P connection is in progress. This makes the connection more robust should an extended listen timer trigger during such an operation. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-05-06 18:34:37 +02:00
static int _wpas_p2p_in_progress(void *ctx)
{
struct wpa_supplicant *wpa_s = ctx;
return wpas_p2p_in_progress(wpa_s);
}
P2PS: Callback to create pending group after sending PD Response This introduces a P2P module callback function that will be used to create the pending P2PS group after sending PD Response and receiving ACK status for it. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 12:29:29 +01:00
static int wpas_prov_disc_resp_cb(void *ctx)
{
struct wpa_supplicant *wpa_s = ctx;
struct wpa_ssid *persistent_go;
P2PS: Indicate the chosen operating frequency On successful P2P PD, report the chosen frequency in case the local device is going to be the P2P GO, so in can later be used to instantiate the new P2P GO, etc. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-10-08 11:36:01 +02:00
unsigned int freq;
P2PS: Callback to create pending group after sending PD Response This introduces a P2P module callback function that will be used to create the pending P2PS group after sending PD Response and receiving ACK status for it. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 12:29:29 +01:00
if (!wpa_s->global->pending_p2ps_group)
return 0;
P2PS: Indicate the chosen operating frequency On successful P2P PD, report the chosen frequency in case the local device is going to be the P2P GO, so in can later be used to instantiate the new P2P GO, etc. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-10-08 11:36:01 +02:00
freq = wpa_s->global->pending_p2ps_group_freq;
wpa_s->global->pending_p2ps_group_freq = 0;
P2PS: Callback to create pending group after sending PD Response This introduces a P2P module callback function that will be used to create the pending P2PS group after sending PD Response and receiving ACK status for it. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 12:29:29 +01:00
wpa_s->global->pending_p2ps_group = 0;
if (wpas_p2p_get_go_group(wpa_s))
return 0;
persistent_go = wpas_p2p_get_persistent_go(wpa_s);
if (persistent_go) {
wpas_p2p_group_add_persistent(
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
wpa_s, persistent_go, 0, 0, 0, 0, 0, 0, 0, NULL,
P2PS: Callback to create pending group after sending PD Response This introduces a P2P module callback function that will be used to create the pending P2PS group after sending PD Response and receiving ACK status for it. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 12:29:29 +01:00
persistent_go->mode == WPAS_MODE_P2P_GO ?
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
P2P_MAX_INITIAL_CONN_WAIT_GO_REINVOKE : 0, 0);
P2PS: Callback to create pending group after sending PD Response This introduces a P2P module callback function that will be used to create the pending P2PS group after sending PD Response and receiving ACK status for it. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 12:29:29 +01:00
} else {
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
wpas_p2p_group_add(wpa_s, 1, freq, 0, 0, 0, 0);
P2PS: Callback to create pending group after sending PD Response This introduces a P2P module callback function that will be used to create the pending P2PS group after sending PD Response and receiving ACK status for it. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 12:29:29 +01:00
}
return 1;
}
P2P: Expose driver preferred frequency list fetch to P2P This adds a callback function that can be used from the P2P module to request the current preferred list of operating channels from the driver. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-07-24 10:23:24 +02:00
static int wpas_p2p_get_pref_freq_list(void *ctx, int go,
unsigned int *len,
unsigned int *freq_list)
{
struct wpa_supplicant *wpa_s = ctx;
return wpa_drv_get_pref_freq_list(wpa_s, go ? WPA_IF_P2P_GO :
WPA_IF_P2P_CLIENT, len, freq_list);
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/**
* wpas_p2p_init - Initialize P2P module for %wpa_supplicant
* @global: Pointer to global data from wpa_supplicant_init()
* @wpa_s: Pointer to wpa_supplicant data from wpa_supplicant_add_iface()
* Returns: 0 on success, -1 on failure
*/
int wpas_p2p_init(struct wpa_global *global, struct wpa_supplicant *wpa_s)
{
struct p2p_config p2p;
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
int i;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Allow P2P functionality to be disabled per interface By default, P2P is initialized for all driver interfaces and this makes P2P getting initialized for non-P2P station interface if the supplicant is started first on this interface. If an interface is dedicated for non-P2P station mode, it is now possible to disable P2P initialization by adding 'p2p_disabled=1' in the configuration file of non-P2P station interface, irrespective of the order in which supplicant is started. Signed-hostap: Sreenath Sharma <sreenats@broadcom.com>
2013-08-31 10:59:05 +02:00
if (wpa_s->conf->p2p_disabled)
return 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_P2P_CAPABLE))
return 0;
if (global->p2p)
return 0;
os_memset(&p2p, 0, sizeof(p2p));
p2p.cb_ctx = wpa_s;
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
p2p.debug_print = wpas_p2p_debug_print;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p.p2p_scan = wpas_p2p_scan;
p2p.send_action = wpas_send_action;
p2p.send_action_done = wpas_send_action_done;
p2p.go_neg_completed = wpas_go_neg_completed;
p2p.go_neg_req_rx = wpas_go_neg_req_rx;
p2p.dev_found = wpas_dev_found;
P2P: Add method to signal lost device This signal is used to notify users of the P2P state machine or wpa_supplicant of lost devices. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-24 21:22:16 +01:00
p2p.dev_lost = wpas_dev_lost;
P2P: Move p2p_find stopped event message into p2p_supplicant.c This removes wpa_ctrl.h dependency from src/p2p/* and makes the P2P events more consistent, i.e., everything that is aimed for upper layer processing from the wpa_supplicant control interfaces is generated in p2p_supplicant.c. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 15:06:40 +02:00
p2p.find_stopped = wpas_find_stopped;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p.start_listen = wpas_start_listen;
p2p.stop_listen = wpas_stop_listen;
p2p.send_probe_resp = wpas_send_probe_resp;
p2p.sd_request = wpas_sd_request;
p2p.sd_response = wpas_sd_response;
p2p.prov_disc_req = wpas_prov_disc_req;
p2p.prov_disc_resp = wpas_prov_disc_resp;
P2P: Add wpas_notify_p2p_provision_discovery() Add a notification for P2P provision discovery status/result. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:31:56 +02:00
p2p.prov_disc_fail = wpas_prov_disc_fail;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p.invitation_process = wpas_invitation_process;
p2p.invitation_received = wpas_invitation_received;
p2p.invitation_result = wpas_invitation_result;
p2p.get_noa = wpas_get_noa;
P2P: Do not expire peer entry if we are connected to the peer Even though we may not update P2P peer entry while connected to the peer as a P2P client, we should not be expiring a P2P peer entry while that peer is the GO in a group where we are connected as a P2P client. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-01-25 16:27:47 +01:00
p2p.go_connected = wpas_go_connected;
P2P: Send received Presence Response information to ctrl_iface monitors The P2P_PRESENCE_REQ command did not give any easily available indication of the response received from the GO. Make this more useful by providing such response (if received) as a ctrl_iface monitor event (P2P-PRESENCE-RESPONSE). Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-01 17:44:44 +01:00
p2p.presence_resp = wpas_presence_resp;
P2P: Extend the listen time based on the active concurrent session A P2P Device while in the Listen state waiting to respond for the obtained group negotiation request shall give a fair chance for other concurrent sessions to use the shared radio by inducing an idle time between the successive listen states. However, if there are no concurrent operations, this idle time can be reduced. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2014-01-20 21:55:09 +01:00
p2p.is_concurrent_session_active = wpas_is_concurrent_session_active;
P2P: Refrain from performing extended listen during P2P connection Do not perform extended listen period operations when either a P2P connection is in progress. This makes the connection more robust should an extended listen timer trigger during such an operation. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-05-06 18:34:37 +02:00
p2p.is_p2p_in_progress = _wpas_p2p_in_progress;
P2PS: Add P2PS attributes into PD Request if requested This adds a data structure for storing P2PS PD information and code to add the related attributes into PD Request. The actual operation to trigger this behavior will be added in a separate commit. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 09:38:56 +01:00
p2p.get_persistent_group = wpas_get_persistent_group;
p2p.get_go_info = wpas_get_go_info;
P2PS: Callback to remove stale persistent groups When the peer device is trying to form a new group despite having old persistent group with same roles, remove the stale persistent group. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:38:17 +01:00
p2p.remove_stale_groups = wpas_remove_stale_groups;
P2PS: Callback to send P2PS provisioning events Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 14:43:23 +01:00
p2p.p2ps_prov_complete = wpas_p2ps_prov_complete;
P2PS: Callback to create pending group after sending PD Response This introduces a P2P module callback function that will be used to create the pending P2PS group after sending PD Response and receiving ACK status for it. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 12:29:29 +01:00
p2p.prov_disc_resp_cb = wpas_prov_disc_resp_cb;
P2PS: PD Request processing and PD Response building Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 11:53:54 +01:00
p2p.p2ps_group_capability = p2ps_group_capability;
P2P: Expose driver preferred frequency list fetch to P2P This adds a callback function that can be used from the P2P module to request the current preferred list of operating channels from the driver. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-07-24 10:23:24 +02:00
p2p.get_pref_freq_list = wpas_p2p_get_pref_freq_list;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
os_memcpy(wpa_s->global->p2p_dev_addr, wpa_s->own_addr, ETH_ALEN);
P2P: Use global->p2p_dev_addr instead of parent->own_addr Start using global->p2p_dev_addr more consistently as the P2P Device Address. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-25 22:58:03 +01:00
os_memcpy(p2p.dev_addr, wpa_s->global->p2p_dev_addr, ETH_ALEN);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p.dev_name = wpa_s->conf->device_name;
P2P: Add more WPS attributes into Listen state Probe Response Configure more WPS attributes in the P2P module and use them when generating WSC IE for Probe Response frames in Listen state.
2011-03-28 14:24:12 +02:00
p2p.manufacturer = wpa_s->conf->manufacturer;
p2p.model_name = wpa_s->conf->model_name;
p2p.model_number = wpa_s->conf->model_number;
p2p.serial_number = wpa_s->conf->serial_number;
if (wpa_s->wps) {
os_memcpy(p2p.uuid, wpa_s->wps->uuid, 16);
p2p.config_methods = wpa_s->wps->config_methods;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Add support for 60 GHz social channel Support 60 GHz band in P2P module by selecting random social channel from all supported social channels in 2.4 GHz and 60 GHz bands. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-09-25 11:42:07 +02:00
if (wpas_p2p_setup_channels(wpa_s, &p2p.channels, &p2p.cli_channels)) {
wpa_printf(MSG_ERROR,
"P2P: Failed to configure supported channel list");
return -1;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (wpa_s->conf->p2p_listen_reg_class &&
wpa_s->conf->p2p_listen_channel) {
p2p.reg_class = wpa_s->conf->p2p_listen_reg_class;
p2p.channel = wpa_s->conf->p2p_listen_channel;
P2P: Use another interface operating channel as listen channel Performing a P2P Device flow such as p2p_listen or p2p_find, can degrade the performance of an active interface connection, if the listen frequency is different than the frequency used by that interface. To reduce the effect of P2P Device flows on other interfaces, try changing the listen channel of the P2P Device to match the operating channel of one of the other active interfaces. This change will be possible only in case that the listen channel is not forced externally, and will be delayed to a point where the P2P Device state machine is idle. The optimization can be configured in the configuration file and is disabled by default. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:39 +02:00
p2p.channel_forced = 1;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
} else {
/*
* Pick one of the social channels randomly as the listen
* channel.
*/
P2P: Add support for 60 GHz social channel Support 60 GHz band in P2P module by selecting random social channel from all supported social channels in 2.4 GHz and 60 GHz bands. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-09-25 11:42:07 +02:00
if (p2p_config_get_random_social(&p2p, &p2p.reg_class,
&p2p.channel) != 0) {
P2P: Allow wpa_supplicant to start if social channels are not supported It was possible for an nl80211-based driver to be determined to support P2P even when the radio supports only the 5 GHz band. This resulted in P2P initialization failing due to not being able to pick a social channel and wpa_supplicant not starting. Fix this by not enabling P2P, but still allowing wpa_supplicant initialization to complete. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-04-26 12:59:06 +02:00
wpa_printf(MSG_INFO,
"P2P: No social channels supported by the driver - do not enable P2P");
return 0;
P2P: Add support for 60 GHz social channel Support 60 GHz band in P2P module by selecting random social channel from all supported social channels in 2.4 GHz and 60 GHz bands. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-09-25 11:42:07 +02:00
}
P2P: Use another interface operating channel as listen channel Performing a P2P Device flow such as p2p_listen or p2p_find, can degrade the performance of an active interface connection, if the listen frequency is different than the frequency used by that interface. To reduce the effect of P2P Device flows on other interfaces, try changing the listen channel of the P2P Device to match the operating channel of one of the other active interfaces. This change will be possible only in case that the listen channel is not forced externally, and will be delayed to a point where the P2P Device state machine is idle. The optimization can be configured in the configuration file and is disabled by default. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:39 +02:00
p2p.channel_forced = 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Add support for 60 GHz social channel Support 60 GHz band in P2P module by selecting random social channel from all supported social channels in 2.4 GHz and 60 GHz bands. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-09-25 11:42:07 +02:00
wpa_printf(MSG_DEBUG, "P2P: Own listen channel: %d:%d",
p2p.reg_class, p2p.channel);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (wpa_s->conf->p2p_oper_reg_class &&
wpa_s->conf->p2p_oper_channel) {
p2p.op_reg_class = wpa_s->conf->p2p_oper_reg_class;
p2p.op_channel = wpa_s->conf->p2p_oper_channel;
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
p2p.cfg_op_channel = 1;
wpa_printf(MSG_DEBUG, "P2P: Configured operating channel: "
"%d:%d", p2p.op_reg_class, p2p.op_channel);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
} else {
/*
P2P: Add support for 60 GHz social channel Support 60 GHz band in P2P module by selecting random social channel from all supported social channels in 2.4 GHz and 60 GHz bands. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-09-25 11:42:07 +02:00
* Use random operation channel from 2.4 GHz band social
* channels (1, 6, 11) or band 60 GHz social channel (2) if no
* other preference is indicated.
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
*/
P2P: Add support for 60 GHz social channel Support 60 GHz band in P2P module by selecting random social channel from all supported social channels in 2.4 GHz and 60 GHz bands. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-09-25 11:42:07 +02:00
if (p2p_config_get_random_social(&p2p, &p2p.op_reg_class,
&p2p.op_channel) != 0) {
wpa_printf(MSG_ERROR,
"P2P: Failed to select random social channel as operation channel");
P2P: Check os_get_random() return value more consistently In theory, this call could fail, so check the return value before using the received data. These specific cases would not really care much about the failures, but this keeps the code more consistent and keeps static analyzer warnings more useful. (CID 72678, CID 72679, CID 72680, CID 72683, CID 72689, CID 72698, CID 72703) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-09-13 15:27:52 +02:00
return -1;
P2P: Add support for 60 GHz social channel Support 60 GHz band in P2P module by selecting random social channel from all supported social channels in 2.4 GHz and 60 GHz bands. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-09-25 11:42:07 +02:00
}
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
p2p.cfg_op_channel = 0;
wpa_printf(MSG_DEBUG, "P2P: Random operating channel: "
"%d:%d", p2p.op_reg_class, p2p.op_channel);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Fix p2p_pref_chan setting from configuration file Commit 21d996f775a2131bb0c73d6e18ca9b382f017057 added p2p_pref_chan as a configuration file parameter, but included only the case of dynamically setting this at runtime through the control interface SET command. Complete this functionality by taking this value into use directly from the configuration file, too. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-05-17 10:03:52 +02:00
if (wpa_s->conf->p2p_pref_chan && wpa_s->conf->num_p2p_pref_chan) {
p2p.pref_chan = wpa_s->conf->p2p_pref_chan;
p2p.num_pref_chan = wpa_s->conf->num_p2p_pref_chan;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (wpa_s->conf->country[0] && wpa_s->conf->country[1]) {
os_memcpy(p2p.country, wpa_s->conf->country, 2);
p2p.country[2] = 0x04;
} else
P2P: Replace the default country with "XX" (non-country entity)
2010-11-10 15:22:22 +01:00
os_memcpy(p2p.country, "XX\x04", 3);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
WPS: Store (secondary) device type as binary Instead of converting back and forth from the string representation, always use the binary representation internally. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-17 17:50:22 +01:00
os_memcpy(p2p.pri_dev_type, wpa_s->conf->device_type,
WPS_DEV_TYPE_LEN);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
WPS: Store (secondary) device type as binary Instead of converting back and forth from the string representation, always use the binary representation internally. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-17 17:50:22 +01:00
p2p.num_sec_dev_types = wpa_s->conf->num_sec_device_types;
os_memcpy(p2p.sec_dev_type, wpa_s->conf->sec_device_type,
p2p.num_sec_dev_types * WPS_DEV_TYPE_LEN);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p.concurrent_operations = !!(wpa_s->drv_flags &
WPA_DRIVER_FLAGS_P2P_CONCURRENT);
Fix max_stations to apply to associated STAs, not P2P peers This driver capability limit was supposed to indicate limit on how many stations can associate with us in the AP mode, not how many P2P peers are stored in the peer table.
2010-10-19 16:17:04 +02:00
p2p.max_peers = 100;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (wpa_s->conf->p2p_ssid_postfix) {
p2p.ssid_postfix_len =
os_strlen(wpa_s->conf->p2p_ssid_postfix);
if (p2p.ssid_postfix_len > sizeof(p2p.ssid_postfix))
p2p.ssid_postfix_len = sizeof(p2p.ssid_postfix);
os_memcpy(p2p.ssid_postfix, wpa_s->conf->p2p_ssid_postfix,
p2p.ssid_postfix_len);
}
P2P: Add option for disabling intra BSS distribution p2p_intra_bss configuration parameter can now be used to disable/enable intra BSS distribution (bridging of frames between the clients in a group).
2010-09-08 20:18:10 +02:00
p2p.p2p_intra_bss = wpa_s->conf->p2p_intra_bss;
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
p2p.max_listen = wpa_s->max_remain_on_chan;
P2P: Allow passphrase length to be configured Previously, eight character random passphrase was generated automatically for P2P GO. The new p2p_passphrase_len parameter can be used to increase this length to generate a stronger passphrase for cases where practicality of manual configuration of legacy devices is not a concern. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-21 23:15:53 +02:00
if (wpa_s->conf->p2p_passphrase_len >= 8 &&
wpa_s->conf->p2p_passphrase_len <= 63)
p2p.passphrase_len = wpa_s->conf->p2p_passphrase_len;
else
p2p.passphrase_len = 8;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
global->p2p = p2p_init(&p2p);
if (global->p2p == NULL)
return -1;
P2P: Deinitialize global P2P context on P2P mgmt interface removal The P2P implementation assumes that the first wpa_s interface instance is used to manage P2P operations and the P2P module maintains a pointer to this interface in msg_ctx. This can result in issues (e.g., use of freed memory) when the management interface is removed. Fix this by deinitializing global P2P data if the interface that created it is removed. This will disable P2P until the next interface is added. Signed-hostap: Jouni Malinen <j@w1.fi> intended-for: hostap-1
2012-05-10 09:49:22 +02:00
global->p2p_init_wpa_s = wpa_s;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
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
for (i = 0; i < MAX_WPS_VENDOR_EXT; i++) {
if (wpa_s->conf->wps_vendor_ext[i] == NULL)
continue;
p2p_add_wps_vendor_extension(
global->p2p, wpa_s->conf->wps_vendor_ext[i]);
}
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
p2p_set_no_go_freq(global->p2p, &wpa_s->conf->p2p_no_go_freq);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return 0;
}
/**
* wpas_p2p_deinit - Deinitialize per-interface P2P data
* @wpa_s: Pointer to wpa_supplicant data from wpa_supplicant_add_iface()
*
* This function deinitialize per-interface P2P data.
*/
void wpas_p2p_deinit(struct wpa_supplicant *wpa_s)
{
if (wpa_s->driver && wpa_s->drv_priv)
wpa_drv_probe_req_report(wpa_s, 0);
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
if (wpa_s->go_params) {
/* Clear any stored provisioning info */
p2p_clear_provisioning_info(
wpa_s->global->p2p,
P2P: Fix provisioning info clearing after successful WPS step Previously, this provisioning info was cleared using the P2P Interface Address of the GO as the key. That did not always work in the case the where we joined an already running group. This could result in the next connection to that same GO skipping provision discovery. Fix this by finding the peer entry based on its P2P Device Address instead of the P2P Interface Address which may not always be set. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-03-01 21:06:03 +01:00
wpa_s->go_params->peer_device_addr);
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
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
os_free(wpa_s->go_params);
wpa_s->go_params = NULL;
Remove leftover timeouts on cleanup Signed-off-by: Alexandru Costache <alexandru.costache.100@gmail.com>
2014-05-12 18:14:55 +02:00
eloop_cancel_timeout(wpas_p2p_psk_failure_removal, wpa_s, NULL);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
eloop_cancel_timeout(wpas_p2p_group_formation_timeout, wpa_s, NULL);
P2P: Run a scan before provision discovery in p2p_connect join This is needed to make sure we have fresh BSS information for the GO.
2010-06-27 01:20:57 +02:00
eloop_cancel_timeout(wpas_p2p_join_scan, wpa_s, NULL);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_s->p2p_long_listen = 0;
eloop_cancel_timeout(wpas_p2p_long_listen_timeout, wpa_s, NULL);
P2P: Add mechanism for timing out idle groups A new configuration parameter, p2p_group_idle, can now be used to set idle timeout value for P2P groups in seconds (0 = no timeout). If set, this values is used to remove P2P group (both GO and P2P client) interfaces after the group has been idle (no clients/GO seen) for the configuration duration. The P2P-GROUP-REMOVED event is now indicating the reason for group removal when known. For example: P2P-GROUP-REMOVED wlan0 GO reason=REQUESTED P2P-GROUP-REMOVED wlan1 client reason=IDLE
2010-10-25 17:24:15 +02:00
eloop_cancel_timeout(wpas_p2p_group_idle_timeout, wpa_s, NULL);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpas_p2p_remove_pending_group_interface(wpa_s);
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
eloop_cancel_timeout(wpas_p2p_group_freq_conflict, wpa_s, NULL);
Use radio work for P2P Listen requests Avoid concurrent P2P Listen operations with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-04 08:36:13 +01:00
wpas_p2p_listen_work_done(wpa_s);
P2P: Use radio work to protect offchannel Action frame exchanges Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-07 08:39:30 +01:00
if (wpa_s->p2p_send_action_work) {
os_free(wpa_s->p2p_send_action_work->ctx);
radio_work_done(wpa_s->p2p_send_action_work);
wpa_s->p2p_send_action_work = NULL;
}
eloop_cancel_timeout(wpas_p2p_send_action_work_timeout, wpa_s, NULL);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
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
wpabuf_free(wpa_s->p2p_oob_dev_pw);
wpa_s->p2p_oob_dev_pw = NULL;
P2P: Save group common frequencies Once a P2P GO interface is configured, save the group common frequencies, as this can be useful later for channel selection considerations during channel switch, etc. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-07-07 13:20:59 +02:00
os_free(wpa_s->p2p_group_common_freqs);
wpa_s->p2p_group_common_freqs = NULL;
wpa_s->p2p_group_common_freqs_num = 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/* TODO: remove group interface from the driver if this wpa_s instance
* is on top of a P2P group interface */
}
/**
* wpas_p2p_deinit_global - Deinitialize global P2P module
* @global: Pointer to global data from wpa_supplicant_init()
*
* This function deinitializes the global (per device) P2P module.
*/
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 void wpas_p2p_deinit_global(struct wpa_global *global)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct wpa_supplicant *wpa_s, *tmp;
P2P: Fix memory leak with driver-based P2P management If the P2P management operations are handled within the driver, the P2P service entries were not freed when terminating wpa_supplicant. Fix this by calling wpas_p2p_service_flush() even if the P2P module within wpa_supplicant has not been initialized. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-24 19:45:22 +02:00
wpa_s = global->ifaces;
P2P: Flush services based on global p2p init and not p2p ifaces As P2P service are not necessarily attached to a iface, when added, proceed with same approach on p2p global deinit. Such approach solves memory leaks ocurring upon wpa_supplicant termination, when p2p services were registered previously. Signed-off-by: Eduardo Abinader <eduardo.abinader@openbossa.org>
2014-09-20 22:51:00 +02:00
wpas_p2p_service_flush(global->p2p_init_wpa_s);
P2P: Fix memory leak with driver-based P2P management If the P2P management operations are handled within the driver, the P2P service entries were not freed when terminating wpa_supplicant. Fix this by calling wpas_p2p_service_flush() even if the P2P module within wpa_supplicant has not been initialized. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-08-24 19:45:22 +02:00
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/* Remove remaining P2P group interfaces */
while (wpa_s && wpa_s->p2p_group_interface != NOT_P2P_GROUP_INTERFACE)
wpa_s = wpa_s->next;
while (wpa_s) {
tmp = global->ifaces;
while (tmp &&
(tmp == wpa_s ||
tmp->p2p_group_interface == NOT_P2P_GROUP_INTERFACE)) {
tmp = tmp->next;
}
if (tmp == NULL)
break;
P2P: Disconnect P2P group on supplicant deinit When a supplicant is deinited and shutting, disconnect from P2P groups. This fixes a memory leak on variable dbus_groupobj_path on exiting supplicant. Signed-hostap: Nirav Shah <nirav.j2.shah@intel.com> Signed-hostap: Angie Chinchilla <angie.v.chinchilla@intel.com>
2012-04-06 17:41:06 +02:00
/* Disconnect from the P2P group and deinit the interface */
wpas_p2p_disconnect(tmp);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Deinit GO group data before global P2P deinit This avoids issues with using freed memory in p2p_group_deinit().
2010-08-05 04:13:00 +02:00
/*
* Deinit GO data on any possibly remaining interface (if main
* interface is used as GO).
*/
for (wpa_s = global->ifaces; wpa_s; wpa_s = wpa_s->next) {
if (wpa_s->ap_iface)
wpas_p2p_group_deinit(wpa_s);
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_deinit(global->p2p);
global->p2p = NULL;
P2P: Deinitialize global P2P context on P2P mgmt interface removal The P2P implementation assumes that the first wpa_s interface instance is used to manage P2P operations and the P2P module maintains a pointer to this interface in msg_ctx. This can result in issues (e.g., use of freed memory) when the management interface is removed. Fix this by deinitializing global P2P data if the interface that created it is removed. This will disable P2P until the next interface is added. Signed-hostap: Jouni Malinen <j@w1.fi> intended-for: hostap-1
2012-05-10 09:49:22 +02:00
global->p2p_init_wpa_s = NULL;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
static int wpas_p2p_create_iface(struct wpa_supplicant *wpa_s)
{
P2P: Support dedicated P2P_DEVICE without separate group interface Add support for drivers with dedicated P2P_DEVICE interface, but without group interface concurrency (only a single netdev is used). With such devices, wpa_supplicant tried to use the p2p_dev interface instead of the group interface and most P2P operations failed. Extend wpa_supplicant to use the primary interface instead of a separate group interface in such cases. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
if (wpa_s->conf->p2p_no_group_iface)
P2P: Allow separate P2P group interface use to be disabled The new p2p_no_group_iface=1 configuration parameter can now be used to disable the default behavior of adding a separate interface for the P2P group when driver support for concurrent interfaces is available. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-10-29 14:02:30 +01:00
return 0; /* separate interface disabled per configuration */
P2P: Add new driver option for interface allocation WPA_DRIVER_FLAGS_P2P_MGMT_AND_NON_P2P flag can now be used to indicate that the initial interface (e.g., wlan0) is used for P2P management operations and potentially non-P2P connections. This is otherwise identical to WPA_DRIVER_FLAGS_P2P_DEDICATED_INTERFACE, but the possibility of non-P2P connections makes some operations differ.
2010-11-26 14:52:16 +01:00
if (wpa_s->drv_flags &
(WPA_DRIVER_FLAGS_P2P_DEDICATED_INTERFACE |
WPA_DRIVER_FLAGS_P2P_MGMT_AND_NON_P2P))
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return 1; /* P2P group requires a new interface in every case
*/
if (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_P2P_CONCURRENT))
return 0; /* driver does not support concurrent operations */
if (wpa_s->global->ifaces->next)
return 1; /* more that one interface already in use */
if (wpa_s->wpa_state >= WPA_AUTHENTICATING)
return 1; /* this interface is already in use */
return 0;
}
static int wpas_p2p_start_go_neg(struct wpa_supplicant *wpa_s,
const u8 *peer_addr,
enum p2p_wps_method wps_method,
int go_intent, const u8 *own_interface_addr,
P2P: Add option to force SSID/passphrase for GO Negotiation An existing persistent group information can now be used to force GO Negotiation to use the previously used SSID/passphrase from a persistent group if we become a GO. This can be used as an alternative to inviting a new P2P peer to join the group (i.e., use GO Negotiation with GO intent 15 instead of starting an autonomous GO and using invitation), e.g., in case a GO Negotiation Request is received from a peer while we are not running as a GO. The persistent group to use for parameters is indicated with persistent=<network id> parameter to p2p_connect. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-27 17:17:10 +02:00
unsigned int force_freq, int persistent_group,
P2P: Allow all channels with multi-channel concurrency If the driver indicates support for multi-channel concurrency, change the p2p_connect behavior to not force the current operating channel, but instead, just mark it as preferred for GO Negotiation. This change applies only for the case when the freq parameter is not used with the p2p_connect command. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-10-26 17:10:46 +02:00
struct wpa_ssid *ssid, unsigned int pref_freq)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
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
if (persistent_group && wpa_s->conf->persistent_reconnect)
persistent_group = 2;
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
/*
* 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.
*/
p2p_set_config_timeout(wpa_s->global->p2p,
wpa_s->p2p_go_ht40 ? 255 : 100, 20);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return p2p_connect(wpa_s->global->p2p, peer_addr, wps_method,
go_intent, own_interface_addr, force_freq,
P2P: Add option to force SSID/passphrase for GO Negotiation An existing persistent group information can now be used to force GO Negotiation to use the previously used SSID/passphrase from a persistent group if we become a GO. This can be used as an alternative to inviting a new P2P peer to join the group (i.e., use GO Negotiation with GO intent 15 instead of starting an autonomous GO and using invitation), e.g., in case a GO Negotiation Request is received from a peer while we are not running as a GO. The persistent group to use for parameters is indicated with persistent=<network id> parameter to p2p_connect. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-27 17:17:10 +02:00
persistent_group, ssid ? ssid->ssid : NULL,
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
ssid ? ssid->ssid_len : 0,
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
wpa_s->p2p_pd_before_go_neg, pref_freq,
wps_method == WPS_NFC ? wpa_s->p2p_oob_dev_pw_id :
0);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
static int wpas_p2p_auth_go_neg(struct wpa_supplicant *wpa_s,
const u8 *peer_addr,
enum p2p_wps_method wps_method,
int go_intent, const u8 *own_interface_addr,
P2P: Add option to force SSID/passphrase for GO Negotiation An existing persistent group information can now be used to force GO Negotiation to use the previously used SSID/passphrase from a persistent group if we become a GO. This can be used as an alternative to inviting a new P2P peer to join the group (i.e., use GO Negotiation with GO intent 15 instead of starting an autonomous GO and using invitation), e.g., in case a GO Negotiation Request is received from a peer while we are not running as a GO. The persistent group to use for parameters is indicated with persistent=<network id> parameter to p2p_connect. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-27 17:17:10 +02:00
unsigned int force_freq, int persistent_group,
P2P: Allow all channels with multi-channel concurrency If the driver indicates support for multi-channel concurrency, change the p2p_connect behavior to not force the current operating channel, but instead, just mark it as preferred for GO Negotiation. This change applies only for the case when the freq parameter is not used with the p2p_connect command. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-10-26 17:10:46 +02:00
struct wpa_ssid *ssid, unsigned int pref_freq)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
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
if (persistent_group && wpa_s->conf->persistent_reconnect)
persistent_group = 2;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return p2p_authorize(wpa_s->global->p2p, peer_addr, wps_method,
go_intent, own_interface_addr, force_freq,
P2P: Add option to force SSID/passphrase for GO Negotiation An existing persistent group information can now be used to force GO Negotiation to use the previously used SSID/passphrase from a persistent group if we become a GO. This can be used as an alternative to inviting a new P2P peer to join the group (i.e., use GO Negotiation with GO intent 15 instead of starting an autonomous GO and using invitation), e.g., in case a GO Negotiation Request is received from a peer while we are not running as a GO. The persistent group to use for parameters is indicated with persistent=<network id> parameter to p2p_connect. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-27 17:17:10 +02:00
persistent_group, ssid ? ssid->ssid : NULL,
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
ssid ? ssid->ssid_len : 0, pref_freq,
wps_method == WPS_NFC ? wpa_s->p2p_oob_dev_pw_id :
0);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Allow multiple scan runs to find GO for p2p_connect join If the GO is not found, we cannot send Provisioning Discovery Request frame and cannot really connect anyway. Since the Provisioning Discovery is a mandatory part, it is better to continue join-scan until the GO is found instead of moving to the next step where normal connection scan is used (PD would not be used from there). Use a limit of 10 scan attempts for p2p_connect join to avoid getting in infinite loop trying to join. If the GO is not found with those scans, indicate failure (P2P-GROUP-FORMATION-FAILURE) and stop the join attempt.
2010-11-15 15:15:38 +01:00
static void wpas_p2p_check_join_scan_limit(struct wpa_supplicant *wpa_s)
{
wpa_s->p2p_join_scan_count++;
wpa_printf(MSG_DEBUG, "P2P: Join scan attempt %d",
wpa_s->p2p_join_scan_count);
if (wpa_s->p2p_join_scan_count > P2P_MAX_JOIN_SCAN_ATTEMPTS) {
wpa_printf(MSG_DEBUG, "P2P: Failed to find GO " MACSTR
" for join operationg - stop join attempt",
MAC2STR(wpa_s->pending_join_iface_addr));
eloop_cancel_timeout(wpas_p2p_join_scan, wpa_s, NULL);
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
if (wpa_s->p2p_auto_pd) {
wpa_s->p2p_auto_pd = 0;
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
wpa_msg_global(wpa_s, MSG_INFO,
P2P_EVENT_PROV_DISC_FAILURE
" p2p_dev_addr=" MACSTR " status=N/A",
MAC2STR(wpa_s->pending_join_dev_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
return;
}
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_msg_global(wpa_s->p2pdev, MSG_INFO,
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
P2P_EVENT_GROUP_FORMATION_FAILURE);
P2P: Add D-Bus signal GroupFormationFailure This is similar to the control interface event P2P-GROUP-FORMATION-FAILURE. Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>
2015-08-20 12:58:33 +02:00
wpas_notify_p2p_group_formation_failure(wpa_s, "");
P2P: Allow multiple scan runs to find GO for p2p_connect join If the GO is not found, we cannot send Provisioning Discovery Request frame and cannot really connect anyway. Since the Provisioning Discovery is a mandatory part, it is better to continue join-scan until the GO is found instead of moving to the next step where normal connection scan is used (PD would not be used from there). Use a limit of 10 scan attempts for p2p_connect join to avoid getting in infinite loop trying to join. If the GO is not found with those scans, indicate failure (P2P-GROUP-FORMATION-FAILURE) and stop the join attempt.
2010-11-15 15:15:38 +01:00
}
}
P2P: Abort join-group operation if concurrent group cannot be supported If the driver does not indicate support for multi-channel concurrency, abort join-group operation if the end result would result in use of multiple operating frequencies with the same radio. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-04-08 19:12:05 +02:00
static int wpas_check_freq_conflict(struct wpa_supplicant *wpa_s, int freq)
{
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
int res;
unsigned int num, i;
struct wpa_used_freq_data *freqs;
P2P: Abort join-group operation if concurrent group cannot be supported If the driver does not indicate support for multi-channel concurrency, abort join-group operation if the end result would result in use of multiple operating frequencies with the same radio. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-04-08 19:12:05 +02:00
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
if (wpas_p2p_num_unused_channels(wpa_s) > 0) {
/* Multiple channels are supported and not all are in use */
P2P: Abort join-group operation if concurrent group cannot be supported If the driver does not indicate support for multi-channel concurrency, abort join-group operation if the end result would result in use of multiple operating frequencies with the same radio. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-04-08 19:12:05 +02:00
return 0;
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
}
P2P: Abort join-group operation if concurrent group cannot be supported If the driver does not indicate support for multi-channel concurrency, abort join-group operation if the end result would result in use of multiple operating frequencies with the same radio. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-04-08 19:12:05 +02:00
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
freqs = os_calloc(wpa_s->num_multichan_concurrent,
sizeof(struct wpa_used_freq_data));
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
if (!freqs)
return 1;
P2P: Fix shared freq check and support AP mode validation The previous commit did not use the correct pointer in all operations and was specific to station mode interfaces. Fix and extend it to work with AP/GO interfaces, too. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-04-08 19:42:45 +02:00
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
num = wpas_p2p_valid_oper_freqs(wpa_s, freqs,
wpa_s->num_multichan_concurrent);
P2P: Abort join-group operation if concurrent group cannot be supported If the driver does not indicate support for multi-channel concurrency, abort join-group operation if the end result would result in use of multiple operating frequencies with the same radio. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-04-08 19:12:05 +02:00
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
for (i = 0; i < num; i++) {
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
if (freqs[i].freq == freq) {
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
wpa_printf(MSG_DEBUG, "P2P: Frequency %d MHz in use by another virtual interface and can be used",
freq);
res = 0;
goto exit_free;
}
P2P: Abort join-group operation if concurrent group cannot be supported If the driver does not indicate support for multi-channel concurrency, abort join-group operation if the end result would result in use of multiple operating frequencies with the same radio. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-04-08 19:12:05 +02:00
}
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
wpa_printf(MSG_DEBUG, "P2P: No valid operating frequencies");
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
res = 1;
exit_free:
os_free(freqs);
return res;
P2P: Abort join-group operation if concurrent group cannot be supported If the driver does not indicate support for multi-channel concurrency, abort join-group operation if the end result would result in use of multiple operating frequencies with the same radio. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-04-08 19:12:05 +02:00
}
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
static int wpas_p2p_peer_go(struct wpa_supplicant *wpa_s,
const u8 *peer_dev_addr)
{
struct wpa_bss *bss;
int updated;
bss = wpa_bss_get_p2p_dev_addr(wpa_s, peer_dev_addr);
if (bss == NULL)
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
return -1;
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
if (bss->last_update_idx < wpa_s->bss_update_idx) {
wpa_printf(MSG_DEBUG, "P2P: Peer BSS entry not updated in the "
"last scan");
return 0;
}
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
updated = os_reltime_before(&wpa_s->p2p_auto_started,
&bss->last_update);
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
wpa_printf(MSG_DEBUG, "P2P: Current BSS entry for peer updated at "
"%ld.%06ld (%supdated in last scan)",
bss->last_update.sec, bss->last_update.usec,
updated ? "": "not ");
return updated;
}
P2P: Run a scan before provision discovery in p2p_connect join This is needed to make sure we have fresh BSS information for the GO.
2010-06-27 01:20:57 +02:00
static void wpas_p2p_scan_res_join(struct wpa_supplicant *wpa_s,
struct wpa_scan_results *scan_res)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
P2P: Limit join-a-group scans based on SSID from invitation If we already know the SSID of the P2P group we are trying to join, use that SSID to limit scan responses and BSS selection since we do not really look for any other network in this case. In addition, this can fix cases where the peer has just changed its SSID (e.g., started a new group) and there may be multiple BSS entries for the same BSSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2014-01-13 20:39:06 +01:00
struct wpa_bss *bss = NULL;
P2P: Use operating frequency from peer table as backup for join The scan operation before Provision Discovery Request may not include the GO. However, we are likely to have the GO in our P2P peer table, so use that information to figure out the operating channel if BSS table entry is not available.
2010-08-05 01:00:21 +02:00
int freq;
P2P: Update pending join interface address during scans Since the P2P peer entry may not have been available at the time the join request was issued, we need to allow the P2P Interface Address to be updated during join-scans when the P2P peer entry for the GO may be added.
2010-11-15 15:16:39 +01:00
u8 iface_addr[ETH_ALEN];
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Run a scan before provision discovery in p2p_connect join This is needed to make sure we have fresh BSS information for the GO.
2010-06-27 01:20:57 +02:00
eloop_cancel_timeout(wpas_p2p_join_scan, wpa_s, NULL);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Run a scan before provision discovery in p2p_connect join This is needed to make sure we have fresh BSS information for the GO.
2010-06-27 01:20:57 +02:00
if (wpa_s->global->p2p_disabled)
return;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
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
wpa_printf(MSG_DEBUG, "P2P: Scan results received (%d BSS) for %sjoin",
scan_res ? (int) scan_res->num : -1,
wpa_s->p2p_auto_join ? "auto_" : "");
P2P: Run a scan before provision discovery in p2p_connect join This is needed to make sure we have fresh BSS information for the GO.
2010-06-27 01:20:57 +02:00
if (scan_res)
wpas_p2p_scan_res_handler(wpa_s, scan_res);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
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
if (wpa_s->p2p_auto_pd) {
int join = wpas_p2p_peer_go(wpa_s,
wpa_s->pending_join_dev_addr);
P2P: Improve p2p_prov_disc-auto robustness Perform addition additional scan runs on the operating channel of the GO (if known from previous scan results) and fall back to initiate the PD for GO Negotiation if these additional scans do not detect the peer as GO. Signed-hostap: Sunil Dutt Undekari <duttus@codeaurora.org>
2012-06-06 14:46:05 +02:00
if (join == 0 &&
wpa_s->auto_pd_scan_retry < P2P_AUTO_PD_SCAN_ATTEMPTS) {
wpa_s->auto_pd_scan_retry++;
WPS: Use latest updated BSS entry if multiple BSSID matches found If the AP (P2P GO) has changes its channel of SSID recently, the BSS table may have multiple entries for a BSSID. Select the one which was most recently updated for WPS/P2P operations in such case to increase the likelihood of using current information. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-03-31 16:15:39 +02:00
bss = wpa_bss_get_bssid_latest(
wpa_s, wpa_s->pending_join_dev_addr);
P2P: Improve p2p_prov_disc-auto robustness Perform addition additional scan runs on the operating channel of the GO (if known from previous scan results) and fall back to initiate the PD for GO Negotiation if these additional scans do not detect the peer as GO. Signed-hostap: Sunil Dutt Undekari <duttus@codeaurora.org>
2012-06-06 14:46:05 +02:00
if (bss) {
freq = bss->freq;
wpa_printf(MSG_DEBUG, "P2P: Scan retry %d for "
"the peer " MACSTR " at %d MHz",
wpa_s->auto_pd_scan_retry,
MAC2STR(wpa_s->
pending_join_dev_addr),
freq);
P2P: Limit join-a-group scans based on SSID from invitation If we already know the SSID of the P2P group we are trying to join, use that SSID to limit scan responses and BSS selection since we do not really look for any other network in this case. In addition, this can fix cases where the peer has just changed its SSID (e.g., started a new group) and there may be multiple BSS entries for the same BSSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2014-01-13 20:39:06 +01:00
wpas_p2p_join_scan_req(wpa_s, freq, NULL, 0);
P2P: Improve p2p_prov_disc-auto robustness Perform addition additional scan runs on the operating channel of the GO (if known from previous scan results) and fall back to initiate the PD for GO Negotiation if these additional scans do not detect the peer as GO. Signed-hostap: Sunil Dutt Undekari <duttus@codeaurora.org>
2012-06-06 14:46:05 +02:00
return;
}
}
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
if (join < 0)
join = 0;
P2P: Improve p2p_prov_disc-auto robustness Perform addition additional scan runs on the operating channel of the GO (if known from previous scan results) and fall back to initiate the PD for GO Negotiation if these additional scans do not detect the peer as GO. Signed-hostap: Sunil Dutt Undekari <duttus@codeaurora.org>
2012-06-06 14:46:05 +02:00
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
wpa_s->p2p_auto_pd = 0;
wpa_s->pending_pd_use = join ? AUTO_PD_JOIN : AUTO_PD_GO_NEG;
wpa_printf(MSG_DEBUG, "P2P: Auto PD with " MACSTR " join=%d",
MAC2STR(wpa_s->pending_join_dev_addr), join);
if (p2p_prov_disc_req(wpa_s->global->p2p,
P2PS: Add P2PS attributes into PD Request if requested This adds a data structure for storing P2PS PD information and code to add the related attributes into PD Request. The actual operation to trigger this behavior will be added in a separate commit. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 09:38:56 +01:00
wpa_s->pending_join_dev_addr, NULL,
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
wpa_s->pending_pd_config_methods, join,
P2P: Set user_initiated_pd separately from the join parameter p2p_prov_disc_req() used the join parameter to figure out whether the PD request was a user initiated or not. This does not cover all use cases of PD, so add a separate parameter to allow caller to indicate whether the user requested the operation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-22 23:48:58 +01:00
0, wpa_s->user_initiated_pd) < 0) {
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
wpa_s->p2p_auto_pd = 0;
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
wpa_msg_global(wpa_s, MSG_INFO,
P2P_EVENT_PROV_DISC_FAILURE
" p2p_dev_addr=" MACSTR " status=N/A",
MAC2STR(wpa_s->pending_join_dev_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
}
return;
}
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
if (wpa_s->p2p_auto_join) {
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 join = wpas_p2p_peer_go(wpa_s,
wpa_s->pending_join_dev_addr);
if (join < 0) {
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
wpa_printf(MSG_DEBUG, "P2P: Peer was not found to be "
"running a GO -> use GO Negotiation");
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_msg_global(wpa_s->p2pdev, MSG_INFO,
P2P: Add event messages for P2P_CONNECT-fallback-to-GO-Neg This makes it easier for upper layer programs to follow progress of P2P_CONNECT-auto operation. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 11:04:15 +01:00
P2P_EVENT_FALLBACK_TO_GO_NEG
"reason=peer-not-running-GO");
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
wpas_p2p_connect(wpa_s, wpa_s->pending_join_dev_addr,
wpa_s->p2p_pin, wpa_s->p2p_wps_method,
wpa_s->p2p_persistent_group, 0, 0, 0,
wpa_s->p2p_go_intent,
P2P: Add option to force SSID/passphrase for GO Negotiation An existing persistent group information can now be used to force GO Negotiation to use the previously used SSID/passphrase from a persistent group if we become a GO. This can be used as an alternative to inviting a new P2P peer to join the group (i.e., use GO Negotiation with GO intent 15 instead of starting an autonomous GO and using invitation), e.g., in case a GO Negotiation Request is received from a peer while we are not running as a GO. The persistent group to use for parameters is indicated with persistent=<network id> parameter to p2p_connect. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-27 17:17:10 +02:00
wpa_s->p2p_connect_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
wpa_s->p2p_go_vht_center_freq2,
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
wpa_s->p2p_persistent_id,
P2P: Add optional "ht40" argument for p2p_connect This can be used to start negotiated GO in 40 MHz channel width in 5GHz band. Signed-hostap: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
2012-08-15 22:07:44 +02:00
wpa_s->p2p_pd_before_go_neg,
P2P: Add VHT parameter to P2P operations Add the option to ask for VHT operation similarly to the way ht40 is configured - either by adding 'vht' param to the relevant p2p_* commands or by configuring p2p_go_vht=1 in the configuration file. This patch only adds the configuration option (e.g., via control interface). The actual handling of the VHT parameter (asking the driver to use VHT, etc.) will be done by the following patch. Signed-hostap: Eliad Peller <eliadx.peller@intel.com>
2013-10-27 18:46:17 +01:00
wpa_s->p2p_go_ht40,
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
wpa_s->p2p_go_vht,
P2P: Provide group SSID, if specified, to P2P Client join step At least one of the wpas_p2p_connect() callers (NFC join case) already had access to the Group SSID. Pass that information through wpas_p2p_connect() to wpas_p2p_join() so that the join operation can filter out incorrect groups more easily. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-12-30 18:08:51 +01:00
wpa_s->p2p_go_max_oper_chwidth,
NULL, 0);
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
return;
}
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
wpa_printf(MSG_DEBUG, "P2P: Peer was found running GO%s -> "
"try to join the group", join ? "" :
" in older scan");
P2P: Add event messages for P2P_CONNECT-fallback-to-GO-Neg This makes it easier for upper layer programs to follow progress of P2P_CONNECT-auto operation. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 11:04:15 +01:00
if (!join) {
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_msg_global(wpa_s->p2pdev, MSG_INFO,
P2P: Add event messages for P2P_CONNECT-fallback-to-GO-Neg This makes it easier for upper layer programs to follow progress of P2P_CONNECT-auto operation. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 11:04:15 +01:00
P2P_EVENT_FALLBACK_TO_GO_NEG_ENABLED);
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
wpa_s->p2p_fallback_to_go_neg = 1;
P2P: Add event messages for P2P_CONNECT-fallback-to-GO-Neg This makes it easier for upper layer programs to follow progress of P2P_CONNECT-auto operation. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 11:04:15 +01:00
}
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
}
P2P: Use operating frequency from peer table as backup for join The scan operation before Provision Discovery Request may not include the GO. However, we are likely to have the GO in our P2P peer table, so use that information to figure out the operating channel if BSS table entry is not available.
2010-08-05 01:00:21 +02:00
freq = p2p_get_oper_freq(wpa_s->global->p2p,
wpa_s->pending_join_iface_addr);
P2P: Update pending join interface address during scans Since the P2P peer entry may not have been available at the time the join request was issued, we need to allow the P2P Interface Address to be updated during join-scans when the P2P peer entry for the GO may be added.
2010-11-15 15:16:39 +01:00
if (freq < 0 &&
p2p_get_interface_addr(wpa_s->global->p2p,
wpa_s->pending_join_dev_addr,
iface_addr) == 0 &&
P2P: Overwrite pending interface only after verifying BSS entry Previously, the P2P Interface Address of the peer gets updated in the peer table every time based on the scan results. For example, in a two port concurrency scenario, where the peer device has two interfaces with unique P2P Interface Addresses and with same P2P Device Address, based on the Probe Response/Beacon frames from these two interfaces, their peer table gets updated, but each of these updates happens in the peer table only based on the P2P Device Address. So, the same peer's P2P Interface address is updated every time and hence, at any instant, only one P2P Device Address to P2P Interface Address mapping entry exist in the peer table for the peer which has two interfaces. When we try to join a group operated by the peer, lookup happens in the peer table and when an interface entry is not available, the pending interface address gets overwritten with the P2P Device Address and hence the P2P connection can fail. Since the BSS table is the one that is up-to-date, this fix will ensure that the interface overwriting will happen only when there is no BSS entry for the pending P2P Interface Address as well. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-08-14 13:14:32 +02:00
os_memcmp(iface_addr, wpa_s->pending_join_dev_addr, ETH_ALEN) != 0
&& !wpa_bss_get_bssid(wpa_s, wpa_s->pending_join_iface_addr)) {
P2P: Update pending join interface address during scans Since the P2P peer entry may not have been available at the time the join request was issued, we need to allow the P2P Interface Address to be updated during join-scans when the P2P peer entry for the GO may be added.
2010-11-15 15:16:39 +01:00
wpa_printf(MSG_DEBUG, "P2P: Overwrite pending interface "
"address for join from " MACSTR " to " MACSTR
" based on newly discovered P2P peer entry",
MAC2STR(wpa_s->pending_join_iface_addr),
MAC2STR(iface_addr));
os_memcpy(wpa_s->pending_join_iface_addr, iface_addr,
ETH_ALEN);
freq = p2p_get_oper_freq(wpa_s->global->p2p,
wpa_s->pending_join_iface_addr);
}
P2P: Use operating frequency from peer table as backup for join The scan operation before Provision Discovery Request may not include the GO. However, we are likely to have the GO in our P2P peer table, so use that information to figure out the operating channel if BSS table entry is not available.
2010-08-05 01:00:21 +02:00
if (freq >= 0) {
wpa_printf(MSG_DEBUG, "P2P: Target GO operating frequency "
"from P2P peer table: %d MHz", freq);
}
P2P: Limit join-a-group scans based on SSID from invitation If we already know the SSID of the P2P group we are trying to join, use that SSID to limit scan responses and BSS selection since we do not really look for any other network in this case. In addition, this can fix cases where the peer has just changed its SSID (e.g., started a new group) and there may be multiple BSS entries for the same BSSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2014-01-13 20:39:06 +01:00
if (wpa_s->p2p_join_ssid_len) {
wpa_printf(MSG_DEBUG, "P2P: Trying to find target GO BSS entry based on BSSID "
MACSTR " and SSID %s",
MAC2STR(wpa_s->pending_join_iface_addr),
wpa_ssid_txt(wpa_s->p2p_join_ssid,
wpa_s->p2p_join_ssid_len));
bss = wpa_bss_get(wpa_s, wpa_s->pending_join_iface_addr,
wpa_s->p2p_join_ssid,
wpa_s->p2p_join_ssid_len);
P2P: Do not accept any GO BSS entry if SSID is specified for join Accept only a BSS entry matching the SSID when trying to find the operating channel of a GO during join operation for which the SSID was already specified. Previously, it could have been possible to pick an incorrect BSS entry if the new GO was not found in the latest scan and there was an older cached scan entry for the same BSSID. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-12-30 18:06:19 +01:00
} else if (!bss) {
P2P: Limit join-a-group scans based on SSID from invitation If we already know the SSID of the P2P group we are trying to join, use that SSID to limit scan responses and BSS selection since we do not really look for any other network in this case. In addition, this can fix cases where the peer has just changed its SSID (e.g., started a new group) and there may be multiple BSS entries for the same BSSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2014-01-13 20:39:06 +01:00
wpa_printf(MSG_DEBUG, "P2P: Trying to find target GO BSS entry based on BSSID "
MACSTR, MAC2STR(wpa_s->pending_join_iface_addr));
bss = wpa_bss_get_bssid_latest(wpa_s,
wpa_s->pending_join_iface_addr);
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (bss) {
P2P: Update target GO Device Address from BSS entry during join It is possible for P2P_CONNECT-join command to be issued on a GO's P2P Interface Address before the P2P peer entry is available to map this into the GO's P2P Device Address. This could result in the join operation failing to continue after receiving PD Response due to the address mismatch (source address = P2P Device Address while only the P2P Interface Address is known). Fix this by updating the pending join P2P Device Address based on the BSS entry, if needed. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-06-14 22:14:26 +02:00
u8 dev_addr[ETH_ALEN];
P2P: Use operating frequency from peer table as backup for join The scan operation before Provision Discovery Request may not include the GO. However, we are likely to have the GO in our P2P peer table, so use that information to figure out the operating channel if BSS table entry is not available.
2010-08-05 01:00:21 +02:00
freq = bss->freq;
wpa_printf(MSG_DEBUG, "P2P: Target GO operating frequency "
P2P: Add GO BSS entry details to debug log on join-a-group This makes it easier to debug issues related to selecting GO information from the latest updated BSS table entry. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-20 16:53:46 +02:00
"from BSS table: %d MHz (SSID %s)", freq,
wpa_ssid_txt(bss->ssid, bss->ssid_len));
P2P: Update target GO Device Address from BSS entry during join It is possible for P2P_CONNECT-join command to be issued on a GO's P2P Interface Address before the P2P peer entry is available to map this into the GO's P2P Device Address. This could result in the join operation failing to continue after receiving PD Response due to the address mismatch (source address = P2P Device Address while only the P2P Interface Address is known). Fix this by updating the pending join P2P Device Address based on the BSS entry, if needed. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-06-14 22:14:26 +02:00
if (p2p_parse_dev_addr((const u8 *) (bss + 1), bss->ie_len,
dev_addr) == 0 &&
os_memcmp(wpa_s->pending_join_dev_addr,
wpa_s->pending_join_iface_addr, ETH_ALEN) == 0 &&
os_memcmp(dev_addr, wpa_s->pending_join_dev_addr,
ETH_ALEN) != 0) {
wpa_printf(MSG_DEBUG,
"P2P: Update target GO device address based on BSS entry: " MACSTR " (was " MACSTR ")",
MAC2STR(dev_addr),
MAC2STR(wpa_s->pending_join_dev_addr));
os_memcpy(wpa_s->pending_join_dev_addr, dev_addr,
ETH_ALEN);
}
P2P: Use operating frequency from peer table as backup for join The scan operation before Provision Discovery Request may not include the GO. However, we are likely to have the GO in our P2P peer table, so use that information to figure out the operating channel if BSS table entry is not available.
2010-08-05 01:00:21 +02:00
}
if (freq > 0) {
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
u16 method;
P2P: Abort join-group operation if concurrent group cannot be supported If the driver does not indicate support for multi-channel concurrency, abort join-group operation if the end result would result in use of multiple operating frequencies with the same radio. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-04-08 19:12:05 +02:00
if (wpas_check_freq_conflict(wpa_s, freq) > 0) {
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_msg_global(wpa_s->p2pdev, MSG_INFO,
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
P2P_EVENT_GROUP_FORMATION_FAILURE
"reason=FREQ_CONFLICT");
P2P: Add D-Bus signal GroupFormationFailure This is similar to the control interface event P2P-GROUP-FORMATION-FAILURE. Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>
2015-08-20 12:58:33 +02:00
wpas_notify_p2p_group_formation_failure(
wpa_s, "FREQ_CONFLICT");
P2P: Abort join-group operation if concurrent group cannot be supported If the driver does not indicate support for multi-channel concurrency, abort join-group operation if the end result would result in use of multiple operating frequencies with the same radio. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-04-08 19:12:05 +02:00
return;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_printf(MSG_DEBUG, "P2P: Send Provision Discovery Request "
"prior to joining an existing group (GO " MACSTR
" freq=%u MHz)",
P2P: Use operating frequency from peer table as backup for join The scan operation before Provision Discovery Request may not include the GO. However, we are likely to have the GO in our P2P peer table, so use that information to figure out the operating channel if BSS table entry is not available.
2010-08-05 01:00:21 +02:00
MAC2STR(wpa_s->pending_join_dev_addr), freq);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_s->pending_pd_before_join = 1;
P2P: Run a scan before provision discovery in p2p_connect join This is needed to make sure we have fresh BSS information for the GO.
2010-06-27 01:20:57 +02:00
switch (wpa_s->pending_join_wps_method) {
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
case WPS_PIN_DISPLAY:
method = WPS_CONFIG_KEYPAD;
break;
case WPS_PIN_KEYPAD:
method = WPS_CONFIG_DISPLAY;
break;
case WPS_PBC:
method = WPS_CONFIG_PUSHBUTTON;
break;
P2PS: Consider WPS P2PS method when joining a group If P2PS PD concludes to use default P2PS method wpas_p2p_scan_res_join() ignores this value and tries to perform a redundant legacy PD. Fix this by considering WPS_P2PS method too. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com>
2015-07-13 08:49:16 +02:00
case WPS_P2PS:
method = WPS_CONFIG_P2PS;
break;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
default:
method = 0;
break;
}
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
if ((p2p_get_provisioning_info(wpa_s->global->p2p,
wpa_s->pending_join_dev_addr) ==
method)) {
/*
* We have already performed provision discovery for
* joining the group. Proceed directly to join
* operation without duplicated provision discovery. */
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
wpa_printf(MSG_DEBUG, "P2P: Provision discovery "
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
"with " MACSTR " already done - proceed to "
"join",
MAC2STR(wpa_s->pending_join_dev_addr));
wpa_s->pending_pd_before_join = 0;
goto start;
}
P2P: Run a scan before provision discovery in p2p_connect join This is needed to make sure we have fresh BSS information for the GO.
2010-06-27 01:20:57 +02:00
if (p2p_prov_disc_req(wpa_s->global->p2p,
P2PS: Add P2PS attributes into PD Request if requested This adds a data structure for storing P2PS PD information and code to add the related attributes into PD Request. The actual operation to trigger this behavior will be added in a separate commit. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 09:38:56 +01:00
wpa_s->pending_join_dev_addr,
NULL, method, 1,
P2P: Set user_initiated_pd separately from the join parameter p2p_prov_disc_req() used the join parameter to figure out whether the PD request was a user initiated or not. This does not cover all use cases of PD, so add a separate parameter to allow caller to indicate whether the user requested the operation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-22 23:48:58 +01:00
freq, wpa_s->user_initiated_pd) < 0) {
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_printf(MSG_DEBUG, "P2P: Failed to send Provision "
"Discovery Request before joining an "
"existing group");
wpa_s->pending_pd_before_join = 0;
goto start;
}
P2P: Run a scan before provision discovery in p2p_connect join This is needed to make sure we have fresh BSS information for the GO.
2010-06-27 01:20:57 +02:00
return;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Allow multiple scan runs to find GO for p2p_connect join If the GO is not found, we cannot send Provisioning Discovery Request frame and cannot really connect anyway. Since the Provisioning Discovery is a mandatory part, it is better to continue join-scan until the GO is found instead of moving to the next step where normal connection scan is used (PD would not be used from there). Use a limit of 10 scan attempts for p2p_connect join to avoid getting in infinite loop trying to join. If the GO is not found with those scans, indicate failure (P2P-GROUP-FORMATION-FAILURE) and stop the join attempt.
2010-11-15 15:15:38 +01:00
wpa_printf(MSG_DEBUG, "P2P: Failed to find BSS/GO - try again later");
eloop_cancel_timeout(wpas_p2p_join_scan, wpa_s, NULL);
eloop_register_timeout(1, 0, wpas_p2p_join_scan, wpa_s, NULL);
wpas_p2p_check_join_scan_limit(wpa_s);
return;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
start:
/* Start join operation immediately */
P2P: Use join SSID in the skip-PD cases It was already possible to limit join operation to accept only a specific SSID. However, this constraint was not used when starting a P2P Client interface as a WPS Enrollee without going through a Provision Discovery exchange. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-12-30 18:04:43 +01:00
wpas_p2p_join_start(wpa_s, 0, wpa_s->p2p_join_ssid,
wpa_s->p2p_join_ssid_len);
P2P: Run a scan before provision discovery in p2p_connect join This is needed to make sure we have fresh BSS information for the GO.
2010-06-27 01:20:57 +02:00
}
P2P: Limit join-a-group scans based on SSID from invitation If we already know the SSID of the P2P group we are trying to join, use that SSID to limit scan responses and BSS selection since we do not really look for any other network in this case. In addition, this can fix cases where the peer has just changed its SSID (e.g., started a new group) and there may be multiple BSS entries for the same BSSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2014-01-13 20:39:06 +01:00
static void wpas_p2p_join_scan_req(struct wpa_supplicant *wpa_s, int freq,
const u8 *ssid, size_t ssid_len)
P2P: Run a scan before provision discovery in p2p_connect join This is needed to make sure we have fresh BSS information for the GO.
2010-06-27 01:20:57 +02:00
{
int ret;
struct wpa_driver_scan_params params;
struct wpabuf *wps_ie, *ies;
P2P: Provide mechanism for figuring out p2p_scan_ie() buffer need The new function, p2p_scan_ie_buf_len(), can be used to figure out how large a buffer needs to be allocated for p2p_scan_ie() use. This makes it easier to add new data into the buffer without forcing all callers to be updated to use a larger buffer.
2011-04-28 15:14:35 +02:00
size_t ielen;
P2P: Improve p2p_prov_disc-auto robustness Perform addition additional scan runs on the operating channel of the GO (if known from previous scan results) and fall back to initiate the PD for GO Negotiation if these additional scans do not detect the peer as GO. Signed-hostap: Sunil Dutt Undekari <duttus@codeaurora.org>
2012-06-06 14:46:05 +02:00
int freqs[2] = { 0, 0 };
P2P: Add Dev Info attribute to Probe Request frames in 60 GHz When building P2P IE for Probe Request frames in P2P scan, add the device information attribute if the 60 GHz band is included in the scan, since this is required by the P2P specification. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-02-20 15:45:58 +01:00
unsigned int bands;
P2P: Run a scan before provision discovery in p2p_connect join This is needed to make sure we have fresh BSS information for the GO.
2010-06-27 01:20:57 +02:00
os_memset(&params, 0, sizeof(params));
/* P2P Wildcard SSID */
params.num_ssids = 1;
P2P: Limit join-a-group scans based on SSID from invitation If we already know the SSID of the P2P group we are trying to join, use that SSID to limit scan responses and BSS selection since we do not really look for any other network in this case. In addition, this can fix cases where the peer has just changed its SSID (e.g., started a new group) and there may be multiple BSS entries for the same BSSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2014-01-13 20:39:06 +01:00
if (ssid && ssid_len) {
params.ssids[0].ssid = ssid;
params.ssids[0].ssid_len = ssid_len;
os_memcpy(wpa_s->p2p_join_ssid, ssid, ssid_len);
wpa_s->p2p_join_ssid_len = ssid_len;
} else {
params.ssids[0].ssid = (u8 *) P2P_WILDCARD_SSID;
params.ssids[0].ssid_len = P2P_WILDCARD_SSID_LEN;
wpa_s->p2p_join_ssid_len = 0;
}
P2P: Run a scan before provision discovery in p2p_connect join This is needed to make sure we have fresh BSS information for the GO.
2010-06-27 01:20:57 +02:00
wpa_s->wps->dev.p2p = 1;
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
wps_ie = wps_build_probe_req_ie(DEV_PW_DEFAULT, &wpa_s->wps->dev,
wpa_s->wps->uuid, WPS_REQ_ENROLLEE, 0,
NULL);
P2P: Run a scan before provision discovery in p2p_connect join This is needed to make sure we have fresh BSS information for the GO.
2010-06-27 01:20:57 +02:00
if (wps_ie == NULL) {
wpas_p2p_scan_res_join(wpa_s, NULL);
return;
}
P2P: Use GO's operating channel to optimize scan during join Use P2P GO's operating channel information, if known, to do a single channel scan during the join operation. Signed-hostap: Jithu Jance <jithu@broadcom.com>
2014-01-15 14:47:19 +01:00
if (!freq) {
int oper_freq;
/*
* If freq is not provided, check the operating freq of the GO
* and use a single channel scan on if possible.
*/
oper_freq = p2p_get_oper_freq(wpa_s->global->p2p,
wpa_s->pending_join_iface_addr);
if (oper_freq > 0)
freq = oper_freq;
}
P2P: Improve p2p_prov_disc-auto robustness Perform addition additional scan runs on the operating channel of the GO (if known from previous scan results) and fall back to initiate the PD for GO Negotiation if these additional scans do not detect the peer as GO. Signed-hostap: Sunil Dutt Undekari <duttus@codeaurora.org>
2012-06-06 14:46:05 +02:00
if (freq > 0) {
freqs[0] = freq;
params.freqs = freqs;
}
P2P: Run a scan before provision discovery in p2p_connect join This is needed to make sure we have fresh BSS information for the GO.
2010-06-27 01:20:57 +02:00
P2P: Change order of P2P IE and frequencies set up When setting up parameters for P2P scan, calculate the frequencies for the scan before calculating the scan IE. This is because the scan IE calculation may need information about the scan frequencies in use. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-02-20 12:28:27 +01:00
ielen = p2p_scan_ie_buf_len(wpa_s->global->p2p);
ies = wpabuf_alloc(wpabuf_len(wps_ie) + ielen);
if (ies == NULL) {
wpabuf_free(wps_ie);
wpas_p2p_scan_res_join(wpa_s, NULL);
return;
}
wpabuf_put_buf(ies, wps_ie);
wpabuf_free(wps_ie);
P2P: Add Dev Info attribute to Probe Request frames in 60 GHz When building P2P IE for Probe Request frames in P2P scan, add the device information attribute if the 60 GHz band is included in the scan, since this is required by the P2P specification. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-02-20 15:45:58 +01:00
bands = wpas_get_bands(wpa_s, freqs);
p2p_scan_ie(wpa_s->global->p2p, ies, NULL, bands);
P2P: Change order of P2P IE and frequencies set up When setting up parameters for P2P scan, calculate the frequencies for the scan before calculating the scan IE. This is because the scan IE calculation may need information about the scan frequencies in use. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-02-20 12:28:27 +01:00
params.p2p_probe = 1;
params.extra_ies = wpabuf_head(ies);
params.extra_ies_len = wpabuf_len(ies);
P2P: Run a scan before provision discovery in p2p_connect join This is needed to make sure we have fresh BSS information for the GO.
2010-06-27 01:20:57 +02:00
/*
* Run a scan to update BSS table and start Provision Discovery once
* the new scan results become available.
*/
Remove user space client MLME This code was used only with driver_test.c to allow MLME operations in hostapd to be tested without having to use a real radio. There are no plans on extending this to any other use than testing and mac80211_hwsim has now obsoled the need for this type of testing. As such, we can drop this code from wpa_supplicant to clean up the implementation of unnecessary complexity.
2011-10-22 21:45:38 +02:00
ret = wpa_drv_scan(wpa_s, &params);
Add ignore_old_scan_res configuration parameter This can be used to configure wpa_supplicant to ignore old scan results from the driver cache in cases where such results were not updated after the scan trigger from wpa_supplicant. This can be useful in some cases where the driver may cache information for a significant time and the AP configuration is changing. Many such cases are for testing scripts, but this could potentially be useful for some WPS use cases, too. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-03-31 16:52:23 +02:00
if (!ret) {
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
os_get_reltime(&wpa_s->scan_trigger_time);
P2P: Fix p2p_connect join scan handler in error cases wpa_drv_scan() may fail for the initial p2p_connect join scan request, e.g., if the driver happened to be scanning at the time the new operation was initialized. Previously, a special scan result handler was registered regardless of whether the new scan was started. This could result in partial scan results (e.g., from p2p_find social scan) from being used as full results for join (or now more importantly for p2p_connect auto) purposes. Fix this by registering the new scan result handler only if wpa_drv_scan() returns success. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-13 15:13:14 +02:00
wpa_s->scan_res_handler = wpas_p2p_scan_res_join;
Track whether scan was started by us or an external program This can be used to improve scan behavior in cases external programs request scans directly from the driver. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-26 16:33:26 +01:00
wpa_s->own_scan_requested = 1;
Add ignore_old_scan_res configuration parameter This can be used to configure wpa_supplicant to ignore old scan results from the driver cache in cases where such results were not updated after the scan trigger from wpa_supplicant. This can be useful in some cases where the driver may cache information for a significant time and the AP configuration is changing. Many such cases are for testing scripts, but this could potentially be useful for some WPS use cases, too. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-03-31 16:52:23 +02:00
}
P2P: Run a scan before provision discovery in p2p_connect join This is needed to make sure we have fresh BSS information for the GO.
2010-06-27 01:20:57 +02:00
wpabuf_free(ies);
if (ret) {
wpa_printf(MSG_DEBUG, "P2P: Failed to start scan for join - "
"try again later");
eloop_cancel_timeout(wpas_p2p_join_scan, wpa_s, NULL);
eloop_register_timeout(1, 0, wpas_p2p_join_scan, wpa_s, NULL);
P2P: Allow multiple scan runs to find GO for p2p_connect join If the GO is not found, we cannot send Provisioning Discovery Request frame and cannot really connect anyway. Since the Provisioning Discovery is a mandatory part, it is better to continue join-scan until the GO is found instead of moving to the next step where normal connection scan is used (PD would not be used from there). Use a limit of 10 scan attempts for p2p_connect join to avoid getting in infinite loop trying to join. If the GO is not found with those scans, indicate failure (P2P-GROUP-FORMATION-FAILURE) and stop the join attempt.
2010-11-15 15:15:38 +01:00
wpas_p2p_check_join_scan_limit(wpa_s);
P2P: Run a scan before provision discovery in p2p_connect join This is needed to make sure we have fresh BSS information for the GO.
2010-06-27 01:20:57 +02:00
}
}
P2P: Improve p2p_prov_disc-auto robustness Perform addition additional scan runs on the operating channel of the GO (if known from previous scan results) and fall back to initiate the PD for GO Negotiation if these additional scans do not detect the peer as GO. Signed-hostap: Sunil Dutt Undekari <duttus@codeaurora.org>
2012-06-06 14:46:05 +02:00
static void wpas_p2p_join_scan(void *eloop_ctx, void *timeout_ctx)
{
struct wpa_supplicant *wpa_s = eloop_ctx;
P2P: Limit join-a-group scans based on SSID from invitation If we already know the SSID of the P2P group we are trying to join, use that SSID to limit scan responses and BSS selection since we do not really look for any other network in this case. In addition, this can fix cases where the peer has just changed its SSID (e.g., started a new group) and there may be multiple BSS entries for the same BSSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2014-01-13 20:39:06 +01:00
wpas_p2p_join_scan_req(wpa_s, 0, NULL, 0);
P2P: Improve p2p_prov_disc-auto robustness Perform addition additional scan runs on the operating channel of the GO (if known from previous scan results) and fall back to initiate the PD for GO Negotiation if these additional scans do not detect the peer as GO. Signed-hostap: Sunil Dutt Undekari <duttus@codeaurora.org>
2012-06-06 14:46:05 +02:00
}
P2P: Run a scan before provision discovery in p2p_connect join This is needed to make sure we have fresh BSS information for the GO.
2010-06-27 01:20:57 +02:00
static int wpas_p2p_join(struct wpa_supplicant *wpa_s, const u8 *iface_addr,
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
const u8 *dev_addr, enum p2p_wps_method wps_method,
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 00:44:29 +02:00
int auto_join, int op_freq,
const u8 *ssid, size_t ssid_len)
P2P: Run a scan before provision discovery in p2p_connect join This is needed to make sure we have fresh BSS information for the GO.
2010-06-27 01:20:57 +02:00
{
wpa_printf(MSG_DEBUG, "P2P: Request to join existing group (iface "
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 00:44:29 +02:00
MACSTR " dev " MACSTR " op_freq=%d)%s",
MAC2STR(iface_addr), MAC2STR(dev_addr), op_freq,
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
auto_join ? " (auto_join)" : "");
P2P: Limit join-a-group scans based on SSID from invitation If we already know the SSID of the P2P group we are trying to join, use that SSID to limit scan responses and BSS selection since we do not really look for any other network in this case. In addition, this can fix cases where the peer has just changed its SSID (e.g., started a new group) and there may be multiple BSS entries for the same BSSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2014-01-13 20:39:06 +01:00
if (ssid && ssid_len) {
wpa_printf(MSG_DEBUG, "P2P: Group SSID specified: %s",
wpa_ssid_txt(ssid, ssid_len));
}
P2P: Run a scan before provision discovery in p2p_connect join This is needed to make sure we have fresh BSS information for the GO.
2010-06-27 01:20:57 +02:00
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
wpa_s->p2p_auto_pd = 0;
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
wpa_s->p2p_auto_join = !!auto_join;
P2P: Run a scan before provision discovery in p2p_connect join This is needed to make sure we have fresh BSS information for the GO.
2010-06-27 01:20:57 +02:00
os_memcpy(wpa_s->pending_join_iface_addr, iface_addr, ETH_ALEN);
os_memcpy(wpa_s->pending_join_dev_addr, dev_addr, ETH_ALEN);
wpa_s->pending_join_wps_method = wps_method;
/* Make sure we are not running find during connection establishment */
wpas_p2p_stop_find(wpa_s);
P2P: Allow multiple scan runs to find GO for p2p_connect join If the GO is not found, we cannot send Provisioning Discovery Request frame and cannot really connect anyway. Since the Provisioning Discovery is a mandatory part, it is better to continue join-scan until the GO is found instead of moving to the next step where normal connection scan is used (PD would not be used from there). Use a limit of 10 scan attempts for p2p_connect join to avoid getting in infinite loop trying to join. If the GO is not found with those scans, indicate failure (P2P-GROUP-FORMATION-FAILURE) and stop the join attempt.
2010-11-15 15:15:38 +01:00
wpa_s->p2p_join_scan_count = 0;
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 00:44:29 +02:00
wpas_p2p_join_scan_req(wpa_s, op_freq, ssid, ssid_len);
P2P: Run a scan before provision discovery in p2p_connect join This is needed to make sure we have fresh BSS information for the GO.
2010-06-27 01:20:57 +02:00
return 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 00:44:29 +02:00
static int wpas_p2p_join_start(struct wpa_supplicant *wpa_s, int freq,
const u8 *ssid, size_t ssid_len)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct wpa_supplicant *group;
struct p2p_go_neg_results res;
P2P: Optimize provisioning step scan for join-a-group sequence Copy the SSID and frequency of the selected group into go_params in join-a-running-group case so that the scan optimization can be used for the provisioning step similarly to the case of group formation. This uses a specific SSID and a single channel scan to avoid unnecessary frames during the step. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-28 23:22:58 +01:00
struct wpa_bss *bss;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
group = wpas_p2p_get_group_iface(wpa_s, 0, 0);
if (group == NULL)
return -1;
P2P: Set Device Password ID in WPS M1/M2 per new rules If the P2P client (WPS Enrollee) uses a PIN from the GO (Registrar), Device Password ID in M1 & M2 is set to Registrar-specified.
2010-06-27 07:49:41 +02:00
if (group != wpa_s) {
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
os_memcpy(group->p2p_pin, wpa_s->p2p_pin,
sizeof(group->p2p_pin));
P2P: Set Device Password ID in WPS M1/M2 per new rules If the P2P client (WPS Enrollee) uses a PIN from the GO (Registrar), Device Password ID in M1 & M2 is set to Registrar-specified.
2010-06-27 07:49:41 +02:00
group->p2p_wps_method = wpa_s->p2p_wps_method;
P2P: Fix P2P-GROUP-STARTED event for p2p_connect-join Commit 50178335bff450829729c91c8af798a1d3a7b408 introduced a regression for P2P-GROUP-STARTED event indication during p2p_connect-join when using a separate P2P group interface. wpa_s->global->p2p_group_formation was already set in that case to point to the group interface and this commit changed this to point to incorrect interface. Fix this by setting p2p_group_formation here only in case a separate group interface is not used. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-04 14:52:53 +01:00
} else {
/*
* Need to mark the current interface for p2p_group_formation
* when a separate group interface is not used. This is needed
* to allow p2p_cancel stop a pending p2p_connect-join.
* wpas_p2p_init_group_interface() addresses this for the case
* where a separate group interface is used.
*/
wpa_s->global->p2p_group_formation = wpa_s;
P2P: Set Device Password ID in WPS M1/M2 per new rules If the P2P client (WPS Enrollee) uses a PIN from the GO (Registrar), Device Password ID in M1 & M2 is set to Registrar-specified.
2010-06-27 07:49:41 +02:00
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
group->p2p_in_provisioning = 1;
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
group->p2p_fallback_to_go_neg = wpa_s->p2p_fallback_to_go_neg;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
os_memset(&res, 0, sizeof(res));
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 00:44:29 +02:00
os_memcpy(res.peer_device_addr, wpa_s->pending_join_dev_addr, ETH_ALEN);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
os_memcpy(res.peer_interface_addr, wpa_s->pending_join_iface_addr,
ETH_ALEN);
res.wps_method = wpa_s->pending_join_wps_method;
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 00:44:29 +02:00
if (freq && ssid && ssid_len) {
res.freq = freq;
res.ssid_len = ssid_len;
os_memcpy(res.ssid, ssid, ssid_len);
} else {
P2P: Do not accept any BSS entry for join if SSID is already known Use wpa_bss_get() with the specific Group SSID instead of wpa_bss_get_bssid_latest() if the SSID is already known. This makes the P2P join operations more robust in case the frequency of the group was not yet known and the same P2P Interface Address may have been used in multiple group instances with an older group entry still present in the cached scan results. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-12-30 18:02:33 +01:00
if (ssid && ssid_len) {
bss = wpa_bss_get(wpa_s, wpa_s->pending_join_iface_addr,
ssid, ssid_len);
} else {
bss = wpa_bss_get_bssid_latest(
wpa_s, wpa_s->pending_join_iface_addr);
}
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 00:44:29 +02:00
if (bss) {
res.freq = bss->freq;
res.ssid_len = bss->ssid_len;
os_memcpy(res.ssid, bss->ssid, bss->ssid_len);
wpa_printf(MSG_DEBUG, "P2P: Join target GO operating frequency from BSS table: %d MHz (SSID %s)",
bss->freq,
wpa_ssid_txt(bss->ssid, bss->ssid_len));
P2P: Use group SSID, if known, for join operation even if no BSS entry This allows the cases where a specific group SSID is known to filter out groups on the P2P Client even if the specific BSS entry for the target group is not yet available. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-12-30 18:00:56 +01:00
} else if (ssid && ssid_len) {
res.ssid_len = ssid_len;
os_memcpy(res.ssid, ssid, ssid_len);
wpa_printf(MSG_DEBUG, "P2P: Join target GO (SSID %s)",
wpa_ssid_txt(ssid, ssid_len));
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 00:44:29 +02:00
}
P2P: Optimize provisioning step scan for join-a-group sequence Copy the SSID and frequency of the selected group into go_params in join-a-running-group case so that the scan optimization can be used for the provisioning step similarly to the case of group formation. This uses a specific SSID and a single channel scan to avoid unnecessary frames during the step. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-28 23:22:58 +01:00
}
P2P: Stop remain-on-channel prior to starting join-a-group client This fixes issues with drivers that do not handle concurrent remain-on-channel and scan operations in a case where Provision Discovery Response frame is not received to stop the Action frame handshake. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-12-29 12:28:17 +01:00
if (wpa_s->off_channel_freq || wpa_s->roc_waiting_drv_freq) {
wpa_printf(MSG_DEBUG, "P2P: Cancel remain-on-channel prior to "
"starting client");
wpa_drv_cancel_remain_on_channel(wpa_s);
wpa_s->off_channel_freq = 0;
wpa_s->roc_waiting_drv_freq = 0;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpas_start_wps_enrollee(group, &res);
P2P: Use group formation timeout (but longer one) with join-a-group This allows the pending group interface to be removed if we fail to join a running group. A longer than 15 second timeout is needed here since the GO may not have authorized our connection yet.
2010-09-07 12:21:33 +02:00
/*
* Allow a longer timeout for join-a-running-group than normal 15
* second group formation timeout since the GO may not have authorized
* our connection yet.
*/
eloop_cancel_timeout(wpas_p2p_group_formation_timeout, wpa_s, NULL);
eloop_register_timeout(60, 0, wpas_p2p_group_formation_timeout,
wpa_s, NULL);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return 0;
}
P2P: Use shared function for setting up frequencies p2p_connect() and p2p_invite() cases used more or less identical implementatin. Use a shared function to avoid duplicated code. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-25 18:30:14 +01:00
static int wpas_p2p_setup_freqs(struct wpa_supplicant *wpa_s, int freq,
P2P: Use preferred frequency list from the local driver If the driver supports the preferred frequency list extension, use this information from the driver when no explicitly configured preference list (p2p_pref_chan) is present for P2P operating channel selection. This commit adds this for GO Negotiation and Invitation use cases. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-07-24 02:39:45 +02:00
int *force_freq, int *pref_freq, int go,
unsigned int *pref_freq_list,
unsigned int *num_pref_freq)
P2P: Use shared function for setting up frequencies p2p_connect() and p2p_invite() cases used more or less identical implementatin. Use a shared function to avoid duplicated code. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-25 18:30:14 +01:00
{
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
struct wpa_used_freq_data *freqs;
int res, best_freq, num_unused;
P2P: Use preferred frequency list from the local driver If the driver supports the preferred frequency list extension, use this information from the driver when no explicitly configured preference list (p2p_pref_chan) is present for P2P operating channel selection. This commit adds this for GO Negotiation and Invitation use cases. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-07-24 02:39:45 +02:00
unsigned int freq_in_use = 0, num, i, max_pref_freq;
max_pref_freq = *num_pref_freq;
*num_pref_freq = 0;
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
freqs = os_calloc(wpa_s->num_multichan_concurrent,
sizeof(struct wpa_used_freq_data));
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
if (!freqs)
return -1;
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
num = wpas_p2p_valid_oper_freqs(wpa_s, freqs,
wpa_s->num_multichan_concurrent);
/*
* It is possible that the total number of used frequencies is bigger
* than the number of frequencies used for P2P, so get the system wide
* number of unused frequencies.
*/
num_unused = wpas_p2p_num_unused_channels(wpa_s);
P2P: Add more debug info on operating channel selection Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-26 13:08:03 +02:00
wpa_printf(MSG_DEBUG,
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
"P2P: Setup freqs: freq=%d num_MCC=%d shared_freqs=%u num_unused=%d",
freq, wpa_s->num_multichan_concurrent, num, num_unused);
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
P2P: Use shared function for setting up frequencies p2p_connect() and p2p_invite() cases used more or less identical implementatin. Use a shared function to avoid duplicated code. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-25 18:30:14 +01:00
if (freq > 0) {
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
int ret;
if (go)
ret = p2p_supported_freq(wpa_s->global->p2p, freq);
else
ret = p2p_supported_freq_cli(wpa_s->global->p2p, freq);
if (!ret) {
DFS offload: P2P changes for autonomous GO Add P2P changes to allow bringing up P2P autonomous GO on a DFS channel if DFS functionality is offloaded to the driver. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-03-05 02:31:25 +01:00
if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_DFS_OFFLOAD) &&
ieee80211_is_dfs(freq)) {
/*
* If freq is a DFS channel and DFS is offloaded
* to the driver, allow P2P GO to use it.
*/
wpa_printf(MSG_DEBUG,
"P2P: The forced channel for GO (%u MHz) is DFS, and DFS is offloaded to the driver",
freq);
} else {
wpa_printf(MSG_DEBUG,
"P2P: The forced channel (%u MHz) is not supported for P2P uses",
freq);
res = -3;
goto exit_free;
}
P2P: Use shared function for setting up frequencies p2p_connect() and p2p_invite() cases used more or less identical implementatin. Use a shared function to avoid duplicated code. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-25 18:30:14 +01:00
}
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
for (i = 0; i < num; i++) {
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
if (freqs[i].freq == freq)
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
freq_in_use = 1;
}
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
if (num_unused <= 0 && !freq_in_use) {
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
wpa_printf(MSG_DEBUG, "P2P: Cannot start P2P group on %u MHz as there are no available channels",
freq);
res = -2;
goto exit_free;
P2P: Use shared function for setting up frequencies p2p_connect() and p2p_invite() cases used more or less identical implementatin. Use a shared function to avoid duplicated code. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-25 18:30:14 +01:00
}
wpa_printf(MSG_DEBUG, "P2P: Trying to force us to use the "
"requested channel (%u MHz)", freq);
*force_freq = freq;
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
goto exit_ok;
}
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
best_freq = wpas_p2p_pick_best_used_freq(wpa_s, freqs, num);
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
P2P: Use preferred frequency list from the local driver If the driver supports the preferred frequency list extension, use this information from the driver when no explicitly configured preference list (p2p_pref_chan) is present for P2P operating channel selection. This commit adds this for GO Negotiation and Invitation use cases. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-07-24 02:39:45 +02:00
if (!wpa_s->conf->num_p2p_pref_chan && *pref_freq == 0) {
enum wpa_driver_if_type iface_type;
if (go)
iface_type = WPA_IF_P2P_GO;
else
iface_type = WPA_IF_P2P_CLIENT;
wpa_printf(MSG_DEBUG, "P2P: best_freq=%d, go=%d",
best_freq, go);
res = wpa_drv_get_pref_freq_list(wpa_s, iface_type,
&max_pref_freq,
pref_freq_list);
if (!res && max_pref_freq > 0) {
*num_pref_freq = max_pref_freq;
i = 0;
while (wpas_p2p_disallowed_freq(wpa_s->global,
pref_freq_list[i]) &&
i < *num_pref_freq) {
wpa_printf(MSG_DEBUG,
"P2P: preferred_freq_list[%d]=%d is disallowed",
i, pref_freq_list[i]);
i++;
}
if (i != *num_pref_freq) {
best_freq = pref_freq_list[i];
wpa_printf(MSG_DEBUG,
"P2P: Using preferred_freq_list[%d]=%d",
i, best_freq);
} else {
wpa_printf(MSG_DEBUG,
"P2P: All driver preferred frequencies are disallowed for P2P use");
*num_pref_freq = 0;
}
} else {
wpa_printf(MSG_DEBUG,
"P2P: No preferred frequency list available");
}
}
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
/* We have a candidate frequency to use */
if (best_freq > 0) {
if (*pref_freq == 0 && num_unused > 0) {
P2P: Fix channel selection for MCC case Commit 0d08efa447a5c5fb20bbed18a2ced36a8afe9221 modified wpas_p2p_setup_freqs() design to use number of MCC channels capability from the driver. However, it resulted in regression on how the preferred vs. forced channel selection is done in the case of a MCC device. force_freq was set unconditionally even though this was supposed to be done only if no additional channels are available. pref_freq needs to be used when possible to avoid preventing connection. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-18 15:53:44 +01:00
wpa_printf(MSG_DEBUG, "P2P: Try to prefer a frequency (%u MHz) we are already using",
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
best_freq);
*pref_freq = best_freq;
P2P: Fix channel selection for MCC case Commit 0d08efa447a5c5fb20bbed18a2ced36a8afe9221 modified wpas_p2p_setup_freqs() design to use number of MCC channels capability from the driver. However, it resulted in regression on how the preferred vs. forced channel selection is done in the case of a MCC device. force_freq was set unconditionally even though this was supposed to be done only if no additional channels are available. pref_freq needs to be used when possible to avoid preventing connection. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-18 15:53:44 +01:00
} else {
wpa_printf(MSG_DEBUG, "P2P: Try to force us to use frequency (%u MHz) which is already in use",
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
best_freq);
*force_freq = best_freq;
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
}
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
} else if (num_unused > 0) {
wpa_printf(MSG_DEBUG,
"P2P: Current operating channels are not available for P2P. Try to use another channel");
*force_freq = 0;
} else {
wpa_printf(MSG_DEBUG,
"P2P: All channels are in use and none of them are P2P enabled. Cannot start P2P group");
res = -2;
goto exit_free;
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
}
exit_ok:
res = 0;
exit_free:
os_free(freqs);
return res;
P2P: Use shared function for setting up frequencies p2p_connect() and p2p_invite() cases used more or less identical implementatin. Use a shared function to avoid duplicated code. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-25 18:30:14 +01:00
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/**
* wpas_p2p_connect - Request P2P Group Formation to be started
* @wpa_s: Pointer to wpa_supplicant data from wpa_supplicant_add_iface()
* @peer_addr: Address of the peer P2P Device
* @pin: PIN to use during provisioning or %NULL to indicate PBC mode
* @persistent_group: Whether to create a persistent group
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
* @auto_join: Whether to select join vs. GO Negotiation automatically
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
* @join: Whether to join an existing group (as a client) instead of starting
* Group Owner negotiation; @peer_addr is BSSID in that case
* @auth: Whether to only authorize the connection instead of doing that and
* initiating Group Owner negotiation
* @go_intent: GO Intent or -1 to use default
* @freq: Frequency for the group or 0 for auto-selection
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
* @freq2: Center frequency of segment 1 for the GO operating in VHT 80P80 mode
P2P: Add option to force SSID/passphrase for GO Negotiation An existing persistent group information can now be used to force GO Negotiation to use the previously used SSID/passphrase from a persistent group if we become a GO. This can be used as an alternative to inviting a new P2P peer to join the group (i.e., use GO Negotiation with GO intent 15 instead of starting an autonomous GO and using invitation), e.g., in case a GO Negotiation Request is received from a peer while we are not running as a GO. The persistent group to use for parameters is indicated with persistent=<network id> parameter to p2p_connect. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-27 17:17:10 +02:00
* @persistent_id: Persistent group credentials to use for forcing GO
* parameters or -1 to generate new values (SSID/passphrase)
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
* @pd: Whether to send Provision Discovery prior to GO Negotiation as an
* interoperability workaround when initiating group formation
P2P: Add optional "ht40" argument for p2p_connect This can be used to start negotiated GO in 40 MHz channel width in 5GHz band. Signed-hostap: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
2012-08-15 22:07:44 +02:00
* @ht40: Start GO with 40 MHz channel width
P2P: Add VHT parameter to P2P operations Add the option to ask for VHT operation similarly to the way ht40 is configured - either by adding 'vht' param to the relevant p2p_* commands or by configuring p2p_go_vht=1 in the configuration file. This patch only adds the configuration option (e.g., via control interface). The actual handling of the VHT parameter (asking the driver to use VHT, etc.) will be done by the following patch. Signed-hostap: Eliad Peller <eliadx.peller@intel.com>
2013-10-27 18:46:17 +01:00
* @vht: Start GO with VHT support
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
* @vht_chwidth: Channel width supported by GO operating with VHT support
* (VHT_CHANWIDTH_*).
P2P: Provide group SSID, if specified, to P2P Client join step At least one of the wpas_p2p_connect() callers (NFC join case) already had access to the Group SSID. Pass that information through wpas_p2p_connect() to wpas_p2p_join() so that the join operation can filter out incorrect groups more easily. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-12-30 18:08:51 +01:00
* @group_ssid: Specific Group SSID for join or %NULL if not set
* @group_ssid_len: Length of @group_ssid in octets
P2P: Reject multi-channel concurrent operations depending on driver The driver wrapper can now indicate whether the driver supports concurrent operations on multiple channels (e.g., infra STA connection on 5 GHz channel 36 and P2P group on 2.4 GHz channel 1). If not, P2P_CONNECT commands will be rejected if they would require multi-channel concurrency. The new failure codes for P2P_CONNECT: FAIL-CHANNEL-UNAVAILABLE: The requested/needed channel is not currently available (i.e., user has an option of disconnecting another interface to make the channel available). FAIL-CHANNEL-UNSUPPORTED: The request channel is not available for P2P.
2010-10-14 13:24:56 +02:00
* Returns: 0 or new PIN (if pin was %NULL) on success, -1 on unspecified
* failure, -2 on failure due to channel not currently available,
* -3 if forced channel is not supported
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, int auth,
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 go_intent, int freq, unsigned int vht_center_freq2,
int persistent_id, int pd, int ht40, int vht,
P2P: Provide group SSID, if specified, to P2P Client join step At least one of the wpas_p2p_connect() callers (NFC join case) already had access to the Group SSID. Pass that information through wpas_p2p_connect() to wpas_p2p_join() so that the join operation can filter out incorrect groups more easily. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-12-30 18:08:51 +01:00
unsigned int vht_chwidth, const u8 *group_ssid,
size_t group_ssid_len)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
int force_freq = 0, pref_freq = 0;
P2P: Use shared function for setting up frequencies p2p_connect() and p2p_invite() cases used more or less identical implementatin. Use a shared function to avoid duplicated code. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-25 18:30:14 +01:00
int ret = 0, res;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
enum wpa_driver_if_type iftype;
P2P: Simplify code in wpas_p2p_connect() There's some duplicated code there that can be simplified with just a single new variable. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2011-11-18 22:32:03 +01:00
const u8 *if_addr;
P2P: Add option to force SSID/passphrase for GO Negotiation An existing persistent group information can now be used to force GO Negotiation to use the previously used SSID/passphrase from a persistent group if we become a GO. This can be used as an alternative to inviting a new P2P peer to join the group (i.e., use GO Negotiation with GO intent 15 instead of starting an autonomous GO and using invitation), e.g., in case a GO Negotiation Request is received from a peer while we are not running as a GO. The persistent group to use for parameters is indicated with persistent=<network id> parameter to p2p_connect. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-27 17:17:10 +02:00
struct wpa_ssid *ssid = NULL;
P2P: Use preferred frequency list from the local driver If the driver supports the preferred frequency list extension, use this information from the driver when no explicitly configured preference list (p2p_pref_chan) is present for P2P operating channel selection. This commit adds this for GO Negotiation and Invitation use cases. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-07-24 02:39:45 +02:00
unsigned int pref_freq_list[P2P_MAX_PREF_CHANNELS], size;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Handle P2P-not-supported without segfaults Previous code was assuming that the P2P module is always initialized. However, that is not the case anymore with drivers that do not support P2P. Add verification of whether P2P is enabled before trying to execute P2P commands.
2011-02-24 20:13:30 +01:00
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
return -1;
P2P: Add option to force SSID/passphrase for GO Negotiation An existing persistent group information can now be used to force GO Negotiation to use the previously used SSID/passphrase from a persistent group if we become a GO. This can be used as an alternative to inviting a new P2P peer to join the group (i.e., use GO Negotiation with GO intent 15 instead of starting an autonomous GO and using invitation), e.g., in case a GO Negotiation Request is received from a peer while we are not running as a GO. The persistent group to use for parameters is indicated with persistent=<network id> parameter to p2p_connect. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-27 17:17:10 +02:00
if (persistent_id >= 0) {
ssid = wpa_config_get_network(wpa_s->conf, persistent_id);
if (ssid == NULL || ssid->disabled != 2 ||
ssid->mode != WPAS_MODE_P2P_GO)
return -1;
}
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
os_free(wpa_s->global->add_psk);
wpa_s->global->add_psk = NULL;
P2P: Reject group formation on WPS provisioning failure There is no need to wait for the 15 second group formation timeout to clear the state if WPS failure is detected during P2P group formation. Allow the WPS exchange steps (WSC_NACK and EAP-Failure) to be completed and remove the group to get rid of the extra wait. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-06 16:56:50 +01:00
wpa_s->global->p2p_fail_on_wps_complete = 0;
P2PS: Callback to create pending group after sending PD Response This introduces a P2P module callback function that will be used to create the pending P2PS group after sending PD Response and receiving ACK status for it. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 12:29:29 +01:00
wpa_s->global->pending_p2ps_group = 0;
P2PS: Indicate the chosen operating frequency On successful P2P PD, report the chosen frequency in case the local device is going to be the P2P GO, so in can later be used to instantiate the new P2P GO, etc. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-10-08 11:36:01 +02:00
wpa_s->global->pending_p2ps_group_freq = 0;
P2PS: Authorize any peer for P2PS method if interface address not known When P2PS PD with default P2PS method is done, the peer that becomes GO should authorize the client. However, P2PS specification doesn't require the client to include its intended interface address in PD Request/Response. As a result, the P2P Client's interface address may not be known and any address may need to be authorized. Previously, client's P2P Device Address was used for authorization, which is not correct when a dedicated interface is used for P2P Client. This is not resulting in a connection failure, however it causes a significant delay (until WPS_PIN_TIME_IGNORE_SEL_REG elapses). Fix this by authorizing the intended interface address, if known; or any address, if not known. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2015-07-30 08:00:06 +02:00
wpa_s->p2ps_method_config_any = 0;
P2P: Reject group formation on WPS provisioning failure There is no need to wait for the 15 second group formation timeout to clear the state if WPS failure is detected during P2P group formation. Allow the WPS exchange steps (WSC_NACK and EAP-Failure) to be completed and remove the group to get rid of the extra wait. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-06 16:56:50 +01:00
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (go_intent < 0)
go_intent = wpa_s->conf->p2p_go_intent;
if (!auth)
wpa_s->p2p_long_listen = 0;
P2P: Set Device Password ID in WPS M1/M2 per new rules If the P2P client (WPS Enrollee) uses a PIN from the GO (Registrar), Device Password ID in M1 & M2 is set to Registrar-specified.
2010-06-27 07:49:41 +02:00
wpa_s->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
wpa_s->p2p_persistent_group = !!persistent_group;
P2P: Add option to force SSID/passphrase for GO Negotiation An existing persistent group information can now be used to force GO Negotiation to use the previously used SSID/passphrase from a persistent group if we become a GO. This can be used as an alternative to inviting a new P2P peer to join the group (i.e., use GO Negotiation with GO intent 15 instead of starting an autonomous GO and using invitation), e.g., in case a GO Negotiation Request is received from a peer while we are not running as a GO. The persistent group to use for parameters is indicated with persistent=<network id> parameter to p2p_connect. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-27 17:17:10 +02:00
wpa_s->p2p_persistent_id = persistent_id;
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
wpa_s->p2p_go_intent = go_intent;
wpa_s->p2p_connect_freq = freq;
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
wpa_s->p2p_fallback_to_go_neg = 0;
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
wpa_s->p2p_pd_before_go_neg = !!pd;
P2P: Add optional "ht40" argument for p2p_connect This can be used to start negotiated GO in 40 MHz channel width in 5GHz band. Signed-hostap: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
2012-08-15 22:07:44 +02:00
wpa_s->p2p_go_ht40 = !!ht40;
P2P: Add VHT parameter to P2P operations Add the option to ask for VHT operation similarly to the way ht40 is configured - either by adding 'vht' param to the relevant p2p_* commands or by configuring p2p_go_vht=1 in the configuration file. This patch only adds the configuration option (e.g., via control interface). The actual handling of the VHT parameter (asking the driver to use VHT, etc.) will be done by the following patch. Signed-hostap: Eliad Peller <eliadx.peller@intel.com>
2013-10-27 18:46:17 +01:00
wpa_s->p2p_go_vht = !!vht;
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
wpa_s->p2p_go_vht_center_freq2 = vht_center_freq2;
wpa_s->p2p_go_max_oper_chwidth = vht_chwidth;
P2P: Set Device Password ID in WPS M1/M2 per new rules If the P2P client (WPS Enrollee) uses a PIN from the GO (Registrar), Device Password ID in M1 & M2 is set to Registrar-specified.
2010-06-27 07:49:41 +02:00
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (pin)
os_strlcpy(wpa_s->p2p_pin, pin, sizeof(wpa_s->p2p_pin));
else if (wps_method == WPS_PIN_DISPLAY) {
WPS: Use only os_get_random() for PIN generation Remove the fallback dependency on os_random() when generating a WPS pin. This is exceptionally unlikely to ever be called as the call to os_get_random() is unlikely to fail. The intention is to facilitate future removal of os_random() as it uses a low quality PRNG. Signed-off-by: Nick Lowe <nick.lowe@lugatech.com>
2016-02-09 15:47:47 +01:00
if (wps_generate_pin((unsigned int *) &ret) < 0)
return -1;
Check os_snprintf() result more consistently While these are using practically large enoungh buffer sizes, it is better to be more consistent with checking os_snprintf() return value. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-06 20:40:31 +01:00
res = os_snprintf(wpa_s->p2p_pin, sizeof(wpa_s->p2p_pin),
"%08d", ret);
if (os_snprintf_error(sizeof(wpa_s->p2p_pin), res))
wpa_s->p2p_pin[sizeof(wpa_s->p2p_pin) - 1] = '\0';
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_printf(MSG_DEBUG, "P2P: Randomly generated PIN: %s",
wpa_s->p2p_pin);
P2PS: Allow P2P_CONNECT command for P2PS connection with/without PIN This allows using P2PS config method with or without PIN for connection. wpa_supplicant should internally handle the default PIN "12345670" and shall also allow connection irrespective of PIN used in P2P_CONNECT. For example, 1. P2P_CONNECT 02:2a:fb:22:22:33 p2ps 2. P2P_CONNECT 02:2a:fb:22:22:33 xxxxxxxx p2ps Where the second one is maintained for backwards compatibility. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-04-29 12:50:12 +02:00
} else if (wps_method == WPS_P2PS) {
/* Force the P2Ps default PIN to be used */
os_strlcpy(wpa_s->p2p_pin, "12345670", sizeof(wpa_s->p2p_pin));
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
} else
wpa_s->p2p_pin[0] = '\0';
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
if (join || auto_join) {
P2P: Fix p2p_connect join with interface address Need to fetch P2P Device Address from the peers table in case the p2p_connect join command uses interface address.
2010-07-10 22:07:08 +02:00
u8 iface_addr[ETH_ALEN], dev_addr[ETH_ALEN];
P2P: Add command for pre-authorizing an invitation to an active group This is mainly designed for testing and allows p2p_connect join auth to be used to accept a specific invitation to an active group that may be received in the future.
2010-06-27 09:11:42 +02:00
if (auth) {
wpa_printf(MSG_DEBUG, "P2P: Authorize invitation to "
"connect a running group from " MACSTR,
MAC2STR(peer_addr));
os_memcpy(wpa_s->p2p_auth_invite, peer_addr, ETH_ALEN);
return ret;
}
P2P: Fix p2p_connect join with interface address Need to fetch P2P Device Address from the peers table in case the p2p_connect join command uses interface address.
2010-07-10 22:07:08 +02:00
os_memcpy(dev_addr, peer_addr, ETH_ALEN);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (p2p_get_interface_addr(wpa_s->global->p2p, peer_addr,
P2P: Fix p2p_connect join with interface address Need to fetch P2P Device Address from the peers table in case the p2p_connect join command uses interface address.
2010-07-10 22:07:08 +02:00
iface_addr) < 0) {
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
os_memcpy(iface_addr, peer_addr, ETH_ALEN);
P2P: Fix p2p_connect join with interface address Need to fetch P2P Device Address from the peers table in case the p2p_connect join command uses interface address.
2010-07-10 22:07:08 +02:00
p2p_get_dev_addr(wpa_s->global->p2p, peer_addr,
dev_addr);
}
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
if (auto_join) {
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
os_get_reltime(&wpa_s->p2p_auto_started);
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
wpa_printf(MSG_DEBUG, "P2P: Auto join started at "
"%ld.%06ld",
wpa_s->p2p_auto_started.sec,
wpa_s->p2p_auto_started.usec);
}
P2P: Set user_initiated_pd separately from the join parameter p2p_prov_disc_req() used the join parameter to figure out whether the PD request was a user initiated or not. This does not cover all use cases of PD, so add a separate parameter to allow caller to indicate whether the user requested the operation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-22 23:48:58 +01:00
wpa_s->user_initiated_pd = 1;
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
if (wpas_p2p_join(wpa_s, iface_addr, dev_addr, wps_method,
P2P: Provide group SSID, if specified, to P2P Client join step At least one of the wpas_p2p_connect() callers (NFC join case) already had access to the Group SSID. Pass that information through wpas_p2p_connect() to wpas_p2p_join() so that the join operation can filter out incorrect groups more easily. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-12-30 18:08:51 +01:00
auto_join, freq,
group_ssid, group_ssid_len) < 0)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return -1;
return ret;
}
P2P: Use preferred frequency list from the local driver If the driver supports the preferred frequency list extension, use this information from the driver when no explicitly configured preference list (p2p_pref_chan) is present for P2P operating channel selection. This commit adds this for GO Negotiation and Invitation use cases. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-07-24 02:39:45 +02:00
size = P2P_MAX_PREF_CHANNELS;
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
res = wpas_p2p_setup_freqs(wpa_s, freq, &force_freq, &pref_freq,
P2P: Use preferred frequency list from the local driver If the driver supports the preferred frequency list extension, use this information from the driver when no explicitly configured preference list (p2p_pref_chan) is present for P2P operating channel selection. This commit adds this for GO Negotiation and Invitation use cases. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-07-24 02:39:45 +02:00
go_intent == 15, pref_freq_list, &size);
P2P: Use shared function for setting up frequencies p2p_connect() and p2p_invite() cases used more or less identical implementatin. Use a shared function to avoid duplicated code. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-25 18:30:14 +01:00
if (res)
return res;
P2P: Fix channel preference use for MCC p2p_connect Only force_freq was used in the wpas_p2p_set_own_freq_preference() call which allowed the P2P module channel re-selection to ignore the preference for using a channel we are already using. Fix this by setting either force_freq or pref_freq as the preference based on which one is set. This allows p2p_ignore_shared_freq parameter to be used whether to prefer the shared frequency in this case. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-19 11:39:29 +01:00
wpas_p2p_set_own_freq_preference(wpa_s,
force_freq ? force_freq : pref_freq);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Use preferred frequency list from the local driver If the driver supports the preferred frequency list extension, use this information from the driver when no explicitly configured preference list (p2p_pref_chan) is present for P2P operating channel selection. This commit adds this for GO Negotiation and Invitation use cases. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-07-24 02:39:45 +02:00
p2p_set_own_pref_freq_list(wpa_s->global->p2p, pref_freq_list, size);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_s->create_p2p_iface = wpas_p2p_create_iface(wpa_s);
P2P: Simplify code in wpas_p2p_connect() There's some duplicated code there that can be simplified with just a single new variable. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2011-11-18 22:32:03 +01:00
if (wpa_s->create_p2p_iface) {
/* Prepare to add a new interface for the group */
iftype = WPA_IF_P2P_GROUP;
if (go_intent == 15)
iftype = WPA_IF_P2P_GO;
if (wpas_p2p_add_group_interface(wpa_s, iftype) < 0) {
wpa_printf(MSG_ERROR, "P2P: Failed to allocate a new "
"interface for the group");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return -1;
P2P: Simplify code in wpas_p2p_connect() There's some duplicated code there that can be simplified with just a single new variable. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2011-11-18 22:32:03 +01:00
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Simplify code in wpas_p2p_connect() There's some duplicated code there that can be simplified with just a single new variable. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2011-11-18 22:32:03 +01:00
if_addr = wpa_s->pending_interface_addr;
P2P: Do not clear wpa_s->go_dev_addr before group removal This variable is needed to figure out whether a wpa_supplicant interface is for a P2P group that is (or was) connected to a specific GO. The previous implementation was able to find such a case only when there was an association with the GO. However, this may be needed even if there is a temporary disconnection from the GO. Keep the GO device address information over such temporary disconnections and only remove it on group termination. This fixes an issue with D-Bus Peer PropertiesChanged signals for the Groups property in case a P2P group gets removed due to group idle timeout instead of explicit group termination command (local request) or GO notification. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-08-02 18:25:41 +02:00
} else {
P2P: Support dedicated P2P_DEVICE without separate group interface Add support for drivers with dedicated P2P_DEVICE interface, but without group interface concurrency (only a single netdev is used). With such devices, wpa_supplicant tried to use the p2p_dev interface instead of the group interface and most P2P operations failed. Extend wpa_supplicant to use the primary interface instead of a separate group interface in such cases. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
if (wpa_s->p2p_mgmt)
if_addr = wpa_s->parent->own_addr;
else
if_addr = wpa_s->own_addr;
P2P: Do not clear wpa_s->go_dev_addr before group removal This variable is needed to figure out whether a wpa_supplicant interface is for a P2P group that is (or was) connected to a specific GO. The previous implementation was able to find such a case only when there was an association with the GO. However, this may be needed even if there is a temporary disconnection from the GO. Keep the GO device address information over such temporary disconnections and only remove it on group termination. This fixes an issue with D-Bus Peer PropertiesChanged signals for the Groups property in case a P2P group gets removed due to group idle timeout instead of explicit group termination command (local request) or GO notification. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-08-02 18:25:41 +02:00
os_memset(wpa_s->go_dev_addr, 0, ETH_ALEN);
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (auth) {
if (wpas_p2p_auth_go_neg(wpa_s, peer_addr, wps_method,
P2P: Simplify code in wpas_p2p_connect() There's some duplicated code there that can be simplified with just a single new variable. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2011-11-18 22:32:03 +01:00
go_intent, if_addr,
P2P: Allow all channels with multi-channel concurrency If the driver indicates support for multi-channel concurrency, change the p2p_connect behavior to not force the current operating channel, but instead, just mark it as preferred for GO Negotiation. This change applies only for the case when the freq parameter is not used with the p2p_connect command. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-10-26 17:10:46 +02:00
force_freq, persistent_group, ssid,
pref_freq) < 0)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return -1;
return ret;
}
P2P: Simplify code in wpas_p2p_connect() There's some duplicated code there that can be simplified with just a single new variable. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2011-11-18 22:32:03 +01:00
if (wpas_p2p_start_go_neg(wpa_s, peer_addr, wps_method,
go_intent, if_addr, force_freq,
P2P: Allow all channels with multi-channel concurrency If the driver indicates support for multi-channel concurrency, change the p2p_connect behavior to not force the current operating channel, but instead, just mark it as preferred for GO Negotiation. This change applies only for the case when the freq parameter is not used with the p2p_connect command. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-10-26 17:10:46 +02:00
persistent_group, ssid, pref_freq) < 0) {
P2P: Simplify code in wpas_p2p_connect() There's some duplicated code there that can be simplified with just a single new variable. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2011-11-18 22:32:03 +01:00
if (wpa_s->create_p2p_iface)
wpas_p2p_remove_pending_group_interface(wpa_s);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return -1;
}
return ret;
}
/**
* wpas_p2p_remain_on_channel_cb - Indication of remain-on-channel start
* @wpa_s: Pointer to wpa_supplicant data from wpa_supplicant_add_iface()
* @freq: Frequency of the channel in MHz
* @duration: Duration of the stay on the channel in milliseconds
*
* This callback is called when the driver indicates that it has started the
* requested remain-on-channel duration.
*/
void wpas_p2p_remain_on_channel_cb(struct wpa_supplicant *wpa_s,
unsigned int freq, unsigned int duration)
{
P2P: Handle P2P-not-supported without segfaults Previous code was assuming that the P2P module is always initialized. However, that is not the case anymore with drivers that do not support P2P. Add verification of whether P2P is enabled before trying to execute P2P commands.
2011-02-24 20:13:30 +01:00
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
return;
P2P: Ignore remain-on-channel callback event if not waiting for one It was possible for the previously requested remain-on-channel for P2P listen state to get canceled before having received driver event indicating start of that remain-on-channel operation. In such a case, the event was able to trigger P2P module to start processing listen timeout even though there was not supposed to be a following listen operation anymore. Skip the driver event if we are not waiting for a new listen state. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-02-02 12:32:06 +01:00
wpa_printf(MSG_DEBUG, "P2P: remain-on-channel callback (off_channel_freq=%u pending_listen_freq=%d roc_waiting_drv_freq=%d freq=%u duration=%u)",
wpa_s->off_channel_freq, wpa_s->pending_listen_freq,
wpa_s->roc_waiting_drv_freq, freq, duration);
if (wpa_s->off_channel_freq &&
wpa_s->off_channel_freq == wpa_s->pending_listen_freq) {
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_listen_cb(wpa_s->global->p2p, wpa_s->pending_listen_freq,
wpa_s->pending_listen_duration);
wpa_s->pending_listen_freq = 0;
P2P: Add even more debug prints for Probe Request in non-Listen state It looks like discovery_dev_id test case can still fail and based on the previously added debug prints, this is happening since the P2P module believes it is not in Listen state even when a P2P_LISTEN was issued. p2p_listen_cb() did not get called on remain-on-channel event for some reason, so lets add more debug to find out why this can happen. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-02-20 15:59:29 +01:00
} else {
wpa_printf(MSG_DEBUG, "P2P: Ignore remain-on-channel callback (off_channel_freq=%u pending_listen_freq=%d freq=%u duration=%u)",
wpa_s->off_channel_freq, wpa_s->pending_listen_freq,
freq, duration);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
}
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: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
/* Limit maximum Listen state time based on driver limitation. */
if (timeout > wpa_s->max_remain_on_chan)
timeout = wpa_s->max_remain_on_chan;
return p2p_listen(wpa_s->global->p2p, timeout);
}
/**
* wpas_p2p_cancel_remain_on_channel_cb - Remain-on-channel timeout
* @wpa_s: Pointer to wpa_supplicant data from wpa_supplicant_add_iface()
* @freq: Frequency of the channel in MHz
*
* This callback is called when the driver indicates that a remain-on-channel
* operation has been completed, i.e., the duration on the requested channel
* has timed out.
*/
void wpas_p2p_cancel_remain_on_channel_cb(struct wpa_supplicant *wpa_s,
unsigned int freq)
{
P2P: Clear pending Action TX frame on p2p_stop_find and p2p_listen This is needed to avoid issues with the previous TX command from stopping long Listen state.
2010-08-03 05:40:54 +02:00
wpa_printf(MSG_DEBUG, "P2P: Cancel remain-on-channel callback "
P2P: Fix p2p_long_listen There are two issues with p2p_long_listen: 1) max_remain_on_channel is assumed to be 5 seconds, 2) if max_remain_on_channel is not a full multiple of seconds, accounting breaks. Fix these by converting p2p_long_listen to ms and tracking it according to max_remain_on_channel. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-01 17:09:38 +01:00
"(p2p_long_listen=%d ms pending_action_tx=%p)",
Move some P2P offchannel operations to offchannel.c There is no need for p2p_supplicant.c to access wpa_s->pending_action_tx so move these references to offchannel.c to get a bit cleaner interface between the components. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-22 10:22:12 +01:00
wpa_s->p2p_long_listen, offchannel_pending_action_tx(wpa_s));
Use radio work for P2P Listen requests Avoid concurrent P2P Listen operations with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-04 08:36:13 +01:00
wpas_p2p_listen_work_done(wpa_s);
P2P: Handle P2P-not-supported without segfaults Previous code was assuming that the P2P module is always initialized. However, that is not the case anymore with drivers that do not support P2P. Add verification of whether P2P is enabled before trying to execute P2P commands.
2011-02-24 20:13:30 +01:00
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
return;
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
if (wpa_s->p2p_long_listen > 0)
wpa_s->p2p_long_listen -= wpa_s->max_remain_on_chan;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (p2p_listen_end(wpa_s->global->p2p, freq) > 0)
return; /* P2P module started a new operation */
Move some P2P offchannel operations to offchannel.c There is no need for p2p_supplicant.c to access wpa_s->pending_action_tx so move these references to offchannel.c to get a bit cleaner interface between the components. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-22 10:22:12 +01:00
if (offchannel_pending_action_tx(wpa_s))
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return;
if (wpa_s->p2p_long_listen > 0) {
wpa_printf(MSG_DEBUG, "P2P: Continuing long Listen state");
P2P: Fix p2p_long_listen There are two issues with p2p_long_listen: 1) max_remain_on_channel is assumed to be 5 seconds, 2) if max_remain_on_channel is not a full multiple of seconds, accounting breaks. Fix these by converting p2p_long_listen to ms and tracking it according to max_remain_on_channel. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-01 17:09:38 +01:00
wpas_p2p_listen_start(wpa_s, wpa_s->p2p_long_listen);
P2P: Stop listen state when listen-only duration is over Even after listen duration is over, P2P module remained in P2P_LISTEN_ONLY state, which is blocking station mode scans. Fix this by stopping P2P listen explicitly to update p2p_state to IDLE when listen duration expires. Signed-hostap: Syed Asifful Dayyan <syedd@broadcom.com>
2013-08-31 17:09:15 +02:00
} else {
/*
* When listen duration is over, stop listen & update p2p_state
* to IDLE.
*/
p2p_stop_listen(wpa_s->global->p2p);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
}
/**
* wpas_p2p_group_remove - Remove a P2P group
* @wpa_s: Pointer to wpa_supplicant data from wpa_supplicant_add_iface()
* @ifname: Network interface name of the group interface or "*" to remove all
* groups
* Returns: 0 on success, -1 on failure
*
* This function is used to remove a P2P group. This can be used to disconnect
* from a group in which the local end is a P2P Client or to end a P2P Group in
* case the local end is the Group Owner. If a virtual network interface was
* created for this group, that interface will be removed. Otherwise, only the
* configured P2P group network will be removed from the interface.
*/
int wpas_p2p_group_remove(struct wpa_supplicant *wpa_s, const char *ifname)
{
struct wpa_global *global = wpa_s->global;
P2P: Fix group interface removal through interface ctrl_iface It was possible to issue the P2P_GROUP_REMOVE command through the per-interface control interface. This resulted in freed memory getting accessed when trying to send the control interface response to the operation that ended up deleting the group interface. Fix this by postponing the removal operation until the caller has returned. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-18 15:20:51 +02:00
struct wpa_supplicant *calling_wpa_s = wpa_s;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (os_strcmp(ifname, "*") == 0) {
struct wpa_supplicant *prev;
wpa_s = global->ifaces;
while (wpa_s) {
prev = wpa_s;
wpa_s = wpa_s->next;
P2P: Skip non-P2P interface in p2p_group_remove * When 'p2p_group_remove *' is called while the station interface is connected, the flow also disconnects the station interface. Fix this by skipping non-P2P interfaces in the iteration. Signed-hostap: Ilan Peer <ilan.peer@intel.com>
2013-08-25 10:17:14 +02:00
if (prev->p2p_group_interface !=
NOT_P2P_GROUP_INTERFACE ||
(prev->current_ssid &&
prev->current_ssid->p2p_group))
P2P: Fix group interface removal through interface ctrl_iface It was possible to issue the P2P_GROUP_REMOVE command through the per-interface control interface. This resulted in freed memory getting accessed when trying to send the control interface response to the operation that ended up deleting the group interface. Fix this by postponing the removal operation until the caller has returned. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-18 15:20:51 +02:00
wpas_p2p_disconnect_safely(prev, calling_wpa_s);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
return 0;
}
for (wpa_s = global->ifaces; wpa_s; wpa_s = wpa_s->next) {
if (os_strcmp(wpa_s->ifname, ifname) == 0)
break;
}
P2P: Fix group interface removal through interface ctrl_iface It was possible to issue the P2P_GROUP_REMOVE command through the per-interface control interface. This resulted in freed memory getting accessed when trying to send the control interface response to the operation that ended up deleting the group interface. Fix this by postponing the removal operation until the caller has returned. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-18 15:20:51 +02:00
return wpas_p2p_disconnect_safely(wpa_s, calling_wpa_s);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Automatic channel selection at re-invocation of persistent GO If the driver wrapper supports best operation channel indication, the p2p_group_add command can now use special values (freq=2 and freq=5) to indicate that the re-invoked persistent GO is to be started on the specified band. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-06-05 01:03:26 +02:00
static int wpas_p2p_select_go_freq(struct wpa_supplicant *wpa_s, int freq)
{
unsigned int r;
P2P: Support driver preferred freq list for Autonomous GO case When starting an autonomous GO without specifying the operating channel, query the driver for the preferred frequency list, and use it to select the operating channel of the GO (if supported). Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-08-10 02:44:12 +02:00
if (!wpa_s->conf->num_p2p_pref_chan && !freq) {
unsigned int i, size = P2P_MAX_PREF_CHANNELS;
unsigned int pref_freq_list[P2P_MAX_PREF_CHANNELS];
int res;
res = wpa_drv_get_pref_freq_list(wpa_s, WPA_IF_P2P_GO,
&size, pref_freq_list);
if (!res && size > 0) {
i = 0;
while (wpas_p2p_disallowed_freq(wpa_s->global,
pref_freq_list[i]) &&
i < size) {
wpa_printf(MSG_DEBUG,
"P2P: preferred_freq_list[%d]=%d is disallowed",
i, pref_freq_list[i]);
i++;
}
if (i != size) {
freq = pref_freq_list[i];
wpa_printf(MSG_DEBUG,
"P2P: Using preferred_freq_list[%d]=%d",
i, freq);
} else {
wpa_printf(MSG_DEBUG,
"P2P: All driver preferred frequencies are disallowed for P2P use");
}
} else {
wpa_printf(MSG_DEBUG,
"P2P: No preferred frequency list available");
}
}
P2P: Automatic channel selection at re-invocation of persistent GO If the driver wrapper supports best operation channel indication, the p2p_group_add command can now use special values (freq=2 and freq=5) to indicate that the re-invoked persistent GO is to be started on the specified band. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-06-05 01:03:26 +02:00
if (freq == 2) {
wpa_printf(MSG_DEBUG, "P2P: Request to start GO on 2.4 GHz "
"band");
if (wpa_s->best_24_freq > 0 &&
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
p2p_supported_freq_go(wpa_s->global->p2p,
wpa_s->best_24_freq)) {
P2P: Automatic channel selection at re-invocation of persistent GO If the driver wrapper supports best operation channel indication, the p2p_group_add command can now use special values (freq=2 and freq=5) to indicate that the re-invoked persistent GO is to be started on the specified band. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-06-05 01:03:26 +02:00
freq = wpa_s->best_24_freq;
wpa_printf(MSG_DEBUG, "P2P: Use best 2.4 GHz band "
"channel: %d MHz", freq);
} else {
P2P: Check os_get_random() return value more consistently In theory, this call could fail, so check the return value before using the received data. These specific cases would not really care much about the failures, but this keeps the code more consistent and keeps static analyzer warnings more useful. (CID 72678, CID 72679, CID 72680, CID 72683, CID 72689, CID 72698, CID 72703) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-09-13 15:27:52 +02:00
if (os_get_random((u8 *) &r, sizeof(r)) < 0)
return -1;
P2P: Automatic channel selection at re-invocation of persistent GO If the driver wrapper supports best operation channel indication, the p2p_group_add command can now use special values (freq=2 and freq=5) to indicate that the re-invoked persistent GO is to be started on the specified band. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-06-05 01:03:26 +02:00
freq = 2412 + (r % 3) * 25;
wpa_printf(MSG_DEBUG, "P2P: Use random 2.4 GHz band "
"channel: %d MHz", freq);
}
}
if (freq == 5) {
wpa_printf(MSG_DEBUG, "P2P: Request to start GO on 5 GHz "
"band");
if (wpa_s->best_5_freq > 0 &&
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
p2p_supported_freq_go(wpa_s->global->p2p,
P2P: Automatic channel selection at re-invocation of persistent GO If the driver wrapper supports best operation channel indication, the p2p_group_add command can now use special values (freq=2 and freq=5) to indicate that the re-invoked persistent GO is to be started on the specified band. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-06-05 01:03:26 +02:00
wpa_s->best_5_freq)) {
freq = wpa_s->best_5_freq;
wpa_printf(MSG_DEBUG, "P2P: Use best 5 GHz band "
"channel: %d MHz", freq);
} else {
P2P: Check os_get_random() return value more consistently In theory, this call could fail, so check the return value before using the received data. These specific cases would not really care much about the failures, but this keeps the code more consistent and keeps static analyzer warnings more useful. (CID 72678, CID 72679, CID 72680, CID 72683, CID 72689, CID 72698, CID 72703) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-09-13 15:27:52 +02:00
if (os_get_random((u8 *) &r, sizeof(r)) < 0)
return -1;
P2P: Automatic channel selection at re-invocation of persistent GO If the driver wrapper supports best operation channel indication, the p2p_group_add command can now use special values (freq=2 and freq=5) to indicate that the re-invoked persistent GO is to be started on the specified band. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-06-05 01:03:26 +02:00
freq = 5180 + (r % 4) * 20;
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
if (!p2p_supported_freq_go(wpa_s->global->p2p, freq)) {
P2P: Automatic channel selection at re-invocation of persistent GO If the driver wrapper supports best operation channel indication, the p2p_group_add command can now use special values (freq=2 and freq=5) to indicate that the re-invoked persistent GO is to be started on the specified band. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-06-05 01:03:26 +02:00
wpa_printf(MSG_DEBUG, "P2P: Could not select "
"5 GHz channel for P2P group");
return -1;
}
wpa_printf(MSG_DEBUG, "P2P: Use random 5 GHz band "
"channel: %d MHz", freq);
}
}
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
if (freq > 0 && !p2p_supported_freq_go(wpa_s->global->p2p, freq)) {
DFS offload: P2P changes for autonomous GO Add P2P changes to allow bringing up P2P autonomous GO on a DFS channel if DFS functionality is offloaded to the driver. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-03-05 02:31:25 +01:00
if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_DFS_OFFLOAD) &&
ieee80211_is_dfs(freq)) {
/*
* If freq is a DFS channel and DFS is offloaded to the
* driver, allow P2P GO to use it.
*/
wpa_printf(MSG_DEBUG, "P2P: "
"%s: The forced channel for GO (%u MHz) is DFS, and DFS is offloaded",
__func__, freq);
return freq;
}
P2P: Automatic channel selection at re-invocation of persistent GO If the driver wrapper supports best operation channel indication, the p2p_group_add command can now use special values (freq=2 and freq=5) to indicate that the re-invoked persistent GO is to be started on the specified band. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-06-05 01:03:26 +02:00
wpa_printf(MSG_DEBUG, "P2P: The forced channel for GO "
"(%u MHz) is not supported for P2P uses",
freq);
return -1;
}
return freq;
}
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
static int wpas_p2p_supported_freq_go(struct wpa_supplicant *wpa_s,
const struct p2p_channels *channels,
int freq)
{
if (!wpas_p2p_disallowed_freq(wpa_s->global, freq) &&
p2p_supported_freq_go(wpa_s->global->p2p, freq) &&
freq_included(wpa_s, channels, freq))
return 1;
return 0;
}
static void wpas_p2p_select_go_freq_no_pref(struct wpa_supplicant *wpa_s,
struct p2p_go_neg_results *params,
const struct p2p_channels *channels)
P2P: Try using one of the social channels for GO In case there is no preference for the GO operating channel, try using one of 1, 6, 11 (randomly), and only if the random selection is not suitable traverse all the channels 1..11. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:38 +02:00
{
unsigned int i, r;
/* first try some random selection of the social channels */
P2P: Verify that os_get_random() succeeds Be more consistent with os_get_random() use (CID 72710). Signed-off-by: Jouni Malinen <j@w1.fi>
2014-09-07 17:05:53 +02:00
if (os_get_random((u8 *) &r, sizeof(r)) < 0)
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
return;
P2P: Try using one of the social channels for GO In case there is no preference for the GO operating channel, try using one of 1, 6, 11 (randomly), and only if the random selection is not suitable traverse all the channels 1..11. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:38 +02:00
for (i = 0; i < 3; i++) {
params->freq = 2412 + ((r + i) % 3) * 25;
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
if (wpas_p2p_supported_freq_go(wpa_s, channels, params->freq))
P2P: Try using one of the social channels for GO In case there is no preference for the GO operating channel, try using one of 1, 6, 11 (randomly), and only if the random selection is not suitable traverse all the channels 1..11. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:38 +02:00
goto out;
}
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
/* try all other channels in operating class 81 */
P2P: Try using one of the social channels for GO In case there is no preference for the GO operating channel, try using one of 1, 6, 11 (randomly), and only if the random selection is not suitable traverse all the channels 1..11. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:38 +02:00
for (i = 0; i < 11; i++) {
params->freq = 2412 + i * 5;
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
/* skip social channels; covered in the previous loop */
if (params->freq == 2412 ||
params->freq == 2437 ||
params->freq == 2462)
continue;
if (wpas_p2p_supported_freq_go(wpa_s, channels, params->freq))
P2P: Add support for 60 GHz social channel Support 60 GHz band in P2P module by selecting random social channel from all supported social channels in 2.4 GHz and 60 GHz bands. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-09-25 11:42:07 +02:00
goto out;
}
P2P: Consider 5 GHz channels also for auto GO When there is no channel preference mentioned by user, auto GO can be started on any of the 5 GHz channels supported for P2P. Consider operating classes 115 and 124 which do not require DFS. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-02-24 07:43:33 +01:00
/* try all channels in operating class 115 */
for (i = 0; i < 4; i++) {
params->freq = 5180 + i * 20;
if (!wpas_p2p_disallowed_freq(wpa_s->global, params->freq) &&
P2P: Move a GO to a frequency that is also supported by the client A P2P GO interface that was instantiated after a GO Negotiation or Invitation holds the intersection of frequencies between the GO and the client. In case the GO is going to move to another frequency, allow it to move only to a frequency that is also supported by the client. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:21 +02:00
freq_included(wpa_s, channels, params->freq) &&
P2P: Consider 5 GHz channels also for auto GO When there is no channel preference mentioned by user, auto GO can be started on any of the 5 GHz channels supported for P2P. Consider operating classes 115 and 124 which do not require DFS. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-02-24 07:43:33 +01:00
p2p_supported_freq(wpa_s->global->p2p, params->freq))
goto out;
}
/* try all channels in operating class 124 */
for (i = 0; i < 4; i++) {
params->freq = 5745 + i * 20;
if (!wpas_p2p_disallowed_freq(wpa_s->global, params->freq) &&
P2P: Move a GO to a frequency that is also supported by the client A P2P GO interface that was instantiated after a GO Negotiation or Invitation holds the intersection of frequencies between the GO and the client. In case the GO is going to move to another frequency, allow it to move only to a frequency that is also supported by the client. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:21 +02:00
freq_included(wpa_s, channels, params->freq) &&
P2P: Consider 5 GHz channels also for auto GO When there is no channel preference mentioned by user, auto GO can be started on any of the 5 GHz channels supported for P2P. Consider operating classes 115 and 124 which do not require DFS. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-02-24 07:43:33 +01:00
p2p_supported_freq(wpa_s->global->p2p, params->freq))
goto out;
}
P2P: Add support for 60 GHz social channel Support 60 GHz band in P2P module by selecting random social channel from all supported social channels in 2.4 GHz and 60 GHz bands. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-09-25 11:42:07 +02:00
/* try social channel class 180 channel 2 */
params->freq = 58320 + 1 * 2160;
if (!wpas_p2p_disallowed_freq(wpa_s->global, params->freq) &&
P2P: Move a GO to a frequency that is also supported by the client A P2P GO interface that was instantiated after a GO Negotiation or Invitation holds the intersection of frequencies between the GO and the client. In case the GO is going to move to another frequency, allow it to move only to a frequency that is also supported by the client. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:21 +02:00
freq_included(wpa_s, channels, params->freq) &&
P2P: Add support for 60 GHz social channel Support 60 GHz band in P2P module by selecting random social channel from all supported social channels in 2.4 GHz and 60 GHz bands. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-09-25 11:42:07 +02:00
p2p_supported_freq(wpa_s->global->p2p, params->freq))
goto out;
/* try all channels in reg. class 180 */
for (i = 0; i < 4; i++) {
params->freq = 58320 + i * 2160;
if (!wpas_p2p_disallowed_freq(wpa_s->global, params->freq) &&
P2P: Move a GO to a frequency that is also supported by the client A P2P GO interface that was instantiated after a GO Negotiation or Invitation holds the intersection of frequencies between the GO and the client. In case the GO is going to move to another frequency, allow it to move only to a frequency that is also supported by the client. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:21 +02:00
freq_included(wpa_s, channels, params->freq) &&
P2P: Add support for 60 GHz social channel Support 60 GHz band in P2P module by selecting random social channel from all supported social channels in 2.4 GHz and 60 GHz bands. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-09-25 11:42:07 +02:00
p2p_supported_freq(wpa_s->global->p2p, params->freq))
P2P: Try using one of the social channels for GO In case there is no preference for the GO operating channel, try using one of 1, 6, 11 (randomly), and only if the random selection is not suitable traverse all the channels 1..11. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:38 +02:00
goto out;
}
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
params->freq = 0;
P2P: Consider 5 GHz channels also for auto GO When there is no channel preference mentioned by user, auto GO can be started on any of the 5 GHz channels supported for P2P. Consider operating classes 115 and 124 which do not require DFS. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-02-24 07:43:33 +01:00
wpa_printf(MSG_DEBUG, "P2P: No 2.4, 5, or 60 GHz channel allowed");
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
return;
P2P: Try using one of the social channels for GO In case there is no preference for the GO operating channel, try using one of 1, 6, 11 (randomly), and only if the random selection is not suitable traverse all the channels 1..11. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:38 +02:00
out:
wpa_printf(MSG_DEBUG, "P2P: Set GO freq %d MHz (no preference known)",
params->freq);
}
P2P: Reject p2p_group_add if forced frequency is not acceptable If the freq parameter is specified and we are already running legacy STA on a different frequency with a driver that does not support multi-channel concurrency, reject p2p_group_add. Same code already exists in the path of P2P connection with go negotiation but is missing for autonomous GO. Signed-hostap: Neeraj Garg <neerajkg@broadcom.com>
2011-12-27 22:21:45 +01:00
static int wpas_p2p_init_go_params(struct wpa_supplicant *wpa_s,
struct p2p_go_neg_results *params,
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: 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
const struct p2p_channels *channels)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
struct wpa_used_freq_data *freqs;
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
unsigned int cand;
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
unsigned int num, i;
P2P: Relax wpas_p2p_init_go_params() for P2P GO CSA wpas_p2p_move_go_csa() uses wpas_p2p_init_p2p_params() to select the frequency to move to. However, it is possible that all the channels are already used, so the selection of a new frequency would fail, although the frequency used by the P2P GO should not be considered as used if it is the only one using it. To overcome this, allow the frequency selection to continue even if all the frequencies are in use, but the frequency used by the P2P GO is not used by any station interface. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-09-08 11:46:17 +02:00
int ignore_no_freqs = 0;
P2P: Respect p2p_ignore_shared_freq on p2p_group_add Make sure wpas_p2p_init_go_params() respects the p2p_ignore_shared_freq configuration option. Choose currently used frequencies only if this option is not set, or if there are no unused channels left. Signed-off-by: Eliad Peller <eliad@wizery.com>
2016-03-03 17:18:30 +01:00
int unused_channels = wpas_p2p_num_unused_channels(wpa_s) > 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
os_memset(params, 0, sizeof(*params));
params->role_go = 1;
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
params->ht40 = ht40;
P2P: Add VHT parameter to P2P operations Add the option to ask for VHT operation similarly to the way ht40 is configured - either by adding 'vht' param to the relevant p2p_* commands or by configuring p2p_go_vht=1 in the configuration file. This patch only adds the configuration option (e.g., via control interface). The actual handling of the VHT parameter (asking the driver to use VHT, etc.) will be done by the following patch. Signed-hostap: Eliad Peller <eliadx.peller@intel.com>
2013-10-27 18:46:17 +01:00
params->vht = vht;
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
params->max_oper_chwidth = max_oper_chwidth;
params->vht_center_freq2 = vht_center_freq2;
P2P: Move a GO to a frequency that is also supported by the client A P2P GO interface that was instantiated after a GO Negotiation or Invitation holds the intersection of frequencies between the GO and the client. In case the GO is going to move to another frequency, allow it to move only to a frequency that is also supported by the client. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:21 +02:00
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
freqs = os_calloc(wpa_s->num_multichan_concurrent,
sizeof(struct wpa_used_freq_data));
if (!freqs)
return -1;
P2P: Relax wpas_p2p_init_go_params() for P2P GO CSA wpas_p2p_move_go_csa() uses wpas_p2p_init_p2p_params() to select the frequency to move to. However, it is possible that all the channels are already used, so the selection of a new frequency would fail, although the frequency used by the P2P GO should not be considered as used if it is the only one using it. To overcome this, allow the frequency selection to continue even if all the frequencies are in use, but the frequency used by the P2P GO is not used by any station interface. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-09-08 11:46:17 +02:00
num = get_shared_radio_freqs_data(wpa_s, freqs,
wpa_s->num_multichan_concurrent);
if (wpa_s->current_ssid &&
wpa_s->current_ssid->mode == WPAS_MODE_P2P_GO &&
wpa_s->wpa_state == WPA_COMPLETED) {
wpa_printf(MSG_DEBUG, "P2P: %s called for an active GO",
__func__);
/*
* If the frequency selection is done for an active P2P GO that
* is not sharing a frequency, allow to select a new frequency
* even if there are no unused frequencies as we are about to
* move the P2P GO so its frequency can be re-used.
*/
for (i = 0; i < num; i++) {
if (freqs[i].freq == wpa_s->current_ssid->frequency &&
freqs[i].flags == 0) {
ignore_no_freqs = 1;
break;
}
}
}
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
/* try using the forced freq */
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
if (freq) {
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
if (!wpas_p2p_supported_freq_go(wpa_s, channels, freq)) {
wpa_printf(MSG_DEBUG,
"P2P: Forced GO freq %d MHz not accepted",
freq);
goto fail;
}
for (i = 0; i < num; i++) {
if (freqs[i].freq == freq) {
wpa_printf(MSG_DEBUG,
"P2P: forced freq (%d MHz) is also shared",
freq);
params->freq = freq;
goto success;
}
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
}
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
P2P: Respect p2p_ignore_shared_freq on p2p_group_add Make sure wpas_p2p_init_go_params() respects the p2p_ignore_shared_freq configuration option. Choose currently used frequencies only if this option is not set, or if there are no unused channels left. Signed-off-by: Eliad Peller <eliad@wizery.com>
2016-03-03 17:18:30 +01:00
if (!ignore_no_freqs && !unused_channels) {
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
wpa_printf(MSG_DEBUG,
"P2P: Cannot force GO on freq (%d MHz) as all the channels are in use",
freq);
goto fail;
}
wpa_printf(MSG_DEBUG,
"P2P: force GO freq (%d MHz) on a free channel",
freq);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
params->freq = freq;
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
goto success;
}
/* consider using one of the shared frequencies */
P2P: Respect p2p_ignore_shared_freq on p2p_group_add Make sure wpas_p2p_init_go_params() respects the p2p_ignore_shared_freq configuration option. Choose currently used frequencies only if this option is not set, or if there are no unused channels left. Signed-off-by: Eliad Peller <eliad@wizery.com>
2016-03-03 17:18:30 +01:00
if (num &&
(!wpa_s->conf->p2p_ignore_shared_freq || !unused_channels)) {
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
cand = wpas_p2p_pick_best_used_freq(wpa_s, freqs, num);
if (wpas_p2p_supported_freq_go(wpa_s, channels, cand)) {
wpa_printf(MSG_DEBUG,
"P2P: Use shared freq (%d MHz) for GO",
P2P: Fix shared freq print in wpas_p2p_init_go_params() "freq" contains the forced frequency, not the selected one. Print the correct freq instead. Signed-off-by: Eliad Peller <eliad@wizery.com>
2016-03-03 17:18:29 +01:00
cand);
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
params->freq = cand;
goto success;
}
/* try using one of the shared freqs */
for (i = 0; i < num; i++) {
if (wpas_p2p_supported_freq_go(wpa_s, channels,
freqs[i].freq)) {
wpa_printf(MSG_DEBUG,
"P2P: Use shared freq (%d MHz) for GO",
P2P: Fix shared freq print in wpas_p2p_init_go_params() "freq" contains the forced frequency, not the selected one. Print the correct freq instead. Signed-off-by: Eliad Peller <eliad@wizery.com>
2016-03-03 17:18:29 +01:00
freqs[i].freq);
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
params->freq = freqs[i].freq;
goto success;
}
}
}
P2P: Respect p2p_ignore_shared_freq on p2p_group_add Make sure wpas_p2p_init_go_params() respects the p2p_ignore_shared_freq configuration option. Choose currently used frequencies only if this option is not set, or if there are no unused channels left. Signed-off-by: Eliad Peller <eliad@wizery.com>
2016-03-03 17:18:30 +01:00
if (!ignore_no_freqs && !unused_channels) {
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
wpa_printf(MSG_DEBUG,
"P2P: Cannot force GO on any of the channels we are already using");
goto fail;
}
/* try using the setting from the configuration file */
if (wpa_s->conf->p2p_oper_reg_class == 81 &&
wpa_s->conf->p2p_oper_channel >= 1 &&
wpa_s->conf->p2p_oper_channel <= 11 &&
wpas_p2p_supported_freq_go(
wpa_s, channels,
2407 + 5 * wpa_s->conf->p2p_oper_channel)) {
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
params->freq = 2407 + 5 * wpa_s->conf->p2p_oper_channel;
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
wpa_printf(MSG_DEBUG, "P2P: Set GO freq based on configured "
"frequency %d MHz", params->freq);
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
goto success;
}
if ((wpa_s->conf->p2p_oper_reg_class == 115 ||
wpa_s->conf->p2p_oper_reg_class == 116 ||
wpa_s->conf->p2p_oper_reg_class == 117 ||
wpa_s->conf->p2p_oper_reg_class == 124 ||
wpa_s->conf->p2p_oper_reg_class == 125 ||
wpa_s->conf->p2p_oper_reg_class == 126 ||
wpa_s->conf->p2p_oper_reg_class == 127) &&
wpas_p2p_supported_freq_go(wpa_s, channels,
5000 +
5 * wpa_s->conf->p2p_oper_channel)) {
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
params->freq = 5000 + 5 * wpa_s->conf->p2p_oper_channel;
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
wpa_printf(MSG_DEBUG, "P2P: Set GO freq based on configured "
"frequency %d MHz", params->freq);
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
goto success;
}
/* Try using best channels */
if (wpa_s->conf->p2p_oper_channel == 0 &&
wpa_s->best_overall_freq > 0 &&
wpas_p2p_supported_freq_go(wpa_s, channels,
wpa_s->best_overall_freq)) {
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
params->freq = wpa_s->best_overall_freq;
wpa_printf(MSG_DEBUG, "P2P: Set GO freq based on best overall "
"channel %d MHz", params->freq);
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
goto success;
}
if (wpa_s->conf->p2p_oper_channel == 0 &&
wpa_s->best_24_freq > 0 &&
wpas_p2p_supported_freq_go(wpa_s, channels,
wpa_s->best_24_freq)) {
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
params->freq = wpa_s->best_24_freq;
wpa_printf(MSG_DEBUG, "P2P: Set GO freq based on best 2.4 GHz "
"channel %d MHz", params->freq);
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
goto success;
}
if (wpa_s->conf->p2p_oper_channel == 0 &&
wpa_s->best_5_freq > 0 &&
wpas_p2p_supported_freq_go(wpa_s, channels,
wpa_s->best_5_freq)) {
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
params->freq = wpa_s->best_5_freq;
wpa_printf(MSG_DEBUG, "P2P: Set GO freq based on best 5 GHz "
"channel %d MHz", params->freq);
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
goto success;
}
/* try using preferred channels */
cand = p2p_get_pref_freq(wpa_s->global->p2p, channels);
if (cand && wpas_p2p_supported_freq_go(wpa_s, channels, cand)) {
params->freq = cand;
P2P: Use preferred channel list during GO creation This extends support for p2p_pref_Chan configuration parameter for autonomous GO creation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-05-17 10:27:02 +02:00
wpa_printf(MSG_DEBUG, "P2P: Set GO freq %d MHz from preferred "
"channels", params->freq);
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
goto success;
}
/* Try using one of the group common freqs */
if (wpa_s->p2p_group_common_freqs) {
P2P: Move a GO to a frequency that is also supported by the client A P2P GO interface that was instantiated after a GO Negotiation or Invitation holds the intersection of frequencies between the GO and the client. In case the GO is going to move to another frequency, allow it to move only to a frequency that is also supported by the client. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:21 +02:00
for (i = 0; i < wpa_s->p2p_group_common_freqs_num; i++) {
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
cand = wpa_s->p2p_group_common_freqs[i];
if (wpas_p2p_supported_freq_go(wpa_s, channels, cand)) {
params->freq = cand;
P2P: Move a GO to a frequency that is also supported by the client A P2P GO interface that was instantiated after a GO Negotiation or Invitation holds the intersection of frequencies between the GO and the client. In case the GO is going to move to another frequency, allow it to move only to a frequency that is also supported by the client. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:21 +02:00
wpa_printf(MSG_DEBUG,
"P2P: Use freq %d MHz common with the peer",
params->freq);
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
goto success;
P2P: Move a GO to a frequency that is also supported by the client A P2P GO interface that was instantiated after a GO Negotiation or Invitation holds the intersection of frequencies between the GO and the client. In case the GO is going to move to another frequency, allow it to move only to a frequency that is also supported by the client. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:21 +02:00
}
}
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
}
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
/* no preference, select some channel */
wpas_p2p_select_go_freq_no_pref(wpa_s, params, channels);
P2P: Collect and use extended data on used frequencies When the number of frequencies supported by the kernel is bigger than one, and there is a need to pick a frequency for a new flow such as P2P GO Negotiation or P2P Invitation, the flow should be able to pick the best frequency among all the frequencies currently used by the device. In order to prioritize between the currently used frequencies, add the ability to collect additional data about each used frequency (if the frequency is used by a station interface or P2P Client) and when needed select the best frequency, where: 1. Infrastructure interfaces have highest priority 2. P2P Client interfaces have higher priority over AP/GO interfaces. The rational is that the frequency of an AP/GO can change while that of a station interface cannot. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:35 +02:00
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
if (params->freq == 0) {
wpa_printf(MSG_DEBUG, "P2P: did not find a freq for GO use");
goto fail;
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
}
P2P: Clean up wpas_p2p_init_go_params() It is clearer if there is only a single loop of the channel list and shared debug prints. In addition, the note about current operating channels not being available is quite confusing if there are no operating group, so make that part of the message conditional. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-18 17:13:15 +01:00
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
success:
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
os_free(freqs);
P2P: Reject p2p_group_add if forced frequency is not acceptable If the freq parameter is specified and we are already running legacy STA on a different frequency with a driver that does not support multi-channel concurrency, reject p2p_group_add. Same code already exists in the path of P2P connection with go negotiation but is missing for autonomous GO. Signed-hostap: Neeraj Garg <neerajkg@broadcom.com>
2011-12-27 22:21:45 +01:00
return 0;
P2P: Modify wpas_p2p_init_go_params() Not all paths in wpas_p2p_init_go_params() verified that the candidate frequency can be used for GO purposes. Fix this, and in addition re-factor the code to put better emphasis on the frequency selection priorities. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:23 +02:00
fail:
os_free(freqs);
return -1;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
static struct wpa_supplicant *
wpas_p2p_get_group_iface(struct wpa_supplicant *wpa_s, int addr_allocated,
int go)
{
struct wpa_supplicant *group_wpa_s;
P2P: Add more debug prints for GO start routines This makes it easier to debug issues in starting GO mode. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-24 00:05:51 +02:00
if (!wpas_p2p_create_iface(wpa_s)) {
P2P: Support dedicated P2P_DEVICE without separate group interface Add support for drivers with dedicated P2P_DEVICE interface, but without group interface concurrency (only a single netdev is used). With such devices, wpa_supplicant tried to use the p2p_dev interface instead of the group interface and most P2P operations failed. Extend wpa_supplicant to use the primary interface instead of a separate group interface in such cases. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
if (wpa_s->p2p_mgmt) {
/*
* We may be called on the p2p_dev interface which
* cannot be used for group operations, so always use
* the primary interface.
*/
wpa_s->parent->p2pdev = wpa_s;
wpa_s = wpa_s->parent;
}
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P: Use primary interface for group operations");
P2P: Use group formation timeout on persistent group GO Previously, GO considered the group to be fully re-invoked after starting beaconing on successful invitation exchange. This would leave the group running until idle timeout (which may not be enabled) or explicit removal if the client fails to connect for any reason. Since the client is expected to connect immediately after the invitation exchange that ends with status=0 (i.e., either client initiated the exchange or it responded with success), extend group formation timeout to cover that period until the first successfully completed data connection. This allows the GO to remove the group automatically if the client devices does not connect within P2P_MAX_INITIAL_CONN_WAIT_GO_REINVOKE (15) seconds. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-26 20:24:09 +02:00
wpa_s->p2p_first_connection_timeout = 0;
P2P: Support dedicated P2P_DEVICE without separate group interface Add support for drivers with dedicated P2P_DEVICE interface, but without group interface concurrency (only a single netdev is used). With such devices, wpa_supplicant tried to use the p2p_dev interface instead of the group interface and most P2P operations failed. Extend wpa_supplicant to use the primary interface instead of a separate group interface in such cases. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
if (wpa_s != wpa_s->p2pdev)
P2P: Copy config from p2pdev when not using dedicated group interface When the P2P Device interface is used and an existing interface is used for P2P GO/Client, the P2P Device configuration was not cloned to the configuration of the existing interface. Thus, configuration parameters such as idle_group_time, etc., were not propagated to the P2P GO/Client interface. Handle this by copying all configuration parameters of the P2P device interface to the reused interface, with the following exceptions: 1. Copy the NFC key data only if it was not set in the configuration file. 2. The WPS string fields are set only if they were not previously set in the configuration of the destination interface (based on the assumption that these fields should be identical among all interfaces). Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2016-04-07 12:32:08 +02:00
wpas_p2p_clone_config(wpa_s, wpa_s->p2pdev);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return wpa_s;
P2P: Add more debug prints for GO start routines This makes it easier to debug issues in starting GO mode. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-24 00:05:51 +02:00
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (wpas_p2p_add_group_interface(wpa_s, go ? WPA_IF_P2P_GO :
P2P: Add more debug prints for GO start routines This makes it easier to debug issues in starting GO mode. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-24 00:05:51 +02:00
WPA_IF_P2P_CLIENT) < 0) {
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
wpa_msg_global(wpa_s, MSG_ERROR,
"P2P: Failed to add group interface");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return NULL;
P2P: Add more debug prints for GO start routines This makes it easier to debug issues in starting GO mode. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-24 00:05:51 +02:00
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
group_wpa_s = wpas_p2p_init_group_interface(wpa_s, go);
if (group_wpa_s == NULL) {
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
wpa_msg_global(wpa_s, MSG_ERROR,
"P2P: Failed to initialize group interface");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpas_p2p_remove_pending_group_interface(wpa_s);
return NULL;
}
P2P: Add more debug prints for GO start routines This makes it easier to debug issues in starting GO mode. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-09-24 00:05:51 +02:00
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Use separate group interface %s",
group_wpa_s->ifname);
P2P: Use group formation timeout on persistent group GO Previously, GO considered the group to be fully re-invoked after starting beaconing on successful invitation exchange. This would leave the group running until idle timeout (which may not be enabled) or explicit removal if the client fails to connect for any reason. Since the client is expected to connect immediately after the invitation exchange that ends with status=0 (i.e., either client initiated the exchange or it responded with success), extend group formation timeout to cover that period until the first successfully completed data connection. This allows the GO to remove the group automatically if the client devices does not connect within P2P_MAX_INITIAL_CONN_WAIT_GO_REINVOKE (15) seconds. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-26 20:24:09 +02:00
group_wpa_s->p2p_first_connection_timeout = 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return group_wpa_s;
}
/**
* wpas_p2p_group_add - Add a new P2P group with local end as Group Owner
* @wpa_s: Pointer to wpa_supplicant data from wpa_supplicant_add_iface()
* @persistent_group: Whether to create a persistent group
* @freq: Frequency for the group or 0 to indicate no hardcoding
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
* @vht_center_freq2: segment_1 center frequency for GO operating in VHT 80P80
P2P: Add VHT parameter to P2P operations Add the option to ask for VHT operation similarly to the way ht40 is configured - either by adding 'vht' param to the relevant p2p_* commands or by configuring p2p_go_vht=1 in the configuration file. This patch only adds the configuration option (e.g., via control interface). The actual handling of the VHT parameter (asking the driver to use VHT, etc.) will be done by the following patch. Signed-hostap: Eliad Peller <eliadx.peller@intel.com>
2013-10-27 18:46:17 +01:00
* @ht40: Start GO with 40 MHz channel width
* @vht: Start GO with VHT support
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
* @vht_chwidth: channel bandwidth for GO operating with VHT support
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
* Returns: 0 on success, -1 on failure
*
* This function creates a new P2P group with the local end as the Group Owner,
* i.e., without using Group Owner Negotiation.
*/
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
{
struct p2p_go_neg_results params;
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
P2P: Handle P2P-not-supported without segfaults Previous code was assuming that the P2P module is always initialized. However, that is not the case anymore with drivers that do not support P2P. Add verification of whether P2P is enabled before trying to execute P2P commands.
2011-02-24 20:13:30 +01:00
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
return -1;
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
os_free(wpa_s->global->add_psk);
wpa_s->global->add_psk = NULL;
P2P: Stop any on-going "p2p_find" on creating an Autonomous GO This patch stops any on-going "p2p_find" on creating an Autonomous GO. This is already taken care in case of invoking a persistent GO. GO as such will be advertising via the beacons for other devices to discover. So normally the GO doesn't need to do a p2p_find until and unless it wants to invite a P2P Client. In case of Invite scenario, logically it is better to do a explicit discover [via user intervention] after the GO is created. This patch will help to reduce battery wastage [due to p2p_find operations] in scenarios where user creates a GO and doesn't initiate a connection.
2011-10-26 00:28:51 +02:00
/* Make sure we are not running find during connection establishment */
wpa_printf(MSG_DEBUG, "P2P: Stop any on-going P2P FIND");
P2P: Avoid extra group interface creation on GO reinvocation If separate group interfaces are used, the pending group interface got removed unnecessarily when stopping find operations when accepting an invitation to reinvoke the group in GO role. This resulted in the group interfaces getting created twice. Avoid this unnecessary extra operation by skipping removal of the pending interface in the reinvocation sequence. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-11 19:45:27 +01:00
wpas_p2p_stop_find_oper(wpa_s);
P2P: Stop any on-going "p2p_find" on creating an Autonomous GO This patch stops any on-going "p2p_find" on creating an Autonomous GO. This is already taken care in case of invoking a persistent GO. GO as such will be advertising via the beacons for other devices to discover. So normally the GO doesn't need to do a p2p_find until and unless it wants to invite a P2P Client. In case of Invite scenario, logically it is better to do a explicit discover [via user intervention] after the GO is created. This patch will help to reduce battery wastage [due to p2p_find operations] in scenarios where user creates a GO and doesn't initiate a connection.
2011-10-26 00:28:51 +02:00
P2P: Automatic channel selection at re-invocation of persistent GO If the driver wrapper supports best operation channel indication, the p2p_group_add command can now use special values (freq=2 and freq=5) to indicate that the re-invoked persistent GO is to be started on the specified band. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-06-05 01:03:26 +02:00
freq = wpas_p2p_select_go_freq(wpa_s, freq);
if (freq < 0)
P2P: Verify that forced channel is suitable for autonomous GO
2010-10-15 17:46:02 +02:00
return -1;
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
if (wpas_p2p_init_go_params(wpa_s, &params, freq, vht_center_freq2,
ht40, vht, max_oper_chwidth, NULL))
P2P: Reject p2p_group_add if forced frequency is not acceptable If the freq parameter is specified and we are already running legacy STA on a different frequency with a driver that does not support multi-channel concurrency, reject p2p_group_add. Same code already exists in the path of P2P connection with go negotiation but is missing for autonomous GO. Signed-hostap: Neeraj Garg <neerajkg@broadcom.com>
2011-12-27 22:21:45 +01:00
return -1;
P2P: Validate p2p_oper_channel in p2p_group_add If the p2p_group_add command does not specify the operating channel, make sure the operating channel set in the configuration file meets the P2P requirements in the same way as is done with the frequency specified as the command parameter. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-26 21:06:48 +02:00
if (params.freq &&
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
!p2p_supported_freq_go(wpa_s->global->p2p, params.freq)) {
DFS offload: P2P changes for autonomous GO Add P2P changes to allow bringing up P2P autonomous GO on a DFS channel if DFS functionality is offloaded to the driver. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-03-05 02:31:25 +01:00
if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_DFS_OFFLOAD) &&
ieee80211_is_dfs(params.freq)) {
/*
* If freq is a DFS channel and DFS is offloaded to the
* driver, allow P2P GO to use it.
*/
wpa_printf(MSG_DEBUG,
"P2P: %s: The forced channel for GO (%u MHz) is DFS, and DFS is offloaded to driver",
__func__, params.freq);
} else {
wpa_printf(MSG_DEBUG,
"P2P: The selected channel for GO (%u MHz) is not supported for P2P uses",
params.freq);
return -1;
}
P2P: Validate p2p_oper_channel in p2p_group_add If the p2p_group_add command does not specify the operating channel, make sure the operating channel set in the configuration file meets the P2P requirements in the same way as is done with the frequency specified as the command parameter. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-26 21:06:48 +02:00
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_go_params(wpa_s->global->p2p, &params);
params.persistent_group = persistent_group;
wpa_s = wpas_p2p_get_group_iface(wpa_s, 0, 1);
if (wpa_s == NULL)
return -1;
wpas_start_wps_go(wpa_s, &params, 0);
return 0;
}
static int wpas_start_p2p_client(struct wpa_supplicant *wpa_s,
P2P: Optimize scan for GO during persistent group invocation Scan for GO on the negotiated operating channel for few iterations before searching on all the supported channels during persistent group reinvocation. In addition, use the already known SSID of the group in the scans. These optimizations reduce group formation time. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-21 13:56:02 +01:00
struct wpa_ssid *params, int addr_allocated,
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 freq, int force_scan)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct wpa_ssid *ssid;
wpa_s = wpas_p2p_get_group_iface(wpa_s, addr_allocated, 0);
if (wpa_s == NULL)
return -1;
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
if (force_scan)
os_get_reltime(&wpa_s->scan_min_time);
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
wpa_s->p2p_last_4way_hs_fail = NULL;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_supplicant_ap_deinit(wpa_s);
ssid = wpa_config_add_network(wpa_s->conf);
if (ssid == NULL)
return -1;
P2P: Do not clear wpa_s->go_dev_addr before group removal This variable is needed to figure out whether a wpa_supplicant interface is for a P2P group that is (or was) connected to a specific GO. The previous implementation was able to find such a case only when there was an association with the GO. However, this may be needed even if there is a temporary disconnection from the GO. Keep the GO device address information over such temporary disconnections and only remove it on group termination. This fixes an issue with D-Bus Peer PropertiesChanged signals for the Groups property in case a P2P group gets removed due to group idle timeout instead of explicit group termination command (local request) or GO notification. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-08-02 18:25:41 +02:00
os_memset(wpa_s->go_dev_addr, 0, ETH_ALEN);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_config_set_network_defaults(ssid);
ssid->temporary = 1;
ssid->proto = WPA_PROTO_RSN;
P2P: Fix persistent group for 60 GHz networks Fix two problems with storage of 60 GHz P2P persistent groups: 1. pbss flag was not stored in the network block. 2. When recreating the persistent group from storage, in addition to the missing pbss flag, the pairwise_cipher and group_cipher were initialized to CCMP which does not work in 60 GHz since the default in 60 GHz should be GCMP. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-03-23 17:44:10 +01:00
ssid->pbss = params->pbss;
ssid->pairwise_cipher = params->pbss ? WPA_CIPHER_GCMP :
WPA_CIPHER_CCMP;
ssid->group_cipher = params->pbss ? WPA_CIPHER_GCMP : WPA_CIPHER_CCMP;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
ssid->key_mgmt = WPA_KEY_MGMT_PSK;
ssid->ssid = os_malloc(params->ssid_len);
if (ssid->ssid == NULL) {
wpa_config_remove_network(wpa_s->conf, ssid->id);
return -1;
}
os_memcpy(ssid->ssid, params->ssid, params->ssid_len);
ssid->ssid_len = params->ssid_len;
ssid->p2p_group = 1;
DBus: Publish provisioned keys in network properties When the network was provisioned, we need to get the keys to be able to reconnect without new provisioning. To be able to publish those keys but not normally configured ones, add a new attribute to struct wpa_ssid indicating whether or not keys may be exported. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-02 16:00:12 +01:00
ssid->export_keys = 1;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (params->psk_set) {
os_memcpy(ssid->psk, params->psk, 32);
ssid->psk_set = 1;
}
if (params->passphrase)
ssid->passphrase = os_strdup(params->passphrase);
wpa_s->show_group_started = 1;
P2P: Optimize scan for GO during persistent group invocation Scan for GO on the negotiated operating channel for few iterations before searching on all the supported channels during persistent group reinvocation. In addition, use the already known SSID of the group in the scans. These optimizations reduce group formation time. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-21 13:56:02 +01:00
wpa_s->p2p_in_invitation = 1;
wpa_s->p2p_invite_go_freq = freq;
P2P: Fix re-invoked client interface completion on data connection This was already working for the case where a separate group interface is used due to the recent commit 328f49acfe961a212e89e750516d2e2cc320765f ('P2P: Complete group formation on client data connection'). However, the case of no separate group interface was used did not clear the interface state properly on data connection. Fix this by setting the group formation information in wpas_start_p2p_client(). Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-12-04 22:11:10 +01:00
wpa_s->p2p_go_group_formation_completed = 0;
wpa_s->global->p2p_group_formation = wpa_s;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
eloop_cancel_timeout(wpas_p2p_group_formation_timeout, wpa_s->p2pdev,
P2P: Set a timeout for a persistent reinvoke on a P2P Client Use P2P group formation timeout to wait for the 4-way handshake to complete on a persistent reinvocation on a P2P Client. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-11 10:54:17 +01:00
NULL);
eloop_register_timeout(P2P_MAX_INITIAL_CONN_WAIT, 0,
wpas_p2p_group_formation_timeout,
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev, NULL);
P2P: Short scan wait to speed up the group re-invocation The shorter 250 ms wait for the next scan request can be used also for the case of persistent group re-invocation instead of just formation of a new group. This speeds up the process and makes this more robust especially in cases where the GO is using MCC. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-12 15:17:35 +01:00
wpa_supplicant_select_network(wpa_s, ssid);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return 0;
}
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_go_neg_results params;
Fix persistent P2P connection failure in case channel list changes P2P persistent connection may fail due to 802.11d channel change event invalidating support of the operating frequency sent in the invitation request, before receiving the invitation response. If the operating frequency is invalid at the time the invitation response is processed and there is no forced frequency provided by user, allow frequency re-selection. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2014-01-27 15:46:02 +01:00
int go = 0, freq;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (ssid->disabled != 2 || ssid->ssid == NULL)
return -1;
P2P: Do not start multiple copies of same persistent group When running p2p_group_add persistent=<id>, verify whether the requested group is already running and if so, do not try to start another copy of it.
2010-11-19 11:57:36 +01:00
if (wpas_get_p2p_group(wpa_s, ssid->ssid, ssid->ssid_len, &go) &&
go == (ssid->mode == WPAS_MODE_P2P_GO)) {
wpa_printf(MSG_DEBUG, "P2P: Requested persistent group is "
"already running");
P2P: Restart group formation timer upon receiving new Inv Req A new Invitation Request might be received on a just started persistent group if the previous Invitation Response sent isn't received at the peer (GO of the persistent group). When the peer sends an Invitation Request again, treat it as start of group formation and restart the group formation timer at this point of time. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-05-28 16:17:41 +02:00
if (go == 0 &&
eloop_cancel_timeout(wpas_p2p_group_formation_timeout,
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev, NULL)) {
P2P: Restart group formation timer upon receiving new Inv Req A new Invitation Request might be received on a just started persistent group if the previous Invitation Response sent isn't received at the peer (GO of the persistent group). When the peer sends an Invitation Request again, treat it as start of group formation and restart the group formation timer at this point of time. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-05-28 16:17:41 +02:00
/*
* This can happen if Invitation Response frame was lost
* and the peer (GO of a persistent group) tries to
* invite us again. Reschedule the timeout to avoid
* terminating the wait for the connection too early
* since we now know that the peer is still trying to
* invite us instead of having already started the GO.
*/
wpa_printf(MSG_DEBUG,
"P2P: Reschedule group formation timeout since peer is still trying to invite us");
eloop_register_timeout(P2P_MAX_INITIAL_CONN_WAIT, 0,
wpas_p2p_group_formation_timeout,
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev, NULL);
P2P: Restart group formation timer upon receiving new Inv Req A new Invitation Request might be received on a just started persistent group if the previous Invitation Response sent isn't received at the peer (GO of the persistent group). When the peer sends an Invitation Request again, treat it as start of group formation and restart the group formation timer at this point of time. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-05-28 16:17:41 +02:00
}
P2P: Do not start multiple copies of same persistent group When running p2p_group_add persistent=<id>, verify whether the requested group is already running and if so, do not try to start another copy of it.
2010-11-19 11:57:36 +01:00
return 0;
}
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
os_free(wpa_s->global->add_psk);
wpa_s->global->add_psk = NULL;
P2P: Stop p2p_find/p2p_listen when Invitation is accepted When an Invitation to reinvoke a persistent group is accepted, we need to make sure that any pending p2p_find or p2p_listen operation gets stopped to avoid consuming all radio resources doing device discovery while the group is being set up.
2010-11-19 11:58:03 +01:00
/* Make sure we are not running find during connection establishment */
P2P: Avoid extra group interface creation on GO reinvocation If separate group interfaces are used, the pending group interface got removed unnecessarily when stopping find operations when accepting an invitation to reinvoke the group in GO role. This resulted in the group interfaces getting created twice. Avoid this unnecessary extra operation by skipping removal of the pending interface in the reinvocation sequence. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-11 19:45:27 +01:00
wpas_p2p_stop_find_oper(wpa_s);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
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
wpa_s->p2p_fallback_to_go_neg = 0;
P2P: Use neg_freq when re-establish persistent group as GC When GC receives invitation response and tries to re-establish connection to a persistent group channels from passive list should be allowed. A missing check for operation mode triggered reselection of operating channel from active channels only to happen and thus fail the connect attempt. Add a check for operation mode and if GC instead use negotiated frequency (i.e. GO operating channel from invitation response). Signed-off-by: Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
2014-10-21 12:08:30 +02:00
if (ssid->mode == WPAS_MODE_P2P_GO) {
if (force_freq > 0) {
freq = wpas_p2p_select_go_freq(wpa_s, force_freq);
if (freq < 0)
return -1;
} else {
freq = wpas_p2p_select_go_freq(wpa_s, neg_freq);
if (freq < 0 ||
P2P: Move a GO to a frequency that is also supported by the client A P2P GO interface that was instantiated after a GO Negotiation or Invitation holds the intersection of frequencies between the GO and the client. In case the GO is going to move to another frequency, allow it to move only to a frequency that is also supported by the client. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:21 +02:00
(freq > 0 && !freq_included(wpa_s, channels, freq)))
P2P: Use neg_freq when re-establish persistent group as GC When GC receives invitation response and tries to re-establish connection to a persistent group channels from passive list should be allowed. A missing check for operation mode triggered reselection of operating channel from active channels only to happen and thus fail the connect attempt. Add a check for operation mode and if GC instead use negotiated frequency (i.e. GO operating channel from invitation response). Signed-off-by: Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
2014-10-21 12:08:30 +02:00
freq = 0;
}
P2P: Optimize scan frequencies list when re-joining a persistent group When starting a P2P client to re-join a persistent group (P2P_GROUP_ADD persistent=<id>), it is possible that the P2P GO was already found in previous scans. Try to get the P2P GO operating frequency from the scan results list so wpa_supplicant will initially scan only the P2P GO known operating frequency. Signed-off-by: Avraham Stern <avraham.stern@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-03-29 12:10:36 +02:00
} else if (ssid->mode == WPAS_MODE_INFRA) {
P2P: Use neg_freq when re-establish persistent group as GC When GC receives invitation response and tries to re-establish connection to a persistent group channels from passive list should be allowed. A missing check for operation mode triggered reselection of operating channel from active channels only to happen and thus fail the connect attempt. Add a check for operation mode and if GC instead use negotiated frequency (i.e. GO operating channel from invitation response). Signed-off-by: Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
2014-10-21 12:08:30 +02:00
freq = neg_freq;
P2P: Move a GO to a frequency that is also supported by the client A P2P GO interface that was instantiated after a GO Negotiation or Invitation holds the intersection of frequencies between the GO and the client. In case the GO is going to move to another frequency, allow it to move only to a frequency that is also supported by the client. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:21 +02:00
if (freq <= 0 || !freq_included(wpa_s, channels, freq)) {
P2P: Optimize scan frequencies list when re-joining a persistent group When starting a P2P client to re-join a persistent group (P2P_GROUP_ADD persistent=<id>), it is possible that the P2P GO was already found in previous scans. Try to get the P2P GO operating frequency from the scan results list so wpa_supplicant will initially scan only the P2P GO known operating frequency. Signed-off-by: Avraham Stern <avraham.stern@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-03-29 12:10:36 +02:00
struct os_reltime now;
struct wpa_bss *bss =
wpa_bss_get_p2p_dev_addr(wpa_s, ssid->bssid);
os_get_reltime(&now);
if (bss &&
!os_reltime_expired(&now, &bss->last_update, 5) &&
P2P: Move a GO to a frequency that is also supported by the client A P2P GO interface that was instantiated after a GO Negotiation or Invitation holds the intersection of frequencies between the GO and the client. In case the GO is going to move to another frequency, allow it to move only to a frequency that is also supported by the client. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:21 +02:00
freq_included(wpa_s, channels, bss->freq))
P2P: Optimize scan frequencies list when re-joining a persistent group When starting a P2P client to re-join a persistent group (P2P_GROUP_ADD persistent=<id>), it is possible that the P2P GO was already found in previous scans. Try to get the P2P GO operating frequency from the scan results list so wpa_supplicant will initially scan only the P2P GO known operating frequency. Signed-off-by: Avraham Stern <avraham.stern@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-03-29 12:10:36 +02:00
freq = bss->freq;
else
freq = 0;
}
P2P: Automatic channel selection at re-invocation of persistent GO If the driver wrapper supports best operation channel indication, the p2p_group_add command can now use special values (freq=2 and freq=5) to indicate that the re-invoked persistent GO is to be started on the specified band. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-06-05 01:03:26 +02:00
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
return wpas_start_p2p_client(wpa_s, ssid, addr_allocated, freq,
force_scan);
P2P: Optimize scan frequencies list when re-joining a persistent group When starting a P2P client to re-join a persistent group (P2P_GROUP_ADD persistent=<id>), it is possible that the P2P GO was already found in previous scans. Try to get the P2P GO operating frequency from the scan results list so wpa_supplicant will initially scan only the P2P GO known operating frequency. Signed-off-by: Avraham Stern <avraham.stern@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-03-29 12:10:36 +02:00
} else {
P2P: Optimize scan for GO during persistent group invocation Scan for GO on the negotiated operating channel for few iterations before searching on all the supported channels during persistent group reinvocation. In addition, use the already known SSID of the group in the scans. These optimizations reduce group formation time. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-21 13:56:02 +01:00
return -1;
P2P: Optimize scan frequencies list when re-joining a persistent group When starting a P2P client to re-join a persistent group (P2P_GROUP_ADD persistent=<id>), it is possible that the P2P GO was already found in previous scans. Try to get the P2P GO operating frequency from the scan results list so wpa_supplicant will initially scan only the P2P GO known operating frequency. Signed-off-by: Avraham Stern <avraham.stern@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-03-29 12:10:36 +02:00
}
P2P: Optimize scan for GO during persistent group invocation Scan for GO on the negotiated operating channel for few iterations before searching on all the supported channels during persistent group reinvocation. In addition, use the already known SSID of the group in the scans. These optimizations reduce group formation time. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-03-21 13:56:02 +01:00
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
if (wpas_p2p_init_go_params(wpa_s, &params, freq, vht_center_freq2,
ht40, vht, max_oper_chwidth, channels))
P2P: Reject p2p_group_add if forced frequency is not acceptable If the freq parameter is specified and we are already running legacy STA on a different frequency with a driver that does not support multi-channel concurrency, reject p2p_group_add. Same code already exists in the path of P2P connection with go negotiation but is missing for autonomous GO. Signed-hostap: Neeraj Garg <neerajkg@broadcom.com>
2011-12-27 22:21:45 +01:00
return -1;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
params.role_go = 1;
P2P: Reduce redundant PSK generation for GO The PSK generation done by pbkdf2_sha1() is one of the longest CPU time users according to our profiling from boot to GO started. So I have reduced some steps. I could boot a GO by this command sequence. ------------- add_net set_network 0 ssid '"DIRECT-XX"' set_network 0 psk '"123456789012345678901234567890123456789012345678901234567890123"' set_network 0 proto RSN set_network 0 key_mgmt WPA-PSK set_network 0 pairwise CCMP set_network 0 auth_alg OPEN set_network 0 mode 3 set_network 0 disabled 2 p2p_group_add persistent=0 freq=2412 ------------- By this sequence, pbkdf2_sha1() was called three times and the function calculates the same value each time. Reduce number of calls to pbkdf2_sha1() from 3 to 1 by caching the previous result. Signed-hostap: Masashi Honma <masashi.honma at gmail.com>
2012-11-11 10:39:24 +01:00
params.psk_set = ssid->psk_set;
if (params.psk_set)
os_memcpy(params.psk, ssid->psk, sizeof(params.psk));
P2P: Allow PSK to be used instead of passphrase for persistent GO This continues optimizations for use of CPU heavy pbkdf2_sha1() in GO setup after the earlier commit 30c371e8a54c3b1bece6366ff0666da15d63e45e by allowing PSK to be used instead of passphrase when creating persistent group information manually for the GO. It should be noted that this would not meet the requirements in the P2P specification (GO shall maintain the passphrase), so this should be used only when there is no need to allow manual configuration of legacy STAs using the passphrase. Signed-hostap: Masashi Honma <masashi.honma@gmail.com>
2012-12-25 13:15:07 +01:00
if (ssid->passphrase) {
if (os_strlen(ssid->passphrase) >= sizeof(params.passphrase)) {
wpa_printf(MSG_ERROR, "P2P: Invalid passphrase in "
"persistent group");
return -1;
}
os_strlcpy(params.passphrase, ssid->passphrase,
sizeof(params.passphrase));
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
os_memcpy(params.ssid, ssid->ssid, ssid->ssid_len);
params.ssid_len = ssid->ssid_len;
params.persistent_group = 1;
wpa_s = wpas_p2p_get_group_iface(wpa_s, addr_allocated, 1);
if (wpa_s == NULL)
return -1;
P2P: Save group common frequencies in invitation result Save the group common frequencies when starting a GO due to an invitation signaling requesting to re-invoke a persistent GO. To do so, move the code that handles the translation of p2p_channels to frequency list into a public function so it can be re-used both when GO Negotiation is done and invitation signaling is done. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-07-07 13:21:01 +02:00
p2p_channels_to_freqs(channels, params.freq_list, P2P_MAX_CHANNELS);
P2P: Use group formation timeout on persistent group GO Previously, GO considered the group to be fully re-invoked after starting beaconing on successful invitation exchange. This would leave the group running until idle timeout (which may not be enabled) or explicit removal if the client fails to connect for any reason. Since the client is expected to connect immediately after the invitation exchange that ends with status=0 (i.e., either client initiated the exchange or it responded with success), extend group formation timeout to cover that period until the first successfully completed data connection. This allows the GO to remove the group automatically if the client devices does not connect within P2P_MAX_INITIAL_CONN_WAIT_GO_REINVOKE (15) seconds. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-26 20:24:09 +02:00
wpa_s->p2p_first_connection_timeout = connection_timeout;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpas_start_wps_go(wpa_s, &params, 0);
return 0;
}
static void wpas_p2p_ie_update(void *ctx, struct wpabuf *beacon_ies,
struct wpabuf *proberesp_ies)
{
struct wpa_supplicant *wpa_s = ctx;
if (wpa_s->ap_iface) {
struct hostapd_data *hapd = wpa_s->ap_iface->bss[0];
Do not add P2P IE into Beacon/Probe Response if P2P is disabled P2P IE was incorrectly added in wpa_supplicant AP mode even if P2P function was not actually enabled. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-14 15:26:45 +01:00
if (!(hapd->conf->p2p & P2P_GROUP_OWNER)) {
wpabuf_free(beacon_ies);
wpabuf_free(proberesp_ies);
return;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (beacon_ies) {
wpabuf_free(hapd->p2p_beacon_ie);
hapd->p2p_beacon_ie = beacon_ies;
}
wpabuf_free(hapd->p2p_probe_resp_ie);
hapd->p2p_probe_resp_ie = proberesp_ies;
} else {
wpabuf_free(beacon_ies);
wpabuf_free(proberesp_ies);
}
wpa_supplicant_ap_update_beacon(wpa_s);
}
P2P: Add mechanism for timing out idle groups A new configuration parameter, p2p_group_idle, can now be used to set idle timeout value for P2P groups in seconds (0 = no timeout). If set, this values is used to remove P2P group (both GO and P2P client) interfaces after the group has been idle (no clients/GO seen) for the configuration duration. The P2P-GROUP-REMOVED event is now indicating the reason for group removal when known. For example: P2P-GROUP-REMOVED wlan0 GO reason=REQUESTED P2P-GROUP-REMOVED wlan1 client reason=IDLE
2010-10-25 17:24:15 +02:00
static void wpas_p2p_idle_update(void *ctx, int idle)
{
struct wpa_supplicant *wpa_s = ctx;
if (!wpa_s->ap_iface)
return;
wpa_printf(MSG_DEBUG, "P2P: GO - group %sidle", idle ? "" : "not ");
P2P: Reject group formation on WPS provisioning failure There is no need to wait for the 15 second group formation timeout to clear the state if WPS failure is detected during P2P group formation. Allow the WPS exchange steps (WSC_NACK and EAP-Failure) to be completed and remove the group to get rid of the extra wait. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-06 16:56:50 +01:00
if (idle) {
if (wpa_s->global->p2p_fail_on_wps_complete &&
wpa_s->p2p_in_provisioning) {
wpas_p2p_grpform_fail_after_wps(wpa_s);
return;
}
P2P: Add mechanism for timing out idle groups A new configuration parameter, p2p_group_idle, can now be used to set idle timeout value for P2P groups in seconds (0 = no timeout). If set, this values is used to remove P2P group (both GO and P2P client) interfaces after the group has been idle (no clients/GO seen) for the configuration duration. The P2P-GROUP-REMOVED event is now indicating the reason for group removal when known. For example: P2P-GROUP-REMOVED wlan0 GO reason=REQUESTED P2P-GROUP-REMOVED wlan1 client reason=IDLE
2010-10-25 17:24:15 +02:00
wpas_p2p_set_group_idle_timeout(wpa_s);
P2P: Reject group formation on WPS provisioning failure There is no need to wait for the 15 second group formation timeout to clear the state if WPS failure is detected during P2P group formation. Allow the WPS exchange steps (WSC_NACK and EAP-Failure) to be completed and remove the group to get rid of the extra wait. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-06 16:56:50 +01:00
} else
P2P: Add mechanism for timing out idle groups A new configuration parameter, p2p_group_idle, can now be used to set idle timeout value for P2P groups in seconds (0 = no timeout). If set, this values is used to remove P2P group (both GO and P2P client) interfaces after the group has been idle (no clients/GO seen) for the configuration duration. The P2P-GROUP-REMOVED event is now indicating the reason for group removal when known. For example: P2P-GROUP-REMOVED wlan0 GO reason=REQUESTED P2P-GROUP-REMOVED wlan1 client reason=IDLE
2010-10-25 17:24:15 +02:00
eloop_cancel_timeout(wpas_p2p_group_idle_timeout, wpa_s, NULL);
}
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 initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct p2p_group *group;
struct p2p_group_config *cfg;
P2P: Do not enable P2P group processing for non-P2P AP mode wpa_supplicant was starting P2P group processing for all AP mode interfaces in CONFIG_P2P=y builds. This is unnecessary and such operations should be enabled only for actual GO interfaces. Signed-off-by: Jouni Malinen <j@w1.fi>
2016-05-14 18:39:10 +02:00
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL ||
!ssid->p2p_group)
P2P: Handle P2P-not-supported without segfaults Previous code was assuming that the P2P module is always initialized. However, that is not the case anymore with drivers that do not support P2P. Add verification of whether P2P is enabled before trying to execute P2P commands.
2011-02-24 20:13:30 +01:00
return NULL;
P2P: Add initial support for driver-based P2P management This adds partial callbacks and events to allow P2P management to be implemented in a driver/firmware. This is not yet complete and is very much subject to change in the future.
2010-12-30 11:48:55 +01:00
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
cfg = os_zalloc(sizeof(*cfg));
if (cfg == NULL)
return NULL;
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
if (ssid->p2p_persistent_group && wpa_s->conf->persistent_reconnect)
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
cfg->persistent_group = 2;
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
else if (ssid->p2p_persistent_group)
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
cfg->persistent_group = 1;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
os_memcpy(cfg->interface_addr, wpa_s->own_addr, ETH_ALEN);
P2P: Track non-P2P members in the group and set Group Limit bit The P2P group component is now tracking of associated stations in the group and the Group Limit bit in the Group Capabilities is updated based on whether there is room for new clients in the group.
2010-10-19 17:10:28 +02:00
if (wpa_s->max_stations &&
wpa_s->max_stations < wpa_s->conf->max_num_sta)
cfg->max_clients = wpa_s->max_stations;
else
cfg->max_clients = wpa_s->conf->max_num_sta;
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
os_memcpy(cfg->ssid, ssid->ssid, ssid->ssid_len);
cfg->ssid_len = ssid->ssid_len;
P2P: Make group operating channel available Provide local GO channel to the P2P module so that it can be used in messages that indicate the current operating channel. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-16 19:45:21 +01:00
cfg->freq = ssid->frequency;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
cfg->cb_ctx = wpa_s;
cfg->ie_update = wpas_p2p_ie_update;
P2P: Add mechanism for timing out idle groups A new configuration parameter, p2p_group_idle, can now be used to set idle timeout value for P2P groups in seconds (0 = no timeout). If set, this values is used to remove P2P group (both GO and P2P client) interfaces after the group has been idle (no clients/GO seen) for the configuration duration. The P2P-GROUP-REMOVED event is now indicating the reason for group removal when known. For example: P2P-GROUP-REMOVED wlan0 GO reason=REQUESTED P2P-GROUP-REMOVED wlan1 client reason=IDLE
2010-10-25 17:24:15 +02:00
cfg->idle_update = wpas_p2p_idle_update;
P2P: Advertise IP Address Allocation only if it is enabled on GO This group capability bit was previously added unconditionally which could result in the P2P Client assuming the functionality is available even though the GO would always reject the request (not reply to it with an assigned IP address) during the 4-way handshake. Fix this by advertising the capability only if the GO configuration allow IP address assignment to be completed. Signed-off-by: Jouni Malinen <j@w1.fi>
2016-03-20 10:46:04 +01:00
cfg->ip_addr_alloc = WPA_GET_BE32(wpa_s->p2pdev->conf->ip_addr_start)
!= 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
group = p2p_group_init(wpa_s->global->p2p, cfg);
if (group == NULL)
os_free(cfg);
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
if (ssid->mode != WPAS_MODE_P2P_GROUP_FORMATION)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_group_notif_formation_done(group);
wpa_s->p2p_group = group;
return group;
}
void wpas_p2p_wps_success(struct wpa_supplicant *wpa_s, const u8 *peer_addr,
int registrar)
{
P2P: Fix provisioning info clearing after successful WPS step Previously, this provisioning info was cleared using the P2P Interface Address of the GO as the key. That did not always work in the case the where we joined an already running group. This could result in the next connection to that same GO skipping provision discovery. Fix this by finding the peer entry based on its P2P Device Address instead of the P2P Interface Address which may not always be set. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-03-01 21:06:03 +01:00
struct wpa_ssid *ssid = wpa_s->current_ssid;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (!wpa_s->p2p_in_provisioning) {
wpa_printf(MSG_DEBUG, "P2P: Ignore WPS success event - P2P "
"provisioning not in progress");
return;
}
P2P: Fix provisioning info clearing after successful WPS step Previously, this provisioning info was cleared using the P2P Interface Address of the GO as the key. That did not always work in the case the where we joined an already running group. This could result in the next connection to that same GO skipping provision discovery. Fix this by finding the peer entry based on its P2P Device Address instead of the P2P Interface Address which may not always be set. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-03-01 21:06:03 +01:00
if (ssid && ssid->mode == WPAS_MODE_INFRA) {
u8 go_dev_addr[ETH_ALEN];
os_memcpy(go_dev_addr, wpa_s->bssid, ETH_ALEN);
wpas_p2p_persistent_group(wpa_s, go_dev_addr, ssid->ssid,
ssid->ssid_len);
/* Clear any stored provisioning info */
p2p_clear_provisioning_info(wpa_s->global->p2p, go_dev_addr);
}
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
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
eloop_cancel_timeout(wpas_p2p_group_formation_timeout, wpa_s->p2pdev,
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
NULL);
P2P: Extend group formation timeout on GO to first data connection Previously, GO considered the group to be fully formed at the completed of WPS provisioning step. This would leave the group running until idle timeout (which may not be enabled) or explicit removal if the client fails to connect for any reason. Since the client is expected to connect immediately after the WPS provisioning step, extend group formation timeout to cover that period until the first successfully completed data connection. This allows the GO to remove the group automatically if the client devices does not connect within P2P_MAX_INITIAL_CONN_WAIT_GO (10) seconds. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-26 19:32:44 +02:00
wpa_s->p2p_go_group_formation_completed = 1;
P2P: Extend use of group formation timeout until end of 4-way handshake Instead of relying on the P2P group idle timeout before the group connection has been fully established, re-start the group formation timeout in the end of the WPS provisioning step and clear it at the successful completion of the initial 4-way handshake. This allows the P2P group idle timeout to be set to a small value without triggering it during the initial scan and connection attempt. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-13 16:01:15 +02:00
if (ssid && ssid->mode == WPAS_MODE_INFRA) {
/*
* Use a separate timeout for initial data connection to
* complete to allow the group to be removed automatically if
* something goes wrong in this step before the P2P group idle
* timeout mechanism is taken into use.
*/
P2P: Extend group formation timeout on GO to first data connection Previously, GO considered the group to be fully formed at the completed of WPS provisioning step. This would leave the group running until idle timeout (which may not be enabled) or explicit removal if the client fails to connect for any reason. Since the client is expected to connect immediately after the WPS provisioning step, extend group formation timeout to cover that period until the first successfully completed data connection. This allows the GO to remove the group automatically if the client devices does not connect within P2P_MAX_INITIAL_CONN_WAIT_GO (10) seconds. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-26 19:32:44 +02:00
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P: Re-start group formation timeout (%d seconds) as client for initial connection",
P2P_MAX_INITIAL_CONN_WAIT);
P2P: Extend use of group formation timeout until end of 4-way handshake Instead of relying on the P2P group idle timeout before the group connection has been fully established, re-start the group formation timeout in the end of the WPS provisioning step and clear it at the successful completion of the initial 4-way handshake. This allows the P2P group idle timeout to be set to a small value without triggering it during the initial scan and connection attempt. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-13 16:01:15 +02:00
eloop_register_timeout(P2P_MAX_INITIAL_CONN_WAIT, 0,
wpas_p2p_group_formation_timeout,
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev, NULL);
P2P: Complete group formation on client data connection This was already the case in the GO role where the first client connection is waited before marking wpa_s->p2p_go_group_formation_completed = 1 and clearing wpa_s->global->p2p_group_formation. However, in the P2P Client role, that was done already at the completion of the WPS exchange. This can be problematic since group formation timeout may still try to clear the group and with wpa_s->global->p2p_group_formation == NULL, the correct group interface may not be found. Fix this by postponing clearing of wpa_s->global->p2p_group_formation on the P2P Client side until the data connection has been completed and group is declared started. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-11-30 20:35:16 +01:00
/* Complete group formation on successful data connection. */
wpa_s->p2p_go_group_formation_completed = 0;
P2P: Extend group formation timeout on GO to first data connection Previously, GO considered the group to be fully formed at the completed of WPS provisioning step. This would leave the group running until idle timeout (which may not be enabled) or explicit removal if the client fails to connect for any reason. Since the client is expected to connect immediately after the WPS provisioning step, extend group formation timeout to cover that period until the first successfully completed data connection. This allows the GO to remove the group automatically if the client devices does not connect within P2P_MAX_INITIAL_CONN_WAIT_GO (10) seconds. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-26 19:32:44 +02:00
} else if (ssid) {
/*
* Use a separate timeout for initial data connection to
* complete to allow the group to be removed automatically if
* the client does not complete data connection successfully.
*/
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P: Re-start group formation timeout (%d seconds) as GO for initial connection",
P2P_MAX_INITIAL_CONN_WAIT_GO);
eloop_register_timeout(P2P_MAX_INITIAL_CONN_WAIT_GO, 0,
wpas_p2p_group_formation_timeout,
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev, NULL);
P2P: Extend group formation timeout on GO to first data connection Previously, GO considered the group to be fully formed at the completed of WPS provisioning step. This would leave the group running until idle timeout (which may not be enabled) or explicit removal if the client fails to connect for any reason. Since the client is expected to connect immediately after the WPS provisioning step, extend group formation timeout to cover that period until the first successfully completed data connection. This allows the GO to remove the group automatically if the client devices does not connect within P2P_MAX_INITIAL_CONN_WAIT_GO (10) seconds. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-26 19:32:44 +02:00
/*
* Complete group formation on first successful data connection
*/
wpa_s->p2p_go_group_formation_completed = 0;
P2P: Extend use of group formation timeout until end of 4-way handshake Instead of relying on the P2P group idle timeout before the group connection has been fully established, re-start the group formation timeout in the end of the WPS provisioning step and clear it at the successful completion of the initial 4-way handshake. This allows the P2P group idle timeout to be set to a small value without triggering it during the initial scan and connection attempt. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-13 16:01:15 +02:00
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (wpa_s->global->p2p)
p2p_wps_success_cb(wpa_s->global->p2p, peer_addr);
P2P: Fix group interface addition failure properly for concurrent case It was possible for a P2P group formation failure to result in a concurrent station mode operation getting disconnected in the specific error case where group interface addition fails after a successful GO Negotiation. Fix this by skipping the wpas_p2p_group_delete() call in this specific case since the group interface does not exists anymore at the point wpas_group_formation_completed() gets called. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-06-15 22:34:11 +02:00
wpas_group_formation_completed(wpa_s, 1, 0);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Add WpsFailed signal in P2P D-Bus Signal is triggered if an error occurs during WPS provisioning phase. Signed-off-by: Jean-Michel.Bachot <jean-michelx.bachot@intel.com> Signed-off-by: Jayant Sane <jayant.sane@intel.com>
2011-06-25 10:47:04 +02:00
void wpas_p2p_wps_failed(struct wpa_supplicant *wpa_s,
struct wps_event_fail *fail)
{
if (!wpa_s->p2p_in_provisioning) {
wpa_printf(MSG_DEBUG, "P2P: Ignore WPS fail event - P2P "
"provisioning not in progress");
return;
}
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
if (wpa_s->go_params) {
p2p_clear_provisioning_info(
wpa_s->global->p2p,
P2P: Fix provisioning info clearing after successful WPS step Previously, this provisioning info was cleared using the P2P Interface Address of the GO as the key. That did not always work in the case the where we joined an already running group. This could result in the next connection to that same GO skipping provision discovery. Fix this by finding the peer entry based on its P2P Device Address instead of the P2P Interface Address which may not always be set. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-03-01 21:06:03 +01:00
wpa_s->go_params->peer_device_addr);
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
}
P2P: Add WpsFailed signal in P2P D-Bus Signal is triggered if an error occurs during WPS provisioning phase. Signed-off-by: Jean-Michel.Bachot <jean-michelx.bachot@intel.com> Signed-off-by: Jayant Sane <jayant.sane@intel.com>
2011-06-25 10:47:04 +02:00
wpas_notify_p2p_wps_failed(wpa_s, fail);
P2P: Reject group formation on WPS provisioning failure There is no need to wait for the 15 second group formation timeout to clear the state if WPS failure is detected during P2P group formation. Allow the WPS exchange steps (WSC_NACK and EAP-Failure) to be completed and remove the group to get rid of the extra wait. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-06 16:56:50 +01:00
if (wpa_s == wpa_s->global->p2p_group_formation) {
/*
* Allow some time for the failed WPS negotiation exchange to
* complete, but remove the group since group formation cannot
* succeed after provisioning failure.
*/
wpa_printf(MSG_DEBUG, "P2P: WPS step failed during group formation - reject connection from timeout");
wpa_s->global->p2p_fail_on_wps_complete = 1;
eloop_deplete_timeout(0, 50000,
wpas_p2p_group_formation_timeout,
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev, NULL);
P2P: Reject group formation on WPS provisioning failure There is no need to wait for the 15 second group formation timeout to clear the state if WPS failure is detected during P2P group formation. Allow the WPS exchange steps (WSC_NACK and EAP-Failure) to be completed and remove the group to get rid of the extra wait. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-06 16:56:50 +01:00
}
}
int wpas_p2p_wps_eapol_cb(struct wpa_supplicant *wpa_s)
{
if (!wpa_s->global->p2p_fail_on_wps_complete ||
!wpa_s->p2p_in_provisioning)
return 0;
wpas_p2p_grpform_fail_after_wps(wpa_s);
return 1;
P2P: Add WpsFailed signal in P2P D-Bus Signal is triggered if an error occurs during WPS provisioning phase. Signed-off-by: Jean-Michel.Bachot <jean-michelx.bachot@intel.com> Signed-off-by: Jayant Sane <jayant.sane@intel.com>
2011-06-25 10:47:04 +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
{
u16 config_methods;
P2PS: Callback to create pending group after sending PD Response This introduces a P2P module callback function that will be used to create the pending P2PS group after sending PD Response and receiving ACK status for it. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-10 12:29:29 +01:00
wpa_s->global->pending_p2ps_group = 0;
P2PS: Indicate the chosen operating frequency On successful P2P PD, report the chosen frequency in case the local device is going to be the P2P GO, so in can later be used to instantiate the new P2P GO, etc. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-10-08 11:36:01 +02:00
wpa_s->global->pending_p2ps_group_freq = 0;
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
wpa_s->p2p_fallback_to_go_neg = 0;
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
wpa_s->pending_pd_use = NORMAL_PD;
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
if (p2ps_prov && use == WPAS_P2P_PD_FOR_ASP) {
p2ps_prov->conncap = p2ps_group_capability(
P2PS: Add channel policy to PD Request Add operating channel selection and channel list processing similar to that done when building GO Negotiation Request, i.e., consider the currently used channels, configured channels, etc. P2PS introduces a flow where a responder needs to provide channel data without being previously aware of the current constraints, i.e., the channels currently in use by other interfaces. To handle this, extend the get_group_capability() callback to also handle channel selection aspects of group capabilities. In case there is an active P2P GO that is going to be used for the P2PS PD, force its current operating frequency in the PD attributes. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-10-08 11:35:58 +02:00
wpa_s, P2PS_SETUP_NONE, p2ps_prov->role,
&p2ps_prov->force_freq, &p2ps_prov->pref_freq);
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
wpa_printf(MSG_DEBUG,
"P2P: %s conncap: %d - ASP parsed: %x %x %d %s",
__func__, p2ps_prov->conncap,
p2ps_prov->adv_id, p2ps_prov->conncap,
p2ps_prov->status, p2ps_prov->info);
config_methods = 0;
} else if (os_strncmp(config_method, "display", 7) == 0)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
config_methods = WPS_CONFIG_DISPLAY;
P2P: Add optional "join" argument for p2p_prov_disc command This can be used to request Provision Discovery Request to be sent for the purpose of joining a running group, e.g., to request the GO to display a PIN that we can then use with p2p_connect join command. Signed-hostap: Jithu Jance <jithu@broadcom.com>
2011-12-06 20:28:02 +01:00
else if (os_strncmp(config_method, "keypad", 6) == 0)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
config_methods = WPS_CONFIG_KEYPAD;
P2P: Add optional "join" argument for p2p_prov_disc command This can be used to request Provision Discovery Request to be sent for the purpose of joining a running group, e.g., to request the GO to display a PIN that we can then use with p2p_connect join command. Signed-hostap: Jithu Jance <jithu@broadcom.com>
2011-12-06 20:28:02 +01:00
else if (os_strncmp(config_method, "pbc", 3) == 0 ||
os_strncmp(config_method, "pushbutton", 10) == 0)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
config_methods = WPS_CONFIG_PUSHBUTTON;
P2P: Add optional "join" argument for p2p_prov_disc command This can be used to request Provision Discovery Request to be sent for the purpose of joining a running group, e.g., to request the GO to display a PIN that we can then use with p2p_connect join command. Signed-hostap: Jithu Jance <jithu@broadcom.com>
2011-12-06 20:28:02 +01:00
else {
wpa_printf(MSG_DEBUG, "P2P: Unknown 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
os_free(p2ps_prov);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return -1;
P2P: Add optional "join" argument for p2p_prov_disc command This can be used to request Provision Discovery Request to be sent for the purpose of joining a running group, e.g., to request the GO to display a PIN that we can then use with p2p_connect join command. Signed-hostap: Jithu Jance <jithu@broadcom.com>
2011-12-06 20:28:02 +01:00
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
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
if (use == WPAS_P2P_PD_AUTO) {
os_memcpy(wpa_s->pending_join_dev_addr, peer_addr, ETH_ALEN);
wpa_s->pending_pd_config_methods = config_methods;
wpa_s->p2p_auto_pd = 1;
wpa_s->p2p_auto_join = 0;
wpa_s->pending_pd_before_join = 0;
P2P: Improve p2p_prov_disc-auto robustness Perform addition additional scan runs on the operating channel of the GO (if known from previous scan results) and fall back to initiate the PD for GO Negotiation if these additional scans do not detect the peer as GO. Signed-hostap: Sunil Dutt Undekari <duttus@codeaurora.org>
2012-06-06 14:46:05 +02:00
wpa_s->auto_pd_scan_retry = 0;
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
wpas_p2p_stop_find(wpa_s);
wpa_s->p2p_join_scan_count = 0;
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
os_get_reltime(&wpa_s->p2p_auto_started);
P2P: Improve p2p_prov_disc-auto robustness Perform addition additional scan runs on the operating channel of the GO (if known from previous scan results) and fall back to initiate the PD for GO Negotiation if these additional scans do not detect the peer as GO. Signed-hostap: Sunil Dutt Undekari <duttus@codeaurora.org>
2012-06-06 14:46:05 +02:00
wpa_printf(MSG_DEBUG, "P2P: Auto PD started at %ld.%06ld",
wpa_s->p2p_auto_started.sec,
wpa_s->p2p_auto_started.usec);
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
wpas_p2p_join_scan(wpa_s, NULL);
return 0;
}
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
if (wpa_s->global->p2p == NULL || wpa_s->global->p2p_disabled) {
os_free(p2ps_prov);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return -1;
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
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
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
return p2p_prov_disc_req(wpa_s->global->p2p, peer_addr, p2ps_prov,
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
config_methods, use == WPAS_P2P_PD_FOR_JOIN,
P2P: Set user_initiated_pd separately from the join parameter p2p_prov_disc_req() used the join parameter to figure out whether the PD request was a user initiated or not. This does not cover all use cases of PD, so add a separate parameter to allow caller to indicate whether the user requested the operation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-11-22 23:48:58 +01:00
0, 1);
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)
{
return p2p_scan_result_text(ies, ies_len, buf, end);
}
P2P: Clear pending Action TX frame on p2p_stop_find and p2p_listen This is needed to avoid issues with the previous TX command from stopping long Listen state.
2010-08-03 05:40:54 +02:00
static void wpas_p2p_clear_pending_action_tx(struct wpa_supplicant *wpa_s)
{
Move some P2P offchannel operations to offchannel.c There is no need for p2p_supplicant.c to access wpa_s->pending_action_tx so move these references to offchannel.c to get a bit cleaner interface between the components. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-22 10:22:12 +01:00
if (!offchannel_pending_action_tx(wpa_s))
P2P: Clear pending Action TX frame on p2p_stop_find and p2p_listen This is needed to avoid issues with the previous TX command from stopping long Listen state.
2010-08-03 05:40:54 +02:00
return;
P2P: Stop offchannel TX wait on P2P_STOP_FIND/P2P_LISTEN Previously it was possible for the pending Action frame TX to be cleared, but the offchannel TX operation being left in wait state in the kernel. This would delay start of the next operation (e.g., that listen operation requested by P2P_LISTEN) until the wait time for the previously pending Action frame had expired. Optimize this by explicitly stopping any pending offchannel Action frame TX when clearing the internal offchannel TX state in wpas_p2p_clear_pending_action_tx(). Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-12-30 23:03:21 +01:00
if (wpa_s->p2p_send_action_work) {
P2P: Clear send action work without waiting on find/stop/listen When clearing pending TX action to start a new P2P operation like P2P_FIND or P2P_LISTEN, wpas_p2p_action_tx_clear() was used to clear the send action work. However, in cases where the action work has wait time, it is not cleared immediately but only after the wait time ends. This may cause delay in starting the P2P operation. Fix that by always clearing the send action work immediately on these P2P commands that result in immediate P2P state change and practically stopping a previous operation, if one was pending. Signed-off-by: Avraham Stern <avraham.stern@intel.com>
2015-11-03 15:25:01 +01:00
wpas_p2p_free_send_action_work(wpa_s);
P2P: Stop offchannel TX wait on P2P_STOP_FIND/P2P_LISTEN Previously it was possible for the pending Action frame TX to be cleared, but the offchannel TX operation being left in wait state in the kernel. This would delay start of the next operation (e.g., that listen operation requested by P2P_LISTEN) until the wait time for the previously pending Action frame had expired. Optimize this by explicitly stopping any pending offchannel Action frame TX when clearing the internal offchannel TX state in wpas_p2p_clear_pending_action_tx(). Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-12-30 23:03:21 +01:00
eloop_cancel_timeout(wpas_p2p_send_action_work_timeout,
wpa_s, NULL);
offchannel_send_action_done(wpa_s);
}
P2P: Cancel pending action TX radio work on p2p_cancel When p2p_cancel is invoked while the GO Negotiation Action TX was pending, the p2p_send_action_work was not getting cleared. Signed-off-by: Jithu Jance <jithu@broadcom.com>
2014-07-29 15:04:32 +02:00
P2P: Clear pending Action TX frame on p2p_stop_find and p2p_listen This is needed to avoid issues with the previous TX command from stopping long Listen state.
2010-08-03 05:40:54 +02:00
wpa_printf(MSG_DEBUG, "P2P: Drop pending Action TX due to new "
"operation request");
Move some P2P offchannel operations to offchannel.c There is no need for p2p_supplicant.c to access wpa_s->pending_action_tx so move these references to offchannel.c to get a bit cleaner interface between the components. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-22 10:22:12 +01:00
offchannel_clear_pending_action_tx(wpa_s);
P2P: Clear pending Action TX frame on p2p_stop_find and p2p_listen This is needed to avoid issues with the previous TX command from stopping long Listen state.
2010-08-03 05:40:54 +02:00
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
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
{
P2P: Clear pending Action TX frame on p2p_stop_find and p2p_listen This is needed to avoid issues with the previous TX command from stopping long Listen state.
2010-08-03 05:40:54 +02:00
wpas_p2p_clear_pending_action_tx(wpa_s);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_s->p2p_long_listen = 0;
P2P: Reject p2p_find when in provisioning A p2p_find during provisioning shall not allow the enrollee to pick the network, hence disable p2p_find during provisioning. Signed-hostap: Sunil Dutt Undekari <duttus@codeaurora.org>
2012-06-25 13:05:49 +02:00
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL ||
Revert "P2P: Reject p2p_find while P2P connection is in progress" This reverts commit ce970851af76ed96d203d56c660c73ba02c99673. It turned out that this breaks lots of use cases where p2p_find is issued while already in p2p_listen state. As such, we cannot reject p2p_find this easily without checking for more specific cases. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-08-01 16:00:53 +02:00
wpa_s->p2p_in_provisioning)
P2P: Handle P2P-not-supported without segfaults Previous code was assuming that the P2P module is always initialized. However, that is not the case anymore with drivers that do not support P2P. Add verification of whether P2P is enabled before trying to execute P2P commands.
2011-02-24 20:13:30 +01:00
return -1;
Stop sched_scan in number of cases where it should not be running When a P2P group is removed, we better not leave possibly started sched_scan running. This could happen when a separate group interface was not used. In addition, it looks safer to explicitly stop sched_scan before starting P2P Listen or Find operations to make sure the offloaded scanning is not running when doing similar P2P operations. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-01-23 17:26:09 +01:00
wpa_supplicant_cancel_sched_scan(wpa_s);
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
return p2p_find(wpa_s->global->p2p, timeout, type,
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
num_req_dev_types, req_dev_types, dev_id,
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
search_delay, seek_cnt, seek_string, freq);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Do not consider the p2p_scan results after p2p_stop_find If p2p_stop_find is issued after the p2p_scan request is triggered to the host driver, the obtained scan results are also considered to update the P2P peer entries. This is not always desired behavior, i.e., it can be clearer if no P2P-DEVICE-FOUND events are generated based of that final pending scan. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-30 16:21:52 +01:00
static void wpas_p2p_scan_res_ignore_search(struct wpa_supplicant *wpa_s,
struct wpa_scan_results *scan_res)
{
wpa_printf(MSG_DEBUG, "P2P: Ignore scan results");
if (wpa_s->p2p_scan_work) {
struct wpa_radio_work *work = wpa_s->p2p_scan_work;
wpa_s->p2p_scan_work = NULL;
radio_work_done(work);
}
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
return;
/*
* Indicate that results have been processed so that the P2P module can
* continue pending tasks.
*/
p2p_scan_res_handled(wpa_s->global->p2p);
}
P2P: Remove unreachable code in wpas_p2p_stop_find() Commit 152cff6ba6d6ac206b93a2202eab57f0a36c26cb ('P2P: Remove WPA_DRIVER_FLAGS_P2P_MGMT option') removed the only non-zero return from wpas_p2p_stop_find_oper(), but did not remove the useless return value or the return check in wpas_p2p_stop_find(). Clean these up by removing unreachable code and useless return value. Signed-off-by: Eduardo Abinader <eduardo.abinader@openbossa.org>
2014-08-01 18:31:07 +02:00
static void wpas_p2p_stop_find_oper(struct wpa_supplicant *wpa_s)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
P2P: Clear pending Action TX frame on p2p_stop_find and p2p_listen This is needed to avoid issues with the previous TX command from stopping long Listen state.
2010-08-03 05:40:54 +02:00
wpas_p2p_clear_pending_action_tx(wpa_s);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_s->p2p_long_listen = 0;
P2P: Stop p2p_find/p2p_listen when Invitation is accepted When an Invitation to reinvoke a persistent group is accepted, we need to make sure that any pending p2p_find or p2p_listen operation gets stopped to avoid consuming all radio resources doing device discovery while the group is being set up.
2010-11-19 11:58:03 +01:00
eloop_cancel_timeout(wpas_p2p_long_listen_timeout, wpa_s, NULL);
P2P: Run a scan before provision discovery in p2p_connect join This is needed to make sure we have fresh BSS information for the GO.
2010-06-27 01:20:57 +02:00
eloop_cancel_timeout(wpas_p2p_join_scan, wpa_s, NULL);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Handle P2P-not-supported without segfaults Previous code was assuming that the P2P module is always initialized. However, that is not the case anymore with drivers that do not support P2P. Add verification of whether P2P is enabled before trying to execute P2P commands.
2011-02-24 20:13:30 +01:00
if (wpa_s->global->p2p)
p2p_stop_find(wpa_s->global->p2p);
P2P: Do not consider the p2p_scan results after p2p_stop_find If p2p_stop_find is issued after the p2p_scan request is triggered to the host driver, the obtained scan results are also considered to update the P2P peer entries. This is not always desired behavior, i.e., it can be clearer if no P2P-DEVICE-FOUND events are generated based of that final pending scan. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-30 16:21:52 +01:00
if (wpa_s->scan_res_handler == wpas_p2p_scan_res_handler) {
wpa_printf(MSG_DEBUG,
"P2P: Do not consider the scan results after stop_find");
wpa_s->scan_res_handler = wpas_p2p_scan_res_ignore_search;
}
P2P: Avoid extra group interface creation on GO reinvocation If separate group interfaces are used, the pending group interface got removed unnecessarily when stopping find operations when accepting an invitation to reinvoke the group in GO role. This resulted in the group interfaces getting created twice. Avoid this unnecessary extra operation by skipping removal of the pending interface in the reinvocation sequence. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-11 19:45:27 +01:00
}
void wpas_p2p_stop_find(struct wpa_supplicant *wpa_s)
{
P2P: Remove unreachable code in wpas_p2p_stop_find() Commit 152cff6ba6d6ac206b93a2202eab57f0a36c26cb ('P2P: Remove WPA_DRIVER_FLAGS_P2P_MGMT option') removed the only non-zero return from wpas_p2p_stop_find_oper(), but did not remove the useless return value or the return check in wpas_p2p_stop_find(). Clean these up by removing unreachable code and useless return value. Signed-off-by: Eduardo Abinader <eduardo.abinader@openbossa.org>
2014-08-01 18:31:07 +02:00
wpas_p2p_stop_find_oper(wpa_s);
P2PS: Do not remove pending interface on p2p_stop_find The pending interface created during provision discovery should not be removed on stopping p2p_find. This pending interface has to be used after completing GO negotiation. Earlier the pending interface is created just before GO negotiation so there was no problem. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-12-30 13:27:38 +01:00
if (!wpa_s->global->pending_group_iface_for_p2ps)
wpas_p2p_remove_pending_group_interface(wpa_s);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
static void wpas_p2p_long_listen_timeout(void *eloop_ctx, void *timeout_ctx)
{
struct wpa_supplicant *wpa_s = eloop_ctx;
wpa_s->p2p_long_listen = 0;
}
int wpas_p2p_listen(struct wpa_supplicant *wpa_s, unsigned int timeout)
{
int res;
P2P: Handle P2P-not-supported without segfaults Previous code was assuming that the P2P module is always initialized. However, that is not the case anymore with drivers that do not support P2P. Add verification of whether P2P is enabled before trying to execute P2P commands.
2011-02-24 20:13:30 +01:00
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
return -1;
P2P: Allow P2P listen being offloaded to the driver/firmware This allows P2P Listen to be offloaded to device to enhance power saving. To start P2P listen offload, from wpa_cli interface, issue the command: p2p_lo_start <freq> <period> <interval> <count> To stop P2P listen offload, issue the command: p2p_lo_stop Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-06-24 20:36:18 +02:00
if (wpa_s->p2p_lo_started) {
wpa_printf(MSG_DEBUG,
"P2P: Cannot start P2P listen, it is offloaded");
return -1;
}
Stop sched_scan in number of cases where it should not be running When a P2P group is removed, we better not leave possibly started sched_scan running. This could happen when a separate group interface was not used. In addition, it looks safer to explicitly stop sched_scan before starting P2P Listen or Find operations to make sure the offloaded scanning is not running when doing similar P2P operations. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-01-23 17:26:09 +01:00
wpa_supplicant_cancel_sched_scan(wpa_s);
P2P: Clear pending Action TX frame on p2p_stop_find and p2p_listen This is needed to avoid issues with the previous TX command from stopping long Listen state.
2010-08-03 05:40:54 +02:00
wpas_p2p_clear_pending_action_tx(wpa_s);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (timeout == 0) {
/*
* This is a request for unlimited Listen state. However, at
* least for now, this is mapped to a Listen state for one
* hour.
*/
timeout = 3600;
}
eloop_cancel_timeout(wpas_p2p_long_listen_timeout, wpa_s, NULL);
wpa_s->p2p_long_listen = 0;
P2P: Cancel previous operation before starting new p2p_listen Some drivers do not handle concurrent remain-on-channel operation requests, so run p2p_stop_find() prior to starting p2p_listen. This addresses some issues with P2P_LISTEN command being issues again while already in Listen state. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-17 15:21:11 +01:00
/*
* Stop previous find/listen operation to avoid trying to request a new
* remain-on-channel operation while the driver is still running the
* previous one.
*/
if (wpa_s->global->p2p)
p2p_stop_find(wpa_s->global->p2p);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
res = wpas_p2p_listen_start(wpa_s, timeout * 1000);
if (res == 0 && timeout * 1000 > wpa_s->max_remain_on_chan) {
P2P: Fix p2p_long_listen There are two issues with p2p_long_listen: 1) max_remain_on_channel is assumed to be 5 seconds, 2) if max_remain_on_channel is not a full multiple of seconds, accounting breaks. Fix these by converting p2p_long_listen to ms and tracking it according to max_remain_on_channel. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-01 17:09:38 +01:00
wpa_s->p2p_long_listen = timeout * 1000;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
eloop_register_timeout(timeout, 0,
wpas_p2p_long_listen_timeout,
wpa_s, NULL);
}
return res;
}
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)
{
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
struct wpabuf *p2p_ie;
int ret;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (wpa_s->global->p2p_disabled)
return -1;
P2P: Advertize cross connection to WLAN AP on a non-P2P interface Commit 1c2aa04c96626f5b000d167bb5274a8c39b7dac2 ('P2P: Do not add P2P IEs on P2P disabled interface') removed the P2P IEs from association on non-P2P interface. However, an AP functioning as a P2P manager needs the cross connection capability of the station (P2P Device). This needs to be done to meet the P2P specification requirements even if the station interface has p2p_disabled=1 in case P2P in general is enabled. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-05-09 11:25:03 +02:00
/*
* Advertize mandatory cross connection capability even on
* p2p_disabled=1 interface when associating with a P2P Manager WLAN AP.
*/
if (wpa_s->conf->p2p_disabled && p2p_group)
P2P: Do not add P2P IEs on P2P disabled interface While building Association Request frame IEs we should consider adding P2P IEs only on interface where P2P functionality is enabled. Consider per interface p2p_disabled parameter before adding P2P IEs to complete the checks for this. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-09-02 07:03:44 +02:00
return -1;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (wpa_s->global->p2p == NULL)
return -1;
P2P: Fix P2P IE generation for AssocReq when BSS info is not available This code could segfault on NULL pointer dereference at least when ap_scan=2 is used.
2010-07-30 01:09:38 +02:00
if (bss == NULL)
return -1;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
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
p2p_ie = wpa_bss_get_vendor_ie_multi(bss, P2P_IE_VENDOR_TYPE);
ret = p2p_assoc_req_ie(wpa_s->global->p2p, bss->bssid, buf, len,
p2p_group, p2p_ie);
wpabuf_free(p2p_ie);
return ret;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
int wpas_p2p_probe_req_rx(struct wpa_supplicant *wpa_s, const u8 *addr,
P2P: Filter Probe Request frames based on DA and BSSID in Listen state Only accept Probe Request frames that have a Wildcard BSSID and a destination address that matches with our P2P Device Address or is the broadcast address per P2P specification 3.1.2.1.1.
2011-07-15 19:25:53 +02:00
const u8 *dst, const u8 *bssid,
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
const u8 *ie, size_t ie_len,
unsigned int rx_freq, int ssi_signal)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
if (wpa_s->global->p2p_disabled)
return 0;
if (wpa_s->global->p2p == NULL)
return 0;
DBus: Add ability to report probe requests Some applications require knowing about probe requests to identify devices. This can be the case in AP mode to see the devices before they connect, or even in P2P mode when operating as a P2P device to identify non-P2P peers (P2P peers are identified via PeerFound signals). As there are typically a lot of probe requests, require that an interested application subscribes to this signal so the bus isn't always flooded with these notifications. The notifications in DBus are then unicast only to that application. A small test script is also included. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2012-04-01 20:13:38 +02:00
switch (p2p_probe_req_rx(wpa_s->global->p2p, addr, dst, bssid,
P2P: Allow P2P listen being offloaded to the driver/firmware This allows P2P Listen to be offloaded to device to enhance power saving. To start P2P listen offload, from wpa_cli interface, issue the command: p2p_lo_start <freq> <period> <interval> <count> To stop P2P listen offload, issue the command: p2p_lo_stop Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-06-24 20:36:18 +02:00
ie, ie_len, rx_freq, wpa_s->p2p_lo_started)) {
DBus: Add ability to report probe requests Some applications require knowing about probe requests to identify devices. This can be the case in AP mode to see the devices before they connect, or even in P2P mode when operating as a P2P device to identify non-P2P peers (P2P peers are identified via PeerFound signals). As there are typically a lot of probe requests, require that an interested application subscribes to this signal so the bus isn't always flooded with these notifications. The notifications in DBus are then unicast only to that application. A small test script is also included. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2012-04-01 20:13:38 +02:00
case P2P_PREQ_NOT_P2P:
wpas_notify_preq(wpa_s, addr, dst, bssid, ie, ie_len,
ssi_signal);
/* fall through */
case P2P_PREQ_MALFORMED:
case P2P_PREQ_NOT_LISTEN:
case P2P_PREQ_NOT_PROCESSED:
default: /* make gcc happy */
return 0;
case P2P_PREQ_PROCESSED:
return 1;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
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)
{
if (wpa_s->global->p2p_disabled)
return;
if (wpa_s->global->p2p == NULL)
return;
p2p_rx_action(wpa_s->global->p2p, da, sa, bssid, category, data, len,
freq);
}
void wpas_p2p_scan_ie(struct wpa_supplicant *wpa_s, struct wpabuf *ies)
{
P2P: Add Dev Info attribute to Probe Request frames in 60 GHz When building P2P IE for Probe Request frames in P2P scan, add the device information attribute if the 60 GHz band is included in the scan, since this is required by the P2P specification. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-02-20 15:45:58 +01:00
unsigned int bands;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (wpa_s->global->p2p_disabled)
return;
if (wpa_s->global->p2p == NULL)
return;
P2P: Add Dev Info attribute to Probe Request frames in 60 GHz When building P2P IE for Probe Request frames in P2P scan, add the device information attribute if the 60 GHz band is included in the scan, since this is required by the P2P specification. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-02-20 15:45:58 +01:00
bands = wpas_get_bands(wpa_s, NULL);
p2p_scan_ie(wpa_s->global->p2p, ies, NULL, bands);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
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 void wpas_p2p_group_deinit(struct wpa_supplicant *wpa_s)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
p2p_group_deinit(wpa_s->p2p_group);
wpa_s->p2p_group = NULL;
P2P: Cleanup AP callbacks when removing the group Clear the P2P GO callback parameters when removing the group to avoid using these for non-P2P AP mode. This is a fix for the bug I found in the following scenario: A) p2p_group_add A) p2p_group_remove wlan0 A) add_n A) set_n 0 ssid "testap" A) set_n 0 key_mgmt NONE A) set_n 0 mode 2 A) set_n 0 frequency 2412 A) enable_n 0 B) try connect to testap Authentication request will be always rejected because of HOSTAPD_ACL_REJECT and not cleaned callbacks when group removed.
2011-10-12 20:06:39 +02:00
wpa_s->ap_configured_cb = NULL;
wpa_s->ap_configured_cb_ctx = NULL;
wpa_s->ap_configured_cb_data = NULL;
wpa_s->connect_without_scan = NULL;
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)
{
wpa_s->p2p_long_listen = 0;
P2P: Handle P2P-not-supported without segfaults Previous code was assuming that the P2P module is always initialized. However, that is not the case anymore with drivers that do not support P2P. Add verification of whether P2P is enabled before trying to execute P2P commands.
2011-02-24 20:13:30 +01:00
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
return -1;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return p2p_reject(wpa_s->global->p2p, addr);
}
/* Invite to reinvoke a persistent group */
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_chwidth,
int pref_freq)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
enum p2p_invite_role role;
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
u8 *bssid = NULL;
int force_freq = 0;
P2P: Use shared function for setting up frequencies p2p_connect() and p2p_invite() cases used more or less identical implementatin. Use a shared function to avoid duplicated code. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-25 18:30:14 +01:00
int res;
P2P: Fix p2p_ignore_shared_freq=1 when inviting a peer p2p_ignore_shared_freq=1 was supposed to allow a MCC-capable device to ignore a preference for using the same channel on multiple interfaces. However, it was not used when inviting a peer to re-invoke a persistent group. This case needs special handling since the peer's channel list is not available to perform channel reselection and the operating channel indicated in the Invitation Request frames ends up getting used as the operating channel if the transmitted of that frames becomes the GO. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-19 11:26:16 +01:00
int no_pref_freq_given = pref_freq == 0;
P2P: Use preferred frequency list from the local driver If the driver supports the preferred frequency list extension, use this information from the driver when no explicitly configured preference list (p2p_pref_chan) is present for P2P operating channel selection. This commit adds this for GO Negotiation and Invitation use cases. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-07-24 02:39:45 +02:00
unsigned int pref_freq_list[P2P_MAX_PREF_CHANNELS], size;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Remove persistent group peer if it rejects invitation If a peer replies to persistent group invitation with status code 8 (unknown group), remove the peer from the p2p_client_list if we are the GO or remove the persistent group if we are the P2P client since it looks like that the peer has dropped persistent group credentials and the provisioning step needs to be executed again. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-15 15:31:31 +01:00
wpa_s->global->p2p_invite_group = NULL;
P2P: Mark peer authorized for persistent group invitation When p2p_invite persistent=<id> is used to request a persistent group to be re-invoked, the peer may reply with status=1 (info not yet available) if upper layer processing of the invitiation is requested. The peer is ten expected to start another invitation exchanged within 120 seconds if the user authorizes the connection. Allow this process to be used more easily by automatically authorizing the peer that we tried to invite to use this second invitation sequence even if persistent_reconnect=0. For this mechanism to work, the device that starts the invitation needs to start listen mode to be able to receive the invitation request from the peer. At least for now, this is not done automatically, but future changes could potentially enable this automatically at least if there are no concurrent operations in progress. Example sequence on the initiator: cmd: P2P_INVITE persistent=1 peer=<addr> event: P2P-INVITATION-RESULT status=1 cmd: P2P_LISTEN 120 wait for peer to start another invitiation round.. group will be re-invoked automatically On the peer (with persistent_reconnect=0): event: P2P-INVITATION-RECEIVED sa=<addr> persistent=1 [freq=<MHz>] wait for user approval cmd: P2P_INVITE persistent=1 peer=<addr> group will be re-invoked automatically Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-01 20:32:33 +01:00
if (peer_addr)
os_memcpy(wpa_s->p2p_auth_invite, peer_addr, ETH_ALEN);
else
os_memset(wpa_s->p2p_auth_invite, 0, ETH_ALEN);
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
wpa_s->p2p_persistent_go_freq = freq;
wpa_s->p2p_go_ht40 = !!ht40;
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
wpa_s->p2p_go_vht = !!vht;
wpa_s->p2p_go_max_oper_chwidth = max_chwidth;
wpa_s->p2p_go_vht_center_freq2 = vht_center_freq2;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (ssid->mode == WPAS_MODE_P2P_GO) {
role = P2P_INVITE_ROLE_GO;
if (peer_addr == NULL) {
wpa_printf(MSG_DEBUG, "P2P: Missing peer "
"address in invitation command");
return -1;
}
if (wpas_p2p_create_iface(wpa_s)) {
if (wpas_p2p_add_group_interface(wpa_s,
WPA_IF_P2P_GO) < 0) {
wpa_printf(MSG_ERROR, "P2P: Failed to "
"allocate a new interface for the "
"group");
return -1;
}
bssid = wpa_s->pending_interface_addr;
P2P: Support dedicated P2P_DEVICE without separate group interface Add support for drivers with dedicated P2P_DEVICE interface, but without group interface concurrency (only a single netdev is used). With such devices, wpa_supplicant tried to use the p2p_dev interface instead of the group interface and most P2P operations failed. Extend wpa_supplicant to use the primary interface instead of a separate group interface in such cases. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
} else if (wpa_s->p2p_mgmt)
bssid = wpa_s->parent->own_addr;
else
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
bssid = wpa_s->own_addr;
} else {
role = P2P_INVITE_ROLE_CLIENT;
peer_addr = ssid->bssid;
}
wpa_s->pending_invite_ssid_id = ssid->id;
P2P: Use preferred frequency list from the local driver If the driver supports the preferred frequency list extension, use this information from the driver when no explicitly configured preference list (p2p_pref_chan) is present for P2P operating channel selection. This commit adds this for GO Negotiation and Invitation use cases. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-07-24 02:39:45 +02:00
size = P2P_MAX_PREF_CHANNELS;
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
res = wpas_p2p_setup_freqs(wpa_s, freq, &force_freq, &pref_freq,
P2P: Use preferred frequency list from the local driver If the driver supports the preferred frequency list extension, use this information from the driver when no explicitly configured preference list (p2p_pref_chan) is present for P2P operating channel selection. This commit adds this for GO Negotiation and Invitation use cases. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-07-24 02:39:45 +02:00
role == P2P_INVITE_ROLE_GO,
pref_freq_list, &size);
P2P: Use shared function for setting up frequencies p2p_connect() and p2p_invite() cases used more or less identical implementatin. Use a shared function to avoid duplicated code. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-25 18:30:14 +01:00
if (res)
return res;
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
P2P: Handle P2P-not-supported without segfaults Previous code was assuming that the P2P module is always initialized. However, that is not the case anymore with drivers that do not support P2P. Add verification of whether P2P is enabled before trying to execute P2P commands.
2011-02-24 20:13:30 +01:00
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
return -1;
P2P: Fix possible NULL pointer dereference Fix wpas_p2p_invite() to call p2p_set_own_pref_freq_list() after the NULL check, to avoid NULL pointer dereference if P2P initialization were to have failed or P2P module getting deinitialized. Signed-off-by: Ayala Beker <ayala.beker@intel.com>
2015-12-10 11:56:02 +01:00
p2p_set_own_pref_freq_list(wpa_s->global->p2p, pref_freq_list, size);
P2P: Fix p2p_ignore_shared_freq=1 when inviting a peer p2p_ignore_shared_freq=1 was supposed to allow a MCC-capable device to ignore a preference for using the same channel on multiple interfaces. However, it was not used when inviting a peer to re-invoke a persistent group. This case needs special handling since the peer's channel list is not available to perform channel reselection and the operating channel indicated in the Invitation Request frames ends up getting used as the operating channel if the transmitted of that frames becomes the GO. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-19 11:26:16 +01:00
if (wpa_s->parent->conf->p2p_ignore_shared_freq &&
no_pref_freq_given && pref_freq > 0 &&
wpa_s->num_multichan_concurrent > 1 &&
wpas_p2p_num_unused_channels(wpa_s) > 0) {
wpa_printf(MSG_DEBUG, "P2P: Ignore own channel preference %d MHz for invitation due to p2p_ignore_shared_freq=1 configuration",
pref_freq);
pref_freq = 0;
}
P2P: Stop p2p_listen/find on wpas_p2p_invite Stop any ongoing P2P listen/find flow before starting invitation flow. This was partially handled in p2p_invite() that called p2p_find(), but this did not cleanly handle cases such as long_listen. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-01-19 02:44:12 +01:00
/*
* Stop any find/listen operations before invitation and possibly
* connection establishment.
*/
wpas_p2p_stop_find_oper(wpa_s);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return p2p_invite(wpa_s->global->p2p, peer_addr, role, bssid,
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
ssid->ssid, ssid->ssid_len, force_freq, go_dev_addr,
P2P NFC: Static handover with NFC Tag on client This adds a new P2P Invitation mechanism to invite a P2P Device with an NFC Tag to an already operating group when the GO with NFC Device reads the NFC Tag. The P2P Device with the NFC Tag will then accept invitation and connect to the group automatically using its OOB Device Password. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 18:45:04 +02:00
1, pref_freq, -1);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
/* Invite to join an active group */
int wpas_p2p_invite_group(struct wpa_supplicant *wpa_s, const char *ifname,
const u8 *peer_addr, const u8 *go_dev_addr)
{
struct wpa_global *global = wpa_s->global;
enum p2p_invite_role role;
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
u8 *bssid = NULL;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
struct wpa_ssid *ssid;
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
int persistent;
P2P: Fix Operating Channel in Invitation Request for operating group When a GO or P2P Client invites a peer device to join an already operating group, the Operating Channel in Invitation Request needs to be forced to the current operating channel of the group. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-20 17:33:17 +02:00
int freq = 0, force_freq = 0, pref_freq = 0;
P2P: Use shared function for setting up frequencies p2p_connect() and p2p_invite() cases used more or less identical implementatin. Use a shared function to avoid duplicated code. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-25 18:30:14 +01:00
int res;
P2P: Use preferred frequency list from the local driver If the driver supports the preferred frequency list extension, use this information from the driver when no explicitly configured preference list (p2p_pref_chan) is present for P2P operating channel selection. This commit adds this for GO Negotiation and Invitation use cases. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-07-24 02:39:45 +02:00
unsigned int pref_freq_list[P2P_MAX_PREF_CHANNELS], size;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
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
wpa_s->p2p_persistent_go_freq = 0;
wpa_s->p2p_go_ht40 = 0;
P2P: Add VHT parameter to P2P operations Add the option to ask for VHT operation similarly to the way ht40 is configured - either by adding 'vht' param to the relevant p2p_* commands or by configuring p2p_go_vht=1 in the configuration file. This patch only adds the configuration option (e.g., via control interface). The actual handling of the VHT parameter (asking the driver to use VHT, etc.) will be done by the following patch. Signed-hostap: Eliad Peller <eliadx.peller@intel.com>
2013-10-27 18:46:17 +01:00
wpa_s->p2p_go_vht = 0;
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
wpa_s->p2p_go_vht_center_freq2 = 0;
wpa_s->p2p_go_max_oper_chwidth = 0;
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
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
for (wpa_s = global->ifaces; wpa_s; wpa_s = wpa_s->next) {
if (os_strcmp(wpa_s->ifname, ifname) == 0)
break;
}
if (wpa_s == NULL) {
wpa_printf(MSG_DEBUG, "P2P: Interface '%s' not found", ifname);
return -1;
}
ssid = wpa_s->current_ssid;
if (ssid == NULL) {
wpa_printf(MSG_DEBUG, "P2P: No current SSID to use for "
"invitation");
return -1;
}
P2P: Remove persistent group peer if it rejects invitation If a peer replies to persistent group invitation with status code 8 (unknown group), remove the peer from the p2p_client_list if we are the GO or remove the persistent group if we are the P2P client since it looks like that the peer has dropped persistent group credentials and the provisioning step needs to be executed again. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-15 15:31:31 +01:00
wpa_s->global->p2p_invite_group = 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
persistent = ssid->p2p_persistent_group &&
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpas_p2p_get_persistent(wpa_s->p2pdev, peer_addr,
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
ssid->ssid, ssid->ssid_len);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (ssid->mode == WPAS_MODE_P2P_GO) {
role = P2P_INVITE_ROLE_ACTIVE_GO;
bssid = wpa_s->own_addr;
if (go_dev_addr == NULL)
P2P: Use global->p2p_dev_addr instead of parent->own_addr Start using global->p2p_dev_addr more consistently as the P2P Device Address. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-25 22:58:03 +01:00
go_dev_addr = wpa_s->global->p2p_dev_addr;
P2P: Fix Operating Channel in Invitation Request for operating group When a GO or P2P Client invites a peer device to join an already operating group, the Operating Channel in Invitation Request needs to be forced to the current operating channel of the group. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-20 17:33:17 +02:00
freq = ssid->frequency;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
} else {
role = P2P_INVITE_ROLE_CLIENT;
if (wpa_s->wpa_state < WPA_ASSOCIATED) {
wpa_printf(MSG_DEBUG, "P2P: Not associated - cannot "
"invite to current group");
return -1;
}
bssid = wpa_s->bssid;
if (go_dev_addr == NULL &&
!is_zero_ether_addr(wpa_s->go_dev_addr))
go_dev_addr = wpa_s->go_dev_addr;
P2P: Fix Operating Channel in Invitation Request for operating group When a GO or P2P Client invites a peer device to join an already operating group, the Operating Channel in Invitation Request needs to be forced to the current operating channel of the group. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-20 17:33:17 +02:00
freq = wpa_s->current_bss ? wpa_s->current_bss->freq :
(int) wpa_s->assoc_freq;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev->pending_invite_ssid_id = -1;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Handle P2P-not-supported without segfaults Previous code was assuming that the P2P module is always initialized. However, that is not the case anymore with drivers that do not support P2P. Add verification of whether P2P is enabled before trying to execute P2P commands.
2011-02-24 20:13:30 +01:00
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
return -1;
P2P: Use preferred frequency list from the local driver If the driver supports the preferred frequency list extension, use this information from the driver when no explicitly configured preference list (p2p_pref_chan) is present for P2P operating channel selection. This commit adds this for GO Negotiation and Invitation use cases. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-07-24 02:39:45 +02:00
size = P2P_MAX_PREF_CHANNELS;
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
res = wpas_p2p_setup_freqs(wpa_s, freq, &force_freq, &pref_freq,
P2P: Use preferred frequency list from the local driver If the driver supports the preferred frequency list extension, use this information from the driver when no explicitly configured preference list (p2p_pref_chan) is present for P2P operating channel selection. This commit adds this for GO Negotiation and Invitation use cases. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-07-24 02:39:45 +02:00
role == P2P_INVITE_ROLE_ACTIVE_GO,
pref_freq_list, &size);
P2P: Use shared function for setting up frequencies p2p_connect() and p2p_invite() cases used more or less identical implementatin. Use a shared function to avoid duplicated code. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-25 18:30:14 +01:00
if (res)
return res;
P2P: Use the number of concurrent channels in P2P flows Change the P2P flows to use the number of concurrent channels supported by the device and the number of currently used channels for the P2P flows. Signed-hostap: Ilan Peer <ilan.peer@intel.com> Signed-hostap: David Spinadel <david.spinadel@intel.com>
2013-07-21 19:38:53 +02:00
wpas_p2p_set_own_freq_preference(wpa_s, force_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
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return p2p_invite(wpa_s->global->p2p, peer_addr, role, bssid,
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
ssid->ssid, ssid->ssid_len, force_freq,
P2P NFC: Static handover with NFC Tag on client This adds a new P2P Invitation mechanism to invite a P2P Device with an NFC Tag to an already operating group when the GO with NFC Device reads the NFC Tag. The P2P Device with the NFC Tag will then accept invitation and connect to the group automatically using its OOB Device Password. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 18:45:04 +02:00
go_dev_addr, persistent, pref_freq, -1);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
void wpas_p2p_completed(struct wpa_supplicant *wpa_s)
{
struct wpa_ssid *ssid = wpa_s->current_ssid;
u8 go_dev_addr[ETH_ALEN];
int persistent;
P2P: Fix frequency in the P2P_EVENT_GROUP_STARTED event P2P Client did not show correct frequency in the control interface event P2P_EVENT_GROUP_STARTED. Fix that by using the frequency from the BSS table or association event.
2011-10-28 21:26:30 +02:00
int freq;
P2P: Add support for IP address assignment in 4-way handshake This new mechanism allows P2P Client to request an IPv4 address from the GO as part of the 4-way handshake to avoid use of DHCP exchange after 4-way handshake. If the new mechanism is used, the assigned IP address is shown in the P2P-GROUP-STARTED event on the client side with following new parameters: ip_addr, ip_mask, go_ip_addr. The assigned IP address is included in the AP-STA-CONNECTED event on the GO side as a new ip_addr parameter. The IP address is valid for the duration of the association. The IP address pool for this new mechanism is configured as global wpa_supplicant configuration file parameters ip_addr_go, ip_addr_mask, ip_addr_star, ip_addr_end. For example: ip_addr_go=192.168.42.1 ip_addr_mask=255.255.255.0 ip_addr_start=192.168.42.2 ip_addr_end=192.168.42.100 DHCP mechanism is expected to be enabled at the same time to support P2P Devices that do not use the new mechanism. The easiest way of managing the IP addresses is by splitting the IP address range into two parts and assign a separate range for wpa_supplicant and DHCP server. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-16 18:13:31 +01:00
u8 ip[3 * 4];
char ip_addr[100];
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Fix group formation timeout on GO during WPS step Commit 361cdf34009c7407ddf22dee6f5e6ce82e81bcae changed the way the group formation timeout is used on P2P client. However, it resulted in clearing the timeout on the GO when the GO started beaconing. This is not correct since the timeout is supposed to be maintained until at least the completion of the WPS provisioning step. Fix this regression by clearing the timeout here only in the case we are not GO in group formation phase. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-06-08 17:22:03 +02:00
if (ssid == NULL || ssid->mode != WPAS_MODE_P2P_GROUP_FORMATION) {
eloop_cancel_timeout(wpas_p2p_group_formation_timeout,
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev, NULL);
P2P: Fix group formation timeout on GO during WPS step Commit 361cdf34009c7407ddf22dee6f5e6ce82e81bcae changed the way the group formation timeout is used on P2P client. However, it resulted in clearing the timeout on the GO when the GO started beaconing. This is not correct since the timeout is supposed to be maintained until at least the completion of the WPS provisioning step. Fix this regression by clearing the timeout here only in the case we are not GO in group formation phase. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-06-08 17:22:03 +02:00
}
P2P: Extend use of group formation timeout until end of 4-way handshake Instead of relying on the P2P group idle timeout before the group connection has been fully established, re-start the group formation timeout in the end of the WPS provisioning step and clear it at the successful completion of the initial 4-way handshake. This allows the P2P group idle timeout to be set to a small value without triggering it during the initial scan and connection attempt. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-13 16:01:15 +02:00
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (!wpa_s->show_group_started || !ssid)
Use radio work for P2P scan requests Avoid concurrent P2P scan requests with any other exclusive use of the radio by using the radio work queuing mechanism. This removes some of the earlier workarounds that postponed scans depending on other operations. Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-03 10:57:57 +01:00
return;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_s->show_group_started = 0;
P2P: Complete group formation on client data connection This was already the case in the GO role where the first client connection is waited before marking wpa_s->p2p_go_group_formation_completed = 1 and clearing wpa_s->global->p2p_group_formation. However, in the P2P Client role, that was done already at the completion of the WPS exchange. This can be problematic since group formation timeout may still try to clear the group and with wpa_s->global->p2p_group_formation == NULL, the correct group interface may not be found. Fix this by postponing clearing of wpa_s->global->p2p_group_formation on the P2P Client side until the data connection has been completed and group is declared started. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-11-30 20:35:16 +01:00
if (!wpa_s->p2p_go_group_formation_completed &&
wpa_s->global->p2p_group_formation == wpa_s) {
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P: Marking group formation completed on client on data connection");
wpa_s->p2p_go_group_formation_completed = 1;
wpa_s->global->p2p_group_formation = NULL;
wpa_s->p2p_in_provisioning = 0;
wpa_s->p2p_in_invitation = 0;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
os_memset(go_dev_addr, 0, ETH_ALEN);
if (ssid->bssid_set)
os_memcpy(go_dev_addr, ssid->bssid, ETH_ALEN);
persistent = wpas_p2p_persistent_group(wpa_s, go_dev_addr, ssid->ssid,
ssid->ssid_len);
os_memcpy(wpa_s->go_dev_addr, go_dev_addr, ETH_ALEN);
P2P: Allow p2p_cancel to cancel P2P client that has not yet connected This can now be used to cancel a P2P client interface that has not yet completed the first 4-way handshake with a GO.
2010-11-04 10:59:44 +01:00
if (wpa_s->global->p2p_group_formation == wpa_s)
wpa_s->global->p2p_group_formation = NULL;
P2P: Fix frequency in the P2P_EVENT_GROUP_STARTED event P2P Client did not show correct frequency in the control interface event P2P_EVENT_GROUP_STARTED. Fix that by using the frequency from the BSS table or association event.
2011-10-28 21:26:30 +02:00
freq = wpa_s->current_bss ? wpa_s->current_bss->freq :
(int) wpa_s->assoc_freq;
P2P: Add support for IP address assignment in 4-way handshake This new mechanism allows P2P Client to request an IPv4 address from the GO as part of the 4-way handshake to avoid use of DHCP exchange after 4-way handshake. If the new mechanism is used, the assigned IP address is shown in the P2P-GROUP-STARTED event on the client side with following new parameters: ip_addr, ip_mask, go_ip_addr. The assigned IP address is included in the AP-STA-CONNECTED event on the GO side as a new ip_addr parameter. The IP address is valid for the duration of the association. The IP address pool for this new mechanism is configured as global wpa_supplicant configuration file parameters ip_addr_go, ip_addr_mask, ip_addr_star, ip_addr_end. For example: ip_addr_go=192.168.42.1 ip_addr_mask=255.255.255.0 ip_addr_start=192.168.42.2 ip_addr_end=192.168.42.100 DHCP mechanism is expected to be enabled at the same time to support P2P Devices that do not use the new mechanism. The easiest way of managing the IP addresses is by splitting the IP address range into two parts and assign a separate range for wpa_supplicant and DHCP server. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-16 18:13:31 +01:00
ip_addr[0] = '\0';
if (wpa_sm_get_p2p_ip_addr(wpa_s->wpa, ip) == 0) {
Check os_snprintf() result more consistently While these are using practically large enoungh buffer sizes, it is better to be more consistent with checking os_snprintf() return value. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-06 20:40:31 +01:00
int res;
res = os_snprintf(ip_addr, sizeof(ip_addr),
" ip_addr=%u.%u.%u.%u "
"ip_mask=%u.%u.%u.%u go_ip_addr=%u.%u.%u.%u",
ip[0], ip[1], ip[2], ip[3],
ip[4], ip[5], ip[6], ip[7],
ip[8], ip[9], ip[10], ip[11]);
if (os_snprintf_error(sizeof(ip_addr), res))
ip_addr[0] = '\0';
P2P: Add support for IP address assignment in 4-way handshake This new mechanism allows P2P Client to request an IPv4 address from the GO as part of the 4-way handshake to avoid use of DHCP exchange after 4-way handshake. If the new mechanism is used, the assigned IP address is shown in the P2P-GROUP-STARTED event on the client side with following new parameters: ip_addr, ip_mask, go_ip_addr. The assigned IP address is included in the AP-STA-CONNECTED event on the GO side as a new ip_addr parameter. The IP address is valid for the duration of the association. The IP address pool for this new mechanism is configured as global wpa_supplicant configuration file parameters ip_addr_go, ip_addr_mask, ip_addr_star, ip_addr_end. For example: ip_addr_go=192.168.42.1 ip_addr_mask=255.255.255.0 ip_addr_start=192.168.42.2 ip_addr_end=192.168.42.100 DHCP mechanism is expected to be enabled at the same time to support P2P Devices that do not use the new mechanism. The easiest way of managing the IP addresses is by splitting the IP address range into two parts and assign a separate range for wpa_supplicant and DHCP server. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-16 18:13:31 +01:00
}
P2P: Use a helper function for P2P_EVENT_GROUP_STARTED events This makes it easier to change the event message message for indication when P2P group has stated and removes some duplicated code. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-07-26 12:09:17 +02:00
wpas_p2p_group_started(wpa_s, 0, ssid, freq,
ssid->passphrase == NULL && ssid->psk_set ?
ssid->psk : NULL,
ssid->passphrase, go_dev_addr, persistent,
ip_addr);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (persistent)
D-Bus: Indicate whether created group is persistent or not This adds an extra parameter in GroupStarted signal to indicate whether the created group is Persistent or not. It is similar to the [PERSISTENT] tag which comes in P2P-GROUP-STARTED over the control interface. Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>
2016-05-30 09:38:31 +02:00
wpas_p2p_store_persistent_group(wpa_s->p2pdev,
ssid, go_dev_addr);
wpas_notify_p2p_group_started(wpa_s, ssid, persistent, 1);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
int wpas_p2p_presence_req(struct wpa_supplicant *wpa_s, u32 duration1,
u32 interval1, u32 duration2, u32 interval2)
{
P2P: Send received Presence Response information to ctrl_iface monitors The P2P_PRESENCE_REQ command did not give any easily available indication of the response received from the GO. Make this more useful by providing such response (if received) as a ctrl_iface monitor event (P2P-PRESENCE-RESPONSE). Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-01 17:44:44 +01:00
int ret;
P2P: Handle P2P-not-supported without segfaults Previous code was assuming that the P2P module is always initialized. However, that is not the case anymore with drivers that do not support P2P. Add verification of whether P2P is enabled before trying to execute P2P commands.
2011-02-24 20:13:30 +01:00
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
return -1;
P2P: Add initial support for driver-based P2P management This adds partial callbacks and events to allow P2P management to be implemented in a driver/firmware. This is not yet complete and is very much subject to change in the future.
2010-12-30 11:48:55 +01:00
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (wpa_s->wpa_state < WPA_ASSOCIATED ||
wpa_s->current_ssid == NULL ||
wpa_s->current_ssid->mode != WPAS_MODE_INFRA)
return -1;
P2P: Send received Presence Response information to ctrl_iface monitors The P2P_PRESENCE_REQ command did not give any easily available indication of the response received from the GO. Make this more useful by providing such response (if received) as a ctrl_iface monitor event (P2P-PRESENCE-RESPONSE). Signed-hostap: Jouni Malinen <j@w1.fi>
2014-01-01 17:44:44 +01:00
ret = p2p_presence_req(wpa_s->global->p2p, wpa_s->bssid,
wpa_s->own_addr, wpa_s->assoc_freq,
duration1, interval1, duration2, interval2);
if (ret == 0)
wpa_s->waiting_presence_resp = 1;
return ret;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
int wpas_p2p_ext_listen(struct wpa_supplicant *wpa_s, unsigned int period,
unsigned int interval)
{
P2P: Handle P2P-not-supported without segfaults Previous code was assuming that the P2P module is always initialized. However, that is not the case anymore with drivers that do not support P2P. Add verification of whether P2P is enabled before trying to execute P2P commands.
2011-02-24 20:13:30 +01:00
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
return -1;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return p2p_ext_listen(wpa_s->global->p2p, period, interval);
}
P2P: Use hardcoded idle timeout of 10 seconds in P2P client role The p2p_group_idle configuration parameter is much more useful for GO role, so use a separate hardcoded value of 10 seconds in P2P client role. In practice, this means that the P2P client role will automatically tear down the group when the GO tears down the group. The 10 second timeout is enough to recover from temporary disconnections without unnecessary tearing down the group if the GO is still present and allows the client to connect. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-18 21:21:22 +01:00
static int wpas_p2p_is_client(struct wpa_supplicant *wpa_s)
{
P2P: Fix default p2p_group_idle timeout for P2P client role Commit 0d30cc240fa36905b034dc9676f9d8da0ac18e56 forced wpa_s->current_ssid to be cleared in wpa_supplicant_mark_disassoc() which gets called from wpa_supplicant_event_disassoc(). This breaks the P2P group idle mechanism for the case where p2p_group_idle is not set (i.e., is the default 0) since wpas_p2p_group_idle_timeout() ignores the timeout in that case if the interface is not recognized as a client interface (which was based on wpa_s->current_ssid being set). Fix this by making wpas_p2p_is_client() default to client case if wpa_s->current_ssid is NULL. This is much more likely case since the P2P GO mode operation would not really clear the pointer without explicit request to disconnect. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-10-28 20:37:15 +01:00
if (wpa_s->current_ssid == NULL) {
/*
Fix a typo in a comment Signed-hostap: Jouni Malinen <j@w1.fi>
2012-11-11 15:09:36 +01:00
* current_ssid can be cleared when P2P client interface gets
P2P: Fix default p2p_group_idle timeout for P2P client role Commit 0d30cc240fa36905b034dc9676f9d8da0ac18e56 forced wpa_s->current_ssid to be cleared in wpa_supplicant_mark_disassoc() which gets called from wpa_supplicant_event_disassoc(). This breaks the P2P group idle mechanism for the case where p2p_group_idle is not set (i.e., is the default 0) since wpas_p2p_group_idle_timeout() ignores the timeout in that case if the interface is not recognized as a client interface (which was based on wpa_s->current_ssid being set). Fix this by making wpas_p2p_is_client() default to client case if wpa_s->current_ssid is NULL. This is much more likely case since the P2P GO mode operation would not really clear the pointer without explicit request to disconnect. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-10-28 20:37:15 +01:00
* disconnected, so assume this interface was used as P2P
* client.
*/
return 1;
}
return wpa_s->current_ssid->p2p_group &&
P2P: Use hardcoded idle timeout of 10 seconds in P2P client role The p2p_group_idle configuration parameter is much more useful for GO role, so use a separate hardcoded value of 10 seconds in P2P client role. In practice, this means that the P2P client role will automatically tear down the group when the GO tears down the group. The 10 second timeout is enough to recover from temporary disconnections without unnecessary tearing down the group if the GO is still present and allows the client to connect. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-18 21:21:22 +01:00
wpa_s->current_ssid->mode == WPAS_MODE_INFRA;
}
P2P: Add mechanism for timing out idle groups A new configuration parameter, p2p_group_idle, can now be used to set idle timeout value for P2P groups in seconds (0 = no timeout). If set, this values is used to remove P2P group (both GO and P2P client) interfaces after the group has been idle (no clients/GO seen) for the configuration duration. The P2P-GROUP-REMOVED event is now indicating the reason for group removal when known. For example: P2P-GROUP-REMOVED wlan0 GO reason=REQUESTED P2P-GROUP-REMOVED wlan1 client reason=IDLE
2010-10-25 17:24:15 +02:00
static void wpas_p2p_group_idle_timeout(void *eloop_ctx, void *timeout_ctx)
{
struct wpa_supplicant *wpa_s = eloop_ctx;
P2P: Use hardcoded idle timeout of 10 seconds in P2P client role The p2p_group_idle configuration parameter is much more useful for GO role, so use a separate hardcoded value of 10 seconds in P2P client role. In practice, this means that the P2P client role will automatically tear down the group when the GO tears down the group. The 10 second timeout is enough to recover from temporary disconnections without unnecessary tearing down the group if the GO is still present and allows the client to connect. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-18 21:21:22 +01:00
if (wpa_s->conf->p2p_group_idle == 0 && !wpas_p2p_is_client(wpa_s)) {
P2P: Add mechanism for timing out idle groups A new configuration parameter, p2p_group_idle, can now be used to set idle timeout value for P2P groups in seconds (0 = no timeout). If set, this values is used to remove P2P group (both GO and P2P client) interfaces after the group has been idle (no clients/GO seen) for the configuration duration. The P2P-GROUP-REMOVED event is now indicating the reason for group removal when known. For example: P2P-GROUP-REMOVED wlan0 GO reason=REQUESTED P2P-GROUP-REMOVED wlan1 client reason=IDLE
2010-10-25 17:24:15 +02:00
wpa_printf(MSG_DEBUG, "P2P: Ignore group idle timeout - "
"disabled");
return;
}
wpa_printf(MSG_DEBUG, "P2P: Group idle timeout reached - terminate "
"group");
P2P: Move group removal reason to a function parameter wpa_s->removal_reason was set only when calling wpas_p2p_group_delete() and while couple of call places did not set this, it should really be set in each case. As such, it works better as a function parameter than a variable in struct wpa_supplicant. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-11 11:41:31 +02:00
wpas_p2p_group_delete(wpa_s, P2P_GROUP_REMOVAL_IDLE_TIMEOUT);
P2P: Add mechanism for timing out idle groups A new configuration parameter, p2p_group_idle, can now be used to set idle timeout value for P2P groups in seconds (0 = no timeout). If set, this values is used to remove P2P group (both GO and P2P client) interfaces after the group has been idle (no clients/GO seen) for the configuration duration. The P2P-GROUP-REMOVED event is now indicating the reason for group removal when known. For example: P2P-GROUP-REMOVED wlan0 GO reason=REQUESTED P2P-GROUP-REMOVED wlan1 client reason=IDLE
2010-10-25 17:24:15 +02:00
}
static void wpas_p2p_set_group_idle_timeout(struct wpa_supplicant *wpa_s)
{
P2P: Allow immediate group idle timeout configuration A special value p2p_group_idle=-1 can now be used to configure the P2P group idle mechanism to terminate a P2P client group immediately on any disconnection after the completion of the initial 4-way handshake. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-13 16:03:27 +02:00
int timeout;
P2P: Use hardcoded idle timeout of 10 seconds in P2P client role The p2p_group_idle configuration parameter is much more useful for GO role, so use a separate hardcoded value of 10 seconds in P2P client role. In practice, this means that the P2P client role will automatically tear down the group when the GO tears down the group. The 10 second timeout is enough to recover from temporary disconnections without unnecessary tearing down the group if the GO is still present and allows the client to connect. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-18 21:21:22 +01:00
P2P: Add more debug on group idle timeout This makes it easier to debug issues with P2P group idle timeout. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-19 17:16:34 +01:00
if (eloop_cancel_timeout(wpas_p2p_group_idle_timeout, wpa_s, NULL) > 0)
wpa_printf(MSG_DEBUG, "P2P: Cancelled P2P group idle timeout");
P2P: Use hardcoded idle timeout of 10 seconds in P2P client role The p2p_group_idle configuration parameter is much more useful for GO role, so use a separate hardcoded value of 10 seconds in P2P client role. In practice, this means that the P2P client role will automatically tear down the group when the GO tears down the group. The 10 second timeout is enough to recover from temporary disconnections without unnecessary tearing down the group if the GO is still present and allows the client to connect. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-18 21:21:22 +01:00
if (wpa_s->current_ssid == NULL || !wpa_s->current_ssid->p2p_group)
P2P: Add mechanism for timing out idle groups A new configuration parameter, p2p_group_idle, can now be used to set idle timeout value for P2P groups in seconds (0 = no timeout). If set, this values is used to remove P2P group (both GO and P2P client) interfaces after the group has been idle (no clients/GO seen) for the configuration duration. The P2P-GROUP-REMOVED event is now indicating the reason for group removal when known. For example: P2P-GROUP-REMOVED wlan0 GO reason=REQUESTED P2P-GROUP-REMOVED wlan1 client reason=IDLE
2010-10-25 17:24:15 +02:00
return;
P2P: Use hardcoded idle timeout of 10 seconds in P2P client role The p2p_group_idle configuration parameter is much more useful for GO role, so use a separate hardcoded value of 10 seconds in P2P client role. In practice, this means that the P2P client role will automatically tear down the group when the GO tears down the group. The 10 second timeout is enough to recover from temporary disconnections without unnecessary tearing down the group if the GO is still present and allows the client to connect. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-18 21:21:22 +01:00
timeout = wpa_s->conf->p2p_group_idle;
if (wpa_s->current_ssid->mode == WPAS_MODE_INFRA &&
(timeout == 0 || timeout > P2P_MAX_CLIENT_IDLE))
timeout = P2P_MAX_CLIENT_IDLE;
if (timeout == 0)
P2P: Add mechanism for timing out idle groups A new configuration parameter, p2p_group_idle, can now be used to set idle timeout value for P2P groups in seconds (0 = no timeout). If set, this values is used to remove P2P group (both GO and P2P client) interfaces after the group has been idle (no clients/GO seen) for the configuration duration. The P2P-GROUP-REMOVED event is now indicating the reason for group removal when known. For example: P2P-GROUP-REMOVED wlan0 GO reason=REQUESTED P2P-GROUP-REMOVED wlan1 client reason=IDLE
2010-10-25 17:24:15 +02:00
return;
P2P: Allow immediate group idle timeout configuration A special value p2p_group_idle=-1 can now be used to configure the P2P group idle mechanism to terminate a P2P client group immediately on any disconnection after the completion of the initial 4-way handshake. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-13 16:03:27 +02:00
if (timeout < 0) {
if (wpa_s->current_ssid->mode == WPAS_MODE_INFRA)
timeout = 0; /* special client mode no-timeout */
else
return;
}
P2P: Do not use group idle timeout during provisioning Use the normal group formation timeout during the provisioning phase to avoid terminating this process too early due to group idle timeout. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-27 17:04:06 +02:00
if (wpa_s->p2p_in_provisioning) {
/*
* Use the normal group formation timeout during the
* provisioning phase to avoid terminating this process too
* early due to group idle timeout.
*/
wpa_printf(MSG_DEBUG, "P2P: Do not use P2P group idle timeout "
"during provisioning");
return;
}
P2P: Extend use of group formation timeout until end of 4-way handshake Instead of relying on the P2P group idle timeout before the group connection has been fully established, re-start the group formation timeout in the end of the WPS provisioning step and clear it at the successful completion of the initial 4-way handshake. This allows the P2P group idle timeout to be set to a small value without triggering it during the initial scan and connection attempt. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-04-13 16:01:15 +02:00
if (wpa_s->show_group_started) {
/*
* Use the normal group formation timeout between the end of
* the provisioning phase and completion of 4-way handshake to
* avoid terminating this process too early due to group idle
* timeout.
*/
wpa_printf(MSG_DEBUG, "P2P: Do not use P2P group idle timeout "
"while waiting for initial 4-way handshake to "
"complete");
return;
}
P2P: Add mechanism for timing out idle groups A new configuration parameter, p2p_group_idle, can now be used to set idle timeout value for P2P groups in seconds (0 = no timeout). If set, this values is used to remove P2P group (both GO and P2P client) interfaces after the group has been idle (no clients/GO seen) for the configuration duration. The P2P-GROUP-REMOVED event is now indicating the reason for group removal when known. For example: P2P-GROUP-REMOVED wlan0 GO reason=REQUESTED P2P-GROUP-REMOVED wlan1 client reason=IDLE
2010-10-25 17:24:15 +02:00
wpa_printf(MSG_DEBUG, "P2P: Set P2P group idle timeout to %u seconds",
P2P: Use hardcoded idle timeout of 10 seconds in P2P client role The p2p_group_idle configuration parameter is much more useful for GO role, so use a separate hardcoded value of 10 seconds in P2P client role. In practice, this means that the P2P client role will automatically tear down the group when the GO tears down the group. The 10 second timeout is enough to recover from temporary disconnections without unnecessary tearing down the group if the GO is still present and allows the client to connect. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-18 21:21:22 +01:00
timeout);
eloop_register_timeout(timeout, 0, wpas_p2p_group_idle_timeout,
wpa_s, NULL);
P2P: Add mechanism for timing out idle groups A new configuration parameter, p2p_group_idle, can now be used to set idle timeout value for P2P groups in seconds (0 = no timeout). If set, this values is used to remove P2P group (both GO and P2P client) interfaces after the group has been idle (no clients/GO seen) for the configuration duration. The P2P-GROUP-REMOVED event is now indicating the reason for group removal when known. For example: P2P-GROUP-REMOVED wlan0 GO reason=REQUESTED P2P-GROUP-REMOVED wlan1 client reason=IDLE
2010-10-25 17:24:15 +02:00
}
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
/* Returns 1 if the interface was removed */
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
{
P2P: Handle P2P-not-supported without segfaults Previous code was assuming that the P2P module is always initialized. However, that is not the case anymore with drivers that do not support P2P. Add verification of whether P2P is enabled before trying to execute P2P commands.
2011-02-24 20:13:30 +01:00
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
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
return 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
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
if (!locally_generated)
p2p_deauth_notif(wpa_s->global->p2p, bssid, reason_code, ie,
ie_len);
if (reason_code == WLAN_REASON_DEAUTH_LEAVING && !locally_generated &&
wpa_s->current_ssid &&
wpa_s->current_ssid->p2p_group &&
wpa_s->current_ssid->mode == WPAS_MODE_INFRA) {
wpa_printf(MSG_DEBUG, "P2P: GO indicated that the P2P Group "
"session is ending");
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
if (wpas_p2p_group_delete(wpa_s,
P2P_GROUP_REMOVAL_GO_ENDING_SESSION)
> 0)
return 1;
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
}
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
return 0;
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: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
P2P: Handle P2P-not-supported without segfaults Previous code was assuming that the P2P module is always initialized. However, that is not the case anymore with drivers that do not support P2P. Add verification of whether P2P is enabled before trying to execute P2P commands.
2011-02-24 20:13:30 +01:00
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return;
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
if (!locally_generated)
p2p_disassoc_notif(wpa_s->global->p2p, bssid, reason_code, ie,
ie_len);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
void wpas_p2p_update_config(struct wpa_supplicant *wpa_s)
{
struct p2p_data *p2p = wpa_s->global->p2p;
if (p2p == NULL)
return;
P2P: Do not process configuration changes on non-P2P interfaces
2010-09-07 16:08:52 +02:00
if (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_P2P_CAPABLE))
return;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (wpa_s->conf->changed_parameters & CFG_CHANGED_DEVICE_NAME)
p2p_set_dev_name(p2p, wpa_s->conf->device_name);
WPS: Store (secondary) device type as binary Instead of converting back and forth from the string representation, always use the binary representation internally. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-17 17:50:22 +01:00
if (wpa_s->conf->changed_parameters & CFG_CHANGED_DEVICE_TYPE)
p2p_set_pri_dev_type(p2p, wpa_s->conf->device_type);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Add more WPS attributes into Listen state Probe Response Configure more WPS attributes in the P2P module and use them when generating WSC IE for Probe Response frames in Listen state.
2011-03-28 14:24:12 +02:00
if (wpa_s->wps &&
(wpa_s->conf->changed_parameters & CFG_CHANGED_CONFIG_METHODS))
p2p_set_config_methods(p2p, wpa_s->wps->config_methods);
if (wpa_s->wps && (wpa_s->conf->changed_parameters & CFG_CHANGED_UUID))
p2p_set_uuid(p2p, wpa_s->wps->uuid);
if (wpa_s->conf->changed_parameters & CFG_CHANGED_WPS_STRING) {
p2p_set_manufacturer(p2p, wpa_s->conf->manufacturer);
p2p_set_model_name(p2p, wpa_s->conf->model_name);
p2p_set_model_number(p2p, wpa_s->conf->model_number);
p2p_set_serial_number(p2p, wpa_s->conf->serial_number);
}
WPS: Store (secondary) device type as binary Instead of converting back and forth from the string representation, always use the binary representation internally. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-17 17:50:22 +01:00
if (wpa_s->conf->changed_parameters & CFG_CHANGED_SEC_DEVICE_TYPE)
p2p_set_sec_dev_types(p2p,
(void *) wpa_s->conf->sec_device_type,
wpa_s->conf->num_sec_device_types);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
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
if (wpa_s->conf->changed_parameters & CFG_CHANGED_VENDOR_EXTENSION) {
int i;
p2p_remove_wps_vendor_extensions(p2p);
for (i = 0; i < MAX_WPS_VENDOR_EXT; i++) {
if (wpa_s->conf->wps_vendor_ext[i] == NULL)
continue;
p2p_add_wps_vendor_extension(
p2p, wpa_s->conf->wps_vendor_ext[i]);
}
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if ((wpa_s->conf->changed_parameters & CFG_CHANGED_COUNTRY) &&
wpa_s->conf->country[0] && wpa_s->conf->country[1]) {
char country[3];
country[0] = wpa_s->conf->country[0];
country[1] = wpa_s->conf->country[1];
country[2] = 0x04;
p2p_set_country(p2p, country);
}
if (wpa_s->conf->changed_parameters & CFG_CHANGED_P2P_SSID_POSTFIX) {
p2p_set_ssid_postfix(p2p, (u8 *) wpa_s->conf->p2p_ssid_postfix,
wpa_s->conf->p2p_ssid_postfix ?
os_strlen(wpa_s->conf->p2p_ssid_postfix) :
0);
}
P2P: Add option for disabling intra BSS distribution p2p_intra_bss configuration parameter can now be used to disable/enable intra BSS distribution (bridging of frames between the clients in a group).
2010-09-08 20:18:10 +02:00
if (wpa_s->conf->changed_parameters & CFG_CHANGED_P2P_INTRA_BSS)
p2p_set_intra_bss_dist(p2p, wpa_s->conf->p2p_intra_bss);
P2P: Update listen and operating channel from P2P D-Bus Some P2PDevice properties were not updated in p2p->cfg structure: reg_class, channel, op_reg_class, and op_channel. Hence, update p2p->cfg parameters through p2p core calls in wpas_p2p_update_config(). Signed-off-by: Jean-Michel.Bachot <jean-michelx.bachot@intel.com> Signed-off-by: Jayant Sane <jayant.sane@intel.com>
2011-06-25 11:08:43 +02:00
if (wpa_s->conf->changed_parameters & CFG_CHANGED_P2P_LISTEN_CHANNEL) {
u8 reg_class, channel;
int ret;
unsigned int r;
P2P: Use another interface operating channel as listen channel Performing a P2P Device flow such as p2p_listen or p2p_find, can degrade the performance of an active interface connection, if the listen frequency is different than the frequency used by that interface. To reduce the effect of P2P Device flows on other interfaces, try changing the listen channel of the P2P Device to match the operating channel of one of the other active interfaces. This change will be possible only in case that the listen channel is not forced externally, and will be delayed to a point where the P2P Device state machine is idle. The optimization can be configured in the configuration file and is disabled by default. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:39 +02:00
u8 channel_forced;
P2P: Update listen and operating channel from P2P D-Bus Some P2PDevice properties were not updated in p2p->cfg structure: reg_class, channel, op_reg_class, and op_channel. Hence, update p2p->cfg parameters through p2p core calls in wpas_p2p_update_config(). Signed-off-by: Jean-Michel.Bachot <jean-michelx.bachot@intel.com> Signed-off-by: Jayant Sane <jayant.sane@intel.com>
2011-06-25 11:08:43 +02:00
if (wpa_s->conf->p2p_listen_reg_class &&
wpa_s->conf->p2p_listen_channel) {
reg_class = wpa_s->conf->p2p_listen_reg_class;
channel = wpa_s->conf->p2p_listen_channel;
P2P: Use another interface operating channel as listen channel Performing a P2P Device flow such as p2p_listen or p2p_find, can degrade the performance of an active interface connection, if the listen frequency is different than the frequency used by that interface. To reduce the effect of P2P Device flows on other interfaces, try changing the listen channel of the P2P Device to match the operating channel of one of the other active interfaces. This change will be possible only in case that the listen channel is not forced externally, and will be delayed to a point where the P2P Device state machine is idle. The optimization can be configured in the configuration file and is disabled by default. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:39 +02:00
channel_forced = 1;
P2P: Update listen and operating channel from P2P D-Bus Some P2PDevice properties were not updated in p2p->cfg structure: reg_class, channel, op_reg_class, and op_channel. Hence, update p2p->cfg parameters through p2p core calls in wpas_p2p_update_config(). Signed-off-by: Jean-Michel.Bachot <jean-michelx.bachot@intel.com> Signed-off-by: Jayant Sane <jayant.sane@intel.com>
2011-06-25 11:08:43 +02:00
} else {
reg_class = 81;
/*
* Pick one of the social channels randomly as the
* listen channel.
*/
P2P: Check os_get_random() return value more consistently In theory, this call could fail, so check the return value before using the received data. These specific cases would not really care much about the failures, but this keeps the code more consistent and keeps static analyzer warnings more useful. (CID 72678, CID 72679, CID 72680, CID 72683, CID 72689, CID 72698, CID 72703) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-09-13 15:27:52 +02:00
if (os_get_random((u8 *) &r, sizeof(r)) < 0)
channel = 1;
else
channel = 1 + (r % 3) * 5;
P2P: Use another interface operating channel as listen channel Performing a P2P Device flow such as p2p_listen or p2p_find, can degrade the performance of an active interface connection, if the listen frequency is different than the frequency used by that interface. To reduce the effect of P2P Device flows on other interfaces, try changing the listen channel of the P2P Device to match the operating channel of one of the other active interfaces. This change will be possible only in case that the listen channel is not forced externally, and will be delayed to a point where the P2P Device state machine is idle. The optimization can be configured in the configuration file and is disabled by default. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:39 +02:00
channel_forced = 0;
P2P: Update listen and operating channel from P2P D-Bus Some P2PDevice properties were not updated in p2p->cfg structure: reg_class, channel, op_reg_class, and op_channel. Hence, update p2p->cfg parameters through p2p core calls in wpas_p2p_update_config(). Signed-off-by: Jean-Michel.Bachot <jean-michelx.bachot@intel.com> Signed-off-by: Jayant Sane <jayant.sane@intel.com>
2011-06-25 11:08:43 +02:00
}
P2P: Use another interface operating channel as listen channel Performing a P2P Device flow such as p2p_listen or p2p_find, can degrade the performance of an active interface connection, if the listen frequency is different than the frequency used by that interface. To reduce the effect of P2P Device flows on other interfaces, try changing the listen channel of the P2P Device to match the operating channel of one of the other active interfaces. This change will be possible only in case that the listen channel is not forced externally, and will be delayed to a point where the P2P Device state machine is idle. The optimization can be configured in the configuration file and is disabled by default. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:39 +02:00
ret = p2p_set_listen_channel(p2p, reg_class, channel,
channel_forced);
P2P: Update listen and operating channel from P2P D-Bus Some P2PDevice properties were not updated in p2p->cfg structure: reg_class, channel, op_reg_class, and op_channel. Hence, update p2p->cfg parameters through p2p core calls in wpas_p2p_update_config(). Signed-off-by: Jean-Michel.Bachot <jean-michelx.bachot@intel.com> Signed-off-by: Jayant Sane <jayant.sane@intel.com>
2011-06-25 11:08:43 +02:00
if (ret)
wpa_printf(MSG_ERROR, "P2P: Own listen channel update "
"failed: %d", ret);
}
if (wpa_s->conf->changed_parameters & CFG_CHANGED_P2P_OPER_CHANNEL) {
u8 op_reg_class, op_channel, cfg_op_channel;
int ret = 0;
unsigned int r;
if (wpa_s->conf->p2p_oper_reg_class &&
wpa_s->conf->p2p_oper_channel) {
op_reg_class = wpa_s->conf->p2p_oper_reg_class;
op_channel = wpa_s->conf->p2p_oper_channel;
cfg_op_channel = 1;
} else {
op_reg_class = 81;
/*
* Use random operation channel from (1, 6, 11)
*if no other preference is indicated.
*/
P2P: Check os_get_random() return value more consistently In theory, this call could fail, so check the return value before using the received data. These specific cases would not really care much about the failures, but this keeps the code more consistent and keeps static analyzer warnings more useful. (CID 72678, CID 72679, CID 72680, CID 72683, CID 72689, CID 72698, CID 72703) Signed-off-by: Jouni Malinen <j@w1.fi>
2014-09-13 15:27:52 +02:00
if (os_get_random((u8 *) &r, sizeof(r)) < 0)
op_channel = 1;
else
op_channel = 1 + (r % 3) * 5;
P2P: Update listen and operating channel from P2P D-Bus Some P2PDevice properties were not updated in p2p->cfg structure: reg_class, channel, op_reg_class, and op_channel. Hence, update p2p->cfg parameters through p2p core calls in wpas_p2p_update_config(). Signed-off-by: Jean-Michel.Bachot <jean-michelx.bachot@intel.com> Signed-off-by: Jayant Sane <jayant.sane@intel.com>
2011-06-25 11:08:43 +02:00
cfg_op_channel = 0;
}
ret = p2p_set_oper_channel(p2p, op_reg_class, op_channel,
cfg_op_channel);
if (ret)
wpa_printf(MSG_ERROR, "P2P: Own oper channel update "
"failed: %d", ret);
}
P2P: Add support for preferred channel list p2p_pref_chan configuration parameter can now be used to set the list of preferred channel for P2P GO Negotiation. This will be used in the priority order if the peer does not support the channel we are trying to use as the GO (configured operating channel or the best 2.4 GHz/5 GHz channel) for the case where a forced channel is not used. p2p_pref_chan=<op class:channel>,... For example: p2p_pref_chan=81:1,81:2,81:3,81:4,81:5,81:6 This would configure 2.4 GHz channels 1-6 as the preferred ones with channel 1 the most preferred option. These configuration parameters can be set in wpa_supplicant.conf and dynamically updated with "wpa_cli set <param> <value>". Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-29 20:28:34 +02:00
if (wpa_s->conf->changed_parameters & CFG_CHANGED_P2P_PREF_CHAN) {
if (p2p_set_pref_chan(p2p, wpa_s->conf->num_p2p_pref_chan,
wpa_s->conf->p2p_pref_chan) < 0) {
wpa_printf(MSG_ERROR, "P2P: Preferred channel list "
"update failed");
}
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
if (p2p_set_no_go_freq(p2p, &wpa_s->conf->p2p_no_go_freq) < 0) {
wpa_printf(MSG_ERROR, "P2P: No GO channel list "
"update failed");
}
P2P: Add support for preferred channel list p2p_pref_chan configuration parameter can now be used to set the list of preferred channel for P2P GO Negotiation. This will be used in the priority order if the peer does not support the channel we are trying to use as the GO (configured operating channel or the best 2.4 GHz/5 GHz channel) for the case where a forced channel is not used. p2p_pref_chan=<op class:channel>,... For example: p2p_pref_chan=81:1,81:2,81:3,81:4,81:5,81:6 This would configure 2.4 GHz channels 1-6 as the preferred ones with channel 1 the most preferred option. These configuration parameters can be set in wpa_supplicant.conf and dynamically updated with "wpa_cli set <param> <value>". Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-29 20:28:34 +02:00
}
P2P: Allow passphrase length to be configured Previously, eight character random passphrase was generated automatically for P2P GO. The new p2p_passphrase_len parameter can be used to increase this length to generate a stronger passphrase for cases where practicality of manual configuration of legacy devices is not a concern. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-06-21 23:15:53 +02:00
if (wpa_s->conf->changed_parameters & CFG_CHANGED_P2P_PASSPHRASE_LEN)
p2p_set_passphrase_len(p2p, wpa_s->conf->p2p_passphrase_len);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
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)
{
if (!wpa_s->ap_iface)
return -1;
return hostapd_p2p_set_noa(wpa_s->ap_iface->bss[0], count, start,
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: Handle P2P-not-supported without segfaults Previous code was assuming that the P2P module is always initialized. However, that is not the case anymore with drivers that do not support P2P. Add verification of whether P2P is enabled before trying to execute P2P commands.
2011-02-24 20:13:30 +01:00
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
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
return -1;
wpa_s->global->cross_connection = enabled;
p2p_set_cross_connect(wpa_s->global->p2p, enabled);
if (!enabled) {
struct wpa_supplicant *iface;
for (iface = wpa_s->global->ifaces; iface; iface = iface->next)
{
if (iface->cross_connect_enabled == 0)
continue;
iface->cross_connect_enabled = 0;
iface->cross_connect_in_use = 0;
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_msg_global(iface->p2pdev, MSG_INFO,
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
P2P_EVENT_CROSS_CONNECT_DISABLE "%s %s",
iface->ifname,
iface->cross_connect_uplink);
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
}
}
return 0;
}
static void wpas_p2p_enable_cross_connect(struct wpa_supplicant *uplink)
{
struct wpa_supplicant *iface;
if (!uplink->global->cross_connection)
return;
for (iface = uplink->global->ifaces; iface; iface = iface->next) {
if (!iface->cross_connect_enabled)
continue;
if (os_strcmp(uplink->ifname, iface->cross_connect_uplink) !=
0)
continue;
if (iface->ap_iface == NULL)
continue;
if (iface->cross_connect_in_use)
continue;
iface->cross_connect_in_use = 1;
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_msg_global(iface->p2pdev, MSG_INFO,
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
P2P_EVENT_CROSS_CONNECT_ENABLE "%s %s",
iface->ifname, iface->cross_connect_uplink);
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
}
}
static void wpas_p2p_disable_cross_connect(struct wpa_supplicant *uplink)
{
struct wpa_supplicant *iface;
for (iface = uplink->global->ifaces; iface; iface = iface->next) {
if (!iface->cross_connect_enabled)
continue;
if (os_strcmp(uplink->ifname, iface->cross_connect_uplink) !=
0)
continue;
if (!iface->cross_connect_in_use)
continue;
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_msg_global(iface->p2pdev, MSG_INFO,
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
P2P_EVENT_CROSS_CONNECT_DISABLE "%s %s",
iface->ifname, iface->cross_connect_uplink);
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
iface->cross_connect_in_use = 0;
}
}
void wpas_p2p_notif_connected(struct wpa_supplicant *wpa_s)
{
if (wpa_s->ap_iface || wpa_s->current_ssid == NULL ||
wpa_s->current_ssid->mode != WPAS_MODE_INFRA ||
wpa_s->cross_connect_disallowed)
wpas_p2p_disable_cross_connect(wpa_s);
else
wpas_p2p_enable_cross_connect(wpa_s);
P2P: Add more debug on group idle timeout This makes it easier to debug issues with P2P group idle timeout. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-19 17:16:34 +01:00
if (!wpa_s->ap_iface &&
eloop_cancel_timeout(wpas_p2p_group_idle_timeout, wpa_s, NULL) > 0)
wpa_printf(MSG_DEBUG, "P2P: Cancelled P2P group idle timeout");
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
}
void wpas_p2p_notif_disconnected(struct wpa_supplicant *wpa_s)
{
wpas_p2p_disable_cross_connect(wpa_s);
P2P: Fix disconnect event not to increase idle timeout When P2P client is processing a disconnection event, make sure the P2P idle timeout does not get increased, i.e., set a new timeout only if no timeout is in use. wpa_state changes between DISCONNECTED and SCANNING can generate multiple calls to wpas_p2p_notif_disconnect() and previously this was enough to force the idle timeout never hit in practice when in P2P client role. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-18 21:18:42 +01:00
if (!wpa_s->ap_iface &&
!eloop_is_timeout_registered(wpas_p2p_group_idle_timeout,
wpa_s, NULL))
P2P: Add mechanism for timing out idle groups A new configuration parameter, p2p_group_idle, can now be used to set idle timeout value for P2P groups in seconds (0 = no timeout). If set, this values is used to remove P2P group (both GO and P2P client) interfaces after the group has been idle (no clients/GO seen) for the configuration duration. The P2P-GROUP-REMOVED event is now indicating the reason for group removal when known. For example: P2P-GROUP-REMOVED wlan0 GO reason=REQUESTED P2P-GROUP-REMOVED wlan1 client reason=IDLE
2010-10-25 17:24:15 +02:00
wpas_p2p_set_group_idle_timeout(wpa_s);
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
}
static void wpas_p2p_cross_connect_setup(struct wpa_supplicant *wpa_s)
{
struct wpa_supplicant *iface;
if (!wpa_s->global->cross_connection)
return;
for (iface = wpa_s->global->ifaces; iface; iface = iface->next) {
if (iface == wpa_s)
continue;
if (iface->drv_flags &
WPA_DRIVER_FLAGS_P2P_DEDICATED_INTERFACE)
continue;
P2P: Allow cross connection on the parent interface Previously, any P2P capable interface was skipped in cross connection uplink consideration. However, this ends up skipping more or less all nl80211-based driver cases now since they mark the main interface P2P capable. Relax this rule to allow the parent interface to be used as the non-P2P station interface for cross connection purposes. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-10 00:54:27 +01:00
if ((iface->drv_flags & WPA_DRIVER_FLAGS_P2P_CAPABLE) &&
iface != wpa_s->parent)
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
continue;
wpa_s->cross_connect_enabled = 1;
os_strlcpy(wpa_s->cross_connect_uplink, iface->ifname,
sizeof(wpa_s->cross_connect_uplink));
wpa_printf(MSG_DEBUG, "P2P: Enable cross connection from "
"%s to %s whenever uplink is available",
wpa_s->ifname, wpa_s->cross_connect_uplink);
if (iface->ap_iface || iface->current_ssid == NULL ||
iface->current_ssid->mode != WPAS_MODE_INFRA ||
iface->cross_connect_disallowed ||
iface->wpa_state != WPA_COMPLETED)
break;
wpa_s->cross_connect_in_use = 1;
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_msg_global(wpa_s->p2pdev, MSG_INFO,
P2P: Mark P2P events global (not specific to interface) This removes the "IFNAME=<ifname> " prefix from P2P events that are received through the global control interface since these events are not really specific to any network interface, but the full device. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-05-18 17:59:51 +02:00
P2P_EVENT_CROSS_CONNECT_ENABLE "%s %s",
wpa_s->ifname, wpa_s->cross_connect_uplink);
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
break;
}
}
P2P: Stop connection attempt on PBC session overlap The overlap condition cannot disappear before group formation timeout hits, so there is no point in continuing in this case and failure can be indicated immediately.
2010-09-07 12:42:55 +02:00
int wpas_p2p_notif_pbc_overlap(struct wpa_supplicant *wpa_s)
{
if (wpa_s->p2p_group_interface != P2P_GROUP_INTERFACE_CLIENT &&
!wpa_s->p2p_in_provisioning)
return 0; /* not P2P client operation */
wpa_printf(MSG_DEBUG, "P2P: Terminate connection due to WPS PBC "
"session overlap");
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
if (wpa_s != wpa_s->p2pdev)
wpa_msg_ctrl(wpa_s->p2pdev, MSG_INFO, WPS_EVENT_OVERLAP);
P2P: Fix group interface addition failure properly for concurrent case It was possible for a P2P group formation failure to result in a concurrent station mode operation getting disconnected in the specific error case where group interface addition fails after a successful GO Negotiation. Fix this by skipping the wpas_p2p_group_delete() call in this specific case since the group interface does not exists anymore at the point wpas_group_formation_completed() gets called. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-06-15 22:34:11 +02:00
wpas_p2p_group_formation_failed(wpa_s, 0);
P2P: Stop connection attempt on PBC session overlap The overlap condition cannot disappear before group formation timeout hits, so there is no point in continuing in this case and failure can be indicated immediately.
2010-09-07 12:42:55 +02:00
return 1;
}
P2P: Add mechanism for updating P2P channel list based on driver events This allows P2P channel list to be updated whenever the driver changes its list of allowed channels, e.g., based on country code from scan results.
2010-10-15 17:55:22 +02:00
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)
{
struct wpa_supplicant *wpa_s = eloop_ctx;
wpas_p2p_notif_pbc_overlap(wpa_s);
}
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: Add mechanism for updating P2P channel list based on driver events This allows P2P channel list to be updated whenever the driver changes its list of allowed channels, e.g., based on country code from scan results.
2010-10-15 17:55:22 +02:00
{
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
struct p2p_channels chan, cli_chan;
P2P: Consider channel optimizations for additional cases Re-factor the code, so channel optimizations would be also triggered upon the following changes: channel updates from the kernel, disallow_freq interface, etc. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:25 +02:00
struct wpa_used_freq_data *freqs = NULL;
unsigned int num = wpa_s->num_multichan_concurrent;
P2P: Add mechanism for updating P2P channel list based on driver events This allows P2P channel list to be updated whenever the driver changes its list of allowed channels, e.g., based on country code from scan results.
2010-10-15 17:55:22 +02:00
if (wpa_s->global == NULL || wpa_s->global->p2p == NULL)
return;
P2P: Consider channel optimizations for additional cases Re-factor the code, so channel optimizations would be also triggered upon the following changes: channel updates from the kernel, disallow_freq interface, etc. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:25 +02:00
freqs = os_calloc(num, sizeof(struct wpa_used_freq_data));
if (!freqs)
return;
num = get_shared_radio_freqs_data(wpa_s, freqs, num);
P2P: Add mechanism for updating P2P channel list based on driver events This allows P2P channel list to be updated whenever the driver changes its list of allowed channels, e.g., based on country code from scan results.
2010-10-15 17:55:22 +02:00
os_memset(&chan, 0, sizeof(chan));
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
os_memset(&cli_chan, 0, sizeof(cli_chan));
if (wpas_p2p_setup_channels(wpa_s, &chan, &cli_chan)) {
P2P: Add mechanism for updating P2P channel list based on driver events This allows P2P channel list to be updated whenever the driver changes its list of allowed channels, e.g., based on country code from scan results.
2010-10-15 17:55:22 +02:00
wpa_printf(MSG_ERROR, "P2P: Failed to update supported "
"channel list");
return;
}
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
p2p_update_channel_list(wpa_s->global->p2p, &chan, &cli_chan);
P2P: Validate GO operating channel on channel list changes On receiving CHANNEL_LIST_CHANGED event from driver, verify that local GO (if any) is operating in valid frequency. If not, we should remove the group and reform on valid frequency. Indicate this similarly to the avoid-frequency notification (i.e., a control interface message for upper layers to react to this for now; potentially CSA later). Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-05-05 08:33:21 +02:00
P2P: Consider channel optimizations for additional cases Re-factor the code, so channel optimizations would be also triggered upon the following changes: channel updates from the kernel, disallow_freq interface, etc. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:25 +02:00
wpas_p2p_optimize_listen_channel(wpa_s, freqs, num);
P2P: Validate GO operating channel on channel list changes On receiving CHANNEL_LIST_CHANGED event from driver, verify that local GO (if any) is operating in valid frequency. If not, we should remove the group and reform on valid frequency. Indicate this similarly to the avoid-frequency notification (i.e., a control interface message for upper layers to react to this for now; potentially CSA later). Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-05-05 08:33:21 +02:00
P2P: Consider channel optimizations for additional cases Re-factor the code, so channel optimizations would be also triggered upon the following changes: channel updates from the kernel, disallow_freq interface, etc. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:25 +02:00
/*
* The used frequencies map changed, so it is possible that a GO is
* using a channel that is no longer valid for P2P use. It is also
* possible that due to policy consideration, it would be preferable to
* move it to a frequency already used by other station interfaces.
*/
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
wpas_p2p_consider_moving_gos(wpa_s, freqs, num, trig);
P2P: Consider channel optimizations for additional cases Re-factor the code, so channel optimizations would be also triggered upon the following changes: channel updates from the kernel, disallow_freq interface, etc. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:25 +02:00
os_free(freqs);
P2P: Add mechanism for updating P2P channel list based on driver events This allows P2P channel list to be updated whenever the driver changes its list of allowed channels, e.g., based on country code from scan results.
2010-10-15 17:55:22 +02:00
}
P2P: Add p2p_cancel command for cancelling ongoing group formation
2010-10-19 14:53:28 +02:00
P2P: Allow p2p_cancel to be used to stop p2p_connect-join operation p2p_cancel did not properly cancel a pending p2p_connect-join operation. Address the different steps in that process: initial scan, Provision Discovery exchange before connection, and WPS provisioning step (including the scans before WPS). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-18 09:39:34 +01:00
static void wpas_p2p_scan_res_ignore(struct wpa_supplicant *wpa_s,
struct wpa_scan_results *scan_res)
{
wpa_printf(MSG_DEBUG, "P2P: Ignore scan results");
}
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)
{
struct wpa_global *global = wpa_s->global;
int found = 0;
P2P: Unauthorize pending P2P GO Neg peer on p2p_cancel If there is a pending GO Negotiation when p2p_cancel is used, unauthorize the peer to avoid immediate reconnection from being accepted without a new p2p_connect command.
2010-12-17 14:05:35 +01:00
const u8 *peer;
P2P: Add p2p_cancel command for cancelling ongoing group formation
2010-10-19 14:53:28 +02:00
P2P: Handle P2P-not-supported without segfaults Previous code was assuming that the P2P module is always initialized. However, that is not the case anymore with drivers that do not support P2P. Add verification of whether P2P is enabled before trying to execute P2P commands.
2011-02-24 20:13:30 +01:00
if (global->p2p == NULL)
return -1;
P2P: Add p2p_cancel command for cancelling ongoing group formation
2010-10-19 14:53:28 +02:00
wpa_printf(MSG_DEBUG, "P2P: Request to cancel group formation");
if (wpa_s->pending_interface_name[0] &&
!is_zero_ether_addr(wpa_s->pending_interface_addr))
found = 1;
P2P: Unauthorize pending P2P GO Neg peer on p2p_cancel If there is a pending GO Negotiation when p2p_cancel is used, unauthorize the peer to avoid immediate reconnection from being accepted without a new p2p_connect command.
2010-12-17 14:05:35 +01:00
peer = p2p_get_go_neg_peer(global->p2p);
if (peer) {
wpa_printf(MSG_DEBUG, "P2P: Unauthorize pending GO Neg peer "
MACSTR, MAC2STR(peer));
p2p_unauthorize(global->p2p, peer);
P2P: Fix p2p_cancel to return success if GO Negotiation is stopped If a GO Negotiation peer is found, wpas_p2p_stop_find() stops the negotiation and p2p_cancel can return success. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-01 00:16:06 +01:00
found = 1;
P2P: Unauthorize pending P2P GO Neg peer on p2p_cancel If there is a pending GO Negotiation when p2p_cancel is used, unauthorize the peer to avoid immediate reconnection from being accepted without a new p2p_connect command.
2010-12-17 14:05:35 +01:00
}
P2P: Allow p2p_cancel to be used to stop p2p_connect-join operation p2p_cancel did not properly cancel a pending p2p_connect-join operation. Address the different steps in that process: initial scan, Provision Discovery exchange before connection, and WPS provisioning step (including the scans before WPS). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-12-18 09:39:34 +01:00
if (wpa_s->scan_res_handler == wpas_p2p_scan_res_join) {
wpa_printf(MSG_DEBUG, "P2P: Stop pending scan for join");
wpa_s->scan_res_handler = wpas_p2p_scan_res_ignore;
found = 1;
}
if (wpa_s->pending_pd_before_join) {
wpa_printf(MSG_DEBUG, "P2P: Stop pending PD before join");
wpa_s->pending_pd_before_join = 0;
found = 1;
}
P2P: Add p2p_cancel command for cancelling ongoing group formation
2010-10-19 14:53:28 +02:00
wpas_p2p_stop_find(wpa_s);
for (wpa_s = global->ifaces; wpa_s; wpa_s = wpa_s->next) {
if (wpa_s == global->p2p_group_formation &&
P2P: Allow p2p_cancel to cancel P2P client that has not yet connected This can now be used to cancel a P2P client interface that has not yet completed the first 4-way handshake with a GO.
2010-11-04 10:59:44 +01:00
(wpa_s->p2p_in_provisioning ||
wpa_s->parent->pending_interface_type ==
WPA_IF_P2P_CLIENT)) {
P2P: Add p2p_cancel command for cancelling ongoing group formation
2010-10-19 14:53:28 +02:00
wpa_printf(MSG_DEBUG, "P2P: Interface %s in group "
"formation found - cancelling",
wpa_s->ifname);
found = 1;
P2P: Cancel group formation timeout on p2p_cancel
2010-12-17 14:06:48 +01:00
eloop_cancel_timeout(wpas_p2p_group_formation_timeout,
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev, NULL);
P2P: Fix p2p_cancel processing during group formation The wpa_s->p2p_in_provisioning flag did not get cleared in some cases where p2p_cancel command is used to stop group formation. This can result in some operations (like p2p_find) failing afterwards. Fix this by using wpas_group_formation_completed() when processing p2p_cancel for a group that has not yet completed group formation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-28 21:01:48 +02:00
if (wpa_s->p2p_in_provisioning) {
P2P: Fix group interface addition failure properly for concurrent case It was possible for a P2P group formation failure to result in a concurrent station mode operation getting disconnected in the specific error case where group interface addition fails after a successful GO Negotiation. Fix this by skipping the wpas_p2p_group_delete() call in this specific case since the group interface does not exists anymore at the point wpas_group_formation_completed() gets called. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-06-15 22:34:11 +02:00
wpas_group_formation_completed(wpa_s, 0, 0);
P2P: Fix p2p_cancel processing during group formation The wpa_s->p2p_in_provisioning flag did not get cleared in some cases where p2p_cancel command is used to stop group formation. This can result in some operations (like p2p_find) failing afterwards. Fix this by using wpas_group_formation_completed() when processing p2p_cancel for a group that has not yet completed group formation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-09-28 21:01:48 +02:00
break;
}
P2P: Move group removal reason to a function parameter wpa_s->removal_reason was set only when calling wpas_p2p_group_delete() and while couple of call places did not set this, it should really be set in each case. As such, it works better as a function parameter than a variable in struct wpa_supplicant. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-11 11:41:31 +02:00
wpas_p2p_group_delete(wpa_s,
P2P_GROUP_REMOVAL_REQUESTED);
P2P: Add p2p_cancel command for cancelling ongoing group formation
2010-10-19 14:53:28 +02:00
break;
P2P: Clear p2p_in_invitation on cancel Commit 41d5ce9e0b7b37dd84fbf3c1aa5ed571c32321d4 added scan optimizations for P2P invitation cases. However, it left a path where the invitation state was not cleared and as such, introduced potential issues for following scans that ended up getting incorrectly optimized for a single channel regardless of parameters. Fix this by clearing p2p_in_invitation more carefully, especially on p2p_cancel command. p2p_cancel is now also run from the FLUSH command to avoid issues with hwsim test cases (e.g., persistent_group_per_sta_psk followed by ap_open_tdls resulted in an error due to p2p_in_invitation remaining set after FLUSH). Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-04-07 11:26:04 +02:00
} else if (wpa_s->p2p_in_invitation) {
wpa_printf(MSG_DEBUG, "P2P: Interface %s in invitation found - cancelling",
wpa_s->ifname);
found = 1;
P2P: Fix group interface addition failure properly for concurrent case It was possible for a P2P group formation failure to result in a concurrent station mode operation getting disconnected in the specific error case where group interface addition fails after a successful GO Negotiation. Fix this by skipping the wpas_p2p_group_delete() call in this specific case since the group interface does not exists anymore at the point wpas_group_formation_completed() gets called. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-06-15 22:34:11 +02:00
wpas_p2p_group_formation_failed(wpa_s, 0);
P2P: Fix P2P_CANCEL for p2p_in_invitation case Commit f05cee9714ae87d315d893699a536b60a5aa73a9 ('P2P: Clear p2p_in_invitation on cancel') added a wpas_p2p_cancel() case to call wpas_p2p_group_formation_failed() if wpa_s->p2p_in_invitation is set. This is done in a loop going through wpa_s->next pointers. However, the call here can result in removing the interface and freeing wpa_s. The following attempt to read wpa_s->next is from freed memory and that can result in process termination when using a separate P2P group interface and issuing P2P_CANCEL on a group that was started through re-invocation of a persistent group. The recent commit 328f49acfe961a212e89e750516d2e2cc320765f ('P2P: Complete group formation on client data connection') "fixed" this by accident since wpa_s->p2p_in_invitation gets cleared in the sequence that could hit this issue and this results in P2P_CANCEL getting rejected. However, the real bug here is in the loop that continues after possible wpa_s instance deletion. Fix that by breaking out of the loop. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-12-04 21:49:59 +01:00
break;
P2P: Add p2p_cancel command for cancelling ongoing group formation
2010-10-19 14:53:28 +02:00
}
}
if (!found) {
wpa_printf(MSG_DEBUG, "P2P: No ongoing group formation found");
return -1;
}
return 0;
}
P2P: Remove P2P group on driver resource becoming unavailable Add a new driver event, EVENT_INTERFACE_UNAVAILABLE, for indicating that the driver is not able to continue operating the virtual interface in its current mode anymore, e.g., due to operating channel for GO interface forced to a DFS channel by another virtual interface. When this happens for a P2P group interface, the P2P group will be terminated and P2P-GROUP-REMOVED event shows the reason for this as follows: P2P-GROUP-REMOVED wlan0 GO reason=UNAVAILABLE
2010-10-25 18:16:11 +02:00
void wpas_p2p_interface_unavailable(struct wpa_supplicant *wpa_s)
{
if (wpa_s->current_ssid == NULL || !wpa_s->current_ssid->p2p_group)
return;
wpa_printf(MSG_DEBUG, "P2P: Remove group due to driver resource not "
"being available anymore");
P2P: Move group removal reason to a function parameter wpa_s->removal_reason was set only when calling wpas_p2p_group_delete() and while couple of call places did not set this, it should really be set in each case. As such, it works better as a function parameter than a variable in struct wpa_supplicant. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-11 11:41:31 +02:00
wpas_p2p_group_delete(wpa_s, P2P_GROUP_REMOVAL_UNAVAILABLE);
P2P: Remove P2P group on driver resource becoming unavailable Add a new driver event, EVENT_INTERFACE_UNAVAILABLE, for indicating that the driver is not able to continue operating the virtual interface in its current mode anymore, e.g., due to operating channel for GO interface forced to a DFS channel by another virtual interface. When this happens for a P2P group interface, the P2P group will be terminated and P2P-GROUP-REMOVED event shows the reason for this as follows: P2P-GROUP-REMOVED wlan0 GO reason=UNAVAILABLE
2010-10-25 18:16:11 +02:00
}
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
void wpas_p2p_update_best_channels(struct wpa_supplicant *wpa_s,
int freq_24, int freq_5, int freq_overall)
{
struct p2p_data *p2p = wpa_s->global->p2p;
P2P: Remove WPA_DRIVER_FLAGS_P2P_MGMT option The option of handling upper layer P2P management operations within the driver/firmware was originally planned to be used with wpa_supplicant, but this has not really happened and there is no clear sign of this being needed in the near term either. This functionality has not been completed and it is certainly not being kept up-to-date or tested. As such, it is best to remove it for now and if this or something similar is needed in the future, it can be brought back once a clear need for it has been demonstrated first. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-29 17:20:47 +01:00
if (p2p == NULL)
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
return;
p2p_set_best_channels(p2p, freq_24, freq_5, freq_overall);
}
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)
{
u8 peer[ETH_ALEN];
struct p2p_data *p2p = wpa_s->global->p2p;
P2P: Remove WPA_DRIVER_FLAGS_P2P_MGMT option The option of handling upper layer P2P management operations within the driver/firmware was originally planned to be used with wpa_supplicant, but this has not really happened and there is no clear sign of this being needed in the near term either. This functionality has not been completed and it is certainly not being kept up-to-date or tested. As such, it is best to remove it for now and if this or something similar is needed in the future, it can be brought back once a clear need for it has been demonstrated first. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-12-29 17:20:47 +01:00
if (p2p == NULL)
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
return -1;
if (hwaddr_aton(addr, peer))
return -1;
return p2p_unauthorize(p2p, peer);
}
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
/**
* wpas_p2p_disconnect - Disconnect from a P2P Group
* @wpa_s: Pointer to wpa_supplicant data
* Returns: 0 on success, -1 on failure
*
* This can be used to disconnect from a group in which the local end is a P2P
* Client or to end a P2P Group in case the local end is the Group Owner. If a
* virtual network interface was created for this group, that interface will be
* removed. Otherwise, only the configured P2P group network will be removed
* from the interface.
*/
int wpas_p2p_disconnect(struct wpa_supplicant *wpa_s)
{
if (wpa_s == NULL)
return -1;
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
return wpas_p2p_group_delete(wpa_s, P2P_GROUP_REMOVAL_REQUESTED) < 0 ?
-1 : 0;
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
}
P2P: Do not request station mode scans during P2P operations The P2P search mechanism depends on the same scan functionality that is used for station mode scans. If these operations are being used at the same time, scan result processing is not handled properly. Avoid unexpected behavior by delaying station mode scan requests if a P2P operation is in progress. Among other things, this allows the station mode connection attempt to be continued after a P2P find or group formation has been completed if the interface is available (i.e., when the P2P group uses a separate virtual interface).
2011-09-29 15:53:55 +02:00
int wpas_p2p_in_progress(struct wpa_supplicant *wpa_s)
{
P2P: Avoid concurrent scans during all steps of group formation Previously, only some P2P states were considered to postpone concurrent station mode scans during group formation. Especially the WPS provisioning step was skipped due to issues to scans run on the P2P client interface (see commit fc6997b345d97c80965725b12c52b0d225f32a1a). This is not ideal since a concurrent scan can slow down group formation considerably and potentially make it time out. Enforce p2p-in-progress through all steps of group formation on another interface to address this. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-11 11:21:03 +01:00
int ret;
P2P: Do not request station mode scans during P2P operations The P2P search mechanism depends on the same scan functionality that is used for station mode scans. If these operations are being used at the same time, scan result processing is not handled properly. Avoid unexpected behavior by delaying station mode scan requests if a P2P operation is in progress. Among other things, this allows the station mode connection attempt to be continued after a P2P find or group formation has been completed if the interface is available (i.e., when the P2P group uses a separate virtual interface).
2011-09-29 15:53:55 +02:00
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
return 0;
P2P: Avoid concurrent scans during all steps of group formation Previously, only some P2P states were considered to postpone concurrent station mode scans during group formation. Especially the WPS provisioning step was skipped due to issues to scans run on the P2P client interface (see commit fc6997b345d97c80965725b12c52b0d225f32a1a). This is not ideal since a concurrent scan can slow down group formation considerably and potentially make it time out. Enforce p2p-in-progress through all steps of group formation on another interface to address this. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-11 11:21:03 +01:00
ret = p2p_in_progress(wpa_s->global->p2p);
if (ret == 0) {
/*
* Check whether there is an ongoing WPS provisioning step (or
* other parts of group formation) on another interface since
* p2p_in_progress() does not report this to avoid issues for
* scans during such provisioning step.
*/
if (wpa_s->global->p2p_group_formation &&
wpa_s->global->p2p_group_formation != wpa_s) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Another interface (%s) "
"in group formation",
wpa_s->global->p2p_group_formation->ifname);
ret = 1;
}
}
P2P: Postpone concurrent scans when waiting for first client as GO Previously, concurrent station mode scans were postponed during an ongoing P2P group formation up to the point of completed WPS provisioning step. This would allow a scan to be started before the P2P client has completed association for the data connection if a scan request were timed to hit the window between the provisioning step and the following association. Avoid this by extending P2P-in-progress state to continue until the first data connection has been completed as part of group formation. Use a ten second timeout for this to avoid leaving scans disabled indefinitely if the client fails to connect completely. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-27 11:23:10 +02:00
if (!ret && wpa_s->global->p2p_go_wait_client.sec) {
P2P: Use monotonic time for GO client waiting GO activation can fail if the first client doesn't connect within a certain time, but this should not be dependent on wall time -- use monotonic time instead. While at it, use os_reltime_expired(). Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2013-12-16 21:08:40 +01:00
struct os_reltime now;
os_get_reltime(&now);
if (os_reltime_expired(&now, &wpa_s->global->p2p_go_wait_client,
P2P_MAX_INITIAL_CONN_WAIT_GO)) {
P2P: Postpone concurrent scans when waiting for first client as GO Previously, concurrent station mode scans were postponed during an ongoing P2P group formation up to the point of completed WPS provisioning step. This would allow a scan to be started before the P2P client has completed association for the data connection if a scan request were timed to hit the window between the provisioning step and the following association. Avoid this by extending P2P-in-progress state to continue until the first data connection has been completed as part of group formation. Use a ten second timeout for this to avoid leaving scans disabled indefinitely if the client fails to connect completely. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-27 11:23:10 +02:00
/* Wait for the first client has expired */
wpa_s->global->p2p_go_wait_client.sec = 0;
} else {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Waiting for initial client connection during group formation");
ret = 1;
}
}
P2P: Avoid concurrent scans during all steps of group formation Previously, only some P2P states were considered to postpone concurrent station mode scans during group formation. Especially the WPS provisioning step was skipped due to issues to scans run on the P2P client interface (see commit fc6997b345d97c80965725b12c52b0d225f32a1a). This is not ideal since a concurrent scan can slow down group formation considerably and potentially make it time out. Enforce p2p-in-progress through all steps of group formation on another interface to address this. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-11 11:21:03 +01:00
return ret;
P2P: Do not request station mode scans during P2P operations The P2P search mechanism depends on the same scan functionality that is used for station mode scans. If these operations are being used at the same time, scan result processing is not handled properly. Avoid unexpected behavior by delaying station mode scan requests if a P2P operation is in progress. Among other things, this allows the station mode connection attempt to be continued after a P2P find or group formation has been completed if the interface is available (i.e., when the P2P group uses a separate virtual interface).
2011-09-29 15:53:55 +02:00
}
P2P: Clean up group formation on network block removal If a P2P group network block is removed for any reason (e.g., wps_cancel command) while the interface is in group formation, remove the group formation timeout and indicate failure immediately. Previously, this type of operations could end up leaving the timeout running and result in somewhat unexpected group formation failure events later. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-10 11:56:42 +01:00
void wpas_p2p_network_removed(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid)
{
if (wpa_s->p2p_in_provisioning && ssid->p2p_group &&
eloop_cancel_timeout(wpas_p2p_group_formation_timeout,
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev, NULL) > 0) {
P2P: Fix crash for failure case when WSC PIN is entered incorrectly When forming a P2P group using WSC PIN method, if the PIN is entered incorrectly the P2P client supplicant instance will crash as a result of cleanup happening on data that is still in use in a case where a separate P2P group interface is used. For example, here is the path for the first crash: eap_wsc_process(): - creates struct wpabuf tmpbuf; on the stack - sets data->in_buf = &tmpbuf; - calls wps_process_msg() - which calls wps_process_wsc_msg() - which, in case WPS_M4: calls wps_fail_event() - which calls wps->event_cb() - wps->event_cb = wpa_supplicant_wps_event() - wpa_supplicant_wps_event() - wpa_supplicant_wps_event_fail() - which calls wpas_clear_wps() - which calls wpas_notify_network_removed() - which calls wpas_p2p_network_removed() - which calls wpas_p2p_group_formation_timeout() - which calls wpas_group_formation_completed() - which calls wpas_p2p_group_delete() - which calls wpa_supplicant_remove_iface() - which calls wpa_supplicant_deinit_iface() - which calls wpa_supplicant_cleanup() - which calls eapol_sm_deinit() - ... which eventually uses the ptr data->in_buf to free tmpbuf, our stack variable and then the supplicant crashes If you fix this crash, you'll hit another. Fix it and then a segfault. The way we're cleaning up and deleting data from under ourselves here just isn't safe, so make the teardown portion of this async. Signed-hostap: Angie Chinchilla <angie.v.chinchilla@intel.com> Signed-hostap: Nirav Shah <nirav.j2.shah@intel.com> intended-for: hostap-1
2012-04-06 17:22:03 +02:00
/**
* Remove the network by scheduling the group formation
* timeout to happen immediately. The teardown code
* needs to be scheduled to run asynch later so that we
* don't delete data from under ourselves unexpectedly.
* Calling wpas_p2p_group_formation_timeout directly
* causes a series of crashes in WPS failure scenarios.
*/
P2P: Clean up group formation on network block removal If a P2P group network block is removed for any reason (e.g., wps_cancel command) while the interface is in group formation, remove the group formation timeout and indicate failure immediately. Previously, this type of operations could end up leaving the timeout running and result in somewhat unexpected group formation failure events later. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-10 11:56:42 +01:00
wpa_printf(MSG_DEBUG, "P2P: Canceled group formation due to "
"P2P group network getting removed");
P2P: Fix crash for failure case when WSC PIN is entered incorrectly When forming a P2P group using WSC PIN method, if the PIN is entered incorrectly the P2P client supplicant instance will crash as a result of cleanup happening on data that is still in use in a case where a separate P2P group interface is used. For example, here is the path for the first crash: eap_wsc_process(): - creates struct wpabuf tmpbuf; on the stack - sets data->in_buf = &tmpbuf; - calls wps_process_msg() - which calls wps_process_wsc_msg() - which, in case WPS_M4: calls wps_fail_event() - which calls wps->event_cb() - wps->event_cb = wpa_supplicant_wps_event() - wpa_supplicant_wps_event() - wpa_supplicant_wps_event_fail() - which calls wpas_clear_wps() - which calls wpas_notify_network_removed() - which calls wpas_p2p_network_removed() - which calls wpas_p2p_group_formation_timeout() - which calls wpas_group_formation_completed() - which calls wpas_p2p_group_delete() - which calls wpa_supplicant_remove_iface() - which calls wpa_supplicant_deinit_iface() - which calls wpa_supplicant_cleanup() - which calls eapol_sm_deinit() - ... which eventually uses the ptr data->in_buf to free tmpbuf, our stack variable and then the supplicant crashes If you fix this crash, you'll hit another. Fix it and then a segfault. The way we're cleaning up and deleting data from under ourselves here just isn't safe, so make the teardown portion of this async. Signed-hostap: Angie Chinchilla <angie.v.chinchilla@intel.com> Signed-hostap: Nirav Shah <nirav.j2.shah@intel.com> intended-for: hostap-1
2012-04-06 17:22:03 +02:00
eloop_register_timeout(0, 0, wpas_p2p_group_formation_timeout,
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev, NULL);
P2P: Clean up group formation on network block removal If a P2P group network block is removed for any reason (e.g., wps_cancel command) while the interface is in group formation, remove the group formation timeout and indicate failure immediately. Previously, this type of operations could end up leaving the timeout running and result in somewhat unexpected group formation failure events later. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-10 11:56:42 +01:00
}
}
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: 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 *s;
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
size_t i;
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
for (s = wpa_s->conf->ssid; s; s = s->next) {
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
if (s->disabled != 2)
continue;
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
if (ssid &&
(ssid_len != s->ssid_len ||
os_memcmp(ssid, s->ssid, ssid_len) != 0))
continue;
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
if (addr == NULL) {
if (s->mode == WPAS_MODE_P2P_GO)
return s;
continue;
}
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
if (os_memcmp(s->bssid, addr, ETH_ALEN) == 0)
return s; /* peer is GO in the persistent group */
if (s->mode != WPAS_MODE_P2P_GO || s->p2p_client_list == NULL)
continue;
for (i = 0; i < s->num_p2p_clients; i++) {
Add address masks to BSSID lists In many applications it is useful not just to enumerate a group of well known access points, but to use a address/mask notation to match an entire set of addresses (ca:ff:ee:00:00:00/ff:ff:ff:00:00:00). This change expands the data structures used by MAC lists to include a mask indicating the significant (non-masked) portions of an address and extends the list parser to recognize mask suffixes. Signed-off-by: Stefan Tomanek <stefan.tomanek@wertarbyte.de>
2015-01-05 21:10:16 +01:00
if (os_memcmp(s->p2p_client_list + i * 2 * ETH_ALEN,
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
addr, ETH_ALEN) == 0)
return s; /* peer is P2P client in persistent
* group */
}
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
}
return NULL;
}
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: Cancel group formation timeout on client connection It was possiblle for the group formation timeout to be left running even after the P2P Client connected to the group if the WPS provisioning step was not completed cleanly (e.g., due to WSC_Done not getting received from the client). There is no need to remove the group in such case due to the initial group formation timeout, so work around this by removing that timeout on data connection. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-14 19:39:50 +02:00
if (eloop_cancel_timeout(wpas_p2p_group_formation_timeout,
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_s->p2pdev, NULL) > 0) {
P2P: Cancel group formation timeout on client connection It was possiblle for the group formation timeout to be left running even after the P2P Client connected to the group if the WPS provisioning step was not completed cleanly (e.g., due to WSC_Done not getting received from the client). There is no need to remove the group in such case due to the initial group formation timeout, so work around this by removing that timeout on data connection. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-14 19:39:50 +02:00
/*
* This can happen if WPS provisioning step is not terminated
* cleanly (e.g., P2P Client does not send WSC_Done). Since the
* peer was able to connect, there is no need to time out group
P2P: Extend group formation timeout on GO to first data connection Previously, GO considered the group to be fully formed at the completed of WPS provisioning step. This would leave the group running until idle timeout (which may not be enabled) or explicit removal if the client fails to connect for any reason. Since the client is expected to connect immediately after the WPS provisioning step, extend group formation timeout to cover that period until the first successfully completed data connection. This allows the GO to remove the group automatically if the client devices does not connect within P2P_MAX_INITIAL_CONN_WAIT_GO (10) seconds. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-26 19:32:44 +02:00
* formation after this, though. In addition, this is used with
* the initial connection wait on the GO as a separate formation
* timeout and as such, expected to be hit after the initial WPS
* provisioning step.
P2P: Cancel group formation timeout on client connection It was possiblle for the group formation timeout to be left running even after the P2P Client connected to the group if the WPS provisioning step was not completed cleanly (e.g., due to WSC_Done not getting received from the client). There is no need to remove the group in such case due to the initial group formation timeout, so work around this by removing that timeout on data connection. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-14 19:39:50 +02:00
*/
P2P: Extend group formation timeout on GO to first data connection Previously, GO considered the group to be fully formed at the completed of WPS provisioning step. This would leave the group running until idle timeout (which may not be enabled) or explicit removal if the client fails to connect for any reason. Since the client is expected to connect immediately after the WPS provisioning step, extend group formation timeout to cover that period until the first successfully completed data connection. This allows the GO to remove the group automatically if the client devices does not connect within P2P_MAX_INITIAL_CONN_WAIT_GO (10) seconds. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-26 19:32:44 +02:00
wpa_printf(MSG_DEBUG, "P2P: Canceled P2P group formation timeout on data connection");
P2P: Handle improper WPS termination on GO during group formation A P2P Client may be able to connect to the GO even if the WPS provisioning step has not terminated cleanly (e.g., P2P Client does not send WSC_Done). Such group formation attempt missed the event notification about started group on the GO and also did not set the internal state corresponding to the successful group formation. This commit addresses the missing part by completing GO side group formation on a successful first data connection if WPS does not complete cleanly. Also, this commit reorders the STA authorization indications to ensure that the group formation success notification is given prior to the first STA connection to handle such scenarios. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-01 14:36:53 +02:00
if (!wpa_s->p2p_go_group_formation_completed &&
!wpa_s->group_formation_reported) {
/*
* GO has not yet notified group formation success since
* the WPS step was not completed cleanly. Do that
* notification now since the P2P Client was able to
* connect and as such, must have received the
* credential from the WPS step.
*/
if (wpa_s->global->p2p)
p2p_wps_success_cb(wpa_s->global->p2p, addr);
P2P: Fix group interface addition failure properly for concurrent case It was possible for a P2P group formation failure to result in a concurrent station mode operation getting disconnected in the specific error case where group interface addition fails after a successful GO Negotiation. Fix this by skipping the wpas_p2p_group_delete() call in this specific case since the group interface does not exists anymore at the point wpas_group_formation_completed() gets called. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-06-15 22:34:11 +02:00
wpas_group_formation_completed(wpa_s, 1, 0);
P2P: Handle improper WPS termination on GO during group formation A P2P Client may be able to connect to the GO even if the WPS provisioning step has not terminated cleanly (e.g., P2P Client does not send WSC_Done). Such group formation attempt missed the event notification about started group on the GO and also did not set the internal state corresponding to the successful group formation. This commit addresses the missing part by completing GO side group formation on a successful first data connection if WPS does not complete cleanly. Also, this commit reorders the STA authorization indications to ensure that the group formation success notification is given prior to the first STA connection to handle such scenarios. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-10-01 14:36:53 +02:00
}
P2P: Extend group formation timeout on GO to first data connection Previously, GO considered the group to be fully formed at the completed of WPS provisioning step. This would leave the group running until idle timeout (which may not be enabled) or explicit removal if the client fails to connect for any reason. Since the client is expected to connect immediately after the WPS provisioning step, extend group formation timeout to cover that period until the first successfully completed data connection. This allows the GO to remove the group automatically if the client devices does not connect within P2P_MAX_INITIAL_CONN_WAIT_GO (10) seconds. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-26 19:32:44 +02:00
}
if (!wpa_s->p2p_go_group_formation_completed) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Marking group formation completed on GO on first data connection");
wpa_s->p2p_go_group_formation_completed = 1;
wpa_s->global->p2p_group_formation = NULL;
wpa_s->p2p_in_provisioning = 0;
P2P: Clear p2p_in_invitation on cancel Commit 41d5ce9e0b7b37dd84fbf3c1aa5ed571c32321d4 added scan optimizations for P2P invitation cases. However, it left a path where the invitation state was not cleared and as such, introduced potential issues for following scans that ended up getting incorrectly optimized for a single channel regardless of parameters. Fix this by clearing p2p_in_invitation more carefully, especially on p2p_cancel command. p2p_cancel is now also run from the FLUSH command to avoid issues with hwsim test cases (e.g., persistent_group_per_sta_psk followed by ap_open_tdls resulted in an error due to p2p_in_invitation remaining set after FLUSH). Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-04-07 11:26:04 +02:00
wpa_s->p2p_in_invitation = 0;
P2P: Cancel group formation timeout on client connection It was possiblle for the group formation timeout to be left running even after the P2P Client connected to the group if the WPS provisioning step was not completed cleanly (e.g., due to WSC_Done not getting received from the client). There is no need to remove the group in such case due to the initial group formation timeout, so work around this by removing that timeout on data connection. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-14 19:39:50 +02:00
}
P2P: Postpone concurrent scans when waiting for first client as GO Previously, concurrent station mode scans were postponed during an ongoing P2P group formation up to the point of completed WPS provisioning step. This would allow a scan to be started before the P2P client has completed association for the data connection if a scan request were timed to hit the window between the provisioning step and the following association. Avoid this by extending P2P-in-progress state to continue until the first data connection has been completed as part of group formation. Use a ten second timeout for this to avoid leaving scans disabled indefinitely if the client fails to connect completely. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-27 11:23:10 +02:00
wpa_s->global->p2p_go_wait_client.sec = 0;
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
if (addr == NULL)
return;
wpas_p2p_add_persistent_group_client(wpa_s, 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
P2P: Fix P2P_CONNECT-auto fallback to GO Neg with group interface If a separate P2P group interface was used, P2P_CONNECT-auto fallback to GO Negotiation could result in use of freed memory and segmentation fault. This happened in cases where the peer GO was found in some old scans, but not in the first scan triggered by the P2P_CONNECT-auto command ("P2P: Peer was found running GO in older scan -> try to join the group" shows up in the debug log). In addition, the GO would still need to reply to PD Request to allow this code path to be triggered. When five scans for the GO were completed in this sequence, the P2P group interface was removed as part of falling back to GO Negotiation. However, that ended up dereferencing the freed wpa_s instance at the end of scan event processing. Fix this by reordering code a bit and breaking out from EVENT_SCAN_RESULTS processing if the interface could have been removed. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 10:38:56 +01:00
static int wpas_p2p_fallback_to_go_neg(struct wpa_supplicant *wpa_s,
int group_added)
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
{
struct wpa_supplicant *group = wpa_s;
P2P: Fix P2P_CONNECT-auto fallback to GO Neg with group interface If a separate P2P group interface was used, P2P_CONNECT-auto fallback to GO Negotiation could result in use of freed memory and segmentation fault. This happened in cases where the peer GO was found in some old scans, but not in the first scan triggered by the P2P_CONNECT-auto command ("P2P: Peer was found running GO in older scan -> try to join the group" shows up in the debug log). In addition, the GO would still need to reply to PD Request to allow this code path to be triggered. When five scans for the GO were completed in this sequence, the P2P group interface was removed as part of falling back to GO Negotiation. However, that ended up dereferencing the freed wpa_s instance at the end of scan event processing. Fix this by reordering code a bit and breaking out from EVENT_SCAN_RESULTS processing if the interface could have been removed. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 10:38:56 +01:00
int ret = 0;
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
if (wpa_s->global->p2p_group_formation)
group = wpa_s->global->p2p_group_formation;
P2P: Use the P2P Device interface in wpas_p2p_fallback_to_go_neg() Previously the wpa_s->parent interface was used, which is not necessarily the P2P Device management interface. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-06-17 15:24:54 +02:00
wpa_s = wpa_s->global->p2p_init_wpa_s;
P2P: Improve handling of p2p_connect-auto fallback Commit aa9bb7644b0f7acbc9403189f0c47c17079205bc improved robustness of p2p_connect-auto mechanism by using older scan results to help in determination whether the peer was operating a GO. Improve this by accepting new GO information from scan-for-WPS-provisioning results even if the GO is not yet ready for WPS. In addition, fix an issue where Provision Discovery exchange timeout could have left offchannel TX operation in progress when the fallback was used. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-15 04:55:43 +02:00
offchannel_send_action_done(wpa_s);
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
if (group_added)
P2P: Fix P2P_CONNECT-auto fallback to GO Neg with group interface If a separate P2P group interface was used, P2P_CONNECT-auto fallback to GO Negotiation could result in use of freed memory and segmentation fault. This happened in cases where the peer GO was found in some old scans, but not in the first scan triggered by the P2P_CONNECT-auto command ("P2P: Peer was found running GO in older scan -> try to join the group" shows up in the debug log). In addition, the GO would still need to reply to PD Request to allow this code path to be triggered. When five scans for the GO were completed in this sequence, the P2P group interface was removed as part of falling back to GO Negotiation. However, that ended up dereferencing the freed wpa_s instance at the end of scan event processing. Fix this by reordering code a bit and breaking out from EVENT_SCAN_RESULTS processing if the interface could have been removed. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 10:38:56 +01:00
ret = wpas_p2p_group_delete(group, P2P_GROUP_REMOVAL_SILENT);
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
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Fall back to GO Negotiation");
wpas_p2p_connect(wpa_s, wpa_s->pending_join_dev_addr, wpa_s->p2p_pin,
wpa_s->p2p_wps_method, wpa_s->p2p_persistent_group, 0,
0, 0, wpa_s->p2p_go_intent, wpa_s->p2p_connect_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
wpa_s->p2p_go_vht_center_freq2,
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
wpa_s->p2p_persistent_id,
P2P: Add optional "ht40" argument for p2p_connect This can be used to start negotiated GO in 40 MHz channel width in 5GHz band. Signed-hostap: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
2012-08-15 22:07:44 +02:00
wpa_s->p2p_pd_before_go_neg,
P2P: Add VHT parameter to P2P operations Add the option to ask for VHT operation similarly to the way ht40 is configured - either by adding 'vht' param to the relevant p2p_* commands or by configuring p2p_go_vht=1 in the configuration file. This patch only adds the configuration option (e.g., via control interface). The actual handling of the VHT parameter (asking the driver to use VHT, etc.) will be done by the following patch. Signed-hostap: Eliad Peller <eliadx.peller@intel.com>
2013-10-27 18:46:17 +01:00
wpa_s->p2p_go_ht40,
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
wpa_s->p2p_go_vht,
P2P: Provide group SSID, if specified, to P2P Client join step At least one of the wpas_p2p_connect() callers (NFC join case) already had access to the Group SSID. Pass that information through wpas_p2p_connect() to wpas_p2p_join() so that the join operation can filter out incorrect groups more easily. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-12-30 18:08:51 +01:00
wpa_s->p2p_go_max_oper_chwidth, NULL, 0);
P2P: Fix P2P_CONNECT-auto fallback to GO Neg with group interface If a separate P2P group interface was used, P2P_CONNECT-auto fallback to GO Negotiation could result in use of freed memory and segmentation fault. This happened in cases where the peer GO was found in some old scans, but not in the first scan triggered by the P2P_CONNECT-auto command ("P2P: Peer was found running GO in older scan -> try to join the group" shows up in the debug log). In addition, the GO would still need to reply to PD Request to allow this code path to be triggered. When five scans for the GO were completed in this sequence, the P2P group interface was removed as part of falling back to GO Negotiation. However, that ended up dereferencing the freed wpa_s instance at the end of scan event processing. Fix this by reordering code a bit and breaking out from EVENT_SCAN_RESULTS processing if the interface could have been removed. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 10:38:56 +01:00
return ret;
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: Fix P2P_CONNECT-auto fallback to GO Neg with group interface If a separate P2P group interface was used, P2P_CONNECT-auto fallback to GO Negotiation could result in use of freed memory and segmentation fault. This happened in cases where the peer GO was found in some old scans, but not in the first scan triggered by the P2P_CONNECT-auto command ("P2P: Peer was found running GO in older scan -> try to join the group" shows up in the debug log). In addition, the GO would still need to reply to PD Request to allow this code path to be triggered. When five scans for the GO were completed in this sequence, the P2P group interface was removed as part of falling back to GO Negotiation. However, that ended up dereferencing the freed wpa_s instance at the end of scan event processing. Fix this by reordering code a bit and breaking out from EVENT_SCAN_RESULTS processing if the interface could have been removed. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 10:38:56 +01:00
int res;
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
if (!wpa_s->p2p_fallback_to_go_neg ||
wpa_s->p2p_in_provisioning <= 5)
return 0;
P2P: Improve handling of p2p_connect-auto fallback Commit aa9bb7644b0f7acbc9403189f0c47c17079205bc improved robustness of p2p_connect-auto mechanism by using older scan results to help in determination whether the peer was operating a GO. Improve this by accepting new GO information from scan-for-WPS-provisioning results even if the GO is not yet ready for WPS. In addition, fix an issue where Provision Discovery exchange timeout could have left offchannel TX operation in progress when the fallback was used. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-05-15 04:55:43 +02:00
if (wpas_p2p_peer_go(wpa_s, wpa_s->pending_join_dev_addr) > 0)
return 0; /* peer operating as a GO */
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
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: GO not found for p2p_connect-auto - "
"fallback to GO Negotiation");
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_msg_global(wpa_s->p2pdev, MSG_INFO, P2P_EVENT_FALLBACK_TO_GO_NEG
P2P: Add event messages for P2P_CONNECT-fallback-to-GO-Neg This makes it easier for upper layer programs to follow progress of P2P_CONNECT-auto operation. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 11:04:15 +01:00
"reason=GO-not-found");
P2P: Fix P2P_CONNECT-auto fallback to GO Neg with group interface If a separate P2P group interface was used, P2P_CONNECT-auto fallback to GO Negotiation could result in use of freed memory and segmentation fault. This happened in cases where the peer GO was found in some old scans, but not in the first scan triggered by the P2P_CONNECT-auto command ("P2P: Peer was found running GO in older scan -> try to join the group" shows up in the debug log). In addition, the GO would still need to reply to PD Request to allow this code path to be triggered. When five scans for the GO were completed in this sequence, the P2P group interface was removed as part of falling back to GO Negotiation. However, that ended up dereferencing the freed wpa_s instance at the end of scan event processing. Fix this by reordering code a bit and breaking out from EVENT_SCAN_RESULTS processing if the interface could have been removed. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 10:38:56 +01:00
res = wpas_p2p_fallback_to_go_neg(wpa_s, 1);
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
P2P: Fix P2P_CONNECT-auto fallback to GO Neg with group interface If a separate P2P group interface was used, P2P_CONNECT-auto fallback to GO Negotiation could result in use of freed memory and segmentation fault. This happened in cases where the peer GO was found in some old scans, but not in the first scan triggered by the P2P_CONNECT-auto command ("P2P: Peer was found running GO in older scan -> try to join the group" shows up in the debug log). In addition, the GO would still need to reply to PD Request to allow this code path to be triggered. When five scans for the GO were completed in this sequence, the P2P group interface was removed as part of falling back to GO Negotiation. However, that ended up dereferencing the freed wpa_s instance at the end of scan event processing. Fix this by reordering code a bit and breaking out from EVENT_SCAN_RESULTS processing if the interface could have been removed. Signed-off-by: Jouni Malinen <j@w1.fi>
2015-02-08 10:38:56 +01:00
return res == 1 ? 2 : 1;
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
}
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)
{
struct wpa_supplicant *ifs;
if (wpa_s->wpa_state > WPA_SCANNING) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Use %u ms search delay due to "
"concurrent operation",
P2P: Make the default p2p_find delay value configurable This makes the p2p_find default delay value configurable as p2p_search_delay parameter through the configuration file (and through control interface "SET p2p_search_delay <value>" on the P2P management interface. This parameter controls the number milliseconds of extra delay that is added between search iterations when there is a concurrent operation in progress. This can be used, e.g., p2p_search_delay=100 to make p2p_find friendlier to concurrent operations by avoiding it from taking 100% of the radio resources. The default value is the previous default, i.e., 500 ms. Smaller values can be used to find peers more quickly at the cost of larger effect to concurrent operations while a larger value leaves more time for the concurrent operations at the cost of making device discovery take longer time. The optional p2p_find delay argument can still be used to override the search delay for each search operation. Since the P2P_CONCURRENT_SEARCH_DELAY macro is not used anymore, the driver specific build parameter for bcmdhd from Android.mk is also removed. Similar configuration can now be achieved with p2p_search_delay=0 in the p2p0 interface configuration file. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-06-09 18:43:26 +02:00
wpa_s->conf->p2p_search_delay);
return wpa_s->conf->p2p_search_delay;
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
}
Use wpa_radio data for wpas_p2p_search_delay() This replaces the now unnecessary iteration of get_radio_name() calls. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-11-24 19:01:07 +01:00
dl_list_for_each(ifs, &wpa_s->radio->ifaces, struct wpa_supplicant,
radio_list) {
if (ifs != wpa_s && ifs->wpa_state > WPA_SCANNING) {
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
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Use %u ms search "
"delay due to concurrent operation on "
"interface %s",
P2P: Make the default p2p_find delay value configurable This makes the p2p_find default delay value configurable as p2p_search_delay parameter through the configuration file (and through control interface "SET p2p_search_delay <value>" on the P2P management interface. This parameter controls the number milliseconds of extra delay that is added between search iterations when there is a concurrent operation in progress. This can be used, e.g., p2p_search_delay=100 to make p2p_find friendlier to concurrent operations by avoiding it from taking 100% of the radio resources. The default value is the previous default, i.e., 500 ms. Smaller values can be used to find peers more quickly at the cost of larger effect to concurrent operations while a larger value leaves more time for the concurrent operations at the cost of making device discovery take longer time. The optional p2p_find delay argument can still be used to override the search delay for each search operation. Since the P2P_CONCURRENT_SEARCH_DELAY macro is not used anymore, the driver specific build parameter for bcmdhd from Android.mk is also removed. Similar configuration can now be achieved with p2p_search_delay=0 in the p2p0 interface configuration file. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-06-09 18:43:26 +02:00
wpa_s->conf->p2p_search_delay,
ifs->ifname);
return wpa_s->conf->p2p_search_delay;
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
}
}
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
P2P: Do not store duplicate PSK entries for the same device If a client joins a P2P group multiple times, replace the previous per-client PSK entry instead of adding a new entry each time. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-09-01 16:47:05 +02:00
static int wpas_p2p_remove_psk_entry(struct wpa_supplicant *wpa_s,
struct wpa_ssid *s, const u8 *addr,
int iface_addr)
{
struct psk_list_entry *psk, *tmp;
int changed = 0;
dl_list_for_each_safe(psk, tmp, &s->psk_list, struct psk_list_entry,
list) {
if ((iface_addr && !psk->p2p &&
os_memcmp(addr, psk->addr, ETH_ALEN) == 0) ||
(!iface_addr && psk->p2p &&
os_memcmp(addr, psk->addr, ETH_ALEN) == 0)) {
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P: Remove persistent group PSK list entry for "
MACSTR " p2p=%u",
MAC2STR(psk->addr), psk->p2p);
dl_list_del(&psk->list);
os_free(psk);
changed++;
}
}
return changed;
}
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)
{
struct wpa_ssid *ssid = wpa_s->current_ssid;
struct wpa_ssid *persistent;
Make dl_list_first() and dl_list_last() uses easier for static analyzers The previous check for dl_list_len() or having an entry from the list is sufficient, but some static analyzers cannot figure out that dl_list_first() and dl_list_last() will return non-NULL in this type of cases. Avoid invalid reports by explicitly checking for NULL. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-04-26 10:43:25 +02:00
struct psk_list_entry *p, *last;
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
if (psk_len != sizeof(p->psk))
return;
if (p2p_dev_addr) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: New PSK for addr=" MACSTR
" p2p_dev_addr=" MACSTR,
MAC2STR(mac_addr), MAC2STR(p2p_dev_addr));
if (is_zero_ether_addr(p2p_dev_addr))
p2p_dev_addr = NULL;
} else {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: New PSK for addr=" MACSTR,
MAC2STR(mac_addr));
}
if (ssid->mode == WPAS_MODE_P2P_GROUP_FORMATION) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: new_psk_cb during group formation");
/* To be added to persistent group once created */
if (wpa_s->global->add_psk == NULL) {
wpa_s->global->add_psk = os_zalloc(sizeof(*p));
if (wpa_s->global->add_psk == NULL)
return;
}
p = wpa_s->global->add_psk;
if (p2p_dev_addr) {
p->p2p = 1;
os_memcpy(p->addr, p2p_dev_addr, ETH_ALEN);
} else {
p->p2p = 0;
os_memcpy(p->addr, mac_addr, ETH_ALEN);
}
os_memcpy(p->psk, psk, psk_len);
return;
}
if (ssid->mode != WPAS_MODE_P2P_GO || !ssid->p2p_persistent_group) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Ignore new_psk_cb on not-persistent GO");
return;
}
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
persistent = wpas_p2p_get_persistent(wpa_s->p2pdev, NULL, ssid->ssid,
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
ssid->ssid_len);
if (!persistent) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Could not find persistent group information to store the new PSK");
return;
}
p = os_zalloc(sizeof(*p));
if (p == NULL)
return;
if (p2p_dev_addr) {
p->p2p = 1;
os_memcpy(p->addr, p2p_dev_addr, ETH_ALEN);
} else {
p->p2p = 0;
os_memcpy(p->addr, mac_addr, ETH_ALEN);
}
os_memcpy(p->psk, psk, psk_len);
Make dl_list_first() and dl_list_last() uses easier for static analyzers The previous check for dl_list_len() or having an entry from the list is sufficient, but some static analyzers cannot figure out that dl_list_first() and dl_list_last() will return non-NULL in this type of cases. Avoid invalid reports by explicitly checking for NULL. Signed-off-by: Jouni Malinen <j@w1.fi>
2014-04-26 10:43:25 +02:00
if (dl_list_len(&persistent->psk_list) > P2P_MAX_STORED_CLIENTS &&
(last = dl_list_last(&persistent->psk_list,
struct psk_list_entry, list))) {
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
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Remove oldest PSK entry for "
MACSTR " (p2p=%u) to make room for a new one",
MAC2STR(last->addr), last->p2p);
dl_list_del(&last->list);
os_free(last);
}
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpas_p2p_remove_psk_entry(wpa_s->p2pdev, persistent,
P2P: Do not store duplicate PSK entries for the same device If a client joins a P2P group multiple times, replace the previous per-client PSK entry instead of adding a new entry each time. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-09-01 16:47:05 +02:00
p2p_dev_addr ? p2p_dev_addr : mac_addr,
p2p_dev_addr == NULL);
if (p2p_dev_addr) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Add new PSK for p2p_dev_addr="
MACSTR, MAC2STR(p2p_dev_addr));
} else {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Add new PSK for addr=" MACSTR,
MAC2STR(mac_addr));
}
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
dl_list_add(&persistent->psk_list, &p->list);
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
if (wpa_s->p2pdev->conf->update_config &&
wpa_config_write(wpa_s->p2pdev->confname, wpa_s->p2pdev->conf))
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
wpa_printf(MSG_DEBUG, "P2P: Failed to update configuration");
}
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
static void wpas_p2p_remove_psk(struct wpa_supplicant *wpa_s,
struct wpa_ssid *s, const u8 *addr,
int iface_addr)
{
P2P: Do not store duplicate PSK entries for the same device If a client joins a P2P group multiple times, replace the previous per-client PSK entry instead of adding a new entry each time. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-09-01 16:47:05 +02:00
int res;
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
P2P: Do not store duplicate PSK entries for the same device If a client joins a P2P group multiple times, replace the previous per-client PSK entry instead of adding a new entry each time. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-09-01 16:47:05 +02:00
res = wpas_p2p_remove_psk_entry(wpa_s, s, addr, iface_addr);
P2P: Remove unnecessary ifdef CONFIG_NO_CONFIG_WRITE wpa_config_write() is defined as a dummy function even if actual operation to write the configuration file are commented out from the build. This cleans up the code a bit and removed a compiler warning on set-only variable. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2014-02-25 18:29:05 +01:00
if (res > 0 && wpa_s->conf->update_config &&
wpa_config_write(wpa_s->confname, wpa_s->conf))
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P: Failed to update configuration");
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
}
static void wpas_p2p_remove_client_go(struct wpa_supplicant *wpa_s,
const u8 *peer, int iface_addr)
{
struct hostapd_data *hapd;
struct hostapd_wpa_psk *psk, *prev, *rem;
struct sta_info *sta;
if (wpa_s->ap_iface == NULL || wpa_s->current_ssid == NULL ||
wpa_s->current_ssid->mode != WPAS_MODE_P2P_GO)
return;
/* Remove per-station PSK entry */
hapd = wpa_s->ap_iface->bss[0];
prev = NULL;
psk = hapd->conf->ssid.wpa_psk;
while (psk) {
if ((iface_addr && os_memcmp(peer, psk->addr, ETH_ALEN) == 0) ||
(!iface_addr &&
os_memcmp(peer, psk->p2p_dev_addr, ETH_ALEN) == 0)) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Remove operating group PSK entry for "
MACSTR " iface_addr=%d",
MAC2STR(peer), iface_addr);
if (prev)
prev->next = psk->next;
else
hapd->conf->ssid.wpa_psk = psk->next;
rem = psk;
psk = psk->next;
os_free(rem);
} else {
prev = psk;
psk = psk->next;
}
}
/* Disconnect from group */
if (iface_addr)
sta = ap_get_sta(hapd, peer);
else
sta = ap_get_sta_p2p(hapd, peer);
if (sta) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Disconnect peer " MACSTR
" (iface_addr=%d) from group",
MAC2STR(peer), iface_addr);
hostapd_drv_sta_deauth(hapd, sta->addr,
WLAN_REASON_DEAUTH_LEAVING);
ap_sta_deauthenticate(hapd, sta, WLAN_REASON_DEAUTH_LEAVING);
}
}
void wpas_p2p_remove_client(struct wpa_supplicant *wpa_s, const u8 *peer,
int iface_addr)
{
struct wpa_ssid *s;
struct wpa_supplicant *w;
P2P: Use the P2P Device management interface in wpas_p2p_remove_client() As wpas_p2p_remove_client() is not necessarily called from the interface used to manage the P2P Device operations, when removing a client, use the P2P management interface to iterate over the saved networks and remove the relevant entries form the P2P GO network blocks. Signed-off-by: Ben Rosenfeld <ben.rosenfeld@intel.com>
2015-05-12 16:39:57 +02:00
struct wpa_supplicant *p2p_wpa_s = wpa_s->global->p2p_init_wpa_s;
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
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Remove client " MACSTR, MAC2STR(peer));
/* Remove from any persistent group */
P2P: Use the P2P Device management interface in wpas_p2p_remove_client() As wpas_p2p_remove_client() is not necessarily called from the interface used to manage the P2P Device operations, when removing a client, use the P2P management interface to iterate over the saved networks and remove the relevant entries form the P2P GO network blocks. Signed-off-by: Ben Rosenfeld <ben.rosenfeld@intel.com>
2015-05-12 16:39:57 +02:00
for (s = p2p_wpa_s->conf->ssid; s; s = s->next) {
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
if (s->disabled != 2 || s->mode != WPAS_MODE_P2P_GO)
continue;
if (!iface_addr)
P2P: Use the P2P Device management interface in wpas_p2p_remove_client() As wpas_p2p_remove_client() is not necessarily called from the interface used to manage the P2P Device operations, when removing a client, use the P2P management interface to iterate over the saved networks and remove the relevant entries form the P2P GO network blocks. Signed-off-by: Ben Rosenfeld <ben.rosenfeld@intel.com>
2015-05-12 16:39:57 +02:00
wpas_remove_persistent_peer(p2p_wpa_s, s, peer, 0);
wpas_p2p_remove_psk(p2p_wpa_s, s, peer, iface_addr);
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
}
/* Remove from any operating group */
for (w = wpa_s->global->ifaces; w; w = w->next)
wpas_p2p_remove_client_go(w, peer, iface_addr);
}
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
P2P: Remove group from timeout on PSK failure Avoid potential issues with removing a P2P group on PSK failure directly from the wpa_supplicant_event() call since the caller (in driver_*.c) may not be prepared for the interface disappearing at that point in time. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-02 15:33:42 +02:00
static void wpas_p2p_psk_failure_removal(void *eloop_ctx, void *timeout_ctx)
{
struct wpa_supplicant *wpa_s = eloop_ctx;
wpas_p2p_group_delete(wpa_s, P2P_GROUP_REMOVAL_PSK_FAILURE);
}
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
static void wpas_p2p_group_freq_conflict(void *eloop_ctx, void *timeout_ctx)
{
struct wpa_supplicant *wpa_s = eloop_ctx;
wpa_printf(MSG_DEBUG, "P2P: Frequency conflict - terminate group");
wpas_p2p_group_delete(wpa_s, P2P_GROUP_REMOVAL_FREQ_CONFLICT);
}
int wpas_p2p_handle_frequency_conflicts(struct wpa_supplicant *wpa_s, int freq,
struct wpa_ssid *ssid)
{
struct wpa_supplicant *iface;
for (iface = wpa_s->global->ifaces; iface; iface = iface->next) {
if (!iface->current_ssid ||
iface->current_ssid->frequency == freq ||
(iface->p2p_group_interface == NOT_P2P_GROUP_INTERFACE &&
!iface->current_ssid->p2p_group))
continue;
/* Remove the connection with least priority */
if (!wpas_is_p2p_prioritized(iface)) {
/* STA connection has priority over existing
* P2P connection, so remove the interface. */
wpa_printf(MSG_DEBUG, "P2P: Removing P2P connection due to single channel concurrent mode frequency conflict");
eloop_register_timeout(0, 0,
wpas_p2p_group_freq_conflict,
iface, NULL);
/* If connection in progress is P2P connection, do not
* proceed for the connection. */
if (wpa_s == iface)
return -1;
else
return 0;
} else {
/* P2P connection has priority, disable the STA network
*/
wpa_supplicant_disable_network(wpa_s->global->ifaces,
ssid);
wpa_msg(wpa_s->global->ifaces, MSG_INFO,
WPA_EVENT_FREQ_CONFLICT " id=%d", ssid->id);
os_memset(wpa_s->global->ifaces->pending_bssid, 0,
ETH_ALEN);
/* If P2P connection is in progress, continue
* connecting...*/
if (wpa_s == iface)
return 0;
else
return -1;
}
}
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
int wpas_p2p_4way_hs_failed(struct wpa_supplicant *wpa_s)
{
struct wpa_ssid *ssid = wpa_s->current_ssid;
if (ssid == NULL || !ssid->p2p_group)
return 0;
if (wpa_s->p2p_last_4way_hs_fail &&
wpa_s->p2p_last_4way_hs_fail == ssid) {
u8 go_dev_addr[ETH_ALEN];
struct wpa_ssid *persistent;
if (wpas_p2p_persistent_group(wpa_s, go_dev_addr,
ssid->ssid,
ssid->ssid_len) <= 0) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Could not determine whether 4-way handshake failures were for a persistent group");
goto disconnect;
}
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Two 4-way handshake failures for a P2P group - go_dev_addr="
MACSTR, MAC2STR(go_dev_addr));
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
persistent = wpas_p2p_get_persistent(wpa_s->p2pdev, go_dev_addr,
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
ssid->ssid,
ssid->ssid_len);
if (persistent == NULL || persistent->mode != WPAS_MODE_INFRA) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: No matching persistent group stored");
goto disconnect;
}
P2P: Add a separate pointer to the P2P Device instance In many places in the code there was a reference to wpa_s->parent to get from group interface to p2p_dev interface. These places can break if P2P_DEVICE interface would need to be used with the primary interface as the group interface, since the parent of the primary interface points to itself and not the p2p_dev interface. Fix this by adding a separate "p2pdev" pointer to wpa_supplicant, it will be the same as parent pointer in most cases but whenever the primary interface is used as a group interface, change it to point to the correct p2p_dev interface. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
wpa_msg_global(wpa_s->p2pdev, MSG_INFO,
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
P2P_EVENT_PERSISTENT_PSK_FAIL "%d",
persistent->id);
disconnect:
wpa_s->p2p_last_4way_hs_fail = NULL;
P2P: Remove group from timeout on PSK failure Avoid potential issues with removing a P2P group on PSK failure directly from the wpa_supplicant_event() call since the caller (in driver_*.c) may not be prepared for the interface disappearing at that point in time. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-02 15:33:42 +02:00
/*
* Remove the group from a timeout to avoid issues with caller
* continuing to use the interface if this is on a P2P group
* interface.
*/
eloop_register_timeout(0, 0, wpas_p2p_psk_failure_removal,
wpa_s, NULL);
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
return 1;
}
wpa_s->p2p_last_4way_hs_fail = ssid;
return 0;
}
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
#ifdef CONFIG_WPS_NFC
static struct wpabuf * wpas_p2p_nfc_handover(int ndef, struct wpabuf *wsc,
struct wpabuf *p2p)
{
struct wpabuf *ret;
P2P NFC: Add processing of P2P client while NFC handover case Instead of automatically triggering a connection, provide an indication of one of the devices being a P2P client to upper layers to allow user to determine what to do next. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-04 15:18:46 +02:00
size_t wsc_len;
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
if (p2p == NULL) {
wpabuf_free(wsc);
wpa_printf(MSG_DEBUG, "P2P: No p2p buffer for handover");
return NULL;
}
P2P NFC: Add processing of P2P client while NFC handover case Instead of automatically triggering a connection, provide an indication of one of the devices being a P2P client to upper layers to allow user to determine what to do next. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-04 15:18:46 +02:00
wsc_len = wsc ? wpabuf_len(wsc) : 0;
ret = wpabuf_alloc(2 + wsc_len + 2 + wpabuf_len(p2p));
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
if (ret == NULL) {
wpabuf_free(wsc);
wpabuf_free(p2p);
return NULL;
}
P2P NFC: Add processing of P2P client while NFC handover case Instead of automatically triggering a connection, provide an indication of one of the devices being a P2P client to upper layers to allow user to determine what to do next. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-04 15:18:46 +02:00
wpabuf_put_be16(ret, wsc_len);
if (wsc)
wpabuf_put_buf(ret, wsc);
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
wpabuf_put_be16(ret, wpabuf_len(p2p));
wpabuf_put_buf(ret, p2p);
wpabuf_free(wsc);
wpabuf_free(p2p);
wpa_hexdump_buf(MSG_DEBUG,
"P2P: Generated NFC connection handover message", ret);
if (ndef && ret) {
struct wpabuf *tmp;
tmp = ndef_build_p2p(ret);
wpabuf_free(ret);
if (tmp == NULL) {
wpa_printf(MSG_DEBUG, "P2P: Failed to NDEF encapsulate handover request");
return NULL;
}
ret = tmp;
}
return ret;
}
P2P NFC: Add GO info into handover message when in client role P2P Group ID can optionally be included in the connection handover messages when acting as a P2P Client in a group. Add this information and show it in the P2P-NFC-PEER-CLIENT event message. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 02:51:04 +02:00
static int wpas_p2p_cli_freq(struct wpa_supplicant *wpa_s,
struct wpa_ssid **ssid, u8 *go_dev_addr)
P2P NFC: Add processing of P2P client while NFC handover case Instead of automatically triggering a connection, provide an indication of one of the devices being a P2P client to upper layers to allow user to determine what to do next. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-04 15:18:46 +02:00
{
struct wpa_supplicant *iface;
P2P NFC: Add GO info into handover message when in client role P2P Group ID can optionally be included in the connection handover messages when acting as a P2P Client in a group. Add this information and show it in the P2P-NFC-PEER-CLIENT event message. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 02:51:04 +02:00
if (go_dev_addr)
os_memset(go_dev_addr, 0, ETH_ALEN);
if (ssid)
*ssid = NULL;
P2P NFC: Add processing of P2P client while NFC handover case Instead of automatically triggering a connection, provide an indication of one of the devices being a P2P client to upper layers to allow user to determine what to do next. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-04 15:18:46 +02:00
for (iface = wpa_s->global->ifaces; iface; iface = iface->next) {
if (iface->wpa_state < WPA_ASSOCIATING ||
iface->current_ssid == NULL || iface->assoc_freq == 0 ||
!iface->current_ssid->p2p_group ||
iface->current_ssid->mode != WPAS_MODE_INFRA)
continue;
P2P NFC: Add GO info into handover message when in client role P2P Group ID can optionally be included in the connection handover messages when acting as a P2P Client in a group. Add this information and show it in the P2P-NFC-PEER-CLIENT event message. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 02:51:04 +02:00
if (ssid)
*ssid = iface->current_ssid;
if (go_dev_addr)
os_memcpy(go_dev_addr, iface->go_dev_addr, ETH_ALEN);
P2P NFC: Add processing of P2P client while NFC handover case Instead of automatically triggering a connection, provide an indication of one of the devices being a P2P client to upper layers to allow user to determine what to do next. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-04 15:18:46 +02:00
return iface->assoc_freq;
}
return 0;
}
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 *wsc, *p2p;
P2P NFC: Add GO info into handover message when in client role P2P Group ID can optionally be included in the connection handover messages when acting as a P2P Client in a group. Add this information and show it in the P2P-NFC-PEER-CLIENT event message. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 02:51:04 +02:00
struct wpa_ssid *ssid;
u8 go_dev_addr[ETH_ALEN];
int cli_freq = wpas_p2p_cli_freq(wpa_s, &ssid, go_dev_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
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL) {
wpa_printf(MSG_DEBUG, "P2P: P2P disabled - cannot build handover request");
return NULL;
}
if (wpa_s->conf->wps_nfc_dh_pubkey == NULL &&
wps_nfc_gen_dh(&wpa_s->conf->wps_nfc_dh_pubkey,
&wpa_s->conf->wps_nfc_dh_privkey) < 0) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: No DH key available for handover request");
return NULL;
}
P2P NFC: Add processing of P2P client while NFC handover case Instead of automatically triggering a connection, provide an indication of one of the devices being a P2P client to upper layers to allow user to determine what to do next. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-04 15:18:46 +02:00
if (cli_freq == 0) {
wsc = wps_build_nfc_handover_req_p2p(
wpa_s->parent->wps, wpa_s->conf->wps_nfc_dh_pubkey);
} else
wsc = NULL;
P2P NFC: Add GO info into handover message when in client role P2P Group ID can optionally be included in the connection handover messages when acting as a P2P Client in a group. Add this information and show it in the P2P-NFC-PEER-CLIENT event message. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 02:51:04 +02:00
p2p = p2p_build_nfc_handover_req(wpa_s->global->p2p, cli_freq,
go_dev_addr, ssid ? ssid->ssid : NULL,
ssid ? ssid->ssid_len : 0);
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
return wpas_p2p_nfc_handover(ndef, wsc, p2p);
}
struct wpabuf * wpas_p2p_nfc_handover_sel(struct wpa_supplicant *wpa_s,
int ndef, int tag)
{
struct wpabuf *wsc, *p2p;
P2P NFC: Add GO info into handover message when in client role P2P Group ID can optionally be included in the connection handover messages when acting as a P2P Client in a group. Add this information and show it in the P2P-NFC-PEER-CLIENT event message. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 02:51:04 +02:00
struct wpa_ssid *ssid;
u8 go_dev_addr[ETH_ALEN];
int cli_freq = wpas_p2p_cli_freq(wpa_s, &ssid, go_dev_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
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
return NULL;
if (!tag && wpa_s->conf->wps_nfc_dh_pubkey == NULL &&
wps_nfc_gen_dh(&wpa_s->conf->wps_nfc_dh_pubkey,
&wpa_s->conf->wps_nfc_dh_privkey) < 0)
return NULL;
P2P NFC: Add processing of P2P client while NFC handover case Instead of automatically triggering a connection, provide an indication of one of the devices being a P2P client to upper layers to allow user to determine what to do next. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-04 15:18:46 +02:00
if (cli_freq == 0) {
wsc = wps_build_nfc_handover_sel_p2p(
wpa_s->parent->wps,
tag ? wpa_s->conf->wps_nfc_dev_pw_id :
DEV_PW_NFC_CONNECTION_HANDOVER,
wpa_s->conf->wps_nfc_dh_pubkey,
tag ? wpa_s->conf->wps_nfc_dev_pw : NULL);
} else
wsc = NULL;
P2P NFC: Add GO info into handover message when in client role P2P Group ID can optionally be included in the connection handover messages when acting as a P2P Client in a group. Add this information and show it in the P2P-NFC-PEER-CLIENT event message. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 02:51:04 +02:00
p2p = p2p_build_nfc_handover_sel(wpa_s->global->p2p, cli_freq,
go_dev_addr, ssid ? ssid->ssid : NULL,
ssid ? ssid->ssid_len : 0);
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
return wpas_p2p_nfc_handover(ndef, wsc, p2p);
}
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
static int wpas_p2p_nfc_join_group(struct wpa_supplicant *wpa_s,
struct p2p_nfc_params *params)
{
wpa_printf(MSG_DEBUG, "P2P: Initiate join-group based on NFC "
P2P NFC: Optimize join-a-group operation based on NFC information When the NFC connection handover message received from a peer indicates that the peer is operating as a GO on a specific channel, use that information to avoid having to go through full scan. In addition, skip the separate join-a-group scan since we already know the operating channel, GO P2P Device Address, and SSID. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 00:44:29 +02:00
"connection handover (freq=%d)",
params->go_freq);
if (params->go_freq && params->go_ssid_len) {
wpa_s->p2p_wps_method = WPS_NFC;
wpa_s->pending_join_wps_method = WPS_NFC;
os_memset(wpa_s->pending_join_iface_addr, 0, ETH_ALEN);
os_memcpy(wpa_s->pending_join_dev_addr, params->go_dev_addr,
ETH_ALEN);
return wpas_p2p_join_start(wpa_s, params->go_freq,
params->go_ssid,
params->go_ssid_len);
}
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
return wpas_p2p_connect(wpa_s, params->peer->p2p_device_addr, NULL,
WPS_NFC, 0, 0, 1, 0, wpa_s->conf->p2p_go_intent,
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
params->go_freq, wpa_s->p2p_go_vht_center_freq2,
P2P: Provide group SSID, if specified, to P2P Client join step At least one of the wpas_p2p_connect() callers (NFC join case) already had access to the Group SSID. Pass that information through wpas_p2p_connect() to wpas_p2p_join() so that the join operation can filter out incorrect groups more easily. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-12-30 18:08:51 +01:00
-1, 0, 1, 1, wpa_s->p2p_go_max_oper_chwidth,
params->go_ssid_len ? params->go_ssid : NULL,
params->go_ssid_len);
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
}
static int wpas_p2p_nfc_auth_join(struct wpa_supplicant *wpa_s,
P2P NFC: Static handover with NFC Tag on client This adds a new P2P Invitation mechanism to invite a P2P Device with an NFC Tag to an already operating group when the GO with NFC Device reads the NFC Tag. The P2P Device with the NFC Tag will then accept invitation and connect to the group automatically using its OOB Device Password. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 18:45:04 +02:00
struct p2p_nfc_params *params, int tag)
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
{
P2P NFC: Static handover with NFC Tag on client This adds a new P2P Invitation mechanism to invite a P2P Device with an NFC Tag to an already operating group when the GO with NFC Device reads the NFC Tag. The P2P Device with the NFC Tag will then accept invitation and connect to the group automatically using its OOB Device Password. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 18:45:04 +02:00
int res, persistent;
struct wpa_ssid *ssid;
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
wpa_printf(MSG_DEBUG, "P2P: Authorize join-group based on NFC "
"connection handover");
for (wpa_s = wpa_s->global->ifaces; wpa_s; wpa_s = wpa_s->next) {
P2P NFC: Static handover with NFC Tag on client This adds a new P2P Invitation mechanism to invite a P2P Device with an NFC Tag to an already operating group when the GO with NFC Device reads the NFC Tag. The P2P Device with the NFC Tag will then accept invitation and connect to the group automatically using its OOB Device Password. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 18:45:04 +02:00
ssid = wpa_s->current_ssid;
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
if (ssid == NULL)
continue;
if (ssid->mode != WPAS_MODE_P2P_GO)
continue;
if (wpa_s->ap_iface == NULL)
continue;
break;
}
if (wpa_s == NULL) {
wpa_printf(MSG_DEBUG, "P2P: Could not find GO interface");
return -1;
}
P2P: Fix wpas_p2p_nfc_auth_join() Use the p2pdev pointer instead of the parent pointer to comply with the flows when a dedicated P2P Device interface is used and p2p_no_group_iface == 1 (in which case the parent of the reused interface isn't necessary the same as p2pdev). Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2016-04-07 12:32:07 +02:00
if (wpa_s->p2pdev->p2p_oob_dev_pw_id !=
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
DEV_PW_NFC_CONNECTION_HANDOVER &&
P2P: Fix wpas_p2p_nfc_auth_join() Use the p2pdev pointer instead of the parent pointer to comply with the flows when a dedicated P2P Device interface is used and p2p_no_group_iface == 1 (in which case the parent of the reused interface isn't necessary the same as p2pdev). Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2016-04-07 12:32:07 +02:00
!wpa_s->p2pdev->p2p_oob_dev_pw) {
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
wpa_printf(MSG_DEBUG, "P2P: No NFC Dev Pw known");
return -1;
}
P2P NFC: Static handover with NFC Tag on client This adds a new P2P Invitation mechanism to invite a P2P Device with an NFC Tag to an already operating group when the GO with NFC Device reads the NFC Tag. The P2P Device with the NFC Tag will then accept invitation and connect to the group automatically using its OOB Device Password. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 18:45:04 +02:00
res = wpas_ap_wps_add_nfc_pw(
P2P: Fix wpas_p2p_nfc_auth_join() Use the p2pdev pointer instead of the parent pointer to comply with the flows when a dedicated P2P Device interface is used and p2p_no_group_iface == 1 (in which case the parent of the reused interface isn't necessary the same as p2pdev). Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2016-04-07 12:32:07 +02:00
wpa_s, wpa_s->p2pdev->p2p_oob_dev_pw_id,
wpa_s->p2pdev->p2p_oob_dev_pw,
wpa_s->p2pdev->p2p_peer_oob_pk_hash_known ?
wpa_s->p2pdev->p2p_peer_oob_pubkey_hash : NULL);
P2P NFC: Static handover with NFC Tag on client This adds a new P2P Invitation mechanism to invite a P2P Device with an NFC Tag to an already operating group when the GO with NFC Device reads the NFC Tag. The P2P Device with the NFC Tag will then accept invitation and connect to the group automatically using its OOB Device Password. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 18:45:04 +02:00
if (res)
return res;
if (!tag) {
wpa_printf(MSG_DEBUG, "P2P: Negotiated handover - wait for peer to join without invitation");
return 0;
}
if (!params->peer ||
!(params->peer->dev_capab & P2P_DEV_CAPAB_INVITATION_PROCEDURE))
return 0;
wpa_printf(MSG_DEBUG, "P2P: Static handover - invite peer " MACSTR
" to join", MAC2STR(params->peer->p2p_device_addr));
wpa_s->global->p2p_invite_group = wpa_s;
persistent = ssid->p2p_persistent_group &&
P2P: Fix wpas_p2p_nfc_auth_join() Use the p2pdev pointer instead of the parent pointer to comply with the flows when a dedicated P2P Device interface is used and p2p_no_group_iface == 1 (in which case the parent of the reused interface isn't necessary the same as p2pdev). Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2016-04-07 12:32:07 +02:00
wpas_p2p_get_persistent(wpa_s->p2pdev,
P2P NFC: Static handover with NFC Tag on client This adds a new P2P Invitation mechanism to invite a P2P Device with an NFC Tag to an already operating group when the GO with NFC Device reads the NFC Tag. The P2P Device with the NFC Tag will then accept invitation and connect to the group automatically using its OOB Device Password. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 18:45:04 +02:00
params->peer->p2p_device_addr,
ssid->ssid, ssid->ssid_len);
P2P: Fix wpas_p2p_nfc_auth_join() Use the p2pdev pointer instead of the parent pointer to comply with the flows when a dedicated P2P Device interface is used and p2p_no_group_iface == 1 (in which case the parent of the reused interface isn't necessary the same as p2pdev). Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2016-04-07 12:32:07 +02:00
wpa_s->p2pdev->pending_invite_ssid_id = -1;
P2P NFC: Static handover with NFC Tag on client This adds a new P2P Invitation mechanism to invite a P2P Device with an NFC Tag to an already operating group when the GO with NFC Device reads the NFC Tag. The P2P Device with the NFC Tag will then accept invitation and connect to the group automatically using its OOB Device Password. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 18:45:04 +02:00
return p2p_invite(wpa_s->global->p2p, params->peer->p2p_device_addr,
P2P_INVITE_ROLE_ACTIVE_GO, wpa_s->own_addr,
ssid->ssid, ssid->ssid_len, ssid->frequency,
wpa_s->global->p2p_dev_addr, persistent, 0,
P2P: Fix wpas_p2p_nfc_auth_join() Use the p2pdev pointer instead of the parent pointer to comply with the flows when a dedicated P2P Device interface is used and p2p_no_group_iface == 1 (in which case the parent of the reused interface isn't necessary the same as p2pdev). Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2016-04-07 12:32:07 +02:00
wpa_s->p2pdev->p2p_oob_dev_pw_id);
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
}
static int wpas_p2p_nfc_init_go_neg(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
struct p2p_nfc_params *params,
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
{
wpa_printf(MSG_DEBUG, "P2P: Initiate GO Negotiation based on NFC "
"connection handover");
return wpas_p2p_connect(wpa_s, params->peer->p2p_device_addr, NULL,
WPS_NFC, 0, 0, 0, 0, wpa_s->conf->p2p_go_intent,
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
forced_freq, wpa_s->p2p_go_vht_center_freq2,
P2P: Provide group SSID, if specified, to P2P Client join step At least one of the wpas_p2p_connect() callers (NFC join case) already had access to the Group SSID. Pass that information through wpas_p2p_connect() to wpas_p2p_join() so that the join operation can filter out incorrect groups more easily. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-12-30 18:08:51 +01:00
-1, 0, 1, 1, wpa_s->p2p_go_max_oper_chwidth,
NULL, 0);
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
}
static int wpas_p2p_nfc_resp_go_neg(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
struct p2p_nfc_params *params,
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 res;
wpa_printf(MSG_DEBUG, "P2P: Authorize GO Negotiation based on NFC "
"connection handover");
res = wpas_p2p_connect(wpa_s, params->peer->p2p_device_addr, NULL,
WPS_NFC, 0, 0, 0, 1, wpa_s->conf->p2p_go_intent,
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
forced_freq, wpa_s->p2p_go_vht_center_freq2,
P2P: Provide group SSID, if specified, to P2P Client join step At least one of the wpas_p2p_connect() callers (NFC join case) already had access to the Group SSID. Pass that information through wpas_p2p_connect() to wpas_p2p_join() so that the join operation can filter out incorrect groups more easily. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-12-30 18:08:51 +01:00
-1, 0, 1, 1, wpa_s->p2p_go_max_oper_chwidth,
NULL, 0);
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
if (res)
return res;
res = wpas_p2p_listen(wpa_s, 60);
if (res) {
p2p_unauthorize(wpa_s->global->p2p,
params->peer->p2p_device_addr);
}
return res;
}
static int wpas_p2p_nfc_connection_handover(struct wpa_supplicant *wpa_s,
const struct wpabuf *data,
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
int sel, int tag, 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
{
const u8 *pos, *end;
u16 len, id;
struct p2p_nfc_params params;
int res;
os_memset(&params, 0, sizeof(params));
params.sel = sel;
wpa_hexdump_buf(MSG_DEBUG, "P2P: Received NFC tag payload", data);
pos = wpabuf_head(data);
end = pos + wpabuf_len(data);
if (end - pos < 2) {
wpa_printf(MSG_DEBUG, "P2P: Not enough data for Length of WSC "
"attributes");
return -1;
}
len = WPA_GET_BE16(pos);
pos += 2;
P2P NFC: Make code easier for static analyzers len + pos > end comparison here did verify that the length field had a valid value, but that did not seem to enough to avoid TAINTED_SCALAR warning. Re-order that validation step to be equivalent "len > end - pos" to remove these false positives (CID 68116). Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-11 17:34:25 +02:00
if (len > end - pos) {
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
wpa_printf(MSG_DEBUG, "P2P: Not enough data for WSC "
"attributes");
return -1;
}
params.wsc_attr = pos;
params.wsc_len = len;
pos += len;
if (end - pos < 2) {
wpa_printf(MSG_DEBUG, "P2P: Not enough data for Length of P2P "
"attributes");
return -1;
}
len = WPA_GET_BE16(pos);
pos += 2;
P2P NFC: Make code easier for static analyzers len + pos > end comparison here did verify that the length field had a valid value, but that did not seem to enough to avoid TAINTED_SCALAR warning. Re-order that validation step to be equivalent "len > end - pos" to remove these false positives (CID 68116). Signed-off-by: Jouni Malinen <j@w1.fi>
2014-10-11 17:34:25 +02:00
if (len > end - pos) {
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
wpa_printf(MSG_DEBUG, "P2P: Not enough data for P2P "
"attributes");
return -1;
}
params.p2p_attr = pos;
params.p2p_len = len;
pos += len;
wpa_hexdump(MSG_DEBUG, "P2P: WSC attributes",
params.wsc_attr, params.wsc_len);
wpa_hexdump(MSG_DEBUG, "P2P: P2P attributes",
params.p2p_attr, params.p2p_len);
if (pos < end) {
wpa_hexdump(MSG_DEBUG,
"P2P: Ignored extra data after P2P attributes",
pos, end - pos);
}
res = p2p_process_nfc_connection_handover(wpa_s->global->p2p, &params);
if (res)
return res;
P2P NFC: Do not try to join peer if both devices are already GO Send a P2P-NFC-BOTH-GO event to upper layers to determine what to do in case both devices going through NFC connection handover are already operating as a GO. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-04 14:32:09 +02:00
if (params.next_step == NO_ACTION)
return 0;
if (params.next_step == BOTH_GO) {
wpa_msg(wpa_s, MSG_INFO, P2P_EVENT_NFC_BOTH_GO "peer=" MACSTR,
MAC2STR(params.peer->p2p_device_addr));
return 0;
}
P2P NFC: Add processing of P2P client while NFC handover case Instead of automatically triggering a connection, provide an indication of one of the devices being a P2P client to upper layers to allow user to determine what to do next. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-04 15:18:46 +02:00
if (params.next_step == PEER_CLIENT) {
P2P NFC: Add GO info into handover message when in client role P2P Group ID can optionally be included in the connection handover messages when acting as a P2P Client in a group. Add this information and show it in the P2P-NFC-PEER-CLIENT event message. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 02:51:04 +02:00
if (!is_zero_ether_addr(params.go_dev_addr)) {
wpa_msg(wpa_s, MSG_INFO, P2P_EVENT_NFC_PEER_CLIENT
"peer=" MACSTR " freq=%d go_dev_addr=" MACSTR
" ssid=\"%s\"",
MAC2STR(params.peer->p2p_device_addr),
params.go_freq,
MAC2STR(params.go_dev_addr),
wpa_ssid_txt(params.go_ssid,
params.go_ssid_len));
} else {
wpa_msg(wpa_s, MSG_INFO, P2P_EVENT_NFC_PEER_CLIENT
"peer=" MACSTR " freq=%d",
MAC2STR(params.peer->p2p_device_addr),
params.go_freq);
}
P2P NFC: Add processing of P2P client while NFC handover case Instead of automatically triggering a connection, provide an indication of one of the devices being a P2P client to upper layers to allow user to determine what to do next. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-04 15:18:46 +02:00
return 0;
}
P2P NFC: Add GO info into handover message when in client role P2P Group ID can optionally be included in the connection handover messages when acting as a P2P Client in a group. Add this information and show it in the P2P-NFC-PEER-CLIENT event message. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 02:51:04 +02:00
if (wpas_p2p_cli_freq(wpa_s, NULL, NULL)) {
P2P NFC: Add processing of P2P client while NFC handover case Instead of automatically triggering a connection, provide an indication of one of the devices being a P2P client to upper layers to allow user to determine what to do next. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-04 15:18:46 +02:00
wpa_msg(wpa_s, MSG_INFO, P2P_EVENT_NFC_WHILE_CLIENT "peer="
MACSTR, MAC2STR(params.peer->p2p_device_addr));
return 0;
}
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
wpabuf_free(wpa_s->p2p_oob_dev_pw);
wpa_s->p2p_oob_dev_pw = NULL;
if (params.oob_dev_pw_len < WPS_OOB_PUBKEY_HASH_LEN + 2) {
wpa_printf(MSG_DEBUG, "P2P: No peer OOB Dev Pw "
"received");
return -1;
}
id = WPA_GET_BE16(params.oob_dev_pw + WPS_OOB_PUBKEY_HASH_LEN);
wpa_printf(MSG_DEBUG, "P2P: Peer OOB Dev Pw %u", id);
wpa_hexdump(MSG_DEBUG, "P2P: Peer OOB Public Key hash",
params.oob_dev_pw, WPS_OOB_PUBKEY_HASH_LEN);
os_memcpy(wpa_s->p2p_peer_oob_pubkey_hash,
params.oob_dev_pw, WPS_OOB_PUBKEY_HASH_LEN);
wpa_s->p2p_peer_oob_pk_hash_known = 1;
if (tag) {
if (id < 0x10) {
wpa_printf(MSG_DEBUG, "P2P: Static handover - invalid "
"peer OOB Device Password Id %u", id);
return -1;
}
wpa_printf(MSG_DEBUG, "P2P: Static handover - use peer OOB "
"Device Password Id %u", id);
wpa_hexdump_key(MSG_DEBUG, "P2P: Peer OOB Device Password",
params.oob_dev_pw + WPS_OOB_PUBKEY_HASH_LEN + 2,
params.oob_dev_pw_len -
WPS_OOB_PUBKEY_HASH_LEN - 2);
wpa_s->p2p_oob_dev_pw_id = id;
wpa_s->p2p_oob_dev_pw = wpabuf_alloc_copy(
params.oob_dev_pw + WPS_OOB_PUBKEY_HASH_LEN + 2,
params.oob_dev_pw_len -
WPS_OOB_PUBKEY_HASH_LEN - 2);
if (wpa_s->p2p_oob_dev_pw == NULL)
return -1;
if (wpa_s->conf->wps_nfc_dh_pubkey == NULL &&
wps_nfc_gen_dh(&wpa_s->conf->wps_nfc_dh_pubkey,
&wpa_s->conf->wps_nfc_dh_privkey) < 0)
return -1;
} else {
wpa_printf(MSG_DEBUG, "P2P: Using abbreviated WPS handshake "
"without Device Password");
wpa_s->p2p_oob_dev_pw_id = DEV_PW_NFC_CONNECTION_HANDOVER;
}
switch (params.next_step) {
case NO_ACTION:
P2P NFC: Do not try to join peer if both devices are already GO Send a P2P-NFC-BOTH-GO event to upper layers to determine what to do in case both devices going through NFC connection handover are already operating as a GO. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-04 14:32:09 +02:00
case BOTH_GO:
P2P NFC: Add processing of P2P client while NFC handover case Instead of automatically triggering a connection, provide an indication of one of the devices being a P2P client to upper layers to allow user to determine what to do next. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-04 15:18:46 +02:00
case PEER_CLIENT:
P2P NFC: Do not try to join peer if both devices are already GO Send a P2P-NFC-BOTH-GO event to upper layers to determine what to do in case both devices going through NFC connection handover are already operating as a GO. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-04 14:32:09 +02:00
/* already covered above */
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
return 0;
case JOIN_GROUP:
return wpas_p2p_nfc_join_group(wpa_s, &params);
case AUTH_JOIN:
P2P NFC: Static handover with NFC Tag on client This adds a new P2P Invitation mechanism to invite a P2P Device with an NFC Tag to an already operating group when the GO with NFC Device reads the NFC Tag. The P2P Device with the NFC Tag will then accept invitation and connect to the group automatically using its OOB Device Password. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 18:45:04 +02:00
return wpas_p2p_nfc_auth_join(wpa_s, &params, tag);
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
case INIT_GO_NEG:
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
return wpas_p2p_nfc_init_go_neg(wpa_s, &params, 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
case RESP_GO_NEG:
/* TODO: use own OOB Dev Pw */
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
return wpas_p2p_nfc_resp_go_neg(wpa_s, &params, 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
}
return -1;
}
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 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
{
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
return -1;
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
return wpas_p2p_nfc_connection_handover(wpa_s, data, 1, 1, forced_freq);
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
}
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: 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
{
struct wpabuf *tmp;
int ret;
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
return -1;
wpa_printf(MSG_DEBUG, "NFC: P2P connection handover reported");
wpa_hexdump_ascii(MSG_DEBUG, "NFC: Req",
wpabuf_head(req), wpabuf_len(req));
wpa_hexdump_ascii(MSG_DEBUG, "NFC: Sel",
wpabuf_head(sel), wpabuf_len(sel));
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
if (forced_freq)
wpa_printf(MSG_DEBUG, "NFC: Forced freq %d", 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
tmp = ndef_parse_p2p(init ? sel : req);
if (tmp == NULL) {
wpa_printf(MSG_DEBUG, "P2P: Could not parse NDEF");
return -1;
}
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
ret = wpas_p2p_nfc_connection_handover(wpa_s, tmp, init, 0,
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
wpabuf_free(tmp);
return ret;
}
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)
{
const u8 *if_addr;
int go_intent = wpa_s->conf->p2p_go_intent;
P2P NFC: Enable own NFC Tag on GO Registrar When "P2P_SET nfc_tag 1" is used to enable the own NFC Tag for P2P, also enable it for any running GO interface. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 17:08:26 +02:00
struct wpa_supplicant *iface;
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
if (wpa_s->global->p2p == NULL)
return -1;
if (!enabled) {
P2P NFC: Enable own NFC Tag on GO Registrar When "P2P_SET nfc_tag 1" is used to enable the own NFC Tag for P2P, also enable it for any running GO interface. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 17:08:26 +02:00
wpa_printf(MSG_DEBUG, "P2P: Disable use of own NFC Tag");
for (iface = wpa_s->global->ifaces; iface; iface = iface->next)
{
if (!iface->ap_iface)
continue;
hostapd_wps_nfc_token_disable(iface->ap_iface->bss[0]);
}
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
p2p_set_authorized_oob_dev_pw_id(wpa_s->global->p2p, 0,
0, NULL);
if (wpa_s->p2p_nfc_tag_enabled)
wpas_p2p_remove_pending_group_interface(wpa_s);
wpa_s->p2p_nfc_tag_enabled = 0;
return 0;
}
if (wpa_s->global->p2p_disabled)
return -1;
if (wpa_s->conf->wps_nfc_dh_pubkey == NULL ||
wpa_s->conf->wps_nfc_dh_privkey == NULL ||
wpa_s->conf->wps_nfc_dev_pw == NULL ||
wpa_s->conf->wps_nfc_dev_pw_id < 0x10) {
wpa_printf(MSG_DEBUG, "P2P: NFC password token not configured "
"to allow static handover cases");
return -1;
}
P2P NFC: Enable own NFC Tag on GO Registrar When "P2P_SET nfc_tag 1" is used to enable the own NFC Tag for P2P, also enable it for any running GO interface. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 17:08:26 +02:00
wpa_printf(MSG_DEBUG, "P2P: Enable use of own NFC Tag");
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
wpa_s->p2p_oob_dev_pw_id = wpa_s->conf->wps_nfc_dev_pw_id;
wpabuf_free(wpa_s->p2p_oob_dev_pw);
wpa_s->p2p_oob_dev_pw = wpabuf_dup(wpa_s->conf->wps_nfc_dev_pw);
if (wpa_s->p2p_oob_dev_pw == NULL)
return -1;
wpa_s->p2p_peer_oob_pk_hash_known = 0;
P2P: Do not create another group interface on NFC Token enable If a group interface is present and the command was issued on the group interface, enable the token for that interface instead of creating a new one. Signed-off-by: Manish <manish.bansal@broadcom.com>
2014-03-14 15:55:10 +01:00
if (wpa_s->p2p_group_interface == P2P_GROUP_INTERFACE_GO ||
wpa_s->p2p_group_interface == P2P_GROUP_INTERFACE_CLIENT) {
/*
* P2P Group Interface present and the command came on group
* interface, so enable the token for the current interface.
*/
wpa_s->create_p2p_iface = 0;
} else {
wpa_s->create_p2p_iface = wpas_p2p_create_iface(wpa_s);
}
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
if (wpa_s->create_p2p_iface) {
enum wpa_driver_if_type iftype;
/* Prepare to add a new interface for the group */
iftype = WPA_IF_P2P_GROUP;
if (go_intent == 15)
iftype = WPA_IF_P2P_GO;
if (wpas_p2p_add_group_interface(wpa_s, iftype) < 0) {
wpa_printf(MSG_ERROR, "P2P: Failed to allocate a new "
"interface for the group");
return -1;
}
if_addr = wpa_s->pending_interface_addr;
P2P: Support dedicated P2P_DEVICE without separate group interface Add support for drivers with dedicated P2P_DEVICE interface, but without group interface concurrency (only a single netdev is used). With such devices, wpa_supplicant tried to use the p2p_dev interface instead of the group interface and most P2P operations failed. Extend wpa_supplicant to use the primary interface instead of a separate group interface in such cases. Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
2016-01-24 16:36:49 +01:00
} else if (wpa_s->p2p_mgmt)
if_addr = wpa_s->parent->own_addr;
else
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
if_addr = wpa_s->own_addr;
wpa_s->p2p_nfc_tag_enabled = enabled;
P2P NFC: Enable own NFC Tag on GO Registrar When "P2P_SET nfc_tag 1" is used to enable the own NFC Tag for P2P, also enable it for any running GO interface. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-09-08 17:08:26 +02:00
for (iface = wpa_s->global->ifaces; iface; iface = iface->next) {
struct hostapd_data *hapd;
if (iface->ap_iface == NULL)
continue;
hapd = iface->ap_iface->bss[0];
wpabuf_free(hapd->conf->wps_nfc_dh_pubkey);
hapd->conf->wps_nfc_dh_pubkey =
wpabuf_dup(wpa_s->conf->wps_nfc_dh_pubkey);
wpabuf_free(hapd->conf->wps_nfc_dh_privkey);
hapd->conf->wps_nfc_dh_privkey =
wpabuf_dup(wpa_s->conf->wps_nfc_dh_privkey);
wpabuf_free(hapd->conf->wps_nfc_dev_pw);
hapd->conf->wps_nfc_dev_pw =
wpabuf_dup(wpa_s->conf->wps_nfc_dev_pw);
hapd->conf->wps_nfc_dev_pw_id = wpa_s->conf->wps_nfc_dev_pw_id;
if (hostapd_wps_nfc_token_enable(iface->ap_iface->bss[0]) < 0) {
wpa_dbg(iface, MSG_DEBUG,
"P2P: Failed to enable NFC Tag for GO");
}
}
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
p2p_set_authorized_oob_dev_pw_id(
wpa_s->global->p2p, wpa_s->conf->wps_nfc_dev_pw_id, go_intent,
if_addr);
return 0;
}
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
#endif /* CONFIG_WPS_NFC */
P2P: Use another interface operating channel as listen channel Performing a P2P Device flow such as p2p_listen or p2p_find, can degrade the performance of an active interface connection, if the listen frequency is different than the frequency used by that interface. To reduce the effect of P2P Device flows on other interfaces, try changing the listen channel of the P2P Device to match the operating channel of one of the other active interfaces. This change will be possible only in case that the listen channel is not forced externally, and will be delayed to a point where the P2P Device state machine is idle. The optimization can be configured in the configuration file and is disabled by default. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:39 +02:00
static void wpas_p2p_optimize_listen_channel(struct wpa_supplicant *wpa_s,
struct wpa_used_freq_data *freqs,
unsigned int num)
{
u8 curr_chan, cand, chan;
unsigned int i;
P2P: Consider channel optimizations for additional cases Re-factor the code, so channel optimizations would be also triggered upon the following changes: channel updates from the kernel, disallow_freq interface, etc. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:25 +02:00
/*
* If possible, optimize the Listen channel to be a channel that is
* already used by one of the other interfaces.
*/
if (!wpa_s->conf->p2p_optimize_listen_chan)
return;
if (!wpa_s->current_ssid || wpa_s->wpa_state != WPA_COMPLETED)
return;
P2P: Use another interface operating channel as listen channel Performing a P2P Device flow such as p2p_listen or p2p_find, can degrade the performance of an active interface connection, if the listen frequency is different than the frequency used by that interface. To reduce the effect of P2P Device flows on other interfaces, try changing the listen channel of the P2P Device to match the operating channel of one of the other active interfaces. This change will be possible only in case that the listen channel is not forced externally, and will be delayed to a point where the P2P Device state machine is idle. The optimization can be configured in the configuration file and is disabled by default. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:39 +02:00
curr_chan = p2p_get_listen_channel(wpa_s->global->p2p);
for (i = 0, cand = 0; i < num; i++) {
ieee80211_freq_to_chan(freqs[i].freq, &chan);
if (curr_chan == chan) {
cand = 0;
break;
}
if (chan == 1 || chan == 6 || chan == 11)
cand = chan;
}
if (cand) {
wpa_dbg(wpa_s, MSG_DEBUG,
P2P: Clean up Listen channel optimization debug prints Do not claim to change the Listen channel in a debug message when previously configured channel prevents this. In addition, fix a typo in another related debug print. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2015-02-03 15:13:35 +01:00
"P2P: Update Listen channel to %u based on operating channel",
P2P: Use another interface operating channel as listen channel Performing a P2P Device flow such as p2p_listen or p2p_find, can degrade the performance of an active interface connection, if the listen frequency is different than the frequency used by that interface. To reduce the effect of P2P Device flows on other interfaces, try changing the listen channel of the P2P Device to match the operating channel of one of the other active interfaces. This change will be possible only in case that the listen channel is not forced externally, and will be delayed to a point where the P2P Device state machine is idle. The optimization can be configured in the configuration file and is disabled by default. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:39 +02:00
cand);
p2p_set_listen_channel(wpa_s->global->p2p, 81, cand, 0);
}
}
P2P: Move a GO from its operating frequency Upon any change in the currently used channels evaluate if a GO should move to a different operating frequency, where the possible scenarios: 1. The frequency that the GO is currently using is no longer valid, due to regulatory reasons, and thus the GO must be moved to some other frequency. 2. Due to Multi Concurrent Channel (MCC) policy considerations, it would be preferable, based on configuration settings, to prefer Same Channel Mode (SCM) over concurrent operation in multiple channels. The supported policies: - prefer SCM: prefer moving the GO to a frequency used by some other interface. - prefer SCM if Peer supports: prefer moving the GO to a frequency used by some other station interface iff the other station interface is using a frequency that is common between the local and the peer device (based on the GO Negotiation/Invitation signaling). - Stay on the current frequency. Currently, the GO transition to another frequency is handled by a complete tear down and re-setup of the GO. Still need to add CSA flow to the considerations. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:19 +02:00
static int wpas_p2p_move_go_csa(struct wpa_supplicant *wpa_s)
{
P2P: Implement wpas_p2p_move_go_csa() Use channel switch mechanism to move a P2P GO to a new channel, when required. In order to be able to reconfigure the GO channel, split wpa_supplicant_conf_ap() function, so the frequency configuration part can be reused to find additional CSA settings. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2015-09-08 11:46:16 +02:00
struct hostapd_config *conf;
struct p2p_go_neg_results params;
struct csa_settings csa_settings;
struct wpa_ssid *current_ssid = wpa_s->current_ssid;
int old_freq = current_ssid->frequency;
int ret;
P2P: Move a GO from its operating frequency Upon any change in the currently used channels evaluate if a GO should move to a different operating frequency, where the possible scenarios: 1. The frequency that the GO is currently using is no longer valid, due to regulatory reasons, and thus the GO must be moved to some other frequency. 2. Due to Multi Concurrent Channel (MCC) policy considerations, it would be preferable, based on configuration settings, to prefer Same Channel Mode (SCM) over concurrent operation in multiple channels. The supported policies: - prefer SCM: prefer moving the GO to a frequency used by some other interface. - prefer SCM if Peer supports: prefer moving the GO to a frequency used by some other station interface iff the other station interface is using a frequency that is common between the local and the peer device (based on the GO Negotiation/Invitation signaling). - Stay on the current frequency. Currently, the GO transition to another frequency is handled by a complete tear down and re-setup of the GO. Still need to add CSA flow to the considerations. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:19 +02:00
if (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_AP_CSA)) {
wpa_dbg(wpa_s, MSG_DEBUG, "CSA is not enabled");
return -1;
}
P2P: Implement wpas_p2p_move_go_csa() Use channel switch mechanism to move a P2P GO to a new channel, when required. In order to be able to reconfigure the GO channel, split wpa_supplicant_conf_ap() function, so the frequency configuration part can be reused to find additional CSA settings. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2015-09-08 11:46:16 +02:00
/*
* TODO: This function may not always work correctly. For example,
* when we have a running GO and a BSS on a DFS channel.
*/
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
if (wpas_p2p_init_go_params(wpa_s, &params, 0, 0, 0, 0, 0, NULL)) {
P2P: Implement wpas_p2p_move_go_csa() Use channel switch mechanism to move a P2P GO to a new channel, when required. In order to be able to reconfigure the GO channel, split wpa_supplicant_conf_ap() function, so the frequency configuration part can be reused to find additional CSA settings. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2015-09-08 11:46:16 +02:00
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P CSA: Failed to select new frequency for GO");
return -1;
}
if (current_ssid->frequency == params.freq) {
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P CSA: Selected same frequency - not moving GO");
return 0;
}
conf = hostapd_config_defaults();
if (!conf) {
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P CSA: Failed to allocate default config");
return -1;
}
current_ssid->frequency = params.freq;
if (wpa_supplicant_conf_ap_ht(wpa_s, current_ssid, conf)) {
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P CSA: Failed to create new GO config");
ret = -1;
goto out;
}
if (conf->hw_mode != wpa_s->ap_iface->current_mode->mode) {
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P CSA: CSA to a different band is not supported");
ret = -1;
goto out;
}
os_memset(&csa_settings, 0, sizeof(csa_settings));
csa_settings.cs_count = P2P_GO_CSA_COUNT;
csa_settings.block_tx = P2P_GO_CSA_BLOCK_TX;
csa_settings.freq_params.freq = params.freq;
csa_settings.freq_params.sec_channel_offset = conf->secondary_channel;
csa_settings.freq_params.ht_enabled = conf->ieee80211n;
csa_settings.freq_params.bandwidth = conf->secondary_channel ? 40 : 20;
if (conf->ieee80211ac) {
int freq1 = 0, freq2 = 0;
Set channel and operating class in hostapd_fill_csa_settings() The CSA channel and operating class values need to be set for all types of channel switch (i.e., either if it's triggered by the control interfaces or due to the GO-follows-STA flow). To do so, move the code that sets them from the GO-follows-STA flow to the more generic hostapd_fill_csa_settings() function. Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
2015-09-08 11:46:30 +02:00
u8 chan, opclass;
if (ieee80211_freq_to_channel_ext(params.freq,
conf->secondary_channel,
conf->vht_oper_chwidth,
&opclass, &chan) ==
NUM_HOSTAPD_MODES) {
wpa_printf(MSG_ERROR, "P2P CSA: Bad freq");
ret = -1;
goto out;
}
P2P: Implement wpas_p2p_move_go_csa() Use channel switch mechanism to move a P2P GO to a new channel, when required. In order to be able to reconfigure the GO channel, split wpa_supplicant_conf_ap() function, so the frequency configuration part can be reused to find additional CSA settings. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2015-09-08 11:46:16 +02:00
if (conf->vht_oper_centr_freq_seg0_idx)
freq1 = ieee80211_chan_to_freq(
Set channel and operating class in hostapd_fill_csa_settings() The CSA channel and operating class values need to be set for all types of channel switch (i.e., either if it's triggered by the control interfaces or due to the GO-follows-STA flow). To do so, move the code that sets them from the GO-follows-STA flow to the more generic hostapd_fill_csa_settings() function. Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
2015-09-08 11:46:30 +02:00
NULL, opclass,
P2P: Implement wpas_p2p_move_go_csa() Use channel switch mechanism to move a P2P GO to a new channel, when required. In order to be able to reconfigure the GO channel, split wpa_supplicant_conf_ap() function, so the frequency configuration part can be reused to find additional CSA settings. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2015-09-08 11:46:16 +02:00
conf->vht_oper_centr_freq_seg0_idx);
if (conf->vht_oper_centr_freq_seg1_idx)
freq2 = ieee80211_chan_to_freq(
Set channel and operating class in hostapd_fill_csa_settings() The CSA channel and operating class values need to be set for all types of channel switch (i.e., either if it's triggered by the control interfaces or due to the GO-follows-STA flow). To do so, move the code that sets them from the GO-follows-STA flow to the more generic hostapd_fill_csa_settings() function. Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
2015-09-08 11:46:30 +02:00
NULL, opclass,
P2P: Implement wpas_p2p_move_go_csa() Use channel switch mechanism to move a P2P GO to a new channel, when required. In order to be able to reconfigure the GO channel, split wpa_supplicant_conf_ap() function, so the frequency configuration part can be reused to find additional CSA settings. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2015-09-08 11:46:16 +02:00
conf->vht_oper_centr_freq_seg1_idx);
if (freq1 < 0 || freq2 < 0) {
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P CSA: Selected invalid VHT center freqs");
ret = -1;
goto out;
}
csa_settings.freq_params.vht_enabled = conf->ieee80211ac;
csa_settings.freq_params.center_freq1 = freq1;
csa_settings.freq_params.center_freq2 = freq2;
switch (conf->vht_oper_chwidth) {
case VHT_CHANWIDTH_80MHZ:
case VHT_CHANWIDTH_80P80MHZ:
csa_settings.freq_params.bandwidth = 80;
break;
case VHT_CHANWIDTH_160MHZ:
csa_settings.freq_params.bandwidth = 160;
break;
}
}
ret = ap_switch_channel(wpa_s, &csa_settings);
out:
current_ssid->frequency = old_freq;
hostapd_config_free(conf);
return ret;
P2P: Move a GO from its operating frequency Upon any change in the currently used channels evaluate if a GO should move to a different operating frequency, where the possible scenarios: 1. The frequency that the GO is currently using is no longer valid, due to regulatory reasons, and thus the GO must be moved to some other frequency. 2. Due to Multi Concurrent Channel (MCC) policy considerations, it would be preferable, based on configuration settings, to prefer Same Channel Mode (SCM) over concurrent operation in multiple channels. The supported policies: - prefer SCM: prefer moving the GO to a frequency used by some other interface. - prefer SCM if Peer supports: prefer moving the GO to a frequency used by some other station interface iff the other station interface is using a frequency that is common between the local and the peer device (based on the GO Negotiation/Invitation signaling). - Stay on the current frequency. Currently, the GO transition to another frequency is handled by a complete tear down and re-setup of the GO. Still need to add CSA flow to the considerations. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:19 +02:00
}
static void wpas_p2p_move_go_no_csa(struct wpa_supplicant *wpa_s)
{
struct p2p_go_neg_results params;
struct wpa_ssid *current_ssid = wpa_s->current_ssid;
wpa_msg_global(wpa_s, MSG_INFO, P2P_EVENT_REMOVE_AND_REFORM_GROUP);
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Move GO from freq=%d MHz",
current_ssid->frequency);
/* Stop the AP functionality */
/* TODO: Should do this in a way that does not indicated to possible
* P2P Clients in the group that the group is terminated. */
wpa_supplicant_ap_deinit(wpa_s);
/* Reselect the GO frequency */
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
if (wpas_p2p_init_go_params(wpa_s, &params, 0, 0, 0, 0, 0, NULL)) {
P2P: Move a GO from its operating frequency Upon any change in the currently used channels evaluate if a GO should move to a different operating frequency, where the possible scenarios: 1. The frequency that the GO is currently using is no longer valid, due to regulatory reasons, and thus the GO must be moved to some other frequency. 2. Due to Multi Concurrent Channel (MCC) policy considerations, it would be preferable, based on configuration settings, to prefer Same Channel Mode (SCM) over concurrent operation in multiple channels. The supported policies: - prefer SCM: prefer moving the GO to a frequency used by some other interface. - prefer SCM if Peer supports: prefer moving the GO to a frequency used by some other station interface iff the other station interface is using a frequency that is common between the local and the peer device (based on the GO Negotiation/Invitation signaling). - Stay on the current frequency. Currently, the GO transition to another frequency is handled by a complete tear down and re-setup of the GO. Still need to add CSA flow to the considerations. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:19 +02:00
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Failed to reselect freq");
wpas_p2p_group_delete(wpa_s,
P2P_GROUP_REMOVAL_GO_LEAVE_CHANNEL);
return;
}
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: New freq selected for the GO (%u MHz)",
params.freq);
if (params.freq &&
!p2p_supported_freq_go(wpa_s->global->p2p, params.freq)) {
wpa_printf(MSG_DEBUG,
"P2P: Selected freq (%u MHz) is not valid for P2P",
params.freq);
wpas_p2p_group_delete(wpa_s,
P2P_GROUP_REMOVAL_GO_LEAVE_CHANNEL);
return;
}
/* Update the frequency */
current_ssid->frequency = params.freq;
wpa_s->connect_without_scan = current_ssid;
wpa_s->reassociate = 1;
wpa_s->disconnected = 0;
wpa_supplicant_req_scan(wpa_s, 0, 0);
}
static void wpas_p2p_move_go(void *eloop_ctx, void *timeout_ctx)
{
struct wpa_supplicant *wpa_s = eloop_ctx;
if (!wpa_s->ap_iface || !wpa_s->current_ssid)
return;
P2P: Add a function to compute the group common freqs Add a function to compute the group common frequencies, and use it to update the group_common_frequencies as part of the channel switch flows. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:20 +02:00
wpas_p2p_go_update_common_freqs(wpa_s);
P2P: Trigger channel selection correctly during CSA Do not consider moving GOs to a new channel if one of them is in the middle of CSA. In addition, call wpas_p2p_update_channel_list() after EVENT_CH_SWITCH is handled. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2015-09-08 11:46:19 +02:00
/* Do not move GO in the middle of a CSA */
if (hostapd_csa_in_progress(wpa_s->ap_iface)) {
wpa_printf(MSG_DEBUG,
"P2P: CSA is in progress - not moving GO");
return;
}
P2P: Move a GO from its operating frequency Upon any change in the currently used channels evaluate if a GO should move to a different operating frequency, where the possible scenarios: 1. The frequency that the GO is currently using is no longer valid, due to regulatory reasons, and thus the GO must be moved to some other frequency. 2. Due to Multi Concurrent Channel (MCC) policy considerations, it would be preferable, based on configuration settings, to prefer Same Channel Mode (SCM) over concurrent operation in multiple channels. The supported policies: - prefer SCM: prefer moving the GO to a frequency used by some other interface. - prefer SCM if Peer supports: prefer moving the GO to a frequency used by some other station interface iff the other station interface is using a frequency that is common between the local and the peer device (based on the GO Negotiation/Invitation signaling). - Stay on the current frequency. Currently, the GO transition to another frequency is handled by a complete tear down and re-setup of the GO. Still need to add CSA flow to the considerations. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:19 +02:00
/*
* First, try a channel switch flow. If it is not supported or fails,
* take down the GO and bring it up again.
*/
if (wpas_p2p_move_go_csa(wpa_s) < 0)
wpas_p2p_move_go_no_csa(wpa_s);
}
P2P: Disallow GO CS immediately after GO Negotiation or invitation A newly created GO might move to another channel before the client was able to connect to it. This creates a situation where the client searches the GO on the channel agreed upon during GO Negotiation or invitation signaling, while the GO is on another channel. This in turn might lead to delayed connection or connection failure and group removal. Fix this by disallowing a GO CS as long as there is some activity that should delay the switch. If a GO move is not allowed, set a timeout to re-attempt the move. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:26 +02:00
static void wpas_p2p_reconsider_moving_go(void *eloop_ctx, void *timeout_ctx)
{
struct wpa_supplicant *wpa_s = eloop_ctx;
struct wpa_used_freq_data *freqs = NULL;
unsigned int num = wpa_s->num_multichan_concurrent;
freqs = os_calloc(num, sizeof(struct wpa_used_freq_data));
if (!freqs)
return;
num = get_shared_radio_freqs_data(wpa_s, freqs, num);
/* Previous attempt to move a GO was not possible -- try again. */
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
wpas_p2p_consider_moving_gos(wpa_s, freqs, num,
WPAS_P2P_CHANNEL_UPDATE_ANY);
P2P: Disallow GO CS immediately after GO Negotiation or invitation A newly created GO might move to another channel before the client was able to connect to it. This creates a situation where the client searches the GO on the channel agreed upon during GO Negotiation or invitation signaling, while the GO is on another channel. This in turn might lead to delayed connection or connection failure and group removal. Fix this by disallowing a GO CS as long as there is some activity that should delay the switch. If a GO move is not allowed, set a timeout to re-attempt the move. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:26 +02:00
os_free(freqs);
}
P2P: Move a GO from its operating frequency Upon any change in the currently used channels evaluate if a GO should move to a different operating frequency, where the possible scenarios: 1. The frequency that the GO is currently using is no longer valid, due to regulatory reasons, and thus the GO must be moved to some other frequency. 2. Due to Multi Concurrent Channel (MCC) policy considerations, it would be preferable, based on configuration settings, to prefer Same Channel Mode (SCM) over concurrent operation in multiple channels. The supported policies: - prefer SCM: prefer moving the GO to a frequency used by some other interface. - prefer SCM if Peer supports: prefer moving the GO to a frequency used by some other station interface iff the other station interface is using a frequency that is common between the local and the peer device (based on the GO Negotiation/Invitation signaling). - Stay on the current frequency. Currently, the GO transition to another frequency is handled by a complete tear down and re-setup of the GO. Still need to add CSA flow to the considerations. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:19 +02:00
/*
* Consider moving a GO from its currently used frequency:
* 1. It is possible that due to regulatory consideration the frequency
* can no longer be used and there is a need to evacuate the GO.
* 2. It is possible that due to MCC considerations, it would be preferable
* to move the GO to a channel that is currently used by some other
* station interface.
*
* In case a frequency that became invalid is once again valid, cancel a
* previously initiated GO frequency change.
*/
static void wpas_p2p_consider_moving_one_go(struct wpa_supplicant *wpa_s,
struct wpa_used_freq_data *freqs,
unsigned int num)
{
unsigned int i, invalid_freq = 0, policy_move = 0, flags = 0;
unsigned int timeout;
int freq;
P2P: Add a function to compute the group common freqs Add a function to compute the group common frequencies, and use it to update the group_common_frequencies as part of the channel switch flows. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:20 +02:00
wpas_p2p_go_update_common_freqs(wpa_s);
P2P: Move a GO from its operating frequency Upon any change in the currently used channels evaluate if a GO should move to a different operating frequency, where the possible scenarios: 1. The frequency that the GO is currently using is no longer valid, due to regulatory reasons, and thus the GO must be moved to some other frequency. 2. Due to Multi Concurrent Channel (MCC) policy considerations, it would be preferable, based on configuration settings, to prefer Same Channel Mode (SCM) over concurrent operation in multiple channels. The supported policies: - prefer SCM: prefer moving the GO to a frequency used by some other interface. - prefer SCM if Peer supports: prefer moving the GO to a frequency used by some other station interface iff the other station interface is using a frequency that is common between the local and the peer device (based on the GO Negotiation/Invitation signaling). - Stay on the current frequency. Currently, the GO transition to another frequency is handled by a complete tear down and re-setup of the GO. Still need to add CSA flow to the considerations. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:19 +02:00
freq = wpa_s->current_ssid->frequency;
for (i = 0, invalid_freq = 0; i < num; i++) {
if (freqs[i].freq == freq) {
flags = freqs[i].flags;
/* The channel is invalid, must change it */
if (!p2p_supported_freq_go(wpa_s->global->p2p, freq)) {
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P: Freq=%d MHz no longer valid for GO",
freq);
invalid_freq = 1;
}
} else if (freqs[i].flags == 0) {
/* Freq is not used by any other station interface */
continue;
} else if (!p2p_supported_freq(wpa_s->global->p2p,
freqs[i].freq)) {
/* Freq is not valid for P2P use cases */
continue;
} else if (wpa_s->conf->p2p_go_freq_change_policy ==
P2P_GO_FREQ_MOVE_SCM) {
policy_move = 1;
} else if (wpa_s->conf->p2p_go_freq_change_policy ==
P2P_GO_FREQ_MOVE_SCM_PEER_SUPPORTS &&
wpas_p2p_go_is_peer_freq(wpa_s, freqs[i].freq)) {
policy_move = 1;
P2P: Implement P2P_GO_FREQ_MOVE_SCM_ECSA policy Add new GO frequency move policy. The P2P_GO_FREQ_MOVE_SCM_ECSA prefers SCM if all the clients advertise eCSA support and the candidate frequency is one of the group common frequencies. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2015-09-08 11:46:20 +02:00
} else if ((wpa_s->conf->p2p_go_freq_change_policy ==
P2P_GO_FREQ_MOVE_SCM_ECSA) &&
wpas_p2p_go_is_peer_freq(wpa_s, freqs[i].freq)) {
if (!p2p_get_group_num_members(wpa_s->p2p_group)) {
policy_move = 1;
} else if ((wpa_s->drv_flags &
WPA_DRIVER_FLAGS_AP_CSA) &&
wpas_p2p_go_clients_support_ecsa(wpa_s)) {
u8 chan;
/*
* We do not support CSA between bands, so move
* GO only within the same band.
*/
if (wpa_s->ap_iface->current_mode->mode ==
ieee80211_freq_to_chan(freqs[i].freq,
&chan))
policy_move = 1;
}
P2P: Move a GO from its operating frequency Upon any change in the currently used channels evaluate if a GO should move to a different operating frequency, where the possible scenarios: 1. The frequency that the GO is currently using is no longer valid, due to regulatory reasons, and thus the GO must be moved to some other frequency. 2. Due to Multi Concurrent Channel (MCC) policy considerations, it would be preferable, based on configuration settings, to prefer Same Channel Mode (SCM) over concurrent operation in multiple channels. The supported policies: - prefer SCM: prefer moving the GO to a frequency used by some other interface. - prefer SCM if Peer supports: prefer moving the GO to a frequency used by some other station interface iff the other station interface is using a frequency that is common between the local and the peer device (based on the GO Negotiation/Invitation signaling). - Stay on the current frequency. Currently, the GO transition to another frequency is handled by a complete tear down and re-setup of the GO. Still need to add CSA flow to the considerations. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:19 +02:00
}
}
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P: GO move: invalid_freq=%u, policy_move=%u, flags=0x%X",
invalid_freq, policy_move, flags);
/*
* The channel is valid, or we are going to have a policy move, so
* cancel timeout.
*/
if (!invalid_freq || policy_move) {
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P: Cancel a GO move from freq=%d MHz", freq);
eloop_cancel_timeout(wpas_p2p_move_go, wpa_s, NULL);
P2P: Disallow GO CS immediately after GO Negotiation or invitation A newly created GO might move to another channel before the client was able to connect to it. This creates a situation where the client searches the GO on the channel agreed upon during GO Negotiation or invitation signaling, while the GO is on another channel. This in turn might lead to delayed connection or connection failure and group removal. Fix this by disallowing a GO CS as long as there is some activity that should delay the switch. If a GO move is not allowed, set a timeout to re-attempt the move. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:26 +02:00
if (wpas_p2p_in_progress(wpa_s)) {
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P: GO move: policy CS is not allowed - setting timeout to re-consider GO move");
eloop_cancel_timeout(wpas_p2p_reconsider_moving_go,
wpa_s, NULL);
eloop_register_timeout(P2P_RECONSIDER_GO_MOVE_DELAY, 0,
wpas_p2p_reconsider_moving_go,
wpa_s, NULL);
return;
}
P2P: Move a GO from its operating frequency Upon any change in the currently used channels evaluate if a GO should move to a different operating frequency, where the possible scenarios: 1. The frequency that the GO is currently using is no longer valid, due to regulatory reasons, and thus the GO must be moved to some other frequency. 2. Due to Multi Concurrent Channel (MCC) policy considerations, it would be preferable, based on configuration settings, to prefer Same Channel Mode (SCM) over concurrent operation in multiple channels. The supported policies: - prefer SCM: prefer moving the GO to a frequency used by some other interface. - prefer SCM if Peer supports: prefer moving the GO to a frequency used by some other station interface iff the other station interface is using a frequency that is common between the local and the peer device (based on the GO Negotiation/Invitation signaling). - Stay on the current frequency. Currently, the GO transition to another frequency is handled by a complete tear down and re-setup of the GO. Still need to add CSA flow to the considerations. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:19 +02:00
}
if (!invalid_freq && (!policy_move || flags != 0)) {
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P: Not initiating a GO frequency change");
return;
}
P2P: Trigger channel selection correctly during CSA Do not consider moving GOs to a new channel if one of them is in the middle of CSA. In addition, call wpas_p2p_update_channel_list() after EVENT_CH_SWITCH is handled. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2015-09-08 11:46:19 +02:00
/*
* Do not consider moving GO if it is in the middle of a CSA. When the
* CSA is finished this flow should be retriggered.
*/
if (hostapd_csa_in_progress(wpa_s->ap_iface)) {
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P: Not initiating a GO frequency change - CSA is in progress");
return;
}
P2P: Move a GO from its operating frequency Upon any change in the currently used channels evaluate if a GO should move to a different operating frequency, where the possible scenarios: 1. The frequency that the GO is currently using is no longer valid, due to regulatory reasons, and thus the GO must be moved to some other frequency. 2. Due to Multi Concurrent Channel (MCC) policy considerations, it would be preferable, based on configuration settings, to prefer Same Channel Mode (SCM) over concurrent operation in multiple channels. The supported policies: - prefer SCM: prefer moving the GO to a frequency used by some other interface. - prefer SCM if Peer supports: prefer moving the GO to a frequency used by some other station interface iff the other station interface is using a frequency that is common between the local and the peer device (based on the GO Negotiation/Invitation signaling). - Stay on the current frequency. Currently, the GO transition to another frequency is handled by a complete tear down and re-setup of the GO. Still need to add CSA flow to the considerations. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:19 +02:00
if (invalid_freq && !wpas_p2p_disallowed_freq(wpa_s->global, freq))
timeout = P2P_GO_FREQ_CHANGE_TIME;
else
timeout = 0;
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Move GO from freq=%d MHz in %d secs",
freq, timeout);
eloop_cancel_timeout(wpas_p2p_move_go, wpa_s, NULL);
eloop_register_timeout(timeout, 0, wpas_p2p_move_go, wpa_s, NULL);
}
static void wpas_p2p_consider_moving_gos(struct wpa_supplicant *wpa_s,
struct wpa_used_freq_data *freqs,
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
unsigned int num,
enum wpas_p2p_channel_update_trig trig)
P2P: Move a GO from its operating frequency Upon any change in the currently used channels evaluate if a GO should move to a different operating frequency, where the possible scenarios: 1. The frequency that the GO is currently using is no longer valid, due to regulatory reasons, and thus the GO must be moved to some other frequency. 2. Due to Multi Concurrent Channel (MCC) policy considerations, it would be preferable, based on configuration settings, to prefer Same Channel Mode (SCM) over concurrent operation in multiple channels. The supported policies: - prefer SCM: prefer moving the GO to a frequency used by some other interface. - prefer SCM if Peer supports: prefer moving the GO to a frequency used by some other station interface iff the other station interface is using a frequency that is common between the local and the peer device (based on the GO Negotiation/Invitation signaling). - Stay on the current frequency. Currently, the GO transition to another frequency is handled by a complete tear down and re-setup of the GO. Still need to add CSA flow to the considerations. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:19 +02:00
{
struct wpa_supplicant *ifs;
P2P: Disallow GO CS immediately after GO Negotiation or invitation A newly created GO might move to another channel before the client was able to connect to it. This creates a situation where the client searches the GO on the channel agreed upon during GO Negotiation or invitation signaling, while the GO is on another channel. This in turn might lead to delayed connection or connection failure and group removal. Fix this by disallowing a GO CS as long as there is some activity that should delay the switch. If a GO move is not allowed, set a timeout to re-attempt the move. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:26 +02:00
eloop_cancel_timeout(wpas_p2p_reconsider_moving_go, ELOOP_ALL_CTX,
NULL);
P2P: Move a GO from its operating frequency Upon any change in the currently used channels evaluate if a GO should move to a different operating frequency, where the possible scenarios: 1. The frequency that the GO is currently using is no longer valid, due to regulatory reasons, and thus the GO must be moved to some other frequency. 2. Due to Multi Concurrent Channel (MCC) policy considerations, it would be preferable, based on configuration settings, to prefer Same Channel Mode (SCM) over concurrent operation in multiple channels. The supported policies: - prefer SCM: prefer moving the GO to a frequency used by some other interface. - prefer SCM if Peer supports: prefer moving the GO to a frequency used by some other station interface iff the other station interface is using a frequency that is common between the local and the peer device (based on the GO Negotiation/Invitation signaling). - Stay on the current frequency. Currently, the GO transition to another frequency is handled by a complete tear down and re-setup of the GO. Still need to add CSA flow to the considerations. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:19 +02:00
/*
* Travers all the radio interfaces, and for each GO interface, check
* if there is a need to move the GO from the frequency it is using,
* or in case the frequency is valid again, cancel the evacuation flow.
*/
dl_list_for_each(ifs, &wpa_s->radio->ifaces, struct wpa_supplicant,
radio_list) {
if (ifs->current_ssid == NULL ||
ifs->current_ssid->mode != WPAS_MODE_P2P_GO)
continue;
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
/*
* The GO was just started or completed channel switch, no need
* to move it.
*/
if (wpa_s == ifs &&
(trig == WPAS_P2P_CHANNEL_UPDATE_STATE_CHANGE ||
trig == WPAS_P2P_CHANNEL_UPDATE_CS)) {
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P: GO move - schedule re-consideration");
eloop_register_timeout(P2P_RECONSIDER_GO_MOVE_DELAY, 0,
wpas_p2p_reconsider_moving_go,
wpa_s, NULL);
continue;
}
P2P: Move a GO from its operating frequency Upon any change in the currently used channels evaluate if a GO should move to a different operating frequency, where the possible scenarios: 1. The frequency that the GO is currently using is no longer valid, due to regulatory reasons, and thus the GO must be moved to some other frequency. 2. Due to Multi Concurrent Channel (MCC) policy considerations, it would be preferable, based on configuration settings, to prefer Same Channel Mode (SCM) over concurrent operation in multiple channels. The supported policies: - prefer SCM: prefer moving the GO to a frequency used by some other interface. - prefer SCM if Peer supports: prefer moving the GO to a frequency used by some other station interface iff the other station interface is using a frequency that is common between the local and the peer device (based on the GO Negotiation/Invitation signaling). - Stay on the current frequency. Currently, the GO transition to another frequency is handled by a complete tear down and re-setup of the GO. Still need to add CSA flow to the considerations. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2015-07-27 21:24:19 +02:00
wpas_p2p_consider_moving_one_go(ifs, freqs, num);
}
}
P2P: Use another interface operating channel as listen channel Performing a P2P Device flow such as p2p_listen or p2p_find, can degrade the performance of an active interface connection, if the listen frequency is different than the frequency used by that interface. To reduce the effect of P2P Device flows on other interfaces, try changing the listen channel of the P2P Device to match the operating channel of one of the other active interfaces. This change will be possible only in case that the listen channel is not forced externally, and will be delayed to a point where the P2P Device state machine is idle. The optimization can be configured in the configuration file and is disabled by default. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:39 +02:00
void wpas_p2p_indicate_state_change(struct wpa_supplicant *wpa_s)
{
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
return;
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
wpas_p2p_update_channel_list(wpa_s,
WPAS_P2P_CHANNEL_UPDATE_STATE_CHANGE);
P2P: Use another interface operating channel as listen channel Performing a P2P Device flow such as p2p_listen or p2p_find, can degrade the performance of an active interface connection, if the listen frequency is different than the frequency used by that interface. To reduce the effect of P2P Device flows on other interfaces, try changing the listen channel of the P2P Device to match the operating channel of one of the other active interfaces. This change will be possible only in case that the listen channel is not forced externally, and will be delayed to a point where the P2P Device state machine is idle. The optimization can be configured in the configuration file and is disabled by default. Signed-off-by: Ilan Peer <ilan.peer@intel.com>
2014-05-19 09:05:39 +02:00
}
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_deinit_iface(struct wpa_supplicant *wpa_s)
{
if (wpa_s == wpa_s->global->p2p_init_wpa_s && wpa_s->global->p2p) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Disable P2P since removing "
"the management interface is being removed");
wpas_p2p_deinit_global(wpa_s->global);
}
}
void wpas_p2p_ap_deinit(struct wpa_supplicant *wpa_s)
{
if (wpa_s->ap_iface->bss)
wpa_s->ap_iface->bss[0]->p2p_group = NULL;
wpas_p2p_group_deinit(wpa_s);
}
P2P: Allow P2P listen being offloaded to the driver/firmware This allows P2P Listen to be offloaded to device to enhance power saving. To start P2P listen offload, from wpa_cli interface, issue the command: p2p_lo_start <freq> <period> <interval> <count> To stop P2P listen offload, issue the command: p2p_lo_stop Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
2016-06-24 20:36:18 +02:00
int wpas_p2p_lo_start(struct wpa_supplicant *wpa_s, unsigned int freq,
unsigned int period, unsigned int interval,
unsigned int count)
{
struct p2p_data *p2p = wpa_s->global->p2p;
u8 *device_types;
size_t dev_types_len;
struct wpabuf *buf;
int ret;
if (wpa_s->p2p_lo_started) {
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P Listen offload is already started");
return 0;
}
if (wpa_s->global->p2p == NULL ||
!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_P2P_LISTEN_OFFLOAD)) {
wpa_printf(MSG_DEBUG, "P2P: Listen offload not supported");
return -1;
}
if (!p2p_supported_freq(wpa_s->global->p2p, freq)) {
wpa_printf(MSG_ERROR, "P2P: Input channel not supported: %u",
freq);
return -1;
}
/* Get device type */
dev_types_len = (wpa_s->conf->num_sec_device_types + 1) *
WPS_DEV_TYPE_LEN;
device_types = os_malloc(dev_types_len);
if (!device_types)
return -1;
os_memcpy(device_types, wpa_s->conf->device_type, WPS_DEV_TYPE_LEN);
os_memcpy(&device_types[WPS_DEV_TYPE_LEN], wpa_s->conf->sec_device_type,
wpa_s->conf->num_sec_device_types * WPS_DEV_TYPE_LEN);
/* Get Probe Response IE(s) */
buf = p2p_build_probe_resp_template(p2p, freq);
if (!buf) {
os_free(device_types);
return -1;
}
ret = wpa_drv_p2p_lo_start(wpa_s, freq, period, interval, count,
device_types, dev_types_len,
wpabuf_mhead_u8(buf), wpabuf_len(buf));
if (ret < 0)
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P: Failed to start P2P listen offload");
os_free(device_types);
wpabuf_free(buf);
if (ret == 0) {
wpa_s->p2p_lo_started = 1;
/* Stop current P2P listen if any */
wpas_stop_listen(wpa_s);
}
return ret;
}
int wpas_p2p_lo_stop(struct wpa_supplicant *wpa_s)
{
int ret;
if (!wpa_s->p2p_lo_started)
return 0;
ret = wpa_drv_p2p_lo_stop(wpa_s);
if (ret < 0)
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P: Failed to stop P2P listen offload");
wpa_s->p2p_lo_started = 0;
return ret;
}
Reference in a new issue Copy permalink