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

7383 lines
204 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: 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"
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: 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
* WPS provisioning step.
*/
#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: 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
#ifndef P2P_CONCURRENT_SEARCH_DELAY
#define P2P_CONCURRENT_SEARCH_DELAY 500
#endif /* P2P_CONCURRENT_SEARCH_DELAY */
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: 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_GROUP_REMOVAL_FREQ_CONFLICT
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);
static int wpas_p2p_join_start(struct wpa_supplicant *wpa_s);
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: 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
int auto_join, 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: 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
static void wpas_p2p_fallback_to_go_neg(struct wpa_supplicant *wpa_s,
int group_added);
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
static int 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: 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.
*/
static int wpas_p2p_valid_oper_freqs(struct wpa_supplicant *wpa_s,
int *p2p_freqs, unsigned int len)
{
int *freqs;
unsigned int num, i, j;
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_memset(p2p_freqs, 0, sizeof(int) * len);
for (i = 0, j = 0; i < num && j < len; i++) {
if (p2p_supported_freq(wpa_s->global->p2p, freqs[i]))
p2p_freqs[j++] = freqs[i];
}
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
dump_freq_array(wpa_s, "valid for P2P", p2p_freqs, j);
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: 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
if (wpa_s->parent->conf->p2p_ignore_shared_freq &&
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_scan_free_params(params);
return;
}
ret = wpa_drv_scan(wpa_s, params);
wpa_scan_free_params(params);
work->ctx = NULL;
if (ret) {
radio_work_done(work);
return;
}
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: 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: 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;
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
u8 *n;
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
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
ielen = p2p_scan_ie_buf_len(wpa_s->global->p2p);
ies = wpabuf_alloc(wpabuf_len(wps_ie) + ielen);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (ies == NULL) {
wpabuf_free(wps_ie);
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
}
wpabuf_put_buf(ies, wps_ie);
wpabuf_free(wps_ie);
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
p2p_scan_ie(wpa_s->global->p2p, ies, dev_id);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +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->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);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
switch (type) {
case P2P_SCAN_SOCIAL:
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->freqs = os_malloc(4 * sizeof(int));
if (params->freqs == NULL)
goto fail;
params->freqs[0] = 2412;
params->freqs[1] = 2437;
params->freqs[2] = 2462;
params->freqs[3] = 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
break;
case P2P_SCAN_FULL:
break;
case P2P_SCAN_SOCIAL_PLUS_ONE:
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->freqs = os_malloc(5 * sizeof(int));
if (params->freqs == NULL)
goto fail;
params->freqs[0] = 2412;
params->freqs[1] = 2437;
params->freqs[2] = 2462;
params->freqs[3] = freq;
params->freqs[4] = 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
break;
}
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
radio_remove_unstarted_work(wpa_s, "p2p-scan");
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: 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;
wpa_supplicant_deauthenticate(wpa_s,
WLAN_REASON_DEAUTH_LEAVING);
gtype = "client";
} else
gtype = "GO";
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: 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->parent, MSG_INFO,
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: 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->parent, MSG_INFO,
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: 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->parent, 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: 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: 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: 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 && ssid)
P2P: Add group removed notification Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-24 21:27:23 +01:00
wpas_notify_p2p_group_removed(wpa_s, ssid, gtype);
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);
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: 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: 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
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);
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));
return group_capab & P2P_GROUP_CAPAB_PERSISTENT_GROUP;
}
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;
s->pairwise_cipher = 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
#ifndef CONFIG_NO_CONFIG_WRITE
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");
}
#endif /* CONFIG_NO_CONFIG_WRITE */
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: 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;
for (s = wpa_s->parent->conf->ssid; s; s = s->next) {
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++) {
if (os_memcmp(s->p2p_client_list + i * 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 */
os_memmove(s->p2p_client_list + i * ETH_ALEN,
s->p2p_client_list + (i + 1) * ETH_ALEN,
(s->num_p2p_clients - i - 1) * ETH_ALEN);
os_memcpy(s->p2p_client_list +
(s->num_p2p_clients - 1) * ETH_ALEN, addr, ETH_ALEN);
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,
s->num_p2p_clients + 1, ETH_ALEN);
if (n == NULL)
return;
os_memcpy(n + s->num_p2p_clients * ETH_ALEN, addr, ETH_ALEN);
s->p2p_client_list = n;
s->num_p2p_clients++;
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
} else if (!found) {
/* Not enough room for an additional entry - drop the oldest
* entry */
os_memmove(s->p2p_client_list,
s->p2p_client_list + ETH_ALEN,
(s->num_p2p_clients - 1) * ETH_ALEN);
os_memcpy(s->p2p_client_list +
(s->num_p2p_clients - 1) * ETH_ALEN,
addr, 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
#ifndef CONFIG_NO_CONFIG_WRITE
if (wpa_s->parent->conf->update_config &&
wpa_config_write(wpa_s->parent->confname, wpa_s->parent->conf))
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 wpas_group_formation_completed(struct wpa_supplicant *wpa_s,
int success)
{
struct wpa_ssid *ssid;
const char *ssid_txt;
int client;
int persistent;
u8 go_dev_addr[ETH_ALEN];
P2P: Add group started notification Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:35:37 +02:00
int network_id = -1;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/*
* 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: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (!success) {
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->parent, MSG_INFO,
P2P_EVENT_GROUP_FORMATION_FAILURE);
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: 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->parent, MSG_INFO,
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) {
ssid_txt = wpa_ssid_txt(ssid->ssid, ssid->ssid_len);
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 {
ssid_txt = "";
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 if (ssid && ssid->passphrase == NULL && ssid->psk_set) {
char psk[65];
wpa_snprintf_hex(psk, sizeof(psk), ssid->psk, 32);
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->parent, MSG_INFO, P2P_EVENT_GROUP_STARTED
"%s GO ssid=\"%s\" freq=%d psk=%s go_dev_addr="
MACSTR "%s",
wpa_s->ifname, ssid_txt, ssid->frequency, psk,
MAC2STR(go_dev_addr),
persistent ? " [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
} 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->parent, MSG_INFO, P2P_EVENT_GROUP_STARTED
"%s GO ssid=\"%s\" freq=%d passphrase=\"%s\" "
"go_dev_addr=" MACSTR "%s",
wpa_s->ifname, ssid_txt,
ssid ? ssid->frequency : 0,
ssid && ssid->passphrase ? ssid->passphrase : "",
MAC2STR(go_dev_addr),
persistent ? " [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)
P2P: Add group started notification Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:35:37 +02:00
network_id = wpas_p2p_store_persistent_group(wpa_s->parent,
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;
}
P2P: Use consistent checking of ssid != NULL
2011-07-15 13:20:31 +02:00
if (network_id < 0 && ssid)
P2P: Add group started notification Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:35:37 +02:00
network_id = ssid->id;
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) {
P2P: Add group started notification Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:35:37 +02:00
wpas_notify_p2p_group_started(wpa_s, ssid, network_id, 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];
};
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");
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
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)
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
{
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
enum p2p_send_action_result res = P2P_SEND_ACTION_SUCCESS;
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
if (wpa_s->p2p_send_action_work) {
struct send_action_work *awork;
awork = wpa_s->p2p_send_action_work->ctx;
if (awork->wait_time == 0) {
os_free(awork);
radio_work_done(wpa_s->p2p_send_action_work);
wpa_s->p2p_send_action_work = NULL;
} 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: 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");
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) {
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: 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
wpa_printf(MSG_DEBUG, "P2P: Start WPS Enrollee for peer " MACSTR,
MAC2STR(res->peer_interface_addr));
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) {
wpas_wps_start_nfc(wpa_s, res->peer_interface_addr,
wpa_s->parent->p2p_oob_dev_pw,
wpa_s->parent->p2p_oob_dev_pw_id, 1,
wpa_s->parent->p2p_oob_dev_pw_id ==
DEV_PW_NFC_CONNECTION_HANDOVER ?
wpa_s->parent->p2p_peer_oob_pubkey_hash :
NULL,
NULL, 0);
#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;
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;
persistent = wpas_p2p_get_persistent(wpa_s->parent, NULL, ssid->ssid,
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: 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: Add group started notification Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:35:37 +02:00
int network_id = -1;
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: 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) {
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->parent, MSG_INFO,
P2P_EVENT_GROUP_STARTED
"%s GO ssid=\"%s\" freq=%d "
"passphrase=\"%s\" go_dev_addr=" MACSTR
"%s", wpa_s->ifname,
wpa_ssid_txt(ssid->ssid, ssid->ssid_len),
ssid->frequency, params->passphrase,
MAC2STR(wpa_s->global->p2p_dev_addr),
params->persistent_group ?
" [PERSISTENT]" : "");
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
} else {
char psk[65];
wpa_snprintf_hex(psk, sizeof(psk), params->psk,
sizeof(params->psk));
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->parent, MSG_INFO,
P2P_EVENT_GROUP_STARTED
"%s GO ssid=\"%s\" freq=%d psk=%s "
"go_dev_addr=" MACSTR "%s",
wpa_s->ifname,
wpa_ssid_txt(ssid->ssid, ssid->ssid_len),
ssid->frequency, psk,
MAC2STR(wpa_s->global->p2p_dev_addr),
params->persistent_group ?
" [PERSISTENT]" : "");
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
}
P2P: Add group started notification Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:35:37 +02: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) {
P2P: Add group started notification Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:35:37 +02:00
network_id = wpas_p2p_store_persistent_group(
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_s->parent, 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);
}
P2P: Add group started notification Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:35:37 +02:00
if (network_id < 0)
network_id = ssid->id;
wpas_notify_p2p_group_started(wpa_s, ssid, network_id, 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,
wpa_s->parent, NULL);
eloop_register_timeout(
wpa_s->p2p_first_connection_timeout, 0,
wpas_p2p_group_formation_timeout,
wpa_s->parent, NULL);
}
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) {
if (wpa_s->parent->p2p_oob_dev_pw_id !=
DEV_PW_NFC_CONNECTION_HANDOVER &&
!wpa_s->parent->p2p_oob_dev_pw) {
wpa_printf(MSG_DEBUG, "P2P: No NFC Dev Pw known");
return;
}
wpas_ap_wps_add_nfc_pw(
wpa_s, wpa_s->parent->p2p_oob_dev_pw_id,
wpa_s->parent->p2p_oob_dev_pw,
wpa_s->parent->p2p_peer_oob_pk_hash_known ?
wpa_s->parent->p2p_peer_oob_pubkey_hash : NULL);
#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: 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 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: 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);
Add p2p_go_max_inactivity config option This enables setting a different max inactivity timeout for P2P GO. This timeout is used to detect inactive clients. In some scenarios it may be useful to have control over this and set a shorter timeout than the default 300s. For example when running STA and P2P GO interfaces concurrently, the STA interface may perform scans which may cause the GO to miss a disassoc / deauth frames from a client and keep assuming that the client is connected until the inactivity detection kicks in. 300 secs is a bit too long for such scenarios and creates a bad user experience. Signed-hostap: Eyal Shapira <eyal@wizery.com>
2012-08-10 15:28:38 +02:00
ssid->ap_max_inactivity = wpa_s->parent->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: 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;
#define C(n) if (s->n) d->n = os_strdup(s->n)
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: 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 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;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02: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) {
/* Try to avoid going over the IFNAMSIZ length limit */
P2P: Fix snprintf buffer length for group ifname backup Commit 2e5ba4b6d14e600d259bbaf59a8fca61dab8f987 moved this to a function and updated one of the os_snprintf() calls to use the len parameter, but forgot the other one. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-24 19:13:32 +02:00
os_snprintf(ifname, len, "p2p-%d", wpa_s->p2p_group_idx);
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';
}
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;
group_wpa_s = wpa_supplicant_add_iface(wpa_s->global, &iface);
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->parent = wpa_s;
group_wpa_s->p2p_group_interface = go ? P2P_GROUP_INTERFACE_GO :
P2P_GROUP_INTERFACE_CLIENT;
wpa_s->global->p2p_group_formation = group_wpa_s;
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: 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
wpas_p2p_group_formation_failed(wpa_s);
}
void wpas_p2p_group_formation_failed(struct wpa_supplicant *wpa_s)
{
eloop_cancel_timeout(wpas_p2p_group_formation_timeout,
wpa_s->parent, 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);
wpas_group_formation_completed(wpa_s, 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
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,
wpa_s->parent, NULL);
eloop_register_timeout(0, 0, wpas_p2p_group_formation_timeout,
wpa_s->parent, NULL);
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,
wpa_s->parent, NULL);
eloop_register_timeout(0, 0, wpas_p2p_group_formation_timeout,
wpa_s->parent, NULL);
}
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: 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: 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 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) {
struct wpa_supplicant *group_wpa_s =
wpas_p2p_init_group_interface(wpa_s, res->role_go);
if (group_wpa_s == NULL) {
wpas_p2p_remove_pending_group_interface(wpa_s);
return;
}
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 != wpa_s) {
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
os_memcpy(group_wpa_s->p2p_pin, wpa_s->p2p_pin,
sizeof(group_wpa_s->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_wpa_s->p2p_wps_method = wpa_s->p2p_wps_method;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
os_memset(wpa_s->pending_interface_addr, 0, ETH_ALEN);
wpa_s->pending_interface_name[0] = '\0';
group_wpa_s->p2p_in_provisioning = 1;
if (res->role_go)
wpas_start_wps_go(group_wpa_s, res, 1);
else
wpas_start_wps_enrollee(group_wpa_s, res);
} else {
wpa_s->p2p_in_provisioning = 1;
wpa_s->global->p2p_group_formation = wpa_s;
if (res->role_go)
wpas_start_wps_go(wpa_s, res, 1);
else
wpas_start_wps_enrollee(ctx, res);
}
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: 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_req_rx(void *ctx, const u8 *src, u16 dev_passwd_id)
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
" dev_passwd_id=%u", MAC2STR(src), dev_passwd_id);
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
wpas_notify_p2p_go_neg_req(wpa_s, src, dev_passwd_id);
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
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 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
"dev_capab=0x%x group_capab=0x%x%s%s",
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" : "",
wfd_dev_info_hex ? wfd_dev_info_hex : "");
Fix compiler warning with CONFIG_NO_STDOUT_DEBUG=y Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-11 17:19:24 +01:00
#endif /* CONFIG_NO_STDOUT_DEBUG */
P2P: Add notification for P2P device found Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-24 21:08:18 +01:00
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);
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: 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: 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;
if (deinit) {
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
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 (wpa_drv_remain_on_channel(wpa_s, lwork->freq, lwork->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);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
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
}
static int wpas_send_probe_resp(void *ctx, const struct wpabuf *buf)
{
struct wpa_supplicant *wpa_s = ctx;
P2P: Send Listen state Probe Response frames without retries Use the no-ACK send_mlme request to transmit Probe Response frames in P2P Listen state. This reduces number of unnecessary transmissions if the peer device has already moved away from the channel. It will most likely go through Search state multiple times anyway, so even if the response were to be lost, a new retry will happen at higher layer. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-11-19 18:15:10 +01:00
return wpa_drv_send_mlme(wpa_s, wpabuf_head(buf), wpabuf_len(buf), 1);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Relax Bonjour SD query matching The DNS Name is allowed to use or not use domain name compression. To handle both cases, check human readable DNS Name match if binary matching does not show a hit. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-10-31 17:25:30 +01:00
/*
* DNS Header section is used only to calculate compression pointers, so the
* contents of this data does not matter, but the length needs to be reserved
* in the virtual packet.
*/
#define DNS_HEADER_LEN 12
/*
* 27-octet in-memory packet from P2P specification containing two implied
* queries for _tcp.lcoal. PTR IN and _udp.local. PTR IN
*/
#define P2P_SD_IN_MEMORY_LEN 27
static int p2p_sd_dns_uncompress_label(char **upos, char *uend, u8 *start,
u8 **spos, const u8 *end)
{
while (*spos < end) {
u8 val = ((*spos)[0] & 0xc0) >> 6;
int len;
if (val == 1 || val == 2) {
/* These are reserved values in RFC 1035 */
wpa_printf(MSG_DEBUG, "P2P: Invalid domain name "
"sequence starting with 0x%x", val);
return -1;
}
if (val == 3) {
u16 offset;
u8 *spos_tmp;
/* Offset */
if (*spos + 2 > end) {
wpa_printf(MSG_DEBUG, "P2P: No room for full "
"DNS offset field");
return -1;
}
offset = (((*spos)[0] & 0x3f) << 8) | (*spos)[1];
if (offset >= *spos - start) {
wpa_printf(MSG_DEBUG, "P2P: Invalid DNS "
"pointer offset %u", offset);
return -1;
}
(*spos) += 2;
spos_tmp = start + offset;
return p2p_sd_dns_uncompress_label(upos, uend, start,
&spos_tmp,
*spos - 2);
}
/* Label */
len = (*spos)[0] & 0x3f;
if (len == 0)
return 0;
(*spos)++;
if (*spos + len > end) {
wpa_printf(MSG_DEBUG, "P2P: Invalid domain name "
"sequence - no room for label with length "
"%u", len);
return -1;
}
if (*upos + len + 2 > uend)
return -2;
os_memcpy(*upos, *spos, len);
*spos += len;
*upos += len;
(*upos)[0] = '.';
(*upos)++;
(*upos)[0] = '\0';
}
return 0;
}
/* Uncompress domain names per RFC 1035 using the P2P SD in-memory packet.
* Returns -1 on parsing error (invalid input sequence), -2 if output buffer is
* not large enough */
static int p2p_sd_dns_uncompress(char *buf, size_t buf_len, const u8 *msg,
size_t msg_len, size_t offset)
{
/* 27-octet in-memory packet from P2P specification */
const char *prefix = "\x04_tcp\x05local\x00\x00\x0C\x00\x01"
"\x04_udp\xC0\x11\x00\x0C\x00\x01";
u8 *tmp, *end, *spos;
char *upos, *uend;
int ret = 0;
if (buf_len < 2)
return -1;
if (offset > msg_len)
return -1;
tmp = os_malloc(DNS_HEADER_LEN + P2P_SD_IN_MEMORY_LEN + msg_len);
if (tmp == NULL)
return -1;
spos = tmp + DNS_HEADER_LEN + P2P_SD_IN_MEMORY_LEN;
end = spos + msg_len;
spos += offset;
os_memset(tmp, 0, DNS_HEADER_LEN);
os_memcpy(tmp + DNS_HEADER_LEN, prefix, P2P_SD_IN_MEMORY_LEN);
os_memcpy(tmp + DNS_HEADER_LEN + P2P_SD_IN_MEMORY_LEN, msg, msg_len);
upos = buf;
uend = buf + buf_len;
ret = p2p_sd_dns_uncompress_label(&upos, uend, tmp, &spos, end);
if (ret) {
os_free(tmp);
return ret;
}
if (upos == buf) {
upos[0] = '.';
upos[1] = '\0';
} else if (upos[-1] == '.')
upos[-1] = '\0';
os_free(tmp);
return 0;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
static struct p2p_srv_bonjour *
wpas_p2p_service_get_bonjour(struct wpa_supplicant *wpa_s,
const struct wpabuf *query)
{
struct p2p_srv_bonjour *bsrv;
size_t len;
len = wpabuf_len(query);
dl_list_for_each(bsrv, &wpa_s->global->p2p_srv_bonjour,
struct p2p_srv_bonjour, list) {
if (len == wpabuf_len(bsrv->query) &&
os_memcmp(wpabuf_head(query), wpabuf_head(bsrv->query),
len) == 0)
return bsrv;
}
return NULL;
}
static struct p2p_srv_upnp *
wpas_p2p_service_get_upnp(struct wpa_supplicant *wpa_s, u8 version,
const char *service)
{
struct p2p_srv_upnp *usrv;
dl_list_for_each(usrv, &wpa_s->global->p2p_srv_upnp,
struct p2p_srv_upnp, list) {
if (version == usrv->version &&
os_strcmp(service, usrv->service) == 0)
return usrv;
}
return NULL;
}
static void wpas_sd_add_proto_not_avail(struct wpabuf *resp, u8 srv_proto,
u8 srv_trans_id)
{
u8 *len_pos;
if (wpabuf_tailroom(resp) < 5)
return;
/* Length (to be filled) */
len_pos = wpabuf_put(resp, 2);
wpabuf_put_u8(resp, srv_proto);
wpabuf_put_u8(resp, srv_trans_id);
/* Status Code */
wpabuf_put_u8(resp, P2P_SD_PROTO_NOT_AVAILABLE);
/* Response Data: empty */
WPA_PUT_LE16(len_pos, (u8 *) wpabuf_put(resp, 0) - len_pos - 2);
}
static void wpas_sd_all_bonjour(struct wpa_supplicant *wpa_s,
struct wpabuf *resp, u8 srv_trans_id)
{
struct p2p_srv_bonjour *bsrv;
u8 *len_pos;
wpa_printf(MSG_DEBUG, "P2P: SD Request for all Bonjour services");
if (dl_list_empty(&wpa_s->global->p2p_srv_bonjour)) {
wpa_printf(MSG_DEBUG, "P2P: Bonjour protocol not available");
return;
}
dl_list_for_each(bsrv, &wpa_s->global->p2p_srv_bonjour,
struct p2p_srv_bonjour, list) {
if (wpabuf_tailroom(resp) <
5 + wpabuf_len(bsrv->query) + wpabuf_len(bsrv->resp))
return;
/* Length (to be filled) */
len_pos = wpabuf_put(resp, 2);
wpabuf_put_u8(resp, P2P_SERV_BONJOUR);
wpabuf_put_u8(resp, srv_trans_id);
/* Status Code */
wpabuf_put_u8(resp, P2P_SD_SUCCESS);
wpa_hexdump_ascii(MSG_DEBUG, "P2P: Matching Bonjour service",
wpabuf_head(bsrv->resp),
wpabuf_len(bsrv->resp));
/* Response Data */
wpabuf_put_buf(resp, bsrv->query); /* Key */
wpabuf_put_buf(resp, bsrv->resp); /* Value */
WPA_PUT_LE16(len_pos, (u8 *) wpabuf_put(resp, 0) - len_pos -
2);
}
}
P2P: Relax Bonjour SD query matching The DNS Name is allowed to use or not use domain name compression. To handle both cases, check human readable DNS Name match if binary matching does not show a hit. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-10-31 17:25:30 +01:00
static int match_bonjour_query(struct p2p_srv_bonjour *bsrv, const u8 *query,
size_t query_len)
{
char str_rx[256], str_srv[256];
if (query_len < 3 || wpabuf_len(bsrv->query) < 3)
return 0; /* Too short to include DNS Type and Version */
if (os_memcmp(query + query_len - 3,
wpabuf_head_u8(bsrv->query) + wpabuf_len(bsrv->query) - 3,
3) != 0)
return 0; /* Mismatch in DNS Type or Version */
if (query_len == wpabuf_len(bsrv->query) &&
os_memcmp(query, wpabuf_head(bsrv->query), query_len - 3) == 0)
return 1; /* Binary match */
if (p2p_sd_dns_uncompress(str_rx, sizeof(str_rx), query, query_len - 3,
0))
return 0; /* Failed to uncompress query */
if (p2p_sd_dns_uncompress(str_srv, sizeof(str_srv),
wpabuf_head(bsrv->query),
wpabuf_len(bsrv->query) - 3, 0))
return 0; /* Failed to uncompress service */
return os_strcmp(str_rx, str_srv) == 0;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
static void wpas_sd_req_bonjour(struct wpa_supplicant *wpa_s,
struct wpabuf *resp, u8 srv_trans_id,
const u8 *query, size_t query_len)
{
struct p2p_srv_bonjour *bsrv;
u8 *len_pos;
P2P: Support multiple P2P SD Bonjour services with same key There may be multiple Bonjour PTR matches for the same key, so extend the P2P SD code for this to allow such entries to be added (i.e., do not override previously added value, but add a new one). Similarly, return multiple matches (one per Service TLV) for a query if it happens to match more than a single configured Bonjour service. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-10-31 12:01:43 +01:00
int matches = 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_hexdump_ascii(MSG_DEBUG, "P2P: SD Request for Bonjour",
query, query_len);
if (dl_list_empty(&wpa_s->global->p2p_srv_bonjour)) {
wpa_printf(MSG_DEBUG, "P2P: Bonjour protocol not available");
wpas_sd_add_proto_not_avail(resp, P2P_SERV_BONJOUR,
srv_trans_id);
return;
}
if (query_len == 0) {
wpas_sd_all_bonjour(wpa_s, resp, srv_trans_id);
return;
}
P2P: Support multiple P2P SD Bonjour services with same key There may be multiple Bonjour PTR matches for the same key, so extend the P2P SD code for this to allow such entries to be added (i.e., do not override previously added value, but add a new one). Similarly, return multiple matches (one per Service TLV) for a query if it happens to match more than a single configured Bonjour service. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-10-31 12:01:43 +01:00
dl_list_for_each(bsrv, &wpa_s->global->p2p_srv_bonjour,
struct p2p_srv_bonjour, list) {
P2P: Relax Bonjour SD query matching The DNS Name is allowed to use or not use domain name compression. To handle both cases, check human readable DNS Name match if binary matching does not show a hit. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-10-31 17:25:30 +01:00
if (!match_bonjour_query(bsrv, query, query_len))
P2P: Support multiple P2P SD Bonjour services with same key There may be multiple Bonjour PTR matches for the same key, so extend the P2P SD code for this to allow such entries to be added (i.e., do not override previously added value, but add a new one). Similarly, return multiple matches (one per Service TLV) for a query if it happens to match more than a single configured Bonjour service. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-10-31 12:01:43 +01:00
continue;
if (wpabuf_tailroom(resp) <
5 + query_len + wpabuf_len(bsrv->resp))
return;
matches++;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Support multiple P2P SD Bonjour services with same key There may be multiple Bonjour PTR matches for the same key, so extend the P2P SD code for this to allow such entries to be added (i.e., do not override previously added value, but add a new one). Similarly, return multiple matches (one per Service TLV) for a query if it happens to match more than a single configured Bonjour service. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-10-31 12:01:43 +01:00
/* Length (to be filled) */
len_pos = wpabuf_put(resp, 2);
wpabuf_put_u8(resp, P2P_SERV_BONJOUR);
wpabuf_put_u8(resp, srv_trans_id);
/* Status Code */
wpabuf_put_u8(resp, P2P_SD_SUCCESS);
wpa_hexdump_ascii(MSG_DEBUG, "P2P: Matching Bonjour service",
wpabuf_head(bsrv->resp),
wpabuf_len(bsrv->resp));
/* Response Data */
wpabuf_put_data(resp, query, query_len); /* Key */
wpabuf_put_buf(resp, bsrv->resp); /* Value */
WPA_PUT_LE16(len_pos, (u8 *) wpabuf_put(resp, 0) - len_pos - 2);
}
if (matches == 0) {
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_printf(MSG_DEBUG, "P2P: Requested Bonjour service not "
"available");
P2P: Support multiple P2P SD Bonjour services with same key There may be multiple Bonjour PTR matches for the same key, so extend the P2P SD code for this to allow such entries to be added (i.e., do not override previously added value, but add a new one). Similarly, return multiple matches (one per Service TLV) for a query if it happens to match more than a single configured Bonjour service. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-10-31 12:01:43 +01:00
if (wpabuf_tailroom(resp) < 5)
return;
/* Length (to be filled) */
len_pos = wpabuf_put(resp, 2);
wpabuf_put_u8(resp, P2P_SERV_BONJOUR);
wpabuf_put_u8(resp, srv_trans_id);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/* Status Code */
P2P: Rename SD info not available define to match with spec change
2010-06-27 20:46:44 +02:00
wpabuf_put_u8(resp, P2P_SD_REQUESTED_INFO_NOT_AVAILABLE);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/* Response Data: empty */
WPA_PUT_LE16(len_pos, (u8 *) wpabuf_put(resp, 0) - len_pos -
2);
}
}
static void wpas_sd_all_upnp(struct wpa_supplicant *wpa_s,
struct wpabuf *resp, u8 srv_trans_id)
{
struct p2p_srv_upnp *usrv;
u8 *len_pos;
wpa_printf(MSG_DEBUG, "P2P: SD Request for all UPnP services");
if (dl_list_empty(&wpa_s->global->p2p_srv_upnp)) {
wpa_printf(MSG_DEBUG, "P2P: UPnP protocol not available");
return;
}
dl_list_for_each(usrv, &wpa_s->global->p2p_srv_upnp,
struct p2p_srv_upnp, list) {
if (wpabuf_tailroom(resp) < 5 + 1 + os_strlen(usrv->service))
return;
/* Length (to be filled) */
len_pos = wpabuf_put(resp, 2);
wpabuf_put_u8(resp, P2P_SERV_UPNP);
wpabuf_put_u8(resp, srv_trans_id);
/* Status Code */
wpabuf_put_u8(resp, P2P_SD_SUCCESS);
/* Response Data */
wpabuf_put_u8(resp, usrv->version);
wpa_printf(MSG_DEBUG, "P2P: Matching UPnP Service: %s",
usrv->service);
wpabuf_put_str(resp, usrv->service);
WPA_PUT_LE16(len_pos, (u8 *) wpabuf_put(resp, 0) - len_pos -
2);
}
}
static void wpas_sd_req_upnp(struct wpa_supplicant *wpa_s,
struct wpabuf *resp, u8 srv_trans_id,
const u8 *query, size_t query_len)
{
struct p2p_srv_upnp *usrv;
u8 *len_pos;
u8 version;
char *str;
int count = 0;
wpa_hexdump_ascii(MSG_DEBUG, "P2P: SD Request for UPnP",
query, query_len);
if (dl_list_empty(&wpa_s->global->p2p_srv_upnp)) {
wpa_printf(MSG_DEBUG, "P2P: UPnP protocol not available");
wpas_sd_add_proto_not_avail(resp, P2P_SERV_UPNP,
srv_trans_id);
return;
}
if (query_len == 0) {
wpas_sd_all_upnp(wpa_s, resp, srv_trans_id);
return;
}
if (wpabuf_tailroom(resp) < 5)
return;
/* Length (to be filled) */
len_pos = wpabuf_put(resp, 2);
wpabuf_put_u8(resp, P2P_SERV_UPNP);
wpabuf_put_u8(resp, srv_trans_id);
P2P: Reorder code to avoid memory leak on error path
2010-10-31 11:24:21 +01:00
version = query[0];
str = os_malloc(query_len);
if (str == NULL)
return;
os_memcpy(str, query + 1, query_len - 1);
str[query_len - 1] = '\0';
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
dl_list_for_each(usrv, &wpa_s->global->p2p_srv_upnp,
struct p2p_srv_upnp, list) {
if (version != usrv->version)
continue;
if (os_strcmp(str, "ssdp:all") != 0 &&
os_strstr(usrv->service, str) == NULL)
continue;
if (wpabuf_tailroom(resp) < 2)
break;
if (count == 0) {
/* Status Code */
wpabuf_put_u8(resp, P2P_SD_SUCCESS);
/* Response Data */
wpabuf_put_u8(resp, version);
} else
wpabuf_put_u8(resp, ',');
count++;
wpa_printf(MSG_DEBUG, "P2P: Matching UPnP Service: %s",
usrv->service);
if (wpabuf_tailroom(resp) < os_strlen(usrv->service))
break;
wpabuf_put_str(resp, usrv->service);
}
P2P: Fix memory leak in UPnP service discovery request processing
2011-04-14 00:33:26 +02:00
os_free(str);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (count == 0) {
wpa_printf(MSG_DEBUG, "P2P: Requested UPnP service not "
"available");
/* Status Code */
P2P: Rename SD info not available define to match with spec change
2010-06-27 20:46:44 +02:00
wpabuf_put_u8(resp, P2P_SD_REQUESTED_INFO_NOT_AVAILABLE);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/* Response Data: empty */
}
WPA_PUT_LE16(len_pos, (u8 *) wpabuf_put(resp, 0) - len_pos - 2);
}
WFD: Add preliminary WSD request processing and response This commit does not yet address support for different device roles, i.e., the same set of subelements are returned regardless of which role was indicated in the request. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 21:31:04 +01:00
#ifdef CONFIG_WIFI_DISPLAY
static void wpas_sd_req_wfd(struct wpa_supplicant *wpa_s,
struct wpabuf *resp, u8 srv_trans_id,
const u8 *query, size_t query_len)
{
const u8 *pos;
u8 role;
u8 *len_pos;
wpa_hexdump(MSG_DEBUG, "P2P: SD Request for WFD", query, query_len);
if (!wpa_s->global->wifi_display) {
wpa_printf(MSG_DEBUG, "P2P: WFD protocol not available");
wpas_sd_add_proto_not_avail(resp, P2P_SERV_WIFI_DISPLAY,
srv_trans_id);
return;
}
if (query_len < 1) {
wpa_printf(MSG_DEBUG, "P2P: Missing WFD Requested Device "
"Role");
return;
}
if (wpabuf_tailroom(resp) < 5)
return;
pos = query;
role = *pos++;
wpa_printf(MSG_DEBUG, "P2P: WSD for device role 0x%x", role);
/* TODO: role specific handling */
/* Length (to be filled) */
len_pos = wpabuf_put(resp, 2);
wpabuf_put_u8(resp, P2P_SERV_WIFI_DISPLAY);
wpabuf_put_u8(resp, srv_trans_id);
wpabuf_put_u8(resp, P2P_SD_SUCCESS); /* Status Code */
while (pos < query + query_len) {
if (*pos < MAX_WFD_SUBELEMS &&
wpa_s->global->wfd_subelem[*pos] &&
wpabuf_tailroom(resp) >=
wpabuf_len(wpa_s->global->wfd_subelem[*pos])) {
wpa_printf(MSG_DEBUG, "P2P: Add WSD response "
"subelement %u", *pos);
wpabuf_put_buf(resp, wpa_s->global->wfd_subelem[*pos]);
}
pos++;
}
WPA_PUT_LE16(len_pos, (u8 *) wpabuf_put(resp, 0) - len_pos - 2);
}
#endif /* CONFIG_WIFI_DISPLAY */
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_sd_request(void *ctx, int freq, const u8 *sa, u8 dialog_token,
u16 update_indic, const u8 *tlvs, size_t tlvs_len)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct wpa_supplicant *wpa_s = ctx;
const u8 *pos = tlvs;
const u8 *end = tlvs + tlvs_len;
const u8 *tlv_end;
u16 slen;
struct wpabuf *resp;
u8 srv_proto, srv_trans_id;
size_t buf_len;
char *buf;
wpa_hexdump(MSG_MSGDUMP, "P2P: Service Discovery Request TLVs",
tlvs, tlvs_len);
buf_len = 2 * tlvs_len + 1;
buf = os_malloc(buf_len);
if (buf) {
wpa_snprintf_hex(buf, buf_len, tlvs, tlvs_len);
wpa_msg_ctrl(wpa_s, MSG_INFO, P2P_EVENT_SERV_DISC_REQ "%d "
MACSTR " %u %u %s",
freq, MAC2STR(sa), dialog_token, update_indic,
buf);
os_free(buf);
}
P2P: Send D-Bus ServiceDiscoveryRequest signal for external SD processing wpas_notify_p2p_sd_request() needs to be called when p2p_sd_over_ctrl_iface is set to provide SD events over D-Bus similarly to the ctrl_iface events.
2011-12-21 23:34:29 +01:00
if (wpa_s->p2p_sd_over_ctrl_iface) {
wpas_notify_p2p_sd_request(wpa_s, freq, sa, dialog_token,
update_indic, tlvs, tlvs_len);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return; /* to be processed by an external program */
P2P: Send D-Bus ServiceDiscoveryRequest signal for external SD processing wpas_notify_p2p_sd_request() needs to be called when p2p_sd_over_ctrl_iface is set to provide SD events over D-Bus similarly to the ctrl_iface events.
2011-12-21 23:34:29 +01:00
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
resp = wpabuf_alloc(10000);
if (resp == NULL)
return;
while (pos + 1 < end) {
wpa_printf(MSG_DEBUG, "P2P: Service Request TLV");
slen = WPA_GET_LE16(pos);
pos += 2;
if (pos + slen > end || slen < 2) {
wpa_printf(MSG_DEBUG, "P2P: Unexpected Query Data "
"length");
wpabuf_free(resp);
return;
}
tlv_end = pos + slen;
srv_proto = *pos++;
wpa_printf(MSG_DEBUG, "P2P: Service Protocol Type %u",
srv_proto);
srv_trans_id = *pos++;
wpa_printf(MSG_DEBUG, "P2P: Service Transaction ID %u",
srv_trans_id);
wpa_hexdump(MSG_MSGDUMP, "P2P: Query Data",
pos, tlv_end - pos);
P2P: Add test mode for SD to force fragmented response
2010-06-29 05:44:01 +02:00
if (wpa_s->force_long_sd) {
wpa_printf(MSG_DEBUG, "P2P: SD test - force long "
"response");
wpas_sd_all_bonjour(wpa_s, resp, srv_trans_id);
wpas_sd_all_upnp(wpa_s, resp, srv_trans_id);
goto done;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
switch (srv_proto) {
case P2P_SERV_ALL_SERVICES:
wpa_printf(MSG_DEBUG, "P2P: Service Discovery Request "
"for all services");
if (dl_list_empty(&wpa_s->global->p2p_srv_upnp) &&
dl_list_empty(&wpa_s->global->p2p_srv_bonjour)) {
wpa_printf(MSG_DEBUG, "P2P: No service "
"discovery protocols available");
wpas_sd_add_proto_not_avail(
resp, P2P_SERV_ALL_SERVICES,
srv_trans_id);
break;
}
wpas_sd_all_bonjour(wpa_s, resp, srv_trans_id);
wpas_sd_all_upnp(wpa_s, resp, srv_trans_id);
break;
case P2P_SERV_BONJOUR:
wpas_sd_req_bonjour(wpa_s, resp, srv_trans_id,
pos, tlv_end - pos);
break;
case P2P_SERV_UPNP:
wpas_sd_req_upnp(wpa_s, resp, srv_trans_id,
pos, tlv_end - pos);
break;
WFD: Add preliminary WSD request processing and response This commit does not yet address support for different device roles, i.e., the same set of subelements are returned regardless of which role was indicated in the request. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 21:31:04 +01:00
#ifdef CONFIG_WIFI_DISPLAY
case P2P_SERV_WIFI_DISPLAY:
wpas_sd_req_wfd(wpa_s, resp, srv_trans_id,
pos, tlv_end - pos);
break;
#endif /* CONFIG_WIFI_DISPLAY */
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
default:
wpa_printf(MSG_DEBUG, "P2P: Unavailable service "
"protocol %u", srv_proto);
wpas_sd_add_proto_not_avail(resp, srv_proto,
srv_trans_id);
break;
}
pos = tlv_end;
}
P2P: Add test mode for SD to force fragmented response
2010-06-29 05:44:01 +02:00
done:
P2P: Add wpas_notify_p2p_sd_request Signed-off-by: Konguraj(Raj) Kulanthaivel <konguraj.kulanthaivel@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-24 21:45:39 +01:00
wpas_notify_p2p_sd_request(wpa_s, freq, sa, dialog_token,
update_indic, tlvs, tlvs_len);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpas_p2p_sd_response(wpa_s, freq, sa, dialog_token, resp);
wpabuf_free(resp);
}
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_sd_response(void *ctx, const u8 *sa, u16 update_indic,
const u8 *tlvs, size_t tlvs_len)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct wpa_supplicant *wpa_s = ctx;
const u8 *pos = tlvs;
const u8 *end = tlvs + tlvs_len;
const u8 *tlv_end;
u16 slen;
size_t buf_len;
char *buf;
wpa_hexdump(MSG_MSGDUMP, "P2P: Service Discovery Response TLVs",
tlvs, tlvs_len);
P2P: Initial support for SD fragmentation (GAS Comeback Request/Response)
2010-06-28 18:24:17 +02:00
if (tlvs_len > 1500) {
/* TODO: better way for handling this */
wpa_msg_ctrl(wpa_s, MSG_INFO,
P2P_EVENT_SERV_DISC_RESP MACSTR
" %u <long response: %u bytes>",
MAC2STR(sa), update_indic,
(unsigned int) tlvs_len);
} else {
buf_len = 2 * tlvs_len + 1;
buf = os_malloc(buf_len);
if (buf) {
wpa_snprintf_hex(buf, buf_len, tlvs, tlvs_len);
wpa_msg_ctrl(wpa_s, MSG_INFO,
P2P_EVENT_SERV_DISC_RESP MACSTR " %u %s",
MAC2STR(sa), update_indic, buf);
os_free(buf);
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
while (pos < end) {
u8 srv_proto, srv_trans_id, status;
wpa_printf(MSG_DEBUG, "P2P: Service Response TLV");
slen = WPA_GET_LE16(pos);
pos += 2;
if (pos + slen > end || slen < 3) {
wpa_printf(MSG_DEBUG, "P2P: Unexpected Response Data "
"length");
return;
}
tlv_end = pos + slen;
srv_proto = *pos++;
wpa_printf(MSG_DEBUG, "P2P: Service Protocol Type %u",
srv_proto);
srv_trans_id = *pos++;
wpa_printf(MSG_DEBUG, "P2P: Service Transaction ID %u",
srv_trans_id);
status = *pos++;
wpa_printf(MSG_DEBUG, "P2P: Status Code ID %u",
status);
wpa_hexdump(MSG_MSGDUMP, "P2P: Response Data",
pos, tlv_end - pos);
pos = tlv_end;
}
P2P: Add wpas_notify_p2p_sd_response Signed-off-by: Konguraj(Raj) Kulanthaivel <konguraj.kulanthaivel@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-24 21:47:34 +01:00
wpas_notify_p2p_sd_response(wpa_s, sa, update_indic, tlvs, tlvs_len);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Fix 32-bit compiler warnings on service discovery reference Convert core wpa_supplicant code to use u64 instead of void * for the P2P service discovery reference. Use uintptr_t in type casts in p2p_supplicant.c to handle the conversion without warnings. Note: This needs to be revisited for 128-bit CPU where sizeof(void *) could be larger than sizeof(u64). Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-11 17:06:34 +01:00
u64 wpas_p2p_sd_request(struct wpa_supplicant *wpa_s, const u8 *dst,
const struct wpabuf *tlvs)
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: Fix 32-bit compiler warnings on service discovery reference Convert core wpa_supplicant code to use u64 instead of void * for the P2P service discovery reference. Use uintptr_t in type casts in p2p_supplicant.c to handle the conversion without warnings. Note: This needs to be revisited for 128-bit CPU where sizeof(void *) could be larger than sizeof(u64). Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-11 17:06:34 +01:00
return 0;
return (uintptr_t) p2p_sd_request(wpa_s->global->p2p, dst, tlvs);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Fix 32-bit compiler warnings on service discovery reference Convert core wpa_supplicant code to use u64 instead of void * for the P2P service discovery reference. Use uintptr_t in type casts in p2p_supplicant.c to handle the conversion without warnings. Note: This needs to be revisited for 128-bit CPU where sizeof(void *) could be larger than sizeof(u64). Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-11 17:06:34 +01:00
u64 wpas_p2p_sd_request_upnp(struct wpa_supplicant *wpa_s, const u8 *dst,
u8 version, const char *query)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct wpabuf *tlvs;
P2P: Fix 32-bit compiler warnings on service discovery reference Convert core wpa_supplicant code to use u64 instead of void * for the P2P service discovery reference. Use uintptr_t in type casts in p2p_supplicant.c to handle the conversion without warnings. Note: This needs to be revisited for 128-bit CPU where sizeof(void *) could be larger than sizeof(u64). Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-11 17:06:34 +01:00
u64 ret;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
tlvs = wpabuf_alloc(2 + 1 + 1 + 1 + os_strlen(query));
if (tlvs == NULL)
P2P: Fix 32-bit compiler warnings on service discovery reference Convert core wpa_supplicant code to use u64 instead of void * for the P2P service discovery reference. Use uintptr_t in type casts in p2p_supplicant.c to handle the conversion without warnings. Note: This needs to be revisited for 128-bit CPU where sizeof(void *) could be larger than sizeof(u64). Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-11 17:06:34 +01:00
return 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpabuf_put_le16(tlvs, 1 + 1 + 1 + os_strlen(query));
wpabuf_put_u8(tlvs, P2P_SERV_UPNP); /* Service Protocol Type */
wpabuf_put_u8(tlvs, 1); /* Service Transaction ID */
wpabuf_put_u8(tlvs, version);
wpabuf_put_str(tlvs, query);
ret = wpas_p2p_sd_request(wpa_s, dst, tlvs);
wpabuf_free(tlvs);
return ret;
}
WFD: Add support for sending Wi-Fi Display service discovery requests wpa_cli p2p_serv_disc_req command can now be used to request WSD request to be sent to specified or all peers who support WSD. format: wifi-display <list of roles> <list of subelements> examples: p2p_serv_disc_req 00:00:00:00:00:00 wifi-display [source] 2,3,4,5 p2p_serv_disc_req 02:01:02:03:04:05 wifi-display [pri-sink] 3 p2p_serv_disc_req 00:00:00:00:00:00 wifi-display [sec-source] 2 p2p_serv_disc_req 00:00:00:00:00:00 wifi-display [source+sink] 2,3,4,5 p2p_serv_disc_req 00:00:00:00:00:00 wifi-display [source][pri-sink] 2,3,4,5 Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 20:48:57 +01:00
#ifdef CONFIG_WIFI_DISPLAY
static u64 wpas_p2p_sd_request_wfd(struct wpa_supplicant *wpa_s, const u8 *dst,
const struct wpabuf *tlvs)
{
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
return 0;
return (uintptr_t) p2p_sd_request_wfd(wpa_s->global->p2p, dst, tlvs);
}
#define MAX_WFD_SD_SUBELEMS 20
static void wfd_add_sd_req_role(struct wpabuf *tlvs, u8 id, u8 role,
const char *subelems)
{
u8 *len;
const char *pos;
int val;
int count = 0;
len = wpabuf_put(tlvs, 2);
wpabuf_put_u8(tlvs, P2P_SERV_WIFI_DISPLAY); /* Service Protocol Type */
wpabuf_put_u8(tlvs, id); /* Service Transaction ID */
wpabuf_put_u8(tlvs, role);
pos = subelems;
while (*pos) {
val = atoi(pos);
if (val >= 0 && val < 256) {
wpabuf_put_u8(tlvs, val);
count++;
if (count == MAX_WFD_SD_SUBELEMS)
break;
}
pos = os_strchr(pos + 1, ',');
if (pos == NULL)
break;
pos++;
}
WPA_PUT_LE16(len, (u8 *) wpabuf_put(tlvs, 0) - len - 2);
}
u64 wpas_p2p_sd_request_wifi_display(struct wpa_supplicant *wpa_s,
const u8 *dst, const char *role)
{
struct wpabuf *tlvs;
u64 ret;
const char *subelems;
u8 id = 1;
subelems = os_strchr(role, ' ');
if (subelems == NULL)
return 0;
subelems++;
tlvs = wpabuf_alloc(4 * (2 + 1 + 1 + 1 + MAX_WFD_SD_SUBELEMS));
if (tlvs == NULL)
return 0;
if (os_strstr(role, "[source]"))
wfd_add_sd_req_role(tlvs, id++, 0x00, subelems);
if (os_strstr(role, "[pri-sink]"))
wfd_add_sd_req_role(tlvs, id++, 0x01, subelems);
if (os_strstr(role, "[sec-sink]"))
wfd_add_sd_req_role(tlvs, id++, 0x02, subelems);
if (os_strstr(role, "[source+sink]"))
wfd_add_sd_req_role(tlvs, id++, 0x03, subelems);
ret = wpas_p2p_sd_request_wfd(wpa_s, dst, tlvs);
wpabuf_free(tlvs);
return ret;
}
#endif /* CONFIG_WIFI_DISPLAY */
P2P: Fix 32-bit compiler warnings on service discovery reference Convert core wpa_supplicant code to use u64 instead of void * for the P2P service discovery reference. Use uintptr_t in type casts in p2p_supplicant.c to handle the conversion without warnings. Note: This needs to be revisited for 128-bit CPU where sizeof(void *) could be larger than sizeof(u64). Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-11 17:06:34 +01:00
int wpas_p2p_sd_cancel_request(struct wpa_supplicant *wpa_s, u64 req)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
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 32-bit compiler warnings on service discovery reference Convert core wpa_supplicant code to use u64 instead of void * for the P2P service discovery reference. Use uintptr_t in type casts in p2p_supplicant.c to handle the conversion without warnings. Note: This needs to be revisited for 128-bit CPU where sizeof(void *) could be larger than sizeof(u64). Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-11 17:06:34 +01:00
return p2p_sd_cancel_request(wpa_s->global->p2p,
(void *) (uintptr_t) req);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
void wpas_p2p_sd_response(struct wpa_supplicant *wpa_s, int freq,
const u8 *dst, u8 dialog_token,
const struct wpabuf *resp_tlvs)
{
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: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_sd_response(wpa_s->global->p2p, freq, dst, dialog_token,
resp_tlvs);
}
void wpas_p2p_sd_service_update(struct wpa_supplicant *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)
p2p_sd_service_update(wpa_s->global->p2p);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
static void wpas_p2p_srv_bonjour_free(struct p2p_srv_bonjour *bsrv)
{
dl_list_del(&bsrv->list);
wpabuf_free(bsrv->query);
wpabuf_free(bsrv->resp);
os_free(bsrv);
}
static void wpas_p2p_srv_upnp_free(struct p2p_srv_upnp *usrv)
{
dl_list_del(&usrv->list);
os_free(usrv->service);
os_free(usrv);
}
void wpas_p2p_service_flush(struct wpa_supplicant *wpa_s)
{
struct p2p_srv_bonjour *bsrv, *bn;
struct p2p_srv_upnp *usrv, *un;
dl_list_for_each_safe(bsrv, bn, &wpa_s->global->p2p_srv_bonjour,
struct p2p_srv_bonjour, list)
wpas_p2p_srv_bonjour_free(bsrv);
dl_list_for_each_safe(usrv, un, &wpa_s->global->p2p_srv_upnp,
struct p2p_srv_upnp, list)
wpas_p2p_srv_upnp_free(usrv);
wpas_p2p_sd_service_update(wpa_s);
}
int wpas_p2p_service_add_bonjour(struct wpa_supplicant *wpa_s,
struct wpabuf *query, struct wpabuf *resp)
{
struct p2p_srv_bonjour *bsrv;
bsrv = os_zalloc(sizeof(*bsrv));
if (bsrv == NULL)
return -1;
bsrv->query = query;
bsrv->resp = resp;
dl_list_add(&wpa_s->global->p2p_srv_bonjour, &bsrv->list);
wpas_p2p_sd_service_update(wpa_s);
return 0;
}
int wpas_p2p_service_del_bonjour(struct wpa_supplicant *wpa_s,
const struct wpabuf *query)
{
struct p2p_srv_bonjour *bsrv;
bsrv = wpas_p2p_service_get_bonjour(wpa_s, query);
if (bsrv == NULL)
return -1;
wpas_p2p_srv_bonjour_free(bsrv);
wpas_p2p_sd_service_update(wpa_s);
return 0;
}
int wpas_p2p_service_add_upnp(struct wpa_supplicant *wpa_s, u8 version,
const char *service)
{
struct p2p_srv_upnp *usrv;
if (wpas_p2p_service_get_upnp(wpa_s, version, service))
return 0; /* Already listed */
usrv = os_zalloc(sizeof(*usrv));
if (usrv == NULL)
return -1;
usrv->version = version;
usrv->service = os_strdup(service);
if (usrv->service == NULL) {
os_free(usrv);
return -1;
}
dl_list_add(&wpa_s->global->p2p_srv_upnp, &usrv->list);
wpas_p2p_sd_service_update(wpa_s);
return 0;
}
int wpas_p2p_service_del_upnp(struct wpa_supplicant *wpa_s, u8 version,
const char *service)
{
struct p2p_srv_upnp *usrv;
usrv = wpas_p2p_service_get_upnp(wpa_s, version, service);
if (usrv == NULL)
return -1;
wpas_p2p_srv_upnp_free(usrv);
wpas_p2p_sd_service_update(wpa_s);
return 0;
}
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;
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;
}
os_snprintf(params, sizeof(params), " p2p_dev_addr=" MACSTR
" pri_dev_type=%s name='%s' config_methods=0x%x "
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
"dev_capab=0x%x group_capab=0x%x%s%s",
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
MAC2STR(dev_addr),
wps_dev_type_bin2str(pri_dev_type, devtype,
sizeof(devtype)),
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
dev_name, supp_config_methods, dev_capab, group_capab,
group ? " group=" : "",
group ? group->ifname : "");
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) {
generated_pin = wps_generate_pin();
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");
wpas_p2p_join_start(wpa_s);
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 ||
wpa_s->pending_pd_use == AUTO_PD_GO_NEG)
os_snprintf(params, sizeof(params), " peer_go=%d",
wpa_s->pending_pd_use == AUTO_PD_JOIN);
else
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) {
generated_pin = wps_generate_pin();
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,
enum p2p_prov_disc_status status)
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");
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)");
wpas_p2p_join_start(wpa_s);
return;
}
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=%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: 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
static int freq_included(const struct p2p_channels *channels, unsigned int freq)
{
if (channels == NULL)
return 1; /* Assume no restrictions */
return p2p_channels_includes_freq(channels, 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,
const struct p2p_channels *channels)
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;
int res;
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: 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: 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");
} 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;
}
os_memcpy(group_bssid, wpa_s->own_addr, ETH_ALEN);
} 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: 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 */
if (wpas_p2p_valid_oper_freqs(wpa_s, &res, 1) > 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: 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, res);
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");
*force_freq = res;
}
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;
} else if (!freq_included(channels, *force_freq)) {
/* 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: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpas_p2p_group_add_persistent(
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, s, go, go ? op_freq : 0, 0, 0, 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
go ? P2P_MAX_INITIAL_CONN_WAIT_GO_REINVOKE : 0);
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: 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: 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_s->p2p_wps_method, 0,
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
}
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
}
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;
if (ssid == NULL)
return;
for (i = 0; ssid->p2p_client_list && i < ssid->num_p2p_clients; i++) {
if (os_memcmp(ssid->p2p_client_list + i * ETH_ALEN, peer,
ETH_ALEN) == 0)
break;
}
if (i >= ssid->num_p2p_clients) {
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" : "");
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
os_memmove(ssid->p2p_client_list + i * ETH_ALEN,
ssid->p2p_client_list + (i + 1) * ETH_ALEN,
(ssid->num_p2p_clients - i - 1) * ETH_ALEN);
ssid->num_p2p_clients--;
#ifndef CONFIG_NO_CONFIG_WRITE
if (wpa_s->parent->conf->update_config &&
wpa_config_write(wpa_s->parent->confname, wpa_s->parent->conf))
wpa_printf(MSG_DEBUG, "P2P: Failed to update configuration");
#endif /* CONFIG_NO_CONFIG_WRITE */
}
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 */
ssid = wpas_p2p_get_persistent(wpa_s->parent, peer,
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: Use negotiated channel from invitation for persistent GO During persistent group re-invocation, GO may end up using a different channel as the operation channel compared to what was indicated in the invitation frames. This may break the connection if the peer device ends up scanning the GO only on the channel from the invitation frame. Fix this by using the negotiated channel (if available) on the GO as the operating channel instead of the channel that was provided in the p2p_invite command to start negotiation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-11 09:03:54 +01:00
const u8 *peer, int neg_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: Use negotiated channel from invitation for persistent GO During persistent group re-invocation, GO may end up using a different channel as the operation channel compared to what was indicated in the invitation frames. This may break the connection if the peer device ends up scanning the GO only on the channel from the invitation frame. Fix this by using the negotiated channel (if available) on the GO as the operating channel instead of the channel that was provided in the p2p_invite command to start negotiation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-11 09:03:54 +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) {
if (status == P2P_SC_FAIL_UNKNOWN_GROUP)
wpas_remove_persistent_client(wpa_s, peer);
P2P: Stop early when processing not-persistent invitation result
2010-06-27 09:27:08 +02:00
return; /* Invitation to active 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
}
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: Use negotiated channel from invitation for persistent GO During persistent group re-invocation, GO may end up using a different channel as the operation channel compared to what was indicated in the invitation frames. This may break the connection if the peer device ends up scanning the GO only on the channel from the invitation frame. Fix this by using the negotiated channel (if available) on the GO as the operating channel instead of the channel that was provided in the p2p_invite command to start negotiation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-11 09:03:54 +01:00
freq = wpa_s->p2p_persistent_go_freq;
if (neg_freq > 0 && ssid->mode == WPAS_MODE_P2P_GO &&
freq_included(channels, neg_freq)) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Use frequence %d MHz from invitation for GO mode",
neg_freq);
freq = neg_freq;
}
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,
P2P: Use negotiated channel from invitation for persistent GO During persistent group re-invocation, GO may end up using a different channel as the operation channel compared to what was indicated in the invitation frames. This may break the connection if the peer device ends up scanning the GO only on the channel from the invitation frame. Fix this by using the negotiated channel (if available) on the GO as the operating channel instead of the channel that was provided in the p2p_invite command to start negotiation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-11 09:03:54 +01:00
freq,
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,
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 :
0);
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: 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;
}
static struct hostapd_hw_modes * get_mode(struct hostapd_hw_modes *modes,
u16 num_modes,
enum hostapd_hw_mode mode)
{
u16 i;
for (i = 0; i < num_modes; i++) {
if (modes[i].mode == mode)
return &modes[i];
}
return NULL;
}
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 {
NOT_ALLOWED, PASSIVE_ONLY, ALLOWED
};
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;
if (mode->channels[i].flag &
(HOSTAPD_CHAN_PASSIVE_SCAN |
HOSTAPD_CHAN_NO_IBSS))
return PASSIVE_ONLY;
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
}
struct p2p_oper_class_map {
enum hostapd_hw_mode mode;
u8 op_class;
u8 min_chan;
u8 max_chan;
u8 inc;
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
enum { BW20, BW40PLUS, BW40MINUS, BW80 } bw;
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: Move channel validation into a separate function Signed-hostap: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
2012-08-15 21:44:34 +02:00
static struct p2p_oper_class_map op_class[] = {
{ HOSTAPD_MODE_IEEE80211G, 81, 1, 13, 1, BW20 },
#if 0 /* Do not enable HT40 on 2 GHz for now */
{ HOSTAPD_MODE_IEEE80211G, 83, 1, 9, 1, BW40PLUS },
{ HOSTAPD_MODE_IEEE80211G, 84, 5, 13, 1, BW40MINUS },
#endif
{ HOSTAPD_MODE_IEEE80211A, 115, 36, 48, 4, BW20 },
{ HOSTAPD_MODE_IEEE80211A, 124, 149, 161, 4, BW20 },
{ HOSTAPD_MODE_IEEE80211A, 116, 36, 44, 8, BW40PLUS },
{ HOSTAPD_MODE_IEEE80211A, 117, 40, 48, 8, BW40MINUS },
{ HOSTAPD_MODE_IEEE80211A, 126, 149, 157, 8, BW40PLUS },
{ HOSTAPD_MODE_IEEE80211A, 127, 153, 161, 8, BW40MINUS },
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
/*
* IEEE P802.11ac/D7.0 Table E-4 actually talks about channel center
* frequency index 42, 58, 106, 122, 138, 155 with channel spacing of
* 80 MHz, but currently use the following definition for simplicity
* (these center frequencies are not actual channels, which makes
* has_channel() fail). wpas_p2p_verify_80mhz() should take care of
* removing invalid channels.
*/
{ HOSTAPD_MODE_IEEE80211A, 128, 36, 161, 4, BW80 },
P2P: Move channel validation into a separate function Signed-hostap: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
2012-08-15 21:44:34 +02:00
{ -1, 0, 0, 0, 0, BW20 }
};
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;
if (res == PASSIVE_ONLY)
ret = PASSIVE_ONLY;
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;
}
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
{
int 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
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);
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;
if (res == PASSIVE_ONLY || res2 == PASSIVE_ONLY)
return PASSIVE_ONLY;
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
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 (op = 0; op_class[op].op_class; op++) {
struct p2p_oper_class_map *o = &op_class[op];
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
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;
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++;
} else if (res == PASSIVE_ONLY &&
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
for (op = 0; op_class[op].op_class; op++) {
struct p2p_oper_class_map *o = &op_class[op];
u8 ch;
for (ch = o->min_chan; ch <= o->max_chan; ch += o->inc) {
if (o->mode != HOSTAPD_MODE_IEEE80211A ||
o->bw == BW20 || ch != channel)
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);
}
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: 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
static int wpas_go_connected(void *ctx, const u8 *dev_addr)
{
struct wpa_supplicant *wpa_s = ctx;
for (wpa_s = wpa_s->global->ifaces; wpa_s; wpa_s = wpa_s->next) {
struct wpa_ssid *ssid = wpa_s->current_ssid;
if (ssid == NULL)
continue;
if (ssid->mode != WPAS_MODE_INFRA)
continue;
P2P: Do not expire GO peer entry during group rekeying If wpas_go_connected() is called during group rekeying the P2P GO peer will expire. To prevent that check if group rekeying is not in progress.
2012-02-11 09:54:40 +01:00
if (wpa_s->wpa_state != WPA_COMPLETED &&
wpa_s->wpa_state != WPA_GROUP_HANDSHAKE)
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;
if (os_memcmp(wpa_s->go_dev_addr, dev_addr, ETH_ALEN) == 0)
return 1;
}
return 0;
}
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: 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
int wpas_p2p_add_p2pdev_interface(struct wpa_supplicant *wpa_s)
{
struct wpa_interface iface;
struct wpa_supplicant *p2pdev_wpa_s;
char ifname[100];
char force_name[100];
int ret;
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
os_snprintf(ifname, sizeof(ifname), P2P_MGMT_DEVICE_PREFIX "%s",
wpa_s->ifname);
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;
iface.confname = wpa_s->confname;
p2pdev_wpa_s = wpa_supplicant_add_iface(wpa_s->global, &iface);
if (!p2pdev_wpa_s) {
wpa_printf(MSG_DEBUG, "P2P: Failed to add P2P Device interface");
return -1;
}
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
p2pdev_wpa_s->parent = 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);
}
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;
unsigned int r;
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: 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
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;
} else {
p2p.reg_class = 81;
/*
* Pick one of the social channels randomly as the listen
* channel.
*/
os_get_random((u8 *) &r, sizeof(r));
p2p.channel = 1 + (r % 3) * 5;
}
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: Own listen channel: %d", 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.op_reg_class = 81;
/*
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
* Use random operation channel from (1, 6, 11) if no other
* preference is indicated.
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
*/
P2P: Fix random channel selection to use os_get_random This could have been using an uninitialized variable instead of purposefully random value in picking up the channel. There is not much of a difference for the use case here, but anyway, we may as well do what was initially planned here and.
2010-10-31 11:27:37 +01:00
os_get_random((u8 *) &r, sizeof(r));
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.op_channel = 1 + (r % 3) * 5;
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
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 (wpas_p2p_setup_channels(wpa_s, &p2p.channels, &p2p.cli_channels)) {
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_printf(MSG_ERROR, "P2P: Failed to configure supported "
"channel list");
return -1;
}
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: 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;
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: 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.
*/
void wpas_p2p_deinit_global(struct wpa_global *global)
{
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;
if (wpa_s)
wpas_p2p_service_flush(wpa_s);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (global->p2p == NULL)
return;
/* 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: Ignore p2p_no_group_iface when driver advertizes P2P_DEVICE support Setting p2p_no_group_iface means 'use P2P management interface as P2P connection interface' because it attempts to change the interface type. The P2P_DEVICE is a dedicated interface and can not be changed. As such ignore the configuration option. Signed-hostap: Arend van Spriel <arend@broadcom.com>
2013-06-30 09:48:44 +02:00
if (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_DEDICATED_P2P_DEVICE) &&
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: 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->parent, MSG_INFO,
P2P_EVENT_GROUP_FORMATION_FAILURE);
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: 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 *freqs, res, num, i;
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: 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;
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);
if (num < 0) {
res = 1;
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: 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++) {
if (freqs[i] == freq) {
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: 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,
wpa_s->pending_join_dev_addr,
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");
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 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,
wpa_s->p2p_go_vht);
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");
if (!join)
wpa_s->p2p_fallback_to_go_neg = 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
}
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 &&
os_memcmp(iface_addr, wpa_s->pending_join_dev_addr, ETH_ALEN) != 0)
{
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);
}
if (!bss) {
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: 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: 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: 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->parent, MSG_INFO,
P2P_EVENT_GROUP_FORMATION_FAILURE
"reason=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;
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,
P2P: Fix Provision Discovery channel for some join-GO cases The Provision Discovery Request needs to be sent on the operating channel of the GO and as such, the frequency from the BSS table (scan results) need to override the frequency in the P2P peer table that could be based on the Listen channel of the GO. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-18 16:21:25 +01:00
wpa_s->pending_join_dev_addr, 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: 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
wpas_p2p_join_start(wpa_s);
}
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: 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: 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
ielen = p2p_scan_ie_buf_len(wpa_s->global->p2p);
ies = wpabuf_alloc(wpabuf_len(wps_ie) + ielen);
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 (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: 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
p2p_scan_ie(wpa_s->global->p2p, ies, 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
P2P: Remove CCK supported rates when running P2P scan This allows drivers to disable CCK rates from Probe Request frames. For nl80211, this is currently applying only to the supported rates element(s), but this mechanism could be extended to address TX rate control masking, too, to lessen need for global rate disabling. Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
2011-09-10 21:40:30 +02:00
params.p2p_probe = 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
params.extra_ies = wpabuf_head(ies);
params.extra_ies_len = wpabuf_len(ies);
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
/*
* 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: 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
int auto_join, 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: 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
MACSTR " dev " MACSTR ")%s",
MAC2STR(iface_addr), MAC2STR(dev_addr),
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: 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, 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
}
static int wpas_p2p_join_start(struct wpa_supplicant *wpa_s)
{
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));
os_memcpy(res.peer_interface_addr, wpa_s->pending_join_iface_addr,
ETH_ALEN);
res.wps_method = wpa_s->pending_join_wps_method;
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_iface_addr);
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
if (bss) {
res.freq = bss->freq;
res.ssid_len = bss->ssid_len;
os_memcpy(res.ssid, bss->ssid, bss->ssid_len);
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
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: 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: 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 *force_freq, int *pref_freq, int go)
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
int *freqs, res;
unsigned int freq_in_use = 0, num, i;
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);
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: Setup freqs: freq=%d num_MCC=%d shared_freqs=%u",
freq, wpa_s->num_multichan_concurrent, 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 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) {
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: The forced channel "
"(%u MHz) is not supported for P2P uses",
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
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++) {
if (freqs[i] == freq)
freq_in_use = 1;
}
if (num == wpa_s->num_multichan_concurrent && !freq_in_use) {
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;
}
for (i = 0; i < num; i++) {
if (!p2p_supported_freq(wpa_s->global->p2p, freqs[i]))
continue;
if (*pref_freq == 0 && num < wpa_s->num_multichan_concurrent) {
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",
freqs[i]);
*pref_freq = freqs[i];
} else {
wpa_printf(MSG_DEBUG, "P2P: Try to force us to use frequency (%u MHz) which is already in use",
freqs[i]);
*force_freq = freqs[i];
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
break;
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
if (i == num) {
P2P: Clean up wpas_p2p_setup_freqs() debug message It is confusing to talk about current operating channels being unavailable for P2P when there are no current operating channels. Make the debug message easier to understand. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-18 17:16:27 +01:00
if (num < wpa_s->num_multichan_concurrent && num > 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
wpa_printf(MSG_DEBUG, "P2P: Current operating channels are not available for P2P. Try to use another channel");
*force_freq = 0;
P2P: Clean up wpas_p2p_setup_freqs() debug message It is confusing to talk about current operating channels being unavailable for P2P when there are no current operating channels. Make the debug message easier to understand. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-11-18 17:16:27 +01:00
} else if (num < wpa_s->num_multichan_concurrent) {
wpa_printf(MSG_DEBUG, "P2P: No current operating channels - try to use a new channel");
*force_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
} 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;
}
}
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 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: 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 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
int go_intent, int freq, int persistent_id, int pd,
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
int ht40, int vht)
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: 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;
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: 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) {
ret = wps_generate_pin();
os_snprintf(wpa_s->p2p_pin, sizeof(wpa_s->p2p_pin), "%08d",
ret);
wpa_printf(MSG_DEBUG, "P2P: Randomly generated PIN: %s",
wpa_s->p2p_pin);
} 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: 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
auto_join, NULL, 0) < 0)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return -1;
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
res = wpas_p2p_setup_freqs(wpa_s, freq, &force_freq, &pref_freq,
go_intent == 15);
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
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;
} else
if_addr = wpa_s->own_addr;
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: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (wpa_s->off_channel_freq == wpa_s->pending_listen_freq) {
p2p_listen_cb(wpa_s->global->p2p, wpa_s->pending_listen_freq,
wpa_s->pending_listen_duration);
wpa_s->pending_listen_freq = 0;
}
}
static int wpas_p2p_listen_start(struct wpa_supplicant *wpa_s,
unsigned int timeout)
{
/* 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: 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)
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 -= wpa_s->max_remain_on_chan;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
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;
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))
wpas_p2p_disconnect(prev);
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: 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
return wpas_p2p_disconnect(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;
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 {
os_get_random((u8 *) &r, sizeof(r));
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 {
os_get_random((u8 *) &r, sizeof(r));
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)) {
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: 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 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
int freq, int ht40, int vht,
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: 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 res, *freqs;
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
unsigned int pref_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
unsigned int num, i;
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 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: 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
if (!freq_included(channels, freq)) {
wpa_printf(MSG_DEBUG, "P2P: Forced GO freq %d MHz not "
"accepted", freq);
return -1;
}
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 forced "
"frequency %d MHz", freq);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
params->freq = 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
} else if (wpa_s->conf->p2p_oper_reg_class == 81 &&
wpa_s->conf->p2p_oper_channel >= 1 &&
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
wpa_s->conf->p2p_oper_channel <= 11 &&
freq_included(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: 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
} else 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 == 126 ||
wpa_s->conf->p2p_oper_reg_class == 127) &&
freq_included(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);
} else if (wpa_s->conf->p2p_oper_channel == 0 &&
wpa_s->best_overall_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_overall_freq) &&
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
freq_included(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);
} else if (wpa_s->conf->p2p_oper_channel == 0 &&
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: 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
freq_included(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);
} else if (wpa_s->conf->p2p_oper_channel == 0 &&
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,
wpa_s->best_5_freq) &&
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
freq_included(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: 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
} else if ((pref_freq = p2p_get_pref_freq(wpa_s->global->p2p,
channels))) {
params->freq = pref_freq;
wpa_printf(MSG_DEBUG, "P2P: Set GO freq %d MHz from preferred "
"channels", params->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
} else {
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
int chan;
for (chan = 0; chan < 11; chan++) {
params->freq = 2412 + chan * 5;
if (!wpas_p2p_disallowed_freq(wpa_s->global,
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
params->freq) &&
freq_included(channels, params->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
break;
}
if (chan == 11) {
wpa_printf(MSG_DEBUG, "P2P: No 2.4 GHz channel "
"allowed");
return -1;
}
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 %d MHz (no preference "
"known)", params->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
freqs = os_calloc(wpa_s->num_multichan_concurrent, sizeof(int));
if (!freqs)
return -1;
res = wpas_p2p_valid_oper_freqs(wpa_s, freqs,
wpa_s->num_multichan_concurrent);
if (res < 0) {
os_free(freqs);
return -1;
}
num = res;
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
for (i = 0; i < num; i++) {
if (freq && freqs[i] == freq)
break;
if (!freq && freq_included(channels, freqs[i])) {
wpa_printf(MSG_DEBUG, "P2P: Force GO on a channel we are already using (%u MHz)",
freqs[i]);
params->freq = freqs[i];
break;
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: 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: 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
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
if (i == num) {
if (wpas_p2p_num_unused_channels(wpa_s) <= 0) {
if (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: Cannot force GO on freq (%u MHz) as all the channels are in use", freq);
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
else
wpa_printf(MSG_DEBUG, "P2P: Cannot force GO on any of the channels we are already using");
os_free(freqs);
return -1;
} else if (num == 0) {
wpa_printf(MSG_DEBUG, "P2P: Use one of the free channels");
} else {
wpa_printf(MSG_DEBUG, "P2P: Cannot force GO on any of the channels we are already using. Use one of the free channels");
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: 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: 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)) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Use same 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: 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 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 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 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
int freq, int ht40, int vht)
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 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 (wpas_p2p_init_go_params(wpa_s, &params, freq, ht40, vht, 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)) {
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
wpa_printf(MSG_DEBUG, "P2P: The selected channel for GO "
"(%u MHz) is not supported for P2P uses",
params.freq);
return -1;
}
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,
struct wpa_ssid *params, int addr_allocated)
{
struct wpa_ssid *ssid;
wpa_s = wpas_p2p_get_group_iface(wpa_s, addr_allocated, 0);
if (wpa_s == NULL)
return -1;
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;
wpa_config_set_network_defaults(ssid);
ssid->temporary = 1;
ssid->proto = WPA_PROTO_RSN;
ssid->pairwise_cipher = WPA_CIPHER_CCMP;
ssid->group_cipher = WPA_CIPHER_CCMP;
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: 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 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
int freq, int ht40, int vht,
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
const struct p2p_channels *channels,
int connection_timeout)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct p2p_go_neg_results params;
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
int go = 0;
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");
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: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (ssid->mode == WPAS_MODE_INFRA)
return wpas_start_p2p_client(wpa_s, ssid, addr_allocated);
if (ssid->mode != WPAS_MODE_P2P_GO)
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 = wpas_p2p_select_go_freq(wpa_s, freq);
if (freq < 0)
return -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 (wpas_p2p_init_go_params(wpa_s, &params, freq, ht40, vht, 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: 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: 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 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: 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 initial version of P2P Module
2010-07-18 23:30:25 +02:00
eloop_cancel_timeout(wpas_p2p_group_formation_timeout, wpa_s->parent,
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: Fix P2P Group Formation timeout registration (use parent iface) Commit 361cdf34009c7407ddf22dee6f5e6ce82e81bcae extended the use of group formation timeout for the way handshake, but the registration was done on the group_interface while the cancellation was done on the parent interface. Fix the registration to set the eloop timeout on parent to address potential issues when using a separate group interface. Signed-hostap: Nirav Shah <nirav.j2.shah@intel.com>
2012-06-04 20:58:34 +02:00
wpa_s->parent, 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
} 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,
wpa_s->parent, NULL);
/*
* 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);
wpas_group_formation_completed(wpa_s, 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
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,
wpa_s->parent, NULL);
}
}
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,
enum wpas_p2p_prov_disc_use use)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
u16 config_methods;
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;
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
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");
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;
}
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 -1;
return p2p_prov_disc_req(wpa_s->global->p2p, 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
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;
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,
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
const u8 *dev_id, unsigned int search_delay)
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,
search_delay);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
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
static int 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: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
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
return 0;
}
void wpas_p2p_stop_find(struct wpa_supplicant *wpa_s)
{
if (wpas_p2p_stop_find_oper(wpa_s) > 0)
return;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpas_p2p_remove_pending_group_interface(wpa_s);
}
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;
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;
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,
Pass signal strength through, fix units The signal strength is currently never used as the only driver reporting it is nl80211 which uses IEEE80211_RADIOTAP_DB_ANTSIGNAL which is never populated by the kernel. The kernel will (soon) populate IEEE80211_RADIOTAP_DBM_ANTSIGNAL instead though, so use that. Also, since it was never really populated, we can redefine the signal field to be in dBm units only. My next patch will also require knowing the signal strength of probe requests throughout the code (where available), so add it to the necessary APIs. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2012-04-01 17:48:12 +02:00
const u8 *ie, size_t ie_len, 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,
ie, ie_len)) {
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)
{
if (wpa_s->global->p2p_disabled)
return;
if (wpa_s->global->p2p == NULL)
return;
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
p2p_scan_ie(wpa_s->global->p2p, ies, NULL);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
void wpas_p2p_group_deinit(struct wpa_supplicant *wpa_s)
{
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 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
int ht40, int vht, 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: 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 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;
} else
bssid = wpa_s->own_addr;
} else {
role = P2P_INVITE_ROLE_CLIENT;
peer_addr = ssid->bssid;
}
wpa_s->pending_invite_ssid_id = ssid->id;
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,
role == P2P_INVITE_ROLE_GO);
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 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: 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,
1, pref_freq);
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: 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: 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 &&
wpas_p2p_get_persistent(wpa_s->parent, peer_addr,
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: Fix invitation-to-running-group handling The pending_invite_ssid_id of -1 (running group, not persistent) was being stored incorrectly in the group interface, not device interface (i.e., parent of the group interface) and consequently, the incorrect information was used when processing the Invitation Response. If there was a persistent group credentials stored with network id 0, those were used instead to try to set up a persistent group instead of using the already running group.
2010-11-16 14:22:06 +01:00
wpa_s->parent->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: 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,
role == P2P_INVITE_ROLE_ACTIVE_GO);
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,
go_dev_addr, persistent, pref_freq);
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;
const char *ssid_txt;
u8 go_dev_addr[ETH_ALEN];
P2P: Add group started notification Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:35:37 +02:00
int network_id = -1;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
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,
wpa_s->parent, NULL);
}
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;
ssid_txt = wpa_ssid_txt(ssid->ssid, ssid->ssid_len);
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) {
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]);
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (ssid->passphrase == NULL && ssid->psk_set) {
char psk[65];
wpa_snprintf_hex(psk, sizeof(psk), ssid->psk, 32);
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->parent, MSG_INFO, P2P_EVENT_GROUP_STARTED
"%s client ssid=\"%s\" freq=%d psk=%s "
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
"go_dev_addr=" MACSTR "%s%s",
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_s->ifname, ssid_txt, freq, psk,
MAC2STR(go_dev_addr),
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
persistent ? " [PERSISTENT]" : "", ip_addr);
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->parent, MSG_INFO, P2P_EVENT_GROUP_STARTED
"%s client ssid=\"%s\" freq=%d "
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
"passphrase=\"%s\" go_dev_addr=" MACSTR "%s%s",
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_s->ifname, ssid_txt, freq,
ssid->passphrase ? ssid->passphrase : "",
MAC2STR(go_dev_addr),
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
persistent ? " [PERSISTENT]" : "", ip_addr);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
if (persistent)
P2P: Add group started notification Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:35:37 +02:00
network_id = wpas_p2p_store_persistent_group(wpa_s->parent,
ssid, go_dev_addr);
if (network_id < 0)
network_id = ssid->id;
wpas_notify_p2p_group_started(wpa_s, ssid, network_id, 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;
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;
} else {
reg_class = 81;
/*
* Pick one of the social channels randomly as the
* listen channel.
*/
os_get_random((u8 *) &r, sizeof(r));
channel = 1 + (r % 3) * 5;
}
ret = p2p_set_listen_channel(p2p, reg_class, channel);
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.
*/
os_get_random((u8 *) &r, sizeof(r));
op_channel = 1 + (r % 3) * 5;
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: 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: 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(iface->parent, MSG_INFO,
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: 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(iface->parent, MSG_INFO,
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: 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(iface->parent, MSG_INFO,
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;
if (iface->drv_flags & WPA_DRIVER_FLAGS_P2P_CAPABLE)
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: 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->parent, MSG_INFO,
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: Send WPS-OVERLAP-DETECTED also to the parent interface When running "p2p_connect addr pbc join" command, send the WPS-OVERLAP-DETECTED even also to the parent interface (i.e., the one on which the p2p_connect was issued) and not only the group interface in case separate P2P group interfaces are used.
2010-11-12 10:30:58 +01:00
if (wpa_s != wpa_s->parent)
wpa_msg_ctrl(wpa_s->parent, MSG_INFO, WPS_EVENT_OVERLAP);
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
wpas_p2p_group_formation_failed(wpa_s);
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
void wpas_p2p_update_channel_list(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, 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
if (wpa_s->global == NULL || wpa_s->global->p2p == NULL)
return;
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: 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,
wpa_s->parent, 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) {
wpas_group_formation_completed(wpa_s, 0);
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;
}
}
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,
wpa_s->parent, 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,
wpa_s->parent, 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++) {
if (os_memcmp(s->p2p_client_list + i * ETH_ALEN,
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,
wpa_s->parent, NULL) > 0) {
/*
* 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");
}
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: 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
static void wpas_p2p_fallback_to_go_neg(struct wpa_supplicant *wpa_s,
int group_added)
{
struct wpa_supplicant *group = wpa_s;
if (wpa_s->global->p2p_group_formation)
group = wpa_s->global->p2p_group_formation;
wpa_s = wpa_s->parent;
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: 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(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 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,
wpa_s->p2p_go_vht);
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)
{
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");
wpas_p2p_fallback_to_go_neg(wpa_s, 1);
return 1;
}
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_CONCURRENT_SEARCH_DELAY);
return P2P_CONCURRENT_SEARCH_DELAY;
}
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_CONCURRENT_SEARCH_DELAY, ifs->ifname);
return P2P_CONCURRENT_SEARCH_DELAY;
}
}
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;
struct psk_list_entry *p;
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;
}
persistent = wpas_p2p_get_persistent(wpa_s->parent, NULL, ssid->ssid,
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);
if (dl_list_len(&persistent->psk_list) > P2P_MAX_STORED_CLIENTS) {
struct psk_list_entry *last;
last = dl_list_last(&persistent->psk_list,
struct psk_list_entry, list);
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: 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
wpas_p2p_remove_psk_entry(wpa_s->parent, persistent,
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);
#ifndef CONFIG_NO_CONFIG_WRITE
if (wpa_s->parent->conf->update_config &&
wpa_config_write(wpa_s->parent->confname, wpa_s->parent->conf))
wpa_printf(MSG_DEBUG, "P2P: Failed to update configuration");
#endif /* CONFIG_NO_CONFIG_WRITE */
}
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);
if (res > 0) {
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
#ifndef CONFIG_NO_CONFIG_WRITE
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
if (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
#endif /* CONFIG_NO_CONFIG_WRITE */
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: 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;
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Remove client " MACSTR, MAC2STR(peer));
/* Remove from any persistent group */
for (s = wpa_s->parent->conf->ssid; s; s = s->next) {
if (s->disabled != 2 || s->mode != WPAS_MODE_P2P_GO)
continue;
if (!iface_addr)
wpas_remove_persistent_peer(wpa_s, s, peer, 0);
wpas_p2p_remove_psk(wpa_s->parent, s, peer, iface_addr);
}
/* 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));
persistent = wpas_p2p_get_persistent(wpa_s->parent, go_dev_addr,
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;
}
wpa_msg_global(wpa_s->parent, MSG_INFO,
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;
if (wsc == NULL) {
wpabuf_free(p2p);
return NULL;
}
if (p2p == NULL) {
wpabuf_free(wsc);
wpa_printf(MSG_DEBUG, "P2P: No p2p buffer for handover");
return NULL;
}
ret = wpabuf_alloc(2 + wpabuf_len(wsc) + 2 + wpabuf_len(p2p));
if (ret == NULL) {
wpabuf_free(wsc);
wpabuf_free(p2p);
return NULL;
}
wpabuf_put_be16(ret, wpabuf_len(wsc));
wpabuf_put_buf(ret, wsc);
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;
}
struct wpabuf * wpas_p2p_nfc_handover_req(struct wpa_supplicant *wpa_s,
int ndef)
{
struct wpabuf *wsc, *p2p;
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;
}
wsc = wps_build_nfc_handover_req_p2p(wpa_s->parent->wps,
wpa_s->conf->wps_nfc_dh_pubkey);
p2p = p2p_build_nfc_handover_req(wpa_s->global->p2p);
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;
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;
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);
p2p = p2p_build_nfc_handover_sel(wpa_s->global->p2p);
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 "
"connection handover");
return wpas_p2p_connect(wpa_s, params->peer->p2p_device_addr, NULL,
WPS_NFC, 0, 0, 1, 0, wpa_s->conf->p2p_go_intent,
0, -1, 0, 1, 1);
}
static int wpas_p2p_nfc_auth_join(struct wpa_supplicant *wpa_s,
struct p2p_nfc_params *params)
{
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) {
struct wpa_ssid *ssid = wpa_s->current_ssid;
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;
}
if (wpa_s->parent->p2p_oob_dev_pw_id !=
DEV_PW_NFC_CONNECTION_HANDOVER &&
!wpa_s->parent->p2p_oob_dev_pw) {
wpa_printf(MSG_DEBUG, "P2P: No NFC Dev Pw known");
return -1;
}
return wpas_ap_wps_add_nfc_pw(
wpa_s, wpa_s->parent->p2p_oob_dev_pw_id,
wpa_s->parent->p2p_oob_dev_pw,
wpa_s->parent->p2p_peer_oob_pk_hash_known ?
wpa_s->parent->p2p_peer_oob_pubkey_hash : NULL);
}
static int wpas_p2p_nfc_init_go_neg(struct wpa_supplicant *wpa_s,
struct p2p_nfc_params *params)
{
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,
0, -1, 0, 1, 1);
}
static int wpas_p2p_nfc_resp_go_neg(struct wpa_supplicant *wpa_s,
struct p2p_nfc_params *params)
{
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,
0, -1, 0, 1, 1);
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,
int sel, int tag)
{
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;
if (pos + len > end) {
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;
if (pos + len > end) {
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;
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:
return 0;
case JOIN_GROUP:
return wpas_p2p_nfc_join_group(wpa_s, &params);
case AUTH_JOIN:
return wpas_p2p_nfc_auth_join(wpa_s, &params);
case INIT_GO_NEG:
return wpas_p2p_nfc_init_go_neg(wpa_s, &params);
case RESP_GO_NEG:
/* TODO: use own OOB Dev Pw */
return wpas_p2p_nfc_resp_go_neg(wpa_s, &params);
}
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,
const struct wpabuf *data)
{
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
return -1;
return wpas_p2p_nfc_connection_handover(wpa_s, data, 1, 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
int wpas_p2p_nfc_report_handover(struct wpa_supplicant *wpa_s, int init,
const struct wpabuf *req,
const struct wpabuf *sel)
{
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));
tmp = ndef_parse_p2p(init ? sel : req);
if (tmp == NULL) {
wpa_printf(MSG_DEBUG, "P2P: Could not parse NDEF");
return -1;
}
ret = wpas_p2p_nfc_connection_handover(wpa_s, tmp, init, 0);
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;
if (wpa_s->global->p2p == NULL)
return -1;
if (!enabled) {
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;
}
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;
wpa_s->create_p2p_iface = wpas_p2p_create_iface(wpa_s);
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;
} else
if_addr = wpa_s->own_addr;
wpa_s->p2p_nfc_tag_enabled = enabled;
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 */
Reference in a new issue Copy permalink