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

4374 lines
113 KiB
C
Raw Normal View History

P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/*
* Wi-Fi Direct - P2P module
* Copyright (c) 2009-2010, Atheros Communications
*
Remove the GPL notification from files contributed by Atheros Remove the GPL notification text from files that were initially contributed by Atheros Communications or Qualcomm Atheros. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-02-11 15:31:36 +01:00
* This software may be distributed under the terms of the BSD license.
* See README for more details.
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
*/
#include "includes.h"
#include "common.h"
#include "eloop.h"
#include "common/ieee802_11_defs.h"
#include "common/ieee802_11_common.h"
#include "wps/wps_i.h"
#include "p2p_i.h"
#include "p2p.h"
static void p2p_state_timeout(void *eloop_ctx, void *timeout_ctx);
static void p2p_device_free(struct p2p_data *p2p, struct p2p_device *dev);
static void p2p_process_presence_req(struct p2p_data *p2p, const u8 *da,
const u8 *sa, const u8 *data, size_t len,
int rx_freq);
static void p2p_process_presence_resp(struct p2p_data *p2p, const u8 *da,
const u8 *sa, const u8 *data,
size_t len);
static void p2p_ext_listen_timeout(void *eloop_ctx, void *timeout_ctx);
P2P: Handle p2p_scan tracking in SEARCH state Previously, only the initial p2p_scan was used to delay starting new P2P operations. However, this should have applied to the SEARCH state scans, too.
2010-06-24 07:37:27 +02:00
static void p2p_scan_timeout(void *eloop_ctx, void *timeout_ctx);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Handle p2p_scan tracking in SEARCH state Previously, only the initial p2p_scan was used to delay starting new P2P operations. However, this should have applied to the SEARCH state scans, too.
2010-06-24 07:37:27 +02:00
/*
* p2p_scan recovery timeout
*
* Many drivers are using 30 second timeout on scan results. Allow a bit larger
* timeout for this to avoid hitting P2P timeout unnecessarily.
*/
#define P2P_SCAN_TIMEOUT 35
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/**
* P2P_PEER_EXPIRATION_AGE - Number of seconds after which inactive peer
* entries will be removed
*/
#define P2P_PEER_EXPIRATION_AGE 300
#define P2P_PEER_EXPIRATION_INTERVAL (P2P_PEER_EXPIRATION_AGE / 2)
static void p2p_expire_peers(struct p2p_data *p2p)
{
struct p2p_device *dev, *n;
struct os_time now;
P2P: Do not expire peer entry if peer is connected as a client Even though we may not receive a Probe Response from the peer during the connection, we should not be expiring a P2P peer entry while that peer is connected to a group where we are the GO. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-01-25 16:00:59 +01:00
size_t i;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
os_get_time(&now);
dl_list_for_each_safe(dev, n, &p2p->devices, struct p2p_device, list) {
if (dev->last_seen.sec + P2P_PEER_EXPIRATION_AGE >= now.sec)
continue;
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
if (p2p->cfg->go_connected &&
p2p->cfg->go_connected(p2p->cfg->cb_ctx,
dev->info.p2p_device_addr)) {
/*
* We are connected as a client to a group in which the
* peer is the GO, so do not expire the peer entry.
*/
os_get_time(&dev->last_seen);
continue;
}
P2P: Do not expire peer entry if peer is connected as a client Even though we may not receive a Probe Response from the peer during the connection, we should not be expiring a P2P peer entry while that peer is connected to a group where we are the GO. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-01-25 16:00:59 +01:00
for (i = 0; i < p2p->num_groups; i++) {
if (p2p_group_is_client_connected(
p2p->groups[i], dev->info.p2p_device_addr))
break;
}
if (i < p2p->num_groups) {
/*
* The peer is connected as a client in a group where
* we are the GO, so do not expire the peer entry.
*/
os_get_time(&dev->last_seen);
continue;
}
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_dbg(p2p, "Expiring old peer entry " MACSTR,
MAC2STR(dev->info.p2p_device_addr));
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
dl_list_del(&dev->list);
p2p_device_free(p2p, dev);
}
}
static void p2p_expiration_timeout(void *eloop_ctx, void *timeout_ctx)
{
struct p2p_data *p2p = eloop_ctx;
p2p_expire_peers(p2p);
eloop_register_timeout(P2P_PEER_EXPIRATION_INTERVAL, 0,
p2p_expiration_timeout, p2p, NULL);
}
static const char * p2p_state_txt(int state)
{
switch (state) {
case P2P_IDLE:
return "IDLE";
case P2P_SEARCH:
return "SEARCH";
case P2P_CONNECT:
return "CONNECT";
case P2P_CONNECT_LISTEN:
return "CONNECT_LISTEN";
case P2P_GO_NEG:
return "GO_NEG";
case P2P_LISTEN_ONLY:
return "LISTEN_ONLY";
case P2P_WAIT_PEER_CONNECT:
return "WAIT_PEER_CONNECT";
case P2P_WAIT_PEER_IDLE:
return "WAIT_PEER_IDLE";
case P2P_SD_DURING_FIND:
return "SD_DURING_FIND";
case P2P_PROVISIONING:
return "PROVISIONING";
case P2P_PD_DURING_FIND:
return "PD_DURING_FIND";
case P2P_INVITE:
return "INVITE";
case P2P_INVITE_LISTEN:
return "INVITE_LISTEN";
P2P: Wait until ongoing scan completes before starting P2P find The P2P_FIND command was failing if it was issued at the moment when a scan operation was in progress. Avoid returning failure in this case by scheduling the P2P find to start once the ongoing scan is completed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-15 20:25:21 +01:00
case P2P_SEARCH_WHEN_READY:
return "SEARCH_WHEN_READY";
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
case P2P_CONTINUE_SEARCH_WHEN_READY:
return "CONTINUE_SEARCH_WHEN_READY";
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
default:
return "?";
}
}
P2P: Add state info to global STATUS command This can be used for debugging purposes to see what the current P2P module state is. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-08-25 20:02:12 +02:00
const char * p2p_get_state_txt(struct p2p_data *p2p)
{
return p2p_state_txt(p2p->state);
}
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
u16 p2p_get_provisioning_info(struct p2p_data *p2p, const u8 *addr)
{
struct p2p_device *dev = NULL;
if (!addr || !p2p)
return 0;
dev = p2p_get_device(p2p, addr);
if (dev)
return dev->wps_prov_info;
else
return 0;
}
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
void p2p_clear_provisioning_info(struct p2p_data *p2p, const u8 *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
{
struct p2p_device *dev = NULL;
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 (!addr || !p2p)
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
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
dev = p2p_get_device(p2p, 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
if (dev)
dev->wps_prov_info = 0;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
void p2p_set_state(struct p2p_data *p2p, int new_state)
{
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_dbg(p2p, "State %s -> %s",
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_state_txt(p2p->state), p2p_state_txt(new_state));
p2p->state = new_state;
}
void p2p_set_timeout(struct p2p_data *p2p, unsigned int sec, unsigned int usec)
{
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_dbg(p2p, "Set timeout (state=%s): %u.%06u sec",
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_state_txt(p2p->state), sec, usec);
eloop_cancel_timeout(p2p_state_timeout, p2p, NULL);
eloop_register_timeout(sec, usec, p2p_state_timeout, p2p, NULL);
}
void p2p_clear_timeout(struct p2p_data *p2p)
{
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_dbg(p2p, "Clear timeout (state=%s)", p2p_state_txt(p2p->state));
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
eloop_cancel_timeout(p2p_state_timeout, p2p, NULL);
}
void p2p_go_neg_failed(struct p2p_data *p2p, struct p2p_device *peer,
int status)
{
struct p2p_go_neg_results res;
p2p_clear_timeout(p2p);
p2p_set_state(p2p, P2P_IDLE);
P2P: Skip Listen phase when peer is expected to be waiting In case we have replied to a peer's GO Negotiation Request frame with a GO Negotiation Response frame using status code info-currently-unavailable (1), the peer is likely going to wait for us to initiate GO Negotiation on its Listen channel. We were previously using alternativing send-GO-Neg-Req and Listen phase when providing that response after the user had authorized the connection. However, the Listen phase here is unnecessary in this case and will make the connection take longer time to go through. Skip the Listen phase and make the wait-for-GO-Neg-Resp timeout random between 100 and 200 ms to avoid getting in sync with the peer. In practice, this will make us retry GO Negotiation Request frames more frequently and remain on the peer's Listen channel for most of the time when initiating GO Negotiation after status=1 response. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-28 21:35:11 +01:00
if (p2p->go_neg_peer) {
p2p->go_neg_peer->flags &= ~P2P_DEV_PEER_WAITING_RESPONSE;
P2P: Clear WPS method when GO negotiation fails When GO negotation fails the WPS method is currently not cleared, which can result in GO negotiation being resumed when a GO negotiation request frame is received from the peer. That is unexpected as locally we already gave up. This manifests itself in getting 1319574733.955685: wlan0: P2P-GO-NEG-FAILURE status=-1 1319574733.955723: P2P: Removing pending group interface p2p-wlan0-0 ... 1319574736.648378: wlan0: P2P: Starting GO Negotiation with previously authorized peer ... 1319574736.650115: wlan0: P2P: Sending GO Negotiation Response ... 1319574736.988038: wlan0: P2P-GO-NEG-SUCCESS 1319574736.988233: P2P: No pending group interface 1319574736.988268: P2P: Create a new interface p2p-wlan0-1 for the group Clear the WPS method to avoid this situation. I wasn't able to test this though, but given the log I can only assume this is how the situation happened. Reported-by: Reinette Chatre <reinette.chatre@intel.com> Signed-hostap: Johannes Berg <johannes.berg@intel.com>
2011-11-18 22:34:53 +01:00
p2p->go_neg_peer->wps_method = WPS_NOT_READY;
P2P: Skip Listen phase when peer is expected to be waiting In case we have replied to a peer's GO Negotiation Request frame with a GO Negotiation Response frame using status code info-currently-unavailable (1), the peer is likely going to wait for us to initiate GO Negotiation on its Listen channel. We were previously using alternativing send-GO-Neg-Req and Listen phase when providing that response after the user had authorized the connection. However, the Listen phase here is unnecessary in this case and will make the connection take longer time to go through. Skip the Listen phase and make the wait-for-GO-Neg-Resp timeout random between 100 and 200 ms to avoid getting in sync with the peer. In practice, this will make us retry GO Negotiation Request frames more frequently and remain on the peer's Listen channel for most of the time when initiating GO Negotiation after status=1 response. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-28 21:35:11 +01:00
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->go_neg_peer = NULL;
os_memset(&res, 0, sizeof(res));
res.status = status;
if (peer) {
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
os_memcpy(res.peer_device_addr, peer->info.p2p_device_addr,
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
ETH_ALEN);
os_memcpy(res.peer_interface_addr, peer->intended_addr,
ETH_ALEN);
}
p2p->cfg->go_neg_completed(p2p->cfg->cb_ctx, &res);
}
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
static void p2p_listen_in_find(struct p2p_data *p2p, int dev_disc)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
unsigned int r, tu;
int freq;
struct wpabuf *ies;
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_dbg(p2p, "Starting short listen state (state=%s)",
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_state_txt(p2p->state));
P2P: Clean up channel--frequency conversion functions All P2P use cases are required to use the global operating table and there is no need to need to try to maintain some backwards compatibility with country code -specific values. Clean up the implementation by removing the unnecessary country parameter. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-27 20:03:16 +02:00
freq = p2p_channel_to_freq(p2p->cfg->reg_class, p2p->cfg->channel);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (freq < 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
p2p_dbg(p2p, "Unknown regulatory class/channel");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return;
}
os_get_random((u8 *) &r, sizeof(r));
tu = (r % ((p2p->max_disc_int - p2p->min_disc_int) + 1) +
p2p->min_disc_int) * 100;
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
if (p2p->max_disc_tu >= 0 && tu > (unsigned int) p2p->max_disc_tu)
tu = p2p->max_disc_tu;
if (!dev_disc && tu < 100)
tu = 100; /* Need to wait in non-device discovery use cases */
if (p2p->cfg->max_listen && 1024 * tu / 1000 > p2p->cfg->max_listen)
tu = p2p->cfg->max_listen * 1000 / 1024;
if (tu == 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
p2p_dbg(p2p, "Skip listen state since duration was 0 TU");
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_set_timeout(p2p, 0, 0);
return;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->pending_listen_freq = freq;
p2p->pending_listen_sec = 0;
p2p->pending_listen_usec = 1024 * tu;
ies = p2p_build_probe_resp_ies(p2p);
if (ies == NULL)
return;
if (p2p->cfg->start_listen(p2p->cfg->cb_ctx, freq, 1024 * tu / 1000,
ies) < 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
p2p_dbg(p2p, "Failed to start listen mode");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->pending_listen_freq = 0;
}
wpabuf_free(ies);
}
int p2p_listen(struct p2p_data *p2p, unsigned int timeout)
{
int freq;
struct wpabuf *ies;
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_dbg(p2p, "Going to listen(only) state");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
P2P: Clean up channel--frequency conversion functions All P2P use cases are required to use the global operating table and there is no need to need to try to maintain some backwards compatibility with country code -specific values. Clean up the implementation by removing the unnecessary country parameter. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-27 20:03:16 +02:00
freq = p2p_channel_to_freq(p2p->cfg->reg_class, p2p->cfg->channel);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (freq < 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
p2p_dbg(p2p, "Unknown regulatory class/channel");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return -1;
}
p2p->pending_listen_freq = freq;
p2p->pending_listen_sec = timeout / 1000;
p2p->pending_listen_usec = (timeout % 1000) * 1000;
if (p2p->p2p_scan_running) {
P2P: Fix disallowing of pending listen command to override connect Commit d9bdba9f867577ed9da6df9c5c933033c71bcdf2 was supposed to allow p2p_listen to schedule new after scan operation only if a p2p_connect operation was not pending. However, it used incorrect P2P_AFTER_SCAN_ value for this and did not actually prevent overriding of p2p_connect and could have caused some p2p_listen operations to be skipped unnecessarily. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-04-16 17:51:33 +02:00
if (p2p->start_after_scan == P2P_AFTER_SCAN_CONNECT) {
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_dbg(p2p, "p2p_scan running - connect is already pending - skip listen");
P2P: Do not allow pending listen command override connect If p2p_listen is issued during a p2p_scan, a pending after-scan operation is scheduled. However, since there is support for only a single pending operation, this was able to override a previously scheduled pending connect command. This can break some command sequences, so give higher priority to pending connect operation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-12-21 12:35:18 +01:00
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
p2p_dbg(p2p, "p2p_scan running - delay start of listen state");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->start_after_scan = P2P_AFTER_SCAN_LISTEN;
return 0;
}
ies = p2p_build_probe_resp_ies(p2p);
if (ies == NULL)
return -1;
if (p2p->cfg->start_listen(p2p->cfg->cb_ctx, freq, timeout, ies) < 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
p2p_dbg(p2p, "Failed to start listen mode");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->pending_listen_freq = 0;
wpabuf_free(ies);
return -1;
}
wpabuf_free(ies);
p2p_set_state(p2p, P2P_LISTEN_ONLY);
return 0;
}
static void p2p_device_clear_reported(struct p2p_data *p2p)
{
struct p2p_device *dev;
dl_list_for_each(dev, &p2p->devices, struct p2p_device, list)
dev->flags &= ~P2P_DEV_REPORTED;
}
/**
* p2p_get_device - Fetch a peer entry
* @p2p: P2P module context from p2p_init()
* @addr: P2P Device Address of the peer
* Returns: Pointer to the device entry or %NULL if not found
*/
struct p2p_device * p2p_get_device(struct p2p_data *p2p, const u8 *addr)
{
struct p2p_device *dev;
dl_list_for_each(dev, &p2p->devices, struct p2p_device, list) {
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
if (os_memcmp(dev->info.p2p_device_addr, addr, ETH_ALEN) == 0)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return dev;
}
return NULL;
}
/**
* p2p_get_device_interface - Fetch a peer entry based on P2P Interface Address
* @p2p: P2P module context from p2p_init()
* @addr: P2P Interface Address of the peer
* Returns: Pointer to the device entry or %NULL if not found
*/
struct p2p_device * p2p_get_device_interface(struct p2p_data *p2p,
const u8 *addr)
{
struct p2p_device *dev;
dl_list_for_each(dev, &p2p->devices, struct p2p_device, list) {
if (os_memcmp(dev->interface_addr, addr, ETH_ALEN) == 0)
return dev;
}
return NULL;
}
/**
* p2p_create_device - Create a peer entry
* @p2p: P2P module context from p2p_init()
* @addr: P2P Device Address of the peer
* Returns: Pointer to the device entry or %NULL on failure
*
* If there is already an entry for the peer, it will be returned instead of
* creating a new one.
*/
static struct p2p_device * p2p_create_device(struct p2p_data *p2p,
const u8 *addr)
{
struct p2p_device *dev, *oldest = NULL;
size_t count = 0;
dev = p2p_get_device(p2p, addr);
if (dev)
return dev;
dl_list_for_each(dev, &p2p->devices, struct p2p_device, list) {
count++;
if (oldest == NULL ||
os_time_before(&dev->last_seen, &oldest->last_seen))
oldest = dev;
}
if (count + 1 > p2p->cfg->max_peers && oldest) {
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_dbg(p2p, "Remove oldest peer entry to make room for a new peer");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
dl_list_del(&oldest->list);
p2p_device_free(p2p, oldest);
}
dev = os_zalloc(sizeof(*dev));
if (dev == NULL)
return NULL;
dl_list_add(&p2p->devices, &dev->list);
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
os_memcpy(dev->info.p2p_device_addr, addr, ETH_ALEN);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return dev;
}
static void p2p_copy_client_info(struct p2p_device *dev,
struct p2p_client_info *cli)
{
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
os_memcpy(dev->info.device_name, cli->dev_name, cli->dev_name_len);
dev->info.device_name[cli->dev_name_len] = '\0';
dev->info.dev_capab = cli->dev_capab;
dev->info.config_methods = cli->config_methods;
os_memcpy(dev->info.pri_dev_type, cli->pri_dev_type, 8);
P2P: Keep track of secondary device types for peers Signed-off-by: Jean-Michel Bachot <jean-michelx.bachot@linux.intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-17 10:45:46 +01:00
dev->info.wps_sec_dev_type_list_len = 8 * cli->num_sec_dev_types;
os_memcpy(dev->info.wps_sec_dev_type_list, cli->sec_dev_types,
dev->info.wps_sec_dev_type_list_len);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
static int p2p_add_group_clients(struct p2p_data *p2p, const u8 *go_dev_addr,
const u8 *go_interface_addr, int freq,
const u8 *gi, size_t gi_len)
{
struct p2p_group_info info;
size_t c;
struct p2p_device *dev;
if (gi == NULL)
return 0;
if (p2p_group_info_parse(gi, gi_len, &info) < 0)
return -1;
/*
* Clear old data for this group; if the devices are still in the
* group, the information will be restored in the loop following this.
*/
dl_list_for_each(dev, &p2p->devices, struct p2p_device, list) {
P2P: Fix collection of member-in-group information for peer entries Invalid use of memcpy instead of memcmp in comparison resulted in the GO interface address getting set incorrectly if the GO did not show up in scan results anymore. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-11-18 20:58:18 +01:00
if (os_memcmp(dev->member_in_go_iface, go_interface_addr,
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
ETH_ALEN) == 0) {
os_memset(dev->member_in_go_iface, 0, ETH_ALEN);
os_memset(dev->member_in_go_dev, 0, ETH_ALEN);
}
}
for (c = 0; c < info.num_clients; c++) {
struct p2p_client_info *cli = &info.client[c];
P2P: Do not include own information in the peer table When the station is connected to P2P GO after calling p2p_find command the device sees itself. It is related to lack of filtering itself from clients connected to P2P GO. Step by step: 1. dev1: p2p_group_add 2. dev2: p2p_connect <MAC1> pbc join 3. dev1: wps_pbc 4. dev2: p2p_find Skip P2P client information for our own device from a GO with which we are connected.
2011-12-18 15:38:48 +01:00
if (os_memcmp(cli->p2p_device_addr, p2p->cfg->dev_addr,
ETH_ALEN) == 0)
continue; /* ignore our own entry */
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
dev = p2p_get_device(p2p, cli->p2p_device_addr);
if (dev) {
if (dev->flags & (P2P_DEV_GROUP_CLIENT_ONLY |
P2P: Fix P2P Client Discoverability bit updates The P2P Client Discoverability bit is reserved in most frames and its value in the local P2P peer table should only be updated based on P2P Group Info attribute from a GO. Fix this by avoiding changes to this dev_capab bit based on other P2P frames. It would be more correct to track this separately for each group in which the peer is a member, but since we do not do that for the other group specific information either, this can do for now. It should be noted that prior to commit 18485b5469c5eeea6a552264fbfaabb089a0a557 wpa_supplicant set this bit in all P2P frames. However, that commit changed this to match the specification, i.e., the bit is not set in frames which are received from P2P Device role. As such, this fix is needed to be able to figure out that a peer supports client discoverability capability after that commit. Signed-hostap: Jouni Malinen <j@w1.fi> intended-for: hostap-1
2012-06-16 19:17:39 +02:00
P2P_DEV_PROBE_REQ_ONLY)) {
/*
* Update information since we have not
* received this directly from the client.
*/
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_copy_client_info(dev, cli);
P2P: Fix P2P Client Discoverability bit updates The P2P Client Discoverability bit is reserved in most frames and its value in the local P2P peer table should only be updated based on P2P Group Info attribute from a GO. Fix this by avoiding changes to this dev_capab bit based on other P2P frames. It would be more correct to track this separately for each group in which the peer is a member, but since we do not do that for the other group specific information either, this can do for now. It should be noted that prior to commit 18485b5469c5eeea6a552264fbfaabb089a0a557 wpa_supplicant set this bit in all P2P frames. However, that commit changed this to match the specification, i.e., the bit is not set in frames which are received from P2P Device role. As such, this fix is needed to be able to figure out that a peer supports client discoverability capability after that commit. Signed-hostap: Jouni Malinen <j@w1.fi> intended-for: hostap-1
2012-06-16 19:17:39 +02:00
} else {
/*
* Need to update P2P Client Discoverability
* flag since it is valid only in P2P Group
* Info attribute.
*/
dev->info.dev_capab &=
~P2P_DEV_CAPAB_CLIENT_DISCOVERABILITY;
dev->info.dev_capab |=
cli->dev_capab &
P2P_DEV_CAPAB_CLIENT_DISCOVERABILITY;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (dev->flags & P2P_DEV_PROBE_REQ_ONLY) {
dev->flags &= ~P2P_DEV_PROBE_REQ_ONLY;
}
} else {
dev = p2p_create_device(p2p, cli->p2p_device_addr);
if (dev == NULL)
continue;
dev->flags |= P2P_DEV_GROUP_CLIENT_ONLY;
p2p_copy_client_info(dev, cli);
dev->oper_freq = freq;
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->cfg->dev_found(p2p->cfg->cb_ctx,
dev->info.p2p_device_addr,
P2P: Add new_device flag to dev_found callback The DBus code will want to have perfect matching of dev_found and the dev_lost it adds so it doesn't need to keep track internally. Enable that with a new flag in the core that tracks whether we have already notified about this -- the existing users can ignore it. The part where this is always set to 1 if the new device is discovered by a driver that has P2P in the driver is buggy -- the driver should feed the P2P peer database and then that should feed the notification here instead. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-24 20:59:58 +01:00
&dev->info, 1);
dev->flags |= P2P_DEV_REPORTED | P2P_DEV_REPORTED_ONCE;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
os_memcpy(dev->interface_addr, cli->p2p_interface_addr,
ETH_ALEN);
os_get_time(&dev->last_seen);
os_memcpy(dev->member_in_go_dev, go_dev_addr, ETH_ALEN);
os_memcpy(dev->member_in_go_iface, go_interface_addr,
ETH_ALEN);
}
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 p2p_copy_wps_info(struct p2p_data *p2p, struct p2p_device *dev,
int probe_req, const struct p2p_message *msg)
P2P: Store more WPS attributes for peers Store Manufacturer, Model Name, Model Number, and Serial Number attributes for P2P peers and expose these through the existing peer information mechanisms.
2011-03-28 14:27:10 +02:00
{
os_memcpy(dev->info.device_name, msg->device_name,
sizeof(dev->info.device_name));
if (msg->manufacturer &&
msg->manufacturer_len < sizeof(dev->info.manufacturer)) {
os_memset(dev->info.manufacturer, 0,
sizeof(dev->info.manufacturer));
os_memcpy(dev->info.manufacturer, msg->manufacturer,
msg->manufacturer_len);
}
if (msg->model_name &&
msg->model_name_len < sizeof(dev->info.model_name)) {
os_memset(dev->info.model_name, 0,
sizeof(dev->info.model_name));
os_memcpy(dev->info.model_name, msg->model_name,
msg->model_name_len);
}
if (msg->model_number &&
msg->model_number_len < sizeof(dev->info.model_number)) {
os_memset(dev->info.model_number, 0,
sizeof(dev->info.model_number));
os_memcpy(dev->info.model_number, msg->model_number,
msg->model_number_len);
}
if (msg->serial_number &&
msg->serial_number_len < sizeof(dev->info.serial_number)) {
os_memset(dev->info.serial_number, 0,
sizeof(dev->info.serial_number));
os_memcpy(dev->info.serial_number, msg->serial_number,
msg->serial_number_len);
}
if (msg->pri_dev_type)
os_memcpy(dev->info.pri_dev_type, msg->pri_dev_type,
sizeof(dev->info.pri_dev_type));
else if (msg->wps_pri_dev_type)
os_memcpy(dev->info.pri_dev_type, msg->wps_pri_dev_type,
sizeof(dev->info.pri_dev_type));
if (msg->wps_sec_dev_type_list) {
os_memcpy(dev->info.wps_sec_dev_type_list,
msg->wps_sec_dev_type_list,
msg->wps_sec_dev_type_list_len);
dev->info.wps_sec_dev_type_list_len =
msg->wps_sec_dev_type_list_len;
}
if (msg->capability) {
P2P: Fix P2P Client Discoverability bit updates The P2P Client Discoverability bit is reserved in most frames and its value in the local P2P peer table should only be updated based on P2P Group Info attribute from a GO. Fix this by avoiding changes to this dev_capab bit based on other P2P frames. It would be more correct to track this separately for each group in which the peer is a member, but since we do not do that for the other group specific information either, this can do for now. It should be noted that prior to commit 18485b5469c5eeea6a552264fbfaabb089a0a557 wpa_supplicant set this bit in all P2P frames. However, that commit changed this to match the specification, i.e., the bit is not set in frames which are received from P2P Device role. As such, this fix is needed to be able to figure out that a peer supports client discoverability capability after that commit. Signed-hostap: Jouni Malinen <j@w1.fi> intended-for: hostap-1
2012-06-16 19:17:39 +02:00
/*
* P2P Client Discoverability bit is reserved in all frames
* that use this function, so do not change its value here.
*/
dev->info.dev_capab &= P2P_DEV_CAPAB_CLIENT_DISCOVERABILITY;
dev->info.dev_capab |= msg->capability[0] &
~P2P_DEV_CAPAB_CLIENT_DISCOVERABILITY;
P2P: Store more WPS attributes for peers Store Manufacturer, Model Name, Model Number, and Serial Number attributes for P2P peers and expose these through the existing peer information mechanisms.
2011-03-28 14:27:10 +02:00
dev->info.group_capab = msg->capability[1];
}
if (msg->ext_listen_timing) {
dev->ext_listen_period = WPA_GET_LE16(msg->ext_listen_timing);
dev->ext_listen_interval =
WPA_GET_LE16(msg->ext_listen_timing + 2);
}
if (!probe_req) {
P2P: Do not allow peer update to clear config_methods It could be possible for the scan results to include two entries for a peer, one from the Listen state and the second one from the GO role. The latter could be based on a Beason frame. If that happens and the entry from GO is processed last, the P2P peer config_methods value could potentially get cleared since Beacon frames do not include this information in either WPS or P2P element. Avoid this by allowing the config_methods value for P2P peers to be updated only if the new value is non-zero. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-12 17:14:48 +01:00
u16 new_config_methods;
new_config_methods = msg->config_methods ?
P2P: Store more WPS attributes for peers Store Manufacturer, Model Name, Model Number, and Serial Number attributes for P2P peers and expose these through the existing peer information mechanisms.
2011-03-28 14:27:10 +02:00
msg->config_methods : msg->wps_config_methods;
P2P: Do not allow peer update to clear config_methods It could be possible for the scan results to include two entries for a peer, one from the Listen state and the second one from the GO role. The latter could be based on a Beason frame. If that happens and the entry from GO is processed last, the P2P peer config_methods value could potentially get cleared since Beacon frames do not include this information in either WPS or P2P element. Avoid this by allowing the config_methods value for P2P peers to be updated only if the new value is non-zero. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-12 17:14:48 +01:00
if (new_config_methods &&
dev->info.config_methods != new_config_methods) {
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_dbg(p2p, "Update peer " MACSTR
" config_methods 0x%x -> 0x%x",
MAC2STR(dev->info.p2p_device_addr),
dev->info.config_methods,
new_config_methods);
P2P: Do not allow peer update to clear config_methods It could be possible for the scan results to include two entries for a peer, one from the Listen state and the second one from the GO role. The latter could be based on a Beason frame. If that happens and the entry from GO is processed last, the P2P peer config_methods value could potentially get cleared since Beacon frames do not include this information in either WPS or P2P element. Avoid this by allowing the config_methods value for P2P peers to be updated only if the new value is non-zero. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-12 17:14:48 +01:00
dev->info.config_methods = new_config_methods;
}
P2P: Store more WPS attributes for peers Store Manufacturer, Model Name, Model Number, and Serial Number attributes for P2P peers and expose these through the existing peer information mechanisms.
2011-03-28 14:27:10 +02:00
}
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/**
P2P: Do not update peer Listen channel based on PD/Invitation Commits 17bef1e97a5061a8b5443dc24166e28439911f0b and ffe98dfb88a19b66418184955ef272789e3abb68 started using p2p_add_device() with other frames than just Probe Response frames from scan results. However, these changes did not take into account that the PD Request and Invitation Request frames are normally received on the our own Listen channel, not on the Listen channel of the peer. As such, these frames must not be used to update Listen channel information for the peer. Fix this by letting p2p_add_device() know whether the results are from scan results and if not, skip the peer table updates that are specific to Probe Response frames. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-04-26 15:11:17 +02:00
* p2p_add_device - Add peer entries based on scan results or P2P frames
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
* @p2p: P2P module context from p2p_init()
* @addr: Source address of Beacon or Probe Response frame (may be either
* P2P Device Address or P2P Interface Address)
* @level: Signal level (signal strength of the received frame from the peer)
* @freq: Frequency on which the Beacon or Probe Response frame was received
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
* @rx_time: Time when the result was received
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
* @ies: IEs from the Beacon or Probe Response frame
* @ies_len: Length of ies buffer in octets
P2P: Do not update peer Listen channel based on PD/Invitation Commits 17bef1e97a5061a8b5443dc24166e28439911f0b and ffe98dfb88a19b66418184955ef272789e3abb68 started using p2p_add_device() with other frames than just Probe Response frames from scan results. However, these changes did not take into account that the PD Request and Invitation Request frames are normally received on the our own Listen channel, not on the Listen channel of the peer. As such, these frames must not be used to update Listen channel information for the peer. Fix this by letting p2p_add_device() know whether the results are from scan results and if not, skip the peer table updates that are specific to Probe Response frames. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-04-26 15:11:17 +02:00
* @scan_res: Whether this was based on scan results
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
* Returns: 0 on success, -1 on failure
*
* If the scan result is for a GO, the clients in the group will also be added
P2P: Add peer entry based on Provision Discovery Request Add (or complete Probe Request only) P2P peer entry when receiving Provision Discovery Request from a previously unknown peer. This is especially of use for a GO when a P2P client is requesting to join a running group.
2010-09-06 15:51:46 +02:00
* to the peer table. This function can also be used with some other frames
* like Provision Discovery Request that contains P2P Capability and P2P Device
* Info attributes.
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
*/
P2P: Consider age for the P2P scan results cfg80211 caches the scan results according the channel number. Due to the 15 sec aging this might cause the user mode to see more than one scan result with the same BSSID, e.g. - one scan result for the P2P Device and one for the P2P GO (once it's enabled). Fix this by updating the device entry only if the new peer entry is newer than the one previously stored. Signed-off-by: Yoni Divinsky <yoni.divinsky@ti.com> Signed-off-by: Victor Goldenshtein <victorg@ti.com> Signed-off-by: Igal Chernobelsky <igalc@ti.com> Signed-hostap: Arik Nemtsov <arik@wizery.com>
2012-12-25 10:22:42 +01:00
int p2p_add_device(struct p2p_data *p2p, const u8 *addr, int freq,
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
struct os_time *rx_time, int level, const u8 *ies,
P2P: Consider age for the P2P scan results cfg80211 caches the scan results according the channel number. Due to the 15 sec aging this might cause the user mode to see more than one scan result with the same BSSID, e.g. - one scan result for the P2P Device and one for the P2P GO (once it's enabled). Fix this by updating the device entry only if the new peer entry is newer than the one previously stored. Signed-off-by: Yoni Divinsky <yoni.divinsky@ti.com> Signed-off-by: Victor Goldenshtein <victorg@ti.com> Signed-off-by: Igal Chernobelsky <igalc@ti.com> Signed-hostap: Arik Nemtsov <arik@wizery.com>
2012-12-25 10:22:42 +01:00
size_t ies_len, int scan_res)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct p2p_device *dev;
struct p2p_message msg;
const u8 *p2p_dev_addr;
P2P: Keep track of peer WPS vendor extensions Make the P2P code keep track of WPS vendor extensions received from peers so they can be exposed via DBus later. Signed-off-by: Jean-Michel Bachot <jean-michelx.bachot@linux.intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-19 11:16:20 +01:00
int i;
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
struct os_time time_now;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
os_memset(&msg, 0, sizeof(msg));
if (p2p_parse_ies(ies, ies_len, &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_dbg(p2p, "Failed to parse P2P IE for a device entry");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_parse_free(&msg);
return -1;
}
if (msg.p2p_device_addr)
p2p_dev_addr = msg.p2p_device_addr;
else if (msg.device_id)
p2p_dev_addr = msg.device_id;
else {
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_dbg(p2p, "Ignore scan data without P2P Device Info or P2P Device Id");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_parse_free(&msg);
return -1;
}
P2P: Add test command for filtering which peers are discovered "wpa_cli p2p_set peer_filter <MAC address>" can now be used to only allow a single P2P Device (based on P2P Device Address) to be discovered for testing. Setting the address to 00:00:00:00:00:00 disables the filter.
2010-06-29 07:11:39 +02:00
if (!is_zero_ether_addr(p2p->peer_filter) &&
os_memcmp(p2p_dev_addr, p2p->peer_filter, ETH_ALEN) != 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
p2p_dbg(p2p, "Do not add peer filter for " MACSTR
" due to peer filter", MAC2STR(p2p_dev_addr));
P2P: Fix some memory leaks in p2p_add_device() Signed-hostap: Masashi Honma <masashi.honma@gmail.com>
2013-01-12 09:30:07 +01:00
p2p_parse_free(&msg);
P2P: Add test command for filtering which peers are discovered "wpa_cli p2p_set peer_filter <MAC address>" can now be used to only allow a single P2P Device (based on P2P Device Address) to be discovered for testing. Setting the address to 00:00:00:00:00:00 disables the filter.
2010-06-29 07:11:39 +02:00
return 0;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
dev = p2p_create_device(p2p, p2p_dev_addr);
if (dev == NULL) {
p2p_parse_free(&msg);
return -1;
}
P2P: Consider age for the P2P scan results cfg80211 caches the scan results according the channel number. Due to the 15 sec aging this might cause the user mode to see more than one scan result with the same BSSID, e.g. - one scan result for the P2P Device and one for the P2P GO (once it's enabled). Fix this by updating the device entry only if the new peer entry is newer than the one previously stored. Signed-off-by: Yoni Divinsky <yoni.divinsky@ti.com> Signed-off-by: Victor Goldenshtein <victorg@ti.com> Signed-off-by: Igal Chernobelsky <igalc@ti.com> Signed-hostap: Arik Nemtsov <arik@wizery.com>
2012-12-25 10:22:42 +01:00
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
if (rx_time == NULL) {
os_get_time(&time_now);
rx_time = &time_now;
}
P2P: Consider age for the P2P scan results cfg80211 caches the scan results according the channel number. Due to the 15 sec aging this might cause the user mode to see more than one scan result with the same BSSID, e.g. - one scan result for the P2P Device and one for the P2P GO (once it's enabled). Fix this by updating the device entry only if the new peer entry is newer than the one previously stored. Signed-off-by: Yoni Divinsky <yoni.divinsky@ti.com> Signed-off-by: Victor Goldenshtein <victorg@ti.com> Signed-off-by: Igal Chernobelsky <igalc@ti.com> Signed-hostap: Arik Nemtsov <arik@wizery.com>
2012-12-25 10:22:42 +01:00
/*
* Update the device entry only if the new peer
* entry is newer than the one previously stored.
*/
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
if (dev->last_seen.sec > 0 &&
os_time_before(rx_time, &dev->last_seen)) {
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_dbg(p2p, "Do not update peer entry based on old frame (rx_time=%u.%06u last_seen=%u.%06u)",
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
(unsigned int) rx_time->sec,
(unsigned int) rx_time->usec,
(unsigned int) dev->last_seen.sec,
(unsigned int) dev->last_seen.usec);
P2P: Fix some memory leaks in p2p_add_device() Signed-hostap: Masashi Honma <masashi.honma@gmail.com>
2013-01-12 09:30:07 +01:00
p2p_parse_free(&msg);
P2P: Consider age for the P2P scan results cfg80211 caches the scan results according the channel number. Due to the 15 sec aging this might cause the user mode to see more than one scan result with the same BSSID, e.g. - one scan result for the P2P Device and one for the P2P GO (once it's enabled). Fix this by updating the device entry only if the new peer entry is newer than the one previously stored. Signed-off-by: Yoni Divinsky <yoni.divinsky@ti.com> Signed-off-by: Victor Goldenshtein <victorg@ti.com> Signed-off-by: Igal Chernobelsky <igalc@ti.com> Signed-hostap: Arik Nemtsov <arik@wizery.com>
2012-12-25 10:22:42 +01:00
return -1;
P2P: Fix some memory leaks in p2p_add_device() Signed-hostap: Masashi Honma <masashi.honma@gmail.com>
2013-01-12 09:30:07 +01:00
}
P2P: Consider age for the P2P scan results cfg80211 caches the scan results according the channel number. Due to the 15 sec aging this might cause the user mode to see more than one scan result with the same BSSID, e.g. - one scan result for the P2P Device and one for the P2P GO (once it's enabled). Fix this by updating the device entry only if the new peer entry is newer than the one previously stored. Signed-off-by: Yoni Divinsky <yoni.divinsky@ti.com> Signed-off-by: Victor Goldenshtein <victorg@ti.com> Signed-off-by: Igal Chernobelsky <igalc@ti.com> Signed-hostap: Arik Nemtsov <arik@wizery.com>
2012-12-25 10:22:42 +01:00
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
os_memcpy(&dev->last_seen, rx_time, sizeof(struct os_time));
P2P: Consider age for the P2P scan results cfg80211 caches the scan results according the channel number. Due to the 15 sec aging this might cause the user mode to see more than one scan result with the same BSSID, e.g. - one scan result for the P2P Device and one for the P2P GO (once it's enabled). Fix this by updating the device entry only if the new peer entry is newer than the one previously stored. Signed-off-by: Yoni Divinsky <yoni.divinsky@ti.com> Signed-off-by: Victor Goldenshtein <victorg@ti.com> Signed-off-by: Igal Chernobelsky <igalc@ti.com> Signed-hostap: Arik Nemtsov <arik@wizery.com>
2012-12-25 10:22:42 +01:00
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
dev->flags &= ~(P2P_DEV_PROBE_REQ_ONLY | P2P_DEV_GROUP_CLIENT_ONLY);
if (os_memcmp(addr, p2p_dev_addr, ETH_ALEN) != 0)
os_memcpy(dev->interface_addr, addr, ETH_ALEN);
if (msg.ssid &&
(msg.ssid[1] != P2P_WILDCARD_SSID_LEN ||
os_memcmp(msg.ssid + 2, P2P_WILDCARD_SSID, P2P_WILDCARD_SSID_LEN)
!= 0)) {
os_memcpy(dev->oper_ssid, msg.ssid + 2, msg.ssid[1]);
dev->oper_ssid_len = msg.ssid[1];
}
if (freq >= 2412 && freq <= 2484 && msg.ds_params &&
*msg.ds_params >= 1 && *msg.ds_params <= 14) {
int ds_freq;
if (*msg.ds_params == 14)
ds_freq = 2484;
else
ds_freq = 2407 + *msg.ds_params * 5;
if (freq != ds_freq) {
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_dbg(p2p, "Update Listen frequency based on DS Parameter Set IE: %d -> %d MHz",
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
freq, ds_freq);
freq = ds_freq;
}
}
P2P: Do not update peer Listen channel based on PD/Invitation Commits 17bef1e97a5061a8b5443dc24166e28439911f0b and ffe98dfb88a19b66418184955ef272789e3abb68 started using p2p_add_device() with other frames than just Probe Response frames from scan results. However, these changes did not take into account that the PD Request and Invitation Request frames are normally received on the our own Listen channel, not on the Listen channel of the peer. As such, these frames must not be used to update Listen channel information for the peer. Fix this by letting p2p_add_device() know whether the results are from scan results and if not, skip the peer table updates that are specific to Probe Response frames. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-04-26 15:11:17 +02:00
if (dev->listen_freq && dev->listen_freq != freq && scan_res) {
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_dbg(p2p, "Update Listen frequency based on scan results ("
MACSTR " %d -> %d MHz (DS param %d)",
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
MAC2STR(dev->info.p2p_device_addr), dev->listen_freq,
freq, msg.ds_params ? *msg.ds_params : -1);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Do not update peer Listen channel based on PD/Invitation Commits 17bef1e97a5061a8b5443dc24166e28439911f0b and ffe98dfb88a19b66418184955ef272789e3abb68 started using p2p_add_device() with other frames than just Probe Response frames from scan results. However, these changes did not take into account that the PD Request and Invitation Request frames are normally received on the our own Listen channel, not on the Listen channel of the peer. As such, these frames must not be used to update Listen channel information for the peer. Fix this by letting p2p_add_device() know whether the results are from scan results and if not, skip the peer table updates that are specific to Probe Response frames. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-04-26 15:11:17 +02:00
if (scan_res) {
dev->listen_freq = freq;
if (msg.group_info)
dev->oper_freq = freq;
}
P2P: Show P2P peer signal level in D-Bus P2P device properties Move level parameter from p2p_device to p2p_device_info in order to expose this information and modify D-Bus P2P handler to return this new parameter through the P2P device properties. Signed-off-by: Fabien Marotte <fabienx.marotte@intel.com> Signed-off-by: Jayant Sane <jayant.sane@intel.com>
2011-06-23 20:29:10 +02:00
dev->info.level = level;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
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_copy_wps_info(p2p, dev, 0, &msg);
P2P: Keep track of secondary device types for peers Signed-off-by: Jean-Michel Bachot <jean-michelx.bachot@linux.intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-17 10:45:46 +01:00
P2P: Use a single define for max number of vendor extensions
2011-03-19 11:20:10 +01:00
for (i = 0; i < P2P_MAX_WPS_VENDOR_EXT; i++) {
P2P: Keep track of peer WPS vendor extensions Make the P2P code keep track of WPS vendor extensions received from peers so they can be exposed via DBus later. Signed-off-by: Jean-Michel Bachot <jean-michelx.bachot@linux.intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-19 11:16:20 +01:00
wpabuf_free(dev->info.wps_vendor_ext[i]);
dev->info.wps_vendor_ext[i] = NULL;
}
P2P: Use a single define for max number of vendor extensions
2011-03-19 11:20:10 +01:00
for (i = 0; i < P2P_MAX_WPS_VENDOR_EXT; i++) {
P2P: Keep track of peer WPS vendor extensions Make the P2P code keep track of WPS vendor extensions received from peers so they can be exposed via DBus later. Signed-off-by: Jean-Michel Bachot <jean-michelx.bachot@linux.intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-19 11:16:20 +01:00
if (msg.wps_vendor_ext[i] == NULL)
break;
dev->info.wps_vendor_ext[i] = wpabuf_alloc_copy(
msg.wps_vendor_ext[i], msg.wps_vendor_ext_len[i]);
if (dev->info.wps_vendor_ext[i] == NULL)
break;
}
WFD: Add Wi-Fi Display support This commit adds control interface commands and internal storage of Wi-Fi Display related configuration. In addition, WFD IE is now added to various P2P frames, Probe Request/Response, and (Re)Association Request/Response frames. WFD subelements from peers are stored in the P2P peer table. Following control interface commands are now available: SET wifi_display <0/1> GET wifi_display WFD_SUBELEM_SET <subelem> [hexdump of length+body] WFD_SUBELEM_GET <subelem> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 16:26:01 +01:00
if (msg.wfd_subelems) {
wpabuf_free(dev->info.wfd_subelems);
dev->info.wfd_subelems = wpabuf_dup(msg.wfd_subelems);
}
P2P: Do not update peer Listen channel based on PD/Invitation Commits 17bef1e97a5061a8b5443dc24166e28439911f0b and ffe98dfb88a19b66418184955ef272789e3abb68 started using p2p_add_device() with other frames than just Probe Response frames from scan results. However, these changes did not take into account that the PD Request and Invitation Request frames are normally received on the our own Listen channel, not on the Listen channel of the peer. As such, these frames must not be used to update Listen channel information for the peer. Fix this by letting p2p_add_device() know whether the results are from scan results and if not, skip the peer table updates that are specific to Probe Response frames. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-04-26 15:11:17 +02:00
if (scan_res) {
p2p_add_group_clients(p2p, p2p_dev_addr, addr, freq,
msg.group_info, msg.group_info_len);
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_parse_free(&msg);
if (p2p_pending_sd_req(p2p, dev))
dev->flags |= P2P_DEV_SD_SCHEDULE;
if (dev->flags & P2P_DEV_REPORTED)
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
p2p_dbg(p2p, "Peer found with Listen frequency %d MHz (rx_time=%u.%06u)",
freq, (unsigned int) rx_time->sec,
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
(unsigned int) rx_time->usec);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (dev->flags & P2P_DEV_USER_REJECTED) {
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_dbg(p2p, "Do not report rejected device");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return 0;
}
P2P: Add new_device flag to dev_found callback The DBus code will want to have perfect matching of dev_found and the dev_lost it adds so it doesn't need to keep track internally. Enable that with a new flag in the core that tracks whether we have already notified about this -- the existing users can ignore it. The part where this is always set to 1 if the new device is discovered by a driver that has P2P in the driver is buggy -- the driver should feed the P2P peer database and then that should feed the notification here instead. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-24 20:59:58 +01:00
P2P: Postpone P2P-DEVICE-FOUND if config_methods not known If we discover a P2P peer based on a Beacon frame from the GO role, we do not get information about the supported configuration methods. This can result in issues if the P2P managing entity above wpa_supplicant is not prepared to handling config_methods=0x0. To avoid this, postpone reporting of the P2P-DEVICE-FOUND event when this happens on one of the social channels. It would be good to be able to this on all channels, but that could result in issues of never indicating the event for a peer that is operating a GO on a channel that requires passive scanning. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-12 17:24:56 +01:00
if (dev->info.config_methods == 0 &&
(freq == 2412 || freq == 2437 || freq == 2462)) {
/*
* If we have only seen a Beacon frame from a GO, we do not yet
* know what WPS config methods it supports. Since some
* applications use config_methods value from P2P-DEVICE-FOUND
* events, postpone reporting this peer until we've fully
* discovered its capabilities.
*
* At least for now, do this only if the peer was detected on
* one of the social channels since that peer can be easily be
* found again and there are no limitations of having to use
* passive scan on this channels, so this can be done through
* Probe Response frame that includes the config_methods
* information.
*/
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_dbg(p2p, "Do not report peer " MACSTR
" with unknown config methods", MAC2STR(addr));
P2P: Postpone P2P-DEVICE-FOUND if config_methods not known If we discover a P2P peer based on a Beacon frame from the GO role, we do not get information about the supported configuration methods. This can result in issues if the P2P managing entity above wpa_supplicant is not prepared to handling config_methods=0x0. To avoid this, postpone reporting of the P2P-DEVICE-FOUND event when this happens on one of the social channels. It would be good to be able to this on all channels, but that could result in issues of never indicating the event for a peer that is operating a GO on a channel that requires passive scanning. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-12 17:24:56 +01:00
return 0;
}
P2P: Add new_device flag to dev_found callback The DBus code will want to have perfect matching of dev_found and the dev_lost it adds so it doesn't need to keep track internally. Enable that with a new flag in the core that tracks whether we have already notified about this -- the existing users can ignore it. The part where this is always set to 1 if the new device is discovered by a driver that has P2P in the driver is buggy -- the driver should feed the P2P peer database and then that should feed the notification here instead. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-24 20:59:58 +01:00
p2p->cfg->dev_found(p2p->cfg->cb_ctx, addr, &dev->info,
!(dev->flags & P2P_DEV_REPORTED_ONCE));
dev->flags |= P2P_DEV_REPORTED | P2P_DEV_REPORTED_ONCE;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return 0;
}
static void p2p_device_free(struct p2p_data *p2p, struct p2p_device *dev)
{
P2P: Keep track of peer WPS vendor extensions Make the P2P code keep track of WPS vendor extensions received from peers so they can be exposed via DBus later. Signed-off-by: Jean-Michel Bachot <jean-michelx.bachot@linux.intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-19 11:16:20 +01:00
int i;
P2P: Indicate GO Negotiation failure on peer expiration If P2P device expires while a GO Negotiation is in progress, currently p2p->go_neg_peer is cleared without indicating GO Nego failure. This will result in pending group interfaces to be left over. This patch will indicate GO Negotiation failure and will remove any pending group interfaces. This patch addresses a corner case in GO-Negotiation case. Consider the scenario where two devices A and B are in discovery stage and Device B vanishes [moves out of range] when a connect is issued on the Device A. Then Device A keeps on retrying the GO Negotiation Request till the retry limit is reached. On reaching retry limit, the pending group interface is removed. But suppose if the peer entry in the device list expires before the retry limit is reached, then pending group interface was not removed. Signed-off-by: Jithu Jance <jithu@broadcom.com>
2011-11-18 22:13:03 +01:00
if (p2p->go_neg_peer == dev) {
/*
* If GO Negotiation is in progress, report that it has failed.
*/
p2p_go_neg_failed(p2p, dev, -1);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->go_neg_peer = NULL;
P2P: Indicate GO Negotiation failure on peer expiration If P2P device expires while a GO Negotiation is in progress, currently p2p->go_neg_peer is cleared without indicating GO Nego failure. This will result in pending group interfaces to be left over. This patch will indicate GO Negotiation failure and will remove any pending group interfaces. This patch addresses a corner case in GO-Negotiation case. Consider the scenario where two devices A and B are in discovery stage and Device B vanishes [moves out of range] when a connect is issued on the Device A. Then Device A keeps on retrying the GO Negotiation Request till the retry limit is reached. On reaching retry limit, the pending group interface is removed. But suppose if the peer entry in the device list expires before the retry limit is reached, then pending group interface was not removed. Signed-off-by: Jithu Jance <jithu@broadcom.com>
2011-11-18 22:13:03 +01:00
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (p2p->invite_peer == dev)
p2p->invite_peer = NULL;
if (p2p->sd_peer == dev)
p2p->sd_peer = NULL;
if (p2p->pending_client_disc_go == dev)
p2p->pending_client_disc_go = NULL;
P2P: Only call dev_lost() for devices that have been dev_found() Fix a bug with the current dev_found()/dev_lost() usage. Previously in p2p_device_free() dev_lost() was invoked for devices that had not been dev_found(). This caused dbus related msgs to stderr like: "Attempted to unregister path (path[0] = fi path[1] = w1) which isn't registered" Signed-off-by: Angie Chinchilla <angie.v.chinchilla@intel.com>
2011-07-04 19:30:16 +02:00
/* dev_lost() device, but only if it was previously dev_found() */
if (dev->flags & P2P_DEV_REPORTED_ONCE)
p2p->cfg->dev_lost(p2p->cfg->cb_ctx,
dev->info.p2p_device_addr);
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: Use a single define for max number of vendor extensions
2011-03-19 11:20:10 +01:00
for (i = 0; i < P2P_MAX_WPS_VENDOR_EXT; i++) {
P2P: Keep track of peer WPS vendor extensions Make the P2P code keep track of WPS vendor extensions received from peers so they can be exposed via DBus later. Signed-off-by: Jean-Michel Bachot <jean-michelx.bachot@linux.intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-19 11:16:20 +01:00
wpabuf_free(dev->info.wps_vendor_ext[i]);
dev->info.wps_vendor_ext[i] = NULL;
}
WFD: Add Wi-Fi Display support This commit adds control interface commands and internal storage of Wi-Fi Display related configuration. In addition, WFD IE is now added to various P2P frames, Probe Request/Response, and (Re)Association Request/Response frames. WFD subelements from peers are stored in the P2P peer table. Following control interface commands are now available: SET wifi_display <0/1> GET wifi_display WFD_SUBELEM_SET <subelem> [hexdump of length+body] WFD_SUBELEM_GET <subelem> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 16:26:01 +01:00
wpabuf_free(dev->info.wfd_subelems);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
os_free(dev);
}
static int p2p_get_next_prog_freq(struct p2p_data *p2p)
{
struct p2p_channels *c;
struct p2p_reg_class *cla;
size_t cl, ch;
int found = 0;
u8 reg_class;
u8 channel;
int freq;
c = &p2p->cfg->channels;
for (cl = 0; cl < c->reg_classes; cl++) {
cla = &c->reg_class[cl];
if (cla->reg_class != p2p->last_prog_scan_class)
continue;
for (ch = 0; ch < cla->channels; ch++) {
if (cla->channel[ch] == p2p->last_prog_scan_chan) {
found = 1;
break;
}
}
if (found)
break;
}
if (!found) {
/* Start from beginning */
reg_class = c->reg_class[0].reg_class;
channel = c->reg_class[0].channel[0];
} else {
/* Pick the next channel */
ch++;
if (ch == cla->channels) {
cl++;
if (cl == c->reg_classes)
cl = 0;
ch = 0;
}
reg_class = c->reg_class[cl].reg_class;
channel = c->reg_class[cl].channel[ch];
}
P2P: Clean up channel--frequency conversion functions All P2P use cases are required to use the global operating table and there is no need to need to try to maintain some backwards compatibility with country code -specific values. Clean up the implementation by removing the unnecessary country parameter. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-27 20:03:16 +02:00
freq = p2p_channel_to_freq(reg_class, channel);
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_dbg(p2p, "Next progressive search channel: reg_class %u channel %u -> %d MHz",
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
reg_class, channel, freq);
p2p->last_prog_scan_class = reg_class;
p2p->last_prog_scan_chan = channel;
if (freq == 2412 || freq == 2437 || freq == 2462)
return 0; /* No need to add social channels */
return freq;
}
static void p2p_search(struct p2p_data *p2p)
{
int freq = 0;
enum p2p_scan_type type;
P2P: Advertise immediate availability of WPS credential Use Device Password ID in WSC IE of Probe Request and Probe Response frames to advertise immediate availability of WPS credentials per P2P specification sections 3.1.2.1.1 (Listen State), 3.1.2.1.2 (Scan Phase), and 3.1.2.1.3 (Find Phase). For now, the Device Password ID is set only for the case where we are active GO Negotiation with a specific peer. In practice, this means that the Probe Response frames during pending GO Negotiation (whenever in Listen state) indicate availability of the credential. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-27 22:14:35 +01:00
u16 pw_id = DEV_PW_DEFAULT;
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
int res;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (p2p->drv_in_listen) {
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_dbg(p2p, "Driver is still in Listen state - wait for it to end before continuing");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return;
}
p2p->cfg->stop_listen(p2p->cfg->cb_ctx);
P2P: Remove GO neg/invite special cases from search There are separate states for these, so we can't really get into this situation unless somebody tries to do multiple things at the same time. p2p_connect stops find and CONNECT state is used to probe the peer on its Listen channel with GO Negotiation Request frames. Similarly, p2p_invite() stops find and INVITE state is used to probe the peer on its Listen channel with Invitation Request frames. The older mechanism of using Search state functionality to find the peer can be removed. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2012-06-30 19:18:07 +02:00
if (p2p->find_type == P2P_FIND_PROGRESSIVE &&
(freq = p2p_get_next_prog_freq(p2p)) > 0) {
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
type = P2P_SCAN_SOCIAL_PLUS_ONE;
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_dbg(p2p, "Starting search (+ freq %u)", freq);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
} else {
type = P2P_SCAN_SOCIAL;
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_dbg(p2p, "Starting search");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
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
res = p2p->cfg->p2p_scan(p2p->cfg->cb_ctx, type, freq,
p2p->num_req_dev_types, p2p->req_dev_types,
p2p->find_dev_id, pw_id);
if (res < 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
p2p_dbg(p2p, "Scan request failed");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_continue_find(p2p);
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
} else if (res == 1) {
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_dbg(p2p, "Could not start p2p_scan at this point - will try again after previous scan completes");
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
p2p_set_state(p2p, P2P_CONTINUE_SEARCH_WHEN_READY);
P2P: Handle p2p_scan tracking in SEARCH state Previously, only the initial p2p_scan was used to delay starting new P2P operations. However, this should have applied to the SEARCH state scans, too.
2010-06-24 07:37:27 +02:00
} else {
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_dbg(p2p, "Running p2p_scan");
P2P: Handle p2p_scan tracking in SEARCH state Previously, only the initial p2p_scan was used to delay starting new P2P operations. However, this should have applied to the SEARCH state scans, too.
2010-06-24 07:37:27 +02:00
p2p->p2p_scan_running = 1;
eloop_cancel_timeout(p2p_scan_timeout, p2p, NULL);
eloop_register_timeout(P2P_SCAN_TIMEOUT, 0, p2p_scan_timeout,
p2p, NULL);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
}
static void p2p_find_timeout(void *eloop_ctx, void *timeout_ctx)
{
struct p2p_data *p2p = eloop_ctx;
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_dbg(p2p, "Find timeout -> stop");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_stop_find(p2p);
}
static int p2p_run_after_scan(struct p2p_data *p2p)
{
struct p2p_device *dev;
enum p2p_after_scan op;
P2P: Delay send_action call if p2p_scan is in progress In order to avoid confusing the driver with a new remain-on-channel request, delay sending of a new Action frame if the driver indicates Action frame RX diromg a scan.
2010-10-20 18:41:20 +02:00
if (p2p->after_scan_tx) {
P2P: Fix after_scan_tx processing during ongoing operations When Action frame TX is postponed until a pending p2p_scan completes, there may be additional operations that need to be continued after the postponed Action frame TX operation completes. Fix this by starting pending operation (if any) from TX status event for after_scan_tx frames. This fixes common errors seen with the test_discovery hwsim test case. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-23 20:12:04 +02:00
p2p->after_scan_tx_in_progress = 1;
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_dbg(p2p, "Send pending Action frame at p2p_scan completion");
Remove unused variables
2011-10-23 11:42:55 +02:00
p2p->cfg->send_action(p2p->cfg->cb_ctx,
p2p->after_scan_tx->freq,
p2p->after_scan_tx->dst,
p2p->after_scan_tx->src,
p2p->after_scan_tx->bssid,
(u8 *) (p2p->after_scan_tx + 1),
p2p->after_scan_tx->len,
p2p->after_scan_tx->wait_time);
P2P: Delay send_action call if p2p_scan is in progress In order to avoid confusing the driver with a new remain-on-channel request, delay sending of a new Action frame if the driver indicates Action frame RX diromg a scan.
2010-10-20 18:41:20 +02:00
os_free(p2p->after_scan_tx);
p2p->after_scan_tx = NULL;
return 1;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
op = p2p->start_after_scan;
p2p->start_after_scan = P2P_AFTER_SCAN_NOTHING;
switch (op) {
case P2P_AFTER_SCAN_NOTHING:
break;
case P2P_AFTER_SCAN_LISTEN:
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_dbg(p2p, "Start previously requested Listen state");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_listen(p2p, p2p->pending_listen_sec * 1000 +
p2p->pending_listen_usec / 1000);
return 1;
case P2P_AFTER_SCAN_CONNECT:
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_dbg(p2p, "Start previously requested connect with " MACSTR,
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
MAC2STR(p2p->after_scan_peer));
dev = p2p_get_device(p2p, p2p->after_scan_peer);
if (dev == NULL) {
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_dbg(p2p, "Peer not known anymore");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
break;
}
p2p_connect_send(p2p, dev);
return 1;
}
return 0;
}
static void p2p_scan_timeout(void *eloop_ctx, void *timeout_ctx)
{
struct p2p_data *p2p = eloop_ctx;
int running;
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_dbg(p2p, "p2p_scan timeout (running=%d)", p2p->p2p_scan_running);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
running = p2p->p2p_scan_running;
/* Make sure we recover from missed scan results callback */
p2p->p2p_scan_running = 0;
if (running)
p2p_run_after_scan(p2p);
}
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 void p2p_free_req_dev_types(struct p2p_data *p2p)
{
p2p->num_req_dev_types = 0;
os_free(p2p->req_dev_types);
p2p->req_dev_types = NULL;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
int p2p_find(struct p2p_data *p2p, 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
{
int res;
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_dbg(p2p, "Starting find (type=%d)", type);
P2P: Do not use old scan result data for peer discovery The driver may have cached (e.g., in cfg80211 BSS table) the scan results for relatively long time. To avoid reporting stale information, update P2P peers only based on results that have based on frames received after the last p2p_find operation was started. This helps especially in detecting when a previously operating GO stops the group since the BSS entry for that could live for 30 seconds in the cfg80211 cache. Running p2p_flush followed by p2p_find will now allow wpa_supplicant to not add a P2P peer entry for that GO if the group had been terminated just before that p2p_flush command. Previously, that GO could have been indicated as a newly found device for up to 30 seconds after it had stopped the group. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-12 18:25:18 +01:00
os_get_time(&p2p->find_start);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (p2p->p2p_scan_running) {
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_dbg(p2p, "p2p_scan is already running");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Add option for requested device type in P2P search/scan With this, p2p_find can be extended to find certain requested device types. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-19 11:57:46 +01:00
p2p_free_req_dev_types(p2p);
if (req_dev_types && num_req_dev_types) {
p2p->req_dev_types = os_malloc(num_req_dev_types *
WPS_DEV_TYPE_LEN);
if (p2p->req_dev_types == NULL)
return -1;
os_memcpy(p2p->req_dev_types, req_dev_types,
num_req_dev_types * WPS_DEV_TYPE_LEN);
p2p->num_req_dev_types = num_req_dev_types;
}
P2P: Allow Device ID to be specified for p2p_find command dev_id=<P2P Device Addr> can now be specified as an argument to p2p_find to request P2P find for a specific P2P device. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-01-08 18:25:29 +01:00
if (dev_id) {
os_memcpy(p2p->find_dev_id_buf, dev_id, ETH_ALEN);
p2p->find_dev_id = p2p->find_dev_id_buf;
} else
p2p->find_dev_id = NULL;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->start_after_scan = P2P_AFTER_SCAN_NOTHING;
p2p_clear_timeout(p2p);
p2p->cfg->stop_listen(p2p->cfg->cb_ctx);
p2p->find_type = type;
p2p_device_clear_reported(p2p);
p2p_set_state(p2p, P2P_SEARCH);
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
p2p->search_delay = search_delay;
p2p->in_search_delay = 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
eloop_cancel_timeout(p2p_find_timeout, p2p, NULL);
P2P: Wait until ongoing scan completes before starting P2P find The P2P_FIND command was failing if it was issued at the moment when a scan operation was in progress. Avoid returning failure in this case by scheduling the P2P find to start once the ongoing scan is completed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-15 20:25:21 +01:00
p2p->last_p2p_find_timeout = timeout;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (timeout)
eloop_register_timeout(timeout, 0, p2p_find_timeout,
p2p, NULL);
switch (type) {
case P2P_FIND_START_WITH_FULL:
case P2P_FIND_PROGRESSIVE:
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
res = p2p->cfg->p2p_scan(p2p->cfg->cb_ctx, P2P_SCAN_FULL, 0,
p2p->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
p2p->req_dev_types, dev_id,
DEV_PW_DEFAULT);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
break;
case P2P_FIND_ONLY_SOCIAL:
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
res = p2p->cfg->p2p_scan(p2p->cfg->cb_ctx, P2P_SCAN_SOCIAL, 0,
p2p->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
p2p->req_dev_types, dev_id,
DEV_PW_DEFAULT);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
break;
default:
return -1;
}
if (res == 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
p2p_dbg(p2p, "Running p2p_scan");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->p2p_scan_running = 1;
eloop_cancel_timeout(p2p_scan_timeout, p2p, NULL);
eloop_register_timeout(P2P_SCAN_TIMEOUT, 0, p2p_scan_timeout,
p2p, NULL);
P2P: Wait until ongoing scan completes before starting P2P find The P2P_FIND command was failing if it was issued at the moment when a scan operation was in progress. Avoid returning failure in this case by scheduling the P2P find to start once the ongoing scan is completed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-15 20:25:21 +01:00
} else if (res == 1) {
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_dbg(p2p, "Could not start p2p_scan at this point - will try again after previous scan completes");
P2P: Wait until ongoing scan completes before starting P2P find The P2P_FIND command was failing if it was issued at the moment when a scan operation was in progress. Avoid returning failure in this case by scheduling the P2P find to start once the ongoing scan is completed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-15 20:25:21 +01:00
res = 0;
p2p_set_state(p2p, P2P_SEARCH_WHEN_READY);
eloop_cancel_timeout(p2p_find_timeout, p2p, NULL);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
} else {
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_dbg(p2p, "Failed to start p2p_scan");
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
p2p_set_state(p2p, P2P_IDLE);
eloop_cancel_timeout(p2p_find_timeout, p2p, NULL);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
return res;
}
P2P: Wait until ongoing scan completes before starting P2P find The P2P_FIND command was failing if it was issued at the moment when a scan operation was in progress. Avoid returning failure in this case by scheduling the P2P find to start once the ongoing scan is completed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-15 20:25:21 +01:00
int p2p_other_scan_completed(struct p2p_data *p2p)
{
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
if (p2p->state == P2P_CONTINUE_SEARCH_WHEN_READY) {
p2p_set_state(p2p, P2P_SEARCH);
p2p_search(p2p);
return 1;
}
P2P: Wait until ongoing scan completes before starting P2P find The P2P_FIND command was failing if it was issued at the moment when a scan operation was in progress. Avoid returning failure in this case by scheduling the P2P find to start once the ongoing scan is completed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-15 20:25:21 +01:00
if (p2p->state != P2P_SEARCH_WHEN_READY)
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
p2p_dbg(p2p, "Starting pending P2P find now that previous scan was completed");
P2P: Wait until ongoing scan completes before starting P2P find The P2P_FIND command was failing if it was issued at the moment when a scan operation was in progress. Avoid returning failure in this case by scheduling the P2P find to start once the ongoing scan is completed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-15 20:25:21 +01:00
if (p2p_find(p2p, p2p->last_p2p_find_timeout, p2p->find_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
p2p->num_req_dev_types, p2p->req_dev_types,
P2P: Send p2p_stop_find event on failure to start pending p2p_find When pending p2p_find fails we need to send p2p_stop_find event to indicate the previous p2p_find command has been processed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-08 10:37:07 +01:00
p2p->find_dev_id, p2p->search_delay) < 0) {
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->cfg->find_stopped(p2p->cfg->cb_ctx);
P2P: Wait until ongoing scan completes before starting P2P find The P2P_FIND command was failing if it was issued at the moment when a scan operation was in progress. Avoid returning failure in this case by scheduling the P2P find to start once the ongoing scan is completed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-15 20:25:21 +01:00
return 0;
P2P: Send p2p_stop_find event on failure to start pending p2p_find When pending p2p_find fails we need to send p2p_stop_find event to indicate the previous p2p_find command has been processed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-08 10:37:07 +01:00
}
P2P: Wait until ongoing scan completes before starting P2P find The P2P_FIND command was failing if it was issued at the moment when a scan operation was in progress. Avoid returning failure in this case by scheduling the P2P find to start once the ongoing scan is completed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-15 20:25:21 +01:00
return 1;
}
P2P: Do not stop Listen state if it is on correct channel This is needed to optimize response to GO Negotiation Request frames. The extra remain-on-channel cancel followed by new remain-on-channel for the same channel takes too much time with some driver/firmware designs for the response to go out quickly enough to avoid peer timing out while waiting for our response.
2010-10-20 18:37:47 +02:00
void p2p_stop_find_for_freq(struct p2p_data *p2p, int freq)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
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_dbg(p2p, "Stopping find");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
eloop_cancel_timeout(p2p_find_timeout, p2p, NULL);
p2p_clear_timeout(p2p);
P2P: Send P2P-FIND-STOPPED event in the new continue-search states The P2P-FIND-STOPPED event was sent only in the P2P_SEARCH state, but this needs to be send also in the new continue-search-when-ready states P2P_CONTINUE_SEARCH_WHEN_READY and P2P_SEARCH_WHEN_READY for consistent behavior. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-15 10:52:20 +01:00
if (p2p->state == P2P_SEARCH ||
p2p->state == P2P_CONTINUE_SEARCH_WHEN_READY ||
p2p->state == P2P_SEARCH_WHEN_READY)
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->cfg->find_stopped(p2p->cfg->cb_ctx);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_set_state(p2p, P2P_IDLE);
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
p2p_free_req_dev_types(p2p);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->start_after_scan = P2P_AFTER_SCAN_NOTHING;
P2P: Fix regression in GO Negotiation Commit fb8984fd6f4b49d9178dd87a880dd7add514b7d1 cleared wps_method to WPS_NOT_READY in p2p_stop_find_for_freq() as an attempt to clear authorization when a group formation is cancelled. However, this code path is hit also in cases where the user did not actually cancel anything (e.g., from p2p_process_go_neg_req()). As such, it is not fine to clear wps_method here even if it could be proper for some cases. For now, revert that part to avoid regressions and consider clearing wps_method on cancel separately. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-03-01 10:53:46 +01:00
if (p2p->go_neg_peer)
P2P: Skip Listen phase when peer is expected to be waiting In case we have replied to a peer's GO Negotiation Request frame with a GO Negotiation Response frame using status code info-currently-unavailable (1), the peer is likely going to wait for us to initiate GO Negotiation on its Listen channel. We were previously using alternativing send-GO-Neg-Req and Listen phase when providing that response after the user had authorized the connection. However, the Listen phase here is unnecessary in this case and will make the connection take longer time to go through. Skip the Listen phase and make the wait-for-GO-Neg-Resp timeout random between 100 and 200 ms to avoid getting in sync with the peer. In practice, this will make us retry GO Negotiation Request frames more frequently and remain on the peer's Listen channel for most of the time when initiating GO Negotiation after status=1 response. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-28 21:35:11 +01:00
p2p->go_neg_peer->flags &= ~P2P_DEV_PEER_WAITING_RESPONSE;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->go_neg_peer = NULL;
p2p->sd_peer = NULL;
p2p->invite_peer = NULL;
P2P: Fix remain-on-channel use with PD/Invitation Request while in Listen If Listen state was in progress on another channel when a request to send an Action frame (e.g., Provision Discovery Request or Invitation Request to a peer on the peer's Listen channel that is different from our Listenc hannel) is issued, wpa_supplicant tried to use concurrent remain-on-channel operations. While some drivers can handle this cleanly, there are drivers that don't and wpa_supplicant is not expected to request concurrent remain-on-channel operations. Fix this by cancelling the ongoing remain-on-channel with stop_listen prior to sending the Action frame on another channel. If a P2P search was in progress, it will be continued after the timeout on the new operation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-27 16:23:41 +01:00
p2p_stop_listen_for_freq(p2p, freq);
}
void p2p_stop_listen_for_freq(struct p2p_data *p2p, int freq)
{
P2P: Do not stop Listen state if it is on correct channel This is needed to optimize response to GO Negotiation Request frames. The extra remain-on-channel cancel followed by new remain-on-channel for the same channel takes too much time with some driver/firmware designs for the response to go out quickly enough to avoid peer timing out while waiting for our response.
2010-10-20 18:37:47 +02:00
if (freq > 0 && p2p->drv_in_listen == freq && p2p->in_listen) {
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_dbg(p2p, "Skip stop_listen since we are on correct channel for response");
P2P: Do not stop Listen state if it is on correct channel This is needed to optimize response to GO Negotiation Request frames. The extra remain-on-channel cancel followed by new remain-on-channel for the same channel takes too much time with some driver/firmware designs for the response to go out quickly enough to avoid peer timing out while waiting for our response.
2010-10-20 18:37:47 +02:00
return;
}
P2P: Fix remain-on-channel use with PD/Invitation Request while in Listen If Listen state was in progress on another channel when a request to send an Action frame (e.g., Provision Discovery Request or Invitation Request to a peer on the peer's Listen channel that is different from our Listenc hannel) is issued, wpa_supplicant tried to use concurrent remain-on-channel operations. While some drivers can handle this cleanly, there are drivers that don't and wpa_supplicant is not expected to request concurrent remain-on-channel operations. Fix this by cancelling the ongoing remain-on-channel with stop_listen prior to sending the Action frame on another channel. If a P2P search was in progress, it will be continued after the timeout on the new operation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-27 16:23:41 +01:00
if (p2p->in_listen) {
p2p->in_listen = 0;
p2p_clear_timeout(p2p);
}
P2P: Fix a race condition in some P2P command sequencies The p2p->drv_in_listen variable is used to track Listen state operations in the driver. This is cleared when the driver reports that the Listen state has ended (p2p_listen_end() gets called). However, it is possible that the driver does not indicate that if the Listen state is canceled. This can apparently happen in some cases where p2p_connect command is issues while the Listen state is in progress. Work around this issue by clearing p2p->drv_in_listen when Listen state is stopped as part of p2p_stop operation. This allows the P2P module to process CONNECT_LISTEN timeout in p2p_timeout_connect_listen() to move to CONNECT state, e.g., when starting GO Negotiation after Device Discoverability mechanism.
2011-09-22 21:43:03 +02:00
if (p2p->drv_in_listen) {
/*
* The driver may not deliver callback to p2p_listen_end()
* when the operation gets canceled, so clear the internal
* variable that is tracking driver state.
*/
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_dbg(p2p, "Clear drv_in_listen (%d)", p2p->drv_in_listen);
P2P: Fix a race condition in some P2P command sequencies The p2p->drv_in_listen variable is used to track Listen state operations in the driver. This is cleared when the driver reports that the Listen state has ended (p2p_listen_end() gets called). However, it is possible that the driver does not indicate that if the Listen state is canceled. This can apparently happen in some cases where p2p_connect command is issues while the Listen state is in progress. Work around this issue by clearing p2p->drv_in_listen when Listen state is stopped as part of p2p_stop operation. This allows the P2P module to process CONNECT_LISTEN timeout in p2p_timeout_connect_listen() to move to CONNECT state, e.g., when starting GO Negotiation after Device Discoverability mechanism.
2011-09-22 21:43:03 +02:00
p2p->drv_in_listen = 0;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->cfg->stop_listen(p2p->cfg->cb_ctx);
}
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
void p2p_stop_listen(struct p2p_data *p2p)
{
if (p2p->state != P2P_LISTEN_ONLY) {
p2p_dbg(p2p, "Skip stop_listen since not in listen_only state.");
return;
}
p2p_stop_listen_for_freq(p2p, 0);
p2p_set_state(p2p, P2P_IDLE);
}
P2P: Do not stop Listen state if it is on correct channel This is needed to optimize response to GO Negotiation Request frames. The extra remain-on-channel cancel followed by new remain-on-channel for the same channel takes too much time with some driver/firmware designs for the response to go out quickly enough to avoid peer timing out while waiting for our response.
2010-10-20 18:37:47 +02:00
void p2p_stop_find(struct p2p_data *p2p)
{
p2p_stop_find_for_freq(p2p, 0);
}
Split p2p_prepare_channel() into multiple functions This makes it easier to read the code for the two possible cases (forced/preferred channel and automatic channel selection). Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-27 07:37:13 +01:00
static int p2p_prepare_channel_pref(struct p2p_data *p2p,
unsigned int force_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
unsigned int pref_freq, int go)
Split p2p_prepare_channel() into multiple functions This makes it easier to read the code for the two possible cases (forced/preferred channel and automatic channel selection). Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-27 07:37:13 +01:00
{
u8 op_class, op_channel;
unsigned int freq = force_freq ? force_freq : pref_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
p2p_dbg(p2p, "Prepare channel pref - force_freq=%u pref_freq=%u go=%d",
force_freq, pref_freq, go);
P2P: Clean up channel--frequency conversion functions All P2P use cases are required to use the global operating table and there is no need to need to try to maintain some backwards compatibility with country code -specific values. Clean up the implementation by removing the unnecessary country parameter. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-27 20:03:16 +02:00
if (p2p_freq_to_channel(freq, &op_class, &op_channel) < 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
p2p_dbg(p2p, "Unsupported frequency %u MHz", freq);
Split p2p_prepare_channel() into multiple functions This makes it easier to read the code for the two possible cases (forced/preferred channel and automatic channel selection). Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-27 07:37:13 +01:00
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
if (!p2p_channels_includes(&p2p->cfg->channels, op_class, op_channel) &&
(go || !p2p_channels_includes(&p2p->cfg->cli_channels, op_class,
op_channel))) {
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_dbg(p2p, "Frequency %u MHz (oper_class %u channel %u) not allowed for P2P",
freq, op_class, op_channel);
Split p2p_prepare_channel() into multiple functions This makes it easier to read the code for the two possible cases (forced/preferred channel and automatic channel selection). Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-27 07:37:13 +01:00
return -1;
}
p2p->op_reg_class = op_class;
p2p->op_channel = op_channel;
if (force_freq) {
p2p->channels.reg_classes = 1;
p2p->channels.reg_class[0].channels = 1;
p2p->channels.reg_class[0].reg_class = p2p->op_reg_class;
p2p->channels.reg_class[0].channel[0] = p2p->op_channel;
} else {
os_memcpy(&p2p->channels, &p2p->cfg->channels,
sizeof(struct p2p_channels));
}
return 0;
}
static void p2p_prepare_channel_best(struct p2p_data *p2p)
{
u8 op_class, op_channel;
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
p2p_dbg(p2p, "Prepare channel best");
Split p2p_prepare_channel() into multiple functions This makes it easier to read the code for the two possible cases (forced/preferred channel and automatic channel selection). Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-27 07:37:13 +01:00
if (!p2p->cfg->cfg_op_channel && p2p->best_freq_overall > 0 &&
p2p_supported_freq(p2p, p2p->best_freq_overall) &&
P2P: Clean up channel--frequency conversion functions All P2P use cases are required to use the global operating table and there is no need to need to try to maintain some backwards compatibility with country code -specific values. Clean up the implementation by removing the unnecessary country parameter. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-27 20:03:16 +02:00
p2p_freq_to_channel(p2p->best_freq_overall, &op_class, &op_channel)
== 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
p2p_dbg(p2p, "Select best overall channel as operating channel preference");
Split p2p_prepare_channel() into multiple functions This makes it easier to read the code for the two possible cases (forced/preferred channel and automatic channel selection). Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-27 07:37:13 +01:00
p2p->op_reg_class = op_class;
p2p->op_channel = op_channel;
} else if (!p2p->cfg->cfg_op_channel && p2p->best_freq_5 > 0 &&
p2p_supported_freq(p2p, p2p->best_freq_5) &&
P2P: Clean up channel--frequency conversion functions All P2P use cases are required to use the global operating table and there is no need to need to try to maintain some backwards compatibility with country code -specific values. Clean up the implementation by removing the unnecessary country parameter. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-27 20:03:16 +02:00
p2p_freq_to_channel(p2p->best_freq_5, &op_class, &op_channel)
== 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
p2p_dbg(p2p, "Select best 5 GHz channel as operating channel preference");
Split p2p_prepare_channel() into multiple functions This makes it easier to read the code for the two possible cases (forced/preferred channel and automatic channel selection). Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-27 07:37:13 +01:00
p2p->op_reg_class = op_class;
p2p->op_channel = op_channel;
} else if (!p2p->cfg->cfg_op_channel && p2p->best_freq_24 > 0 &&
p2p_supported_freq(p2p, p2p->best_freq_24) &&
P2P: Clean up channel--frequency conversion functions All P2P use cases are required to use the global operating table and there is no need to need to try to maintain some backwards compatibility with country code -specific values. Clean up the implementation by removing the unnecessary country parameter. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-27 20:03:16 +02:00
p2p_freq_to_channel(p2p->best_freq_24, &op_class,
&op_channel) == 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
p2p_dbg(p2p, "Select best 2.4 GHz channel as operating channel preference");
Split p2p_prepare_channel() into multiple functions This makes it easier to read the code for the two possible cases (forced/preferred channel and automatic channel selection). Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-27 07:37:13 +01:00
p2p->op_reg_class = op_class;
p2p->op_channel = op_channel;
P2P: Use the first pref_chan entry as operating channel preference If there are no higher priority preference for the operating channel, use the first pref_chan entry as the operating channel preference over the pre-configured channel which is not really a good indication of preference. This changes the behavior for GO Negotiation Request frame operating channel preference value in cases where p2p_pref_chan list is set. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-08-26 13:10:23 +02:00
} else if (p2p->cfg->num_pref_chan > 0 &&
p2p_channels_includes(&p2p->cfg->channels,
p2p->cfg->pref_chan[0].op_class,
p2p->cfg->pref_chan[0].chan)) {
p2p_dbg(p2p, "Select first pref_chan entry as operating channel preference");
p2p->op_reg_class = p2p->cfg->pref_chan[0].op_class;
p2p->op_channel = p2p->cfg->pref_chan[0].chan;
Split p2p_prepare_channel() into multiple functions This makes it easier to read the code for the two possible cases (forced/preferred channel and automatic channel selection). Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-27 07:37:13 +01:00
} else {
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
p2p_dbg(p2p, "Select pre-configured channel as operating channel preference");
Split p2p_prepare_channel() into multiple functions This makes it easier to read the code for the two possible cases (forced/preferred channel and automatic channel selection). Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-27 07:37:13 +01:00
p2p->op_reg_class = p2p->cfg->op_reg_class;
p2p->op_channel = p2p->cfg->op_channel;
}
os_memcpy(&p2p->channels, &p2p->cfg->channels,
sizeof(struct p2p_channels));
}
P2P: Document operating channel selection functions Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-27 07:27:11 +01:00
/**
* p2p_prepare_channel - Select operating channel for GO Negotiation
* @p2p: P2P module context from p2p_init()
* @dev: Selected peer device
* @force_freq: Forced frequency in MHz or 0 if not forced
* @pref_freq: Preferred frequency in MHz or 0 if no preference
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
* @go: Whether the local end will be forced to be GO
P2P: Document operating channel selection functions Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-27 07:27:11 +01:00
* Returns: 0 on success, -1 on failure (channel not supported for P2P)
*
* This function is used to do initial operating channel selection for GO
* Negotiation prior to having received peer information. The selected channel
* may be further optimized in p2p_reselect_channel() once the peer information
* is available.
*/
P2P: Allow all channels in case of multi channel concurrency If multi channel concurrency is supported, we have to populate the p2p_channels with list of channels that we support. Use the same design that was previously added for GO Negotiation. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-25 17:41:32 +01:00
int p2p_prepare_channel(struct p2p_data *p2p, struct p2p_device *dev,
P2P: Add option to allow additional client channels The new p2p_add_cli_chan=1 configuration parameter can be used to request passive-scan channels to be included in P2P channel lists for cases where the local end may become the P2P client in a group. This allows more options for the peer to use channels, e.g., if the local device is not aware of its current location and has marked most channels to require passive scanning. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-22 20:00:49 +02:00
unsigned int force_freq, unsigned int pref_freq, int go)
P2P: 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
p2p_dbg(p2p, "Prepare channel - force_freq=%u pref_freq=%u go=%d",
force_freq, pref_freq, go);
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
if (force_freq || pref_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
if (p2p_prepare_channel_pref(p2p, force_freq, pref_freq, go) <
0)
P2P: Verify that p2p_connect forced frequency is allowed for P2P Do not accept forced frequency unless the specified channel is allowed for P2P, i.e., is included in the local list of advertised channels.
2010-10-14 11:39:40 +02:00
return -1;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
} else {
Split p2p_prepare_channel() into multiple functions This makes it easier to read the code for the two possible cases (forced/preferred channel and automatic channel selection). Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-27 07:37:13 +01:00
p2p_prepare_channel_best(p2p);
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
p2p_channels_dump(p2p, "prepared channels", &p2p->channels);
if (go)
p2p_channels_remove_freqs(&p2p->channels, &p2p->no_go_freq);
else if (!force_freq)
p2p_channels_union(&p2p->channels, &p2p->cfg->cli_channels,
&p2p->channels);
p2p_channels_dump(p2p, "after go/cli filter/add", &p2p->channels);
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_dbg(p2p, "Own preference for operation channel: Operating Class %u Channel %u%s",
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->op_reg_class, p2p->op_channel,
force_freq ? " (forced)" : "");
P2P: Set FORCE_FREQ flag as part of p2p_prepare_channel() Both p2p_connect and p2p_authorize use the same functionality to select the channel preferences for GO Negotiation. The part of setting this device flag was copied to each function, but it can also be handled by the shared function after some reordering of code. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-27 06:58:04 +01:00
if (force_freq)
dev->flags |= P2P_DEV_FORCE_FREQ;
else
dev->flags &= ~P2P_DEV_FORCE_FREQ;
P2P: Share code for p2p_connect/authorize channel preparation
2010-10-14 11:45:15 +02:00
return 0;
}
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
static void p2p_set_dev_persistent(struct p2p_device *dev,
int persistent_group)
{
switch (persistent_group) {
case 0:
dev->flags &= ~(P2P_DEV_PREFER_PERSISTENT_GROUP |
P2P_DEV_PREFER_PERSISTENT_RECONN);
break;
case 1:
dev->flags |= P2P_DEV_PREFER_PERSISTENT_GROUP;
dev->flags &= ~P2P_DEV_PREFER_PERSISTENT_RECONN;
break;
case 2:
dev->flags |= P2P_DEV_PREFER_PERSISTENT_GROUP |
P2P_DEV_PREFER_PERSISTENT_RECONN;
break;
}
}
P2P: Share code for p2p_connect/authorize channel preparation
2010-10-14 11:45:15 +02:00
int p2p_connect(struct p2p_data *p2p, 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: 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
const u8 *force_ssid, size_t force_ssid_len,
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
int pd_before_go_neg, unsigned int pref_freq)
P2P: Share code for p2p_connect/authorize channel preparation
2010-10-14 11:45:15 +02:00
{
struct p2p_device *dev;
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_dbg(p2p, "Request to start group negotiation - peer=" MACSTR
P2P: Share code for p2p_connect/authorize channel preparation
2010-10-14 11:45:15 +02:00
" GO Intent=%d Intended Interface Address=" MACSTR
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
" wps_method=%d persistent_group=%d pd_before_go_neg=%d",
P2P: Share code for p2p_connect/authorize channel preparation
2010-10-14 11:45:15 +02:00
MAC2STR(peer_addr), go_intent, MAC2STR(own_interface_addr),
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
wps_method, persistent_group, pd_before_go_neg);
P2P: Share code for p2p_connect/authorize channel preparation
2010-10-14 11:45:15 +02:00
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
dev = p2p_get_device(p2p, peer_addr);
if (dev == NULL || (dev->flags & P2P_DEV_PROBE_REQ_ONLY)) {
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_dbg(p2p, "Cannot connect to unknown P2P Device " MACSTR,
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
MAC2STR(peer_addr));
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
if (p2p_prepare_channel(p2p, dev, force_freq, pref_freq,
go_intent == 15) < 0)
P2P: Set FORCE_FREQ flag as part of p2p_prepare_channel() Both p2p_connect and p2p_authorize use the same functionality to select the channel preferences for GO Negotiation. The part of setting this device flag was copied to each function, but it can also be handled by the shared function after some reordering of code. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-27 06:58:04 +01:00
return -1;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (dev->flags & P2P_DEV_GROUP_CLIENT_ONLY) {
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
if (!(dev->info.dev_capab &
P2P_DEV_CAPAB_CLIENT_DISCOVERABILITY)) {
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_dbg(p2p, "Cannot connect to P2P Device " MACSTR
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
" that is in a group and is not discoverable",
MAC2STR(peer_addr));
return -1;
}
if (dev->oper_freq <= 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
p2p_dbg(p2p, "Cannot connect to P2P Device " MACSTR
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
" with incomplete information",
MAC2STR(peer_addr));
return -1;
}
/*
* First, try to connect directly. If the peer does not
* acknowledge frames, assume it is sleeping and use device
* discoverability via the GO at that point.
*/
}
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
p2p->ssid_set = 0;
if (force_ssid) {
wpa_hexdump_ascii(MSG_DEBUG, "P2P: Forced SSID",
force_ssid, force_ssid_len);
os_memcpy(p2p->ssid, force_ssid, force_ssid_len);
p2p->ssid_len = force_ssid_len;
p2p->ssid_set = 1;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
dev->flags &= ~P2P_DEV_NOT_YET_READY;
dev->flags &= ~P2P_DEV_USER_REJECTED;
dev->flags &= ~P2P_DEV_WAIT_GO_NEG_RESPONSE;
dev->flags &= ~P2P_DEV_WAIT_GO_NEG_CONFIRM;
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
if (pd_before_go_neg)
dev->flags |= P2P_DEV_PD_BEFORE_GO_NEG;
P2P: Use the same Dialog Token value for every GO Negotiation retry Each GO Negotiation Request is (re)tried with an unique dialog token and a GO Negotiation Response / Confirmation from the peer with a mismatched dialog token is ignored which could result in a failure in this group formation attempt. Thus, the P2P device would continue retrying the GO Negotiation Request frames till the GO Negotiation Response frame with a matching dialog token is received. To avoid the failures due to the dialog token mismatch in retry cases if the peer is too slow to reply within the timeout, the same dialog token value is used for every retry in the same group formation handshake. It should be noted that this can result in different contents of the GO Negotiation Request frame being sent with the same dialog token value since the tie breaker bit in GO Intent is still toggled for each attempt. The specification is not very clear on what would be the correct behavior here. Tie breaker bit is not updated on "retransmissions", but that is more likely referring to the layer 2 retransmission and not the retry at higher layer using a new MMPDU. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-09 15:05:18 +01:00
else {
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
dev->flags &= ~P2P_DEV_PD_BEFORE_GO_NEG;
P2P: Use the same Dialog Token value for every GO Negotiation retry Each GO Negotiation Request is (re)tried with an unique dialog token and a GO Negotiation Response / Confirmation from the peer with a mismatched dialog token is ignored which could result in a failure in this group formation attempt. Thus, the P2P device would continue retrying the GO Negotiation Request frames till the GO Negotiation Response frame with a matching dialog token is received. To avoid the failures due to the dialog token mismatch in retry cases if the peer is too slow to reply within the timeout, the same dialog token value is used for every retry in the same group formation handshake. It should be noted that this can result in different contents of the GO Negotiation Request frame being sent with the same dialog token value since the tie breaker bit in GO Intent is still toggled for each attempt. The specification is not very clear on what would be the correct behavior here. Tie breaker bit is not updated on "retransmissions", but that is more likely referring to the layer 2 retransmission and not the retry at higher layer using a new MMPDU. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-09 15:05:18 +01:00
/*
P2P: Assign GO tie breaker bit at the same time with dialog token Commit 624b4d5a6469c92b039e0d39655b9e0eb26588aa changed GO Negotiation to use the same Dialog Token value for all retransmissions of the GO Negotiation Request within the same session. However, it did leave the tie breaker bit changing for each frame. While this should not have caused issues for most cases, it looks like there are possible sequences where the peer may end up replying to two GO Negotiation Request frames with different tie breaker values. If in such a case the different GO Negotiation Response frames are used at each device, GO role determination may result in conflicting results when same GO intent is used. Fix this by assigning the tie breaker value at the same time with the dialog token (i.e., when processing the p2p_connect command instead of for each transmitted GO Negotiation Request frame) to avoid issues with GO selection. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-26 15:56:48 +01:00
* Assign dialog token and tie breaker here to use the same
* values in each retry within the same GO Negotiation exchange.
P2P: Use the same Dialog Token value for every GO Negotiation retry Each GO Negotiation Request is (re)tried with an unique dialog token and a GO Negotiation Response / Confirmation from the peer with a mismatched dialog token is ignored which could result in a failure in this group formation attempt. Thus, the P2P device would continue retrying the GO Negotiation Request frames till the GO Negotiation Response frame with a matching dialog token is received. To avoid the failures due to the dialog token mismatch in retry cases if the peer is too slow to reply within the timeout, the same dialog token value is used for every retry in the same group formation handshake. It should be noted that this can result in different contents of the GO Negotiation Request frame being sent with the same dialog token value since the tie breaker bit in GO Intent is still toggled for each attempt. The specification is not very clear on what would be the correct behavior here. Tie breaker bit is not updated on "retransmissions", but that is more likely referring to the layer 2 retransmission and not the retry at higher layer using a new MMPDU. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-09 15:05:18 +01:00
*/
dev->dialog_token++;
if (dev->dialog_token == 0)
dev->dialog_token = 1;
P2P: Assign GO tie breaker bit at the same time with dialog token Commit 624b4d5a6469c92b039e0d39655b9e0eb26588aa changed GO Negotiation to use the same Dialog Token value for all retransmissions of the GO Negotiation Request within the same session. However, it did leave the tie breaker bit changing for each frame. While this should not have caused issues for most cases, it looks like there are possible sequences where the peer may end up replying to two GO Negotiation Request frames with different tie breaker values. If in such a case the different GO Negotiation Response frames are used at each device, GO role determination may result in conflicting results when same GO intent is used. Fix this by assigning the tie breaker value at the same time with the dialog token (i.e., when processing the p2p_connect command instead of for each transmitted GO Negotiation Request frame) to avoid issues with GO selection. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-26 15:56:48 +01:00
dev->tie_breaker = p2p->next_tie_breaker;
p2p->next_tie_breaker = !p2p->next_tie_breaker;
P2P: Use the same Dialog Token value for every GO Negotiation retry Each GO Negotiation Request is (re)tried with an unique dialog token and a GO Negotiation Response / Confirmation from the peer with a mismatched dialog token is ignored which could result in a failure in this group formation attempt. Thus, the P2P device would continue retrying the GO Negotiation Request frames till the GO Negotiation Response frame with a matching dialog token is received. To avoid the failures due to the dialog token mismatch in retry cases if the peer is too slow to reply within the timeout, the same dialog token value is used for every retry in the same group formation handshake. It should be noted that this can result in different contents of the GO Negotiation Request frame being sent with the same dialog token value since the tie breaker bit in GO Intent is still toggled for each attempt. The specification is not very clear on what would be the correct behavior here. Tie breaker bit is not updated on "retransmissions", but that is more likely referring to the layer 2 retransmission and not the retry at higher layer using a new MMPDU. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-01-09 15:05:18 +01:00
}
P2P: Limit the retransmission of GO Negotiation request to 120 If the peer you want to connect to is no longer available (does not acknowledge frames) when wpa_supplicant sends GO Negotition Request frames, retransmission of this frame is done until the associated p2p_device structure is removed on timeout. In that case, no signal is emitted to inform the GO Negotiation has failed. When sending an Invitation Request frame, the same retransmission mechanism is in place but limit the transmission to 100 and hitting the limit generates an event. This patch adds the same mechanism as the one in place for Invitation Request, but with limit of 120 to match the existing wait_count for for GO Negotiation.
2010-12-28 10:48:58 +01:00
dev->connect_reqs = 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
dev->go_neg_req_sent = 0;
dev->go_state = UNKNOWN_GO;
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
p2p_set_dev_persistent(dev, persistent_group);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->go_intent = go_intent;
os_memcpy(p2p->intended_addr, own_interface_addr, ETH_ALEN);
if (p2p->state != P2P_IDLE)
p2p_stop_find(p2p);
P2P: Drop pending TX frame on new p2p_connect We need to drop the pending frame to avoid issues with the new GO Negotiation, e.g., when the pending frame was from a previous attempt at starting a GO Negotiation.
2010-11-05 17:17:20 +01:00
if (p2p->after_scan_tx) {
/*
* We need to drop the pending frame to avoid issues with the
* new GO Negotiation, e.g., when the pending frame was from a
* previous attempt at starting a GO Negotiation.
*/
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_dbg(p2p, "Dropped previous pending Action frame TX that was waiting for p2p_scan completion");
P2P: Drop pending TX frame on new p2p_connect We need to drop the pending frame to avoid issues with the new GO Negotiation, e.g., when the pending frame was from a previous attempt at starting a GO Negotiation.
2010-11-05 17:17:20 +01:00
os_free(p2p->after_scan_tx);
p2p->after_scan_tx = NULL;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
dev->wps_method = wps_method;
dev->status = P2P_SC_SUCCESS;
P2P: Fix channel forcing for p2p_connect auth
2010-07-02 17:27:00 +02:00
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (p2p->p2p_scan_running) {
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_dbg(p2p, "p2p_scan running - delay connect send");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->start_after_scan = P2P_AFTER_SCAN_CONNECT;
os_memcpy(p2p->after_scan_peer, peer_addr, ETH_ALEN);
return 0;
}
p2p->start_after_scan = P2P_AFTER_SCAN_NOTHING;
return p2p_connect_send(p2p, dev);
}
int p2p_authorize(struct p2p_data *p2p, 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
const u8 *force_ssid, size_t force_ssid_len,
unsigned int pref_freq)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct p2p_device *dev;
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_dbg(p2p, "Request to authorize group negotiation - peer=" MACSTR
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
" GO Intent=%d Intended Interface Address=" MACSTR
" wps_method=%d persistent_group=%d",
MAC2STR(peer_addr), go_intent, MAC2STR(own_interface_addr),
wps_method, persistent_group);
dev = p2p_get_device(p2p, peer_addr);
if (dev == NULL) {
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_dbg(p2p, "Cannot authorize unknown P2P Device " MACSTR,
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
MAC2STR(peer_addr));
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
if (p2p_prepare_channel(p2p, dev, force_freq, pref_freq, go_intent ==
15) < 0)
P2P: Set FORCE_FREQ flag as part of p2p_prepare_channel() Both p2p_connect and p2p_authorize use the same functionality to select the channel preferences for GO Negotiation. The part of setting this device flag was copied to each function, but it can also be handled by the shared function after some reordering of code. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-12-27 06:58:04 +01:00
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
p2p->ssid_set = 0;
if (force_ssid) {
wpa_hexdump_ascii(MSG_DEBUG, "P2P: Forced SSID",
force_ssid, force_ssid_len);
os_memcpy(p2p->ssid, force_ssid, force_ssid_len);
p2p->ssid_len = force_ssid_len;
p2p->ssid_set = 1;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
dev->flags &= ~P2P_DEV_NOT_YET_READY;
dev->flags &= ~P2P_DEV_USER_REJECTED;
dev->go_neg_req_sent = 0;
dev->go_state = UNKNOWN_GO;
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
p2p_set_dev_persistent(dev, persistent_group);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->go_intent = go_intent;
os_memcpy(p2p->intended_addr, own_interface_addr, ETH_ALEN);
dev->wps_method = wps_method;
dev->status = P2P_SC_SUCCESS;
return 0;
}
void p2p_add_dev_info(struct p2p_data *p2p, const u8 *addr,
struct p2p_device *dev, struct p2p_message *msg)
{
os_get_time(&dev->last_seen);
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_copy_wps_info(p2p, dev, 0, msg);
P2P: Keep track of secondary device types for peers Signed-off-by: Jean-Michel Bachot <jean-michelx.bachot@linux.intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-17 10:45:46 +01:00
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (msg->listen_channel) {
int freq;
P2P: Clean up channel--frequency conversion functions All P2P use cases are required to use the global operating table and there is no need to need to try to maintain some backwards compatibility with country code -specific values. Clean up the implementation by removing the unnecessary country parameter. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-27 20:03:16 +02:00
freq = p2p_channel_to_freq(msg->listen_channel[3],
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
msg->listen_channel[4]);
if (freq < 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
p2p_dbg(p2p, "Unknown peer Listen channel: "
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
"country=%c%c(0x%02x) reg_class=%u channel=%u",
msg->listen_channel[0],
msg->listen_channel[1],
msg->listen_channel[2],
msg->listen_channel[3],
msg->listen_channel[4]);
} else {
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_dbg(p2p, "Update peer " MACSTR
" Listen channel: %u -> %u MHz",
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
MAC2STR(dev->info.p2p_device_addr),
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
dev->listen_freq, freq);
dev->listen_freq = freq;
}
}
WFD: Add Wi-Fi Display support This commit adds control interface commands and internal storage of Wi-Fi Display related configuration. In addition, WFD IE is now added to various P2P frames, Probe Request/Response, and (Re)Association Request/Response frames. WFD subelements from peers are stored in the P2P peer table. Following control interface commands are now available: SET wifi_display <0/1> GET wifi_display WFD_SUBELEM_SET <subelem> [hexdump of length+body] WFD_SUBELEM_GET <subelem> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 16:26:01 +01:00
if (msg->wfd_subelems) {
wpabuf_free(dev->info.wfd_subelems);
dev->info.wfd_subelems = wpabuf_dup(msg->wfd_subelems);
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (dev->flags & P2P_DEV_PROBE_REQ_ONLY) {
dev->flags &= ~P2P_DEV_PROBE_REQ_ONLY;
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_dbg(p2p, "Completed device entry based on data from GO Negotiation Request");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
} else {
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_dbg(p2p, "Created device entry based on GO Neg Req: "
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
MACSTR " dev_capab=0x%x group_capab=0x%x name='%s' "
"listen_freq=%d",
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
MAC2STR(dev->info.p2p_device_addr),
dev->info.dev_capab, dev->info.group_capab,
dev->info.device_name, dev->listen_freq);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
dev->flags &= ~P2P_DEV_GROUP_CLIENT_ONLY;
if (dev->flags & P2P_DEV_USER_REJECTED) {
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_dbg(p2p, "Do not report rejected device");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return;
}
P2P: Add new_device flag to dev_found callback The DBus code will want to have perfect matching of dev_found and the dev_lost it adds so it doesn't need to keep track internally. Enable that with a new flag in the core that tracks whether we have already notified about this -- the existing users can ignore it. The part where this is always set to 1 if the new device is discovered by a driver that has P2P in the driver is buggy -- the driver should feed the P2P peer database and then that should feed the notification here instead. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-24 20:59:58 +01:00
p2p->cfg->dev_found(p2p->cfg->cb_ctx, addr, &dev->info,
!(dev->flags & P2P_DEV_REPORTED_ONCE));
dev->flags |= P2P_DEV_REPORTED | P2P_DEV_REPORTED_ONCE;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
void p2p_build_ssid(struct p2p_data *p2p, u8 *ssid, size_t *ssid_len)
{
os_memcpy(ssid, P2P_WILDCARD_SSID, P2P_WILDCARD_SSID_LEN);
p2p_random((char *) &ssid[P2P_WILDCARD_SSID_LEN], 2);
os_memcpy(&ssid[P2P_WILDCARD_SSID_LEN + 2],
p2p->cfg->ssid_postfix, p2p->cfg->ssid_postfix_len);
*ssid_len = P2P_WILDCARD_SSID_LEN + 2 + p2p->cfg->ssid_postfix_len;
}
int p2p_go_params(struct p2p_data *p2p, struct p2p_go_neg_results *params)
{
p2p_build_ssid(p2p, params->ssid, &params->ssid_len);
p2p_random(params->passphrase, 8);
return 0;
}
void p2p_go_complete(struct p2p_data *p2p, struct p2p_device *peer)
{
struct p2p_go_neg_results res;
int go = peer->go_state == LOCAL_GO;
struct p2p_channels intersection;
int freqs;
size_t i, j;
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_dbg(p2p, "GO Negotiation with " MACSTR " completed (%s will be GO)",
MAC2STR(peer->info.p2p_device_addr), go ? "local end" : "peer");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
os_memset(&res, 0, sizeof(res));
res.role_go = go;
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
os_memcpy(res.peer_device_addr, peer->info.p2p_device_addr, ETH_ALEN);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
os_memcpy(res.peer_interface_addr, peer->intended_addr, ETH_ALEN);
res.wps_method = peer->wps_method;
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 (peer->flags & P2P_DEV_PREFER_PERSISTENT_GROUP) {
if (peer->flags & P2P_DEV_PREFER_PERSISTENT_RECONN)
res.persistent_group = 2;
else
res.persistent_group = 1;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (go) {
/* Setup AP mode for WPS provisioning */
P2P: Clean up channel--frequency conversion functions All P2P use cases are required to use the global operating table and there is no need to need to try to maintain some backwards compatibility with country code -specific values. Clean up the implementation by removing the unnecessary country parameter. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-27 20:03:16 +02:00
res.freq = p2p_channel_to_freq(p2p->op_reg_class,
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->op_channel);
os_memcpy(res.ssid, p2p->ssid, p2p->ssid_len);
res.ssid_len = p2p->ssid_len;
p2p_random(res.passphrase, 8);
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
} else {
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
res.freq = peer->oper_freq;
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
if (p2p->ssid_len) {
os_memcpy(res.ssid, p2p->ssid, p2p->ssid_len);
res.ssid_len = p2p->ssid_len;
}
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
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_channels_dump(p2p, "own channels", &p2p->channels);
p2p_channels_dump(p2p, "peer channels", &peer->channels);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_channels_intersect(&p2p->channels, &peer->channels,
&intersection);
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 (go) {
p2p_channels_remove_freqs(&intersection, &p2p->no_go_freq);
p2p_channels_dump(p2p, "intersection after no-GO removal",
&intersection);
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
freqs = 0;
for (i = 0; i < intersection.reg_classes; i++) {
struct p2p_reg_class *c = &intersection.reg_class[i];
if (freqs + 1 == P2P_MAX_CHANNELS)
break;
for (j = 0; j < c->channels; j++) {
int freq;
if (freqs + 1 == P2P_MAX_CHANNELS)
break;
P2P: Clean up channel--frequency conversion functions All P2P use cases are required to use the global operating table and there is no need to need to try to maintain some backwards compatibility with country code -specific values. Clean up the implementation by removing the unnecessary country parameter. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-27 20:03:16 +02:00
freq = p2p_channel_to_freq(c->reg_class, c->channel[j]);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (freq < 0)
continue;
res.freq_list[freqs++] = freq;
}
}
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
res.peer_config_timeout = go ? peer->client_timeout : peer->go_timeout;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_clear_timeout(p2p);
P2P: Do not change SSID during GO negotiation If GO Negotiation Request (or in theory, also GO Negotiation Response) frame is delivered multiple time for processing, the SSID of the group could end up getting changed. This could result in possible issues if the peer ended up using different SSID. To avoid this, make sure the SSID does not get changed unless the negotiation is for a new group.
2011-10-11 17:29:31 +02:00
p2p->ssid_set = 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
peer->go_neg_req_sent = 0;
peer->wps_method = WPS_NOT_READY;
p2p_set_state(p2p, P2P_PROVISIONING);
p2p->cfg->go_neg_completed(p2p->cfg->cb_ctx, &res);
}
static void p2p_rx_p2p_action(struct p2p_data *p2p, const u8 *sa,
const u8 *data, size_t len, int rx_freq)
{
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_dbg(p2p, "RX P2P Public Action from " MACSTR, MAC2STR(sa));
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_hexdump(MSG_MSGDUMP, "P2P: P2P Public Action contents", data, len);
if (len < 1)
return;
switch (data[0]) {
case P2P_GO_NEG_REQ:
p2p_process_go_neg_req(p2p, sa, data + 1, len - 1, rx_freq);
break;
case P2P_GO_NEG_RESP:
p2p_process_go_neg_resp(p2p, sa, data + 1, len - 1, rx_freq);
break;
case P2P_GO_NEG_CONF:
p2p_process_go_neg_conf(p2p, sa, data + 1, len - 1);
break;
case P2P_INVITATION_REQ:
p2p_process_invitation_req(p2p, sa, data + 1, len - 1,
rx_freq);
break;
case P2P_INVITATION_RESP:
P2P: Cancel offchannel TX wait on Invitation Response RX This fixes issues where a GO used offchannel-TX operation to send an Invitation Request frame. Wait for the offchannel TX operation needs to be stopped as soon as the Invitation Response frame has been received. This addresses some issues where Probe Response frame from the GO through the monitor interface may end up going out on a wrong channel (the channel of this offchannel TX operation for invitation). Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-20 17:19:27 +02:00
p2p->cfg->send_action_done(p2p->cfg->cb_ctx);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_process_invitation_resp(p2p, sa, data + 1, len - 1);
break;
case P2P_PROV_DISC_REQ:
p2p_process_prov_disc_req(p2p, sa, data + 1, len - 1, rx_freq);
break;
case P2P_PROV_DISC_RESP:
p2p_process_prov_disc_resp(p2p, sa, data + 1, len - 1);
break;
case P2P_DEV_DISC_REQ:
p2p_process_dev_disc_req(p2p, sa, data + 1, len - 1, rx_freq);
break;
case P2P_DEV_DISC_RESP:
p2p_process_dev_disc_resp(p2p, sa, data + 1, len - 1);
break;
default:
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_dbg(p2p, "Unsupported P2P Public Action frame type %d",
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
data[0]);
break;
}
}
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 p2p_rx_action_public(struct p2p_data *p2p, const u8 *da,
const u8 *sa, const u8 *bssid, const u8 *data,
size_t len, int freq)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
if (len < 1)
return;
switch (data[0]) {
case WLAN_PA_VENDOR_SPECIFIC:
data++;
len--;
if (len < 3)
return;
if (WPA_GET_BE24(data) != OUI_WFA)
return;
data += 3;
len -= 3;
if (len < 1)
return;
if (*data != P2P_OUI_TYPE)
return;
p2p_rx_p2p_action(p2p, sa, data + 1, len - 1, freq);
break;
case WLAN_PA_GAS_INITIAL_REQ:
p2p_rx_gas_initial_req(p2p, sa, data + 1, len - 1, freq);
break;
case WLAN_PA_GAS_INITIAL_RESP:
P2P: Initial support for SD fragmentation (GAS Comeback Request/Response)
2010-06-28 18:24:17 +02:00
p2p_rx_gas_initial_resp(p2p, sa, data + 1, len - 1, freq);
break;
case WLAN_PA_GAS_COMEBACK_REQ:
p2p_rx_gas_comeback_req(p2p, sa, data + 1, len - 1, freq);
break;
case WLAN_PA_GAS_COMEBACK_RESP:
p2p_rx_gas_comeback_resp(p2p, sa, data + 1, len - 1, freq);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
break;
}
}
void p2p_rx_action(struct p2p_data *p2p, const u8 *da, const u8 *sa,
const u8 *bssid, u8 category,
const u8 *data, size_t len, int freq)
{
if (category == WLAN_ACTION_PUBLIC) {
p2p_rx_action_public(p2p, da, sa, bssid, data, len, freq);
return;
}
if (category != WLAN_ACTION_VENDOR_SPECIFIC)
return;
if (len < 4)
return;
if (WPA_GET_BE24(data) != OUI_WFA)
return;
data += 3;
len -= 3;
if (*data != P2P_OUI_TYPE)
return;
data++;
len--;
/* P2P action frame */
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_dbg(p2p, "RX P2P Action from " MACSTR, MAC2STR(sa));
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_hexdump(MSG_MSGDUMP, "P2P: P2P Action contents", data, len);
if (len < 1)
return;
switch (data[0]) {
case P2P_NOA:
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_dbg(p2p, "Received P2P Action - Notice of Absence");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/* TODO */
break;
case P2P_PRESENCE_REQ:
p2p_process_presence_req(p2p, da, sa, data + 1, len - 1, freq);
break;
case P2P_PRESENCE_RESP:
p2p_process_presence_resp(p2p, da, sa, data + 1, len - 1);
break;
case P2P_GO_DISC_REQ:
p2p_process_go_disc_req(p2p, da, sa, data + 1, len - 1, freq);
break;
default:
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_dbg(p2p, "Received P2P Action - unknown type %u", data[0]);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
break;
}
}
static void p2p_go_neg_start(void *eloop_ctx, void *timeout_ctx)
{
struct p2p_data *p2p = eloop_ctx;
if (p2p->go_neg_peer == NULL)
return;
p2p->cfg->stop_listen(p2p->cfg->cb_ctx);
p2p->go_neg_peer->status = P2P_SC_SUCCESS;
p2p_connect_send(p2p, p2p->go_neg_peer);
}
static void p2p_invite_start(void *eloop_ctx, void *timeout_ctx)
{
struct p2p_data *p2p = eloop_ctx;
if (p2p->invite_peer == NULL)
return;
p2p->cfg->stop_listen(p2p->cfg->cb_ctx);
p2p_invite_send(p2p, p2p->invite_peer, p2p->invite_go_dev_addr);
}
static void p2p_add_dev_from_probe_req(struct p2p_data *p2p, const u8 *addr,
const u8 *ie, size_t ie_len)
{
struct p2p_message msg;
struct p2p_device *dev;
os_memset(&msg, 0, sizeof(msg));
if (p2p_parse_ies(ie, ie_len, &msg) < 0 || msg.p2p_attributes == NULL)
{
p2p_parse_free(&msg);
return; /* not a P2P probe */
}
if (msg.ssid == NULL || msg.ssid[1] != P2P_WILDCARD_SSID_LEN ||
os_memcmp(msg.ssid + 2, P2P_WILDCARD_SSID, P2P_WILDCARD_SSID_LEN)
!= 0) {
/* The Probe Request is not part of P2P Device Discovery. It is
* not known whether the source address of the frame is the P2P
* Device Address or P2P Interface Address. Do not add a new
* peer entry based on this frames.
*/
p2p_parse_free(&msg);
return;
}
dev = p2p_get_device(p2p, addr);
if (dev) {
if (dev->country[0] == 0 && msg.listen_channel)
os_memcpy(dev->country, msg.listen_channel, 3);
P2P: Refresh peer entries on Probe Request RX Do not expire P2P peer entries if Probe Request frames are received from them.
2011-10-01 19:40:14 +02:00
os_get_time(&dev->last_seen);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_parse_free(&msg);
return; /* already known */
}
dev = p2p_create_device(p2p, addr);
if (dev == NULL) {
p2p_parse_free(&msg);
return;
}
os_get_time(&dev->last_seen);
dev->flags |= P2P_DEV_PROBE_REQ_ONLY;
if (msg.listen_channel) {
os_memcpy(dev->country, msg.listen_channel, 3);
P2P: Clean up channel--frequency conversion functions All P2P use cases are required to use the global operating table and there is no need to need to try to maintain some backwards compatibility with country code -specific values. Clean up the implementation by removing the unnecessary country parameter. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-27 20:03:16 +02:00
dev->listen_freq = p2p_channel_to_freq(msg.listen_channel[3],
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
msg.listen_channel[4]);
}
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_copy_wps_info(p2p, dev, 1, &msg);
P2P: Keep track of secondary device types for peers Signed-off-by: Jean-Michel Bachot <jean-michelx.bachot@linux.intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-03-17 10:45:46 +01:00
WFD: Add Wi-Fi Display support This commit adds control interface commands and internal storage of Wi-Fi Display related configuration. In addition, WFD IE is now added to various P2P frames, Probe Request/Response, and (Re)Association Request/Response frames. WFD subelements from peers are stored in the P2P peer table. Following control interface commands are now available: SET wifi_display <0/1> GET wifi_display WFD_SUBELEM_SET <subelem> [hexdump of length+body] WFD_SUBELEM_GET <subelem> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 16:26:01 +01:00
if (msg.wfd_subelems) {
wpabuf_free(dev->info.wfd_subelems);
dev->info.wfd_subelems = wpabuf_dup(msg.wfd_subelems);
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_parse_free(&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_dbg(p2p, "Created device entry based on Probe Req: " MACSTR
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
" dev_capab=0x%x group_capab=0x%x name='%s' listen_freq=%d",
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
MAC2STR(dev->info.p2p_device_addr), dev->info.dev_capab,
dev->info.group_capab, dev->info.device_name,
dev->listen_freq);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
struct p2p_device * p2p_add_dev_from_go_neg_req(struct p2p_data *p2p,
const u8 *addr,
struct p2p_message *msg)
{
struct p2p_device *dev;
dev = p2p_get_device(p2p, addr);
if (dev) {
os_get_time(&dev->last_seen);
return dev; /* already known */
}
dev = p2p_create_device(p2p, addr);
if (dev == NULL)
return NULL;
p2p_add_dev_info(p2p, addr, dev, msg);
return dev;
}
static int dev_type_match(const u8 *dev_type, const u8 *req_dev_type)
{
if (os_memcmp(dev_type, req_dev_type, WPS_DEV_TYPE_LEN) == 0)
return 1;
if (os_memcmp(dev_type, req_dev_type, 2) == 0 &&
WPA_GET_BE32(&req_dev_type[2]) == 0 &&
WPA_GET_BE16(&req_dev_type[6]) == 0)
return 1; /* Category match with wildcard OUI/sub-category */
return 0;
}
int dev_type_list_match(const u8 *dev_type, const u8 *req_dev_type[],
size_t num_req_dev_type)
{
size_t i;
for (i = 0; i < num_req_dev_type; i++) {
if (dev_type_match(dev_type, req_dev_type[i]))
return 1;
}
return 0;
}
/**
* p2p_match_dev_type - Match local device type with requested type
* @p2p: P2P module context from p2p_init()
* @wps: WPS TLVs from Probe Request frame (concatenated WPS IEs)
* Returns: 1 on match, 0 on mismatch
*
* This function can be used to match the Requested Device Type attribute in
* WPS IE with the local device types for deciding whether to reply to a Probe
* Request frame.
*/
int p2p_match_dev_type(struct p2p_data *p2p, struct wpabuf *wps)
{
struct wps_parse_attr attr;
size_t i;
if (wps_parse_msg(wps, &attr))
return 1; /* assume no Requested Device Type attributes */
if (attr.num_req_dev_type == 0)
return 1; /* no Requested Device Type attributes -> match */
if (dev_type_list_match(p2p->cfg->pri_dev_type, attr.req_dev_type,
attr.num_req_dev_type))
return 1; /* Own Primary Device Type matches */
for (i = 0; i < p2p->cfg->num_sec_dev_types; i++)
if (dev_type_list_match(p2p->cfg->sec_dev_type[i],
attr.req_dev_type,
attr.num_req_dev_type))
return 1; /* Own Secondary Device Type matches */
/* No matching device type found */
return 0;
}
struct wpabuf * p2p_build_probe_resp_ies(struct p2p_data *p2p)
{
struct wpabuf *buf;
u8 *len;
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
int pw_id = -1;
WFD: Add Wi-Fi Display support This commit adds control interface commands and internal storage of Wi-Fi Display related configuration. In addition, WFD IE is now added to various P2P frames, Probe Request/Response, and (Re)Association Request/Response frames. WFD subelements from peers are stored in the P2P peer table. Following control interface commands are now available: SET wifi_display <0/1> GET wifi_display WFD_SUBELEM_SET <subelem> [hexdump of length+body] WFD_SUBELEM_GET <subelem> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 16:26:01 +01:00
size_t extra = 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
WFD: Add Wi-Fi Display support This commit adds control interface commands and internal storage of Wi-Fi Display related configuration. In addition, WFD IE is now added to various P2P frames, Probe Request/Response, and (Re)Association Request/Response frames. WFD subelements from peers are stored in the P2P peer table. Following control interface commands are now available: SET wifi_display <0/1> GET wifi_display WFD_SUBELEM_SET <subelem> [hexdump of length+body] WFD_SUBELEM_GET <subelem> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 16:26:01 +01:00
#ifdef CONFIG_WIFI_DISPLAY
if (p2p->wfd_ie_probe_resp)
extra = wpabuf_len(p2p->wfd_ie_probe_resp);
#endif /* CONFIG_WIFI_DISPLAY */
buf = wpabuf_alloc(1000 + extra);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (buf == NULL)
return NULL;
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
if (p2p->go_neg_peer) {
/* Advertise immediate availability of WPS credential */
pw_id = p2p_wps_method_pw_id(p2p->go_neg_peer->wps_method);
}
Add explicit buffer length checks for p2p_build_wps_ie() Even though the length of this buffer is based only on locally configured information, it is cleaner to include explicit buffer room validation steps when adding the attributes into the buffer. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-26 11:54:20 +02:00
if (p2p_build_wps_ie(p2p, buf, pw_id, 1) < 0) {
p2p_dbg(p2p, "Failed to build WPS IE for Probe Response");
wpabuf_free(buf);
return NULL;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
WFD: Add Wi-Fi Display support This commit adds control interface commands and internal storage of Wi-Fi Display related configuration. In addition, WFD IE is now added to various P2P frames, Probe Request/Response, and (Re)Association Request/Response frames. WFD subelements from peers are stored in the P2P peer table. Following control interface commands are now available: SET wifi_display <0/1> GET wifi_display WFD_SUBELEM_SET <subelem> [hexdump of length+body] WFD_SUBELEM_GET <subelem> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 16:26:01 +01:00
#ifdef CONFIG_WIFI_DISPLAY
if (p2p->wfd_ie_probe_resp)
wpabuf_put_buf(buf, p2p->wfd_ie_probe_resp);
#endif /* CONFIG_WIFI_DISPLAY */
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/* P2P IE */
len = p2p_buf_add_ie_hdr(buf);
P2P: Fix setting of P2P Client Discoverability bit In the P2P specification v1.1, the P2P Client Discoverability bit is described in Table 12 "Device Capability Bitmap definition". The table says "Within a P2P Group Info attribute and a (Re)association request frame the P2P Client Discoverability field shall be set to 1 when the P2P Device supports P2P Client Discoverability, and is set to 0 otherwise. This field shall be reserved and set to 0 in all other frames or uses.". To match with this, filter out P2P Client Discoverability bit from frames where its use is reserved. Signed-hostap: Masashi Honma <masashi.honma@gmail.com>
2012-06-16 18:54:47 +02:00
p2p_buf_add_capability(buf, p2p->dev_capab &
~P2P_DEV_CAPAB_CLIENT_DISCOVERABILITY, 0);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (p2p->ext_listen_interval)
p2p_buf_add_ext_listen_timing(buf, p2p->ext_listen_period,
p2p->ext_listen_interval);
p2p_buf_add_device_info(buf, p2p, NULL);
p2p_buf_update_ie_hdr(buf, len);
return buf;
}
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
static enum p2p_probe_req_status
p2p_reply_probe(struct p2p_data *p2p, const u8 *addr, const u8 *dst,
const u8 *bssid, const u8 *ie, size_t ie_len)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct ieee802_11_elems elems;
struct wpabuf *buf;
struct ieee80211_mgmt *resp;
P2P: Check Device ID match in Probe Request frames in Listen state Do not reply to Probe Request frames that include a Device ID that does not match with our own P2P Device Address.
2011-07-15 19:48:06 +02:00
struct p2p_message msg;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
struct wpabuf *ies;
if (!p2p->in_listen || !p2p->drv_in_listen) {
/* not in Listen state - ignore Probe Request */
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
return P2P_PREQ_NOT_LISTEN;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
if (ieee802_11_parse_elems((u8 *) ie, ie_len, &elems, 0) ==
ParseFailed) {
/* Ignore invalid Probe Request frames */
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
return P2P_PREQ_MALFORMED;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
if (elems.p2p == NULL) {
/* not a P2P probe - ignore it */
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
return P2P_PREQ_NOT_P2P;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
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
if (dst && !is_broadcast_ether_addr(dst) &&
os_memcmp(dst, p2p->cfg->dev_addr, ETH_ALEN) != 0) {
/* Not sent to the broadcast address or our P2P Device Address
*/
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
return P2P_PREQ_NOT_PROCESSED;
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
}
if (bssid && !is_broadcast_ether_addr(bssid)) {
/* Not sent to the Wildcard BSSID */
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
return P2P_PREQ_NOT_PROCESSED;
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
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (elems.ssid == NULL || elems.ssid_len != P2P_WILDCARD_SSID_LEN ||
os_memcmp(elems.ssid, P2P_WILDCARD_SSID, P2P_WILDCARD_SSID_LEN) !=
0) {
/* not using P2P Wildcard SSID - ignore */
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
return P2P_PREQ_NOT_PROCESSED;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Do not reply to Probe Request frame indicating only 802.11b rates Per P2P specification 2.4.1, P2P Device shall shall not respond to Probe Request frames that indicate support for only 802.11b rates.
2011-07-15 20:49:50 +02:00
if (supp_rates_11b_only(&elems)) {
/* Indicates support for 11b rates only */
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
return P2P_PREQ_NOT_P2P;
P2P: Do not reply to Probe Request frame indicating only 802.11b rates Per P2P specification 2.4.1, P2P Device shall shall not respond to Probe Request frames that indicate support for only 802.11b rates.
2011-07-15 20:49:50 +02:00
}
P2P: Check Device ID match in Probe Request frames in Listen state Do not reply to Probe Request frames that include a Device ID that does not match with our own P2P Device Address.
2011-07-15 19:48:06 +02:00
os_memset(&msg, 0, sizeof(msg));
if (p2p_parse_ies(ie, ie_len, &msg) < 0) {
/* Could not parse P2P attributes */
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
return P2P_PREQ_NOT_P2P;
P2P: Check Device ID match in Probe Request frames in Listen state Do not reply to Probe Request frames that include a Device ID that does not match with our own P2P Device Address.
2011-07-15 19:48:06 +02:00
}
if (msg.device_id &&
P2P: Fix Device ID matching for Probe Request frames The misplaced parenthesis caused Device ID matching to check only the first octet of the P2P Device Address, i.e., we could have replied to Probe Request frames that was searching for another device if any of the last five octets of the address were different. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-05-02 14:19:02 +02:00
os_memcmp(msg.device_id, p2p->cfg->dev_addr, ETH_ALEN) != 0) {
P2P: Check Device ID match in Probe Request frames in Listen state Do not reply to Probe Request frames that include a Device ID that does not match with our own P2P Device Address.
2011-07-15 19:48:06 +02:00
/* Device ID did not match */
p2p_parse_free(&msg);
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
return P2P_PREQ_NOT_PROCESSED;
P2P: Check Device ID match in Probe Request frames in Listen state Do not reply to Probe Request frames that include a Device ID that does not match with our own P2P Device Address.
2011-07-15 19:48:06 +02:00
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/* Check Requested Device Type match */
P2P: Check Device ID match in Probe Request frames in Listen state Do not reply to Probe Request frames that include a Device ID that does not match with our own P2P Device Address.
2011-07-15 19:48:06 +02:00
if (msg.wps_attributes &&
!p2p_match_dev_type(p2p, msg.wps_attributes)) {
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/* No match with Requested Device Type */
P2P: Check Device ID match in Probe Request frames in Listen state Do not reply to Probe Request frames that include a Device ID that does not match with our own P2P Device Address.
2011-07-15 19:48:06 +02:00
p2p_parse_free(&msg);
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
return P2P_PREQ_NOT_PROCESSED;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Check Device ID match in Probe Request frames in Listen state Do not reply to Probe Request frames that include a Device ID that does not match with our own P2P Device Address.
2011-07-15 19:48:06 +02:00
p2p_parse_free(&msg);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
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
if (!p2p->cfg->send_probe_resp) {
/* Response generated elsewhere */
return P2P_PREQ_NOT_PROCESSED;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
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_dbg(p2p, "Reply to P2P Probe Request in Listen state");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/*
* We do not really have a specific BSS that this frame is advertising,
* so build a frame that has some information in valid format. This is
* really only used for discovery purposes, not to learn exact BSS
* parameters.
*/
ies = p2p_build_probe_resp_ies(p2p);
if (ies == NULL)
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
return P2P_PREQ_NOT_PROCESSED;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
buf = wpabuf_alloc(200 + wpabuf_len(ies));
if (buf == NULL) {
wpabuf_free(ies);
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
return P2P_PREQ_NOT_PROCESSED;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
resp = NULL;
resp = wpabuf_put(buf, resp->u.probe_resp.variable - (u8 *) resp);
resp->frame_control = host_to_le16((WLAN_FC_TYPE_MGMT << 2) |
(WLAN_FC_STYPE_PROBE_RESP << 4));
os_memcpy(resp->da, addr, ETH_ALEN);
os_memcpy(resp->sa, p2p->cfg->dev_addr, ETH_ALEN);
os_memcpy(resp->bssid, p2p->cfg->dev_addr, ETH_ALEN);
resp->u.probe_resp.beacon_int = host_to_le16(100);
/* hardware or low-level driver will setup seq_ctrl and timestamp */
resp->u.probe_resp.capab_info =
host_to_le16(WLAN_CAPABILITY_SHORT_PREAMBLE |
WLAN_CAPABILITY_PRIVACY |
WLAN_CAPABILITY_SHORT_SLOT_TIME);
wpabuf_put_u8(buf, WLAN_EID_SSID);
wpabuf_put_u8(buf, P2P_WILDCARD_SSID_LEN);
wpabuf_put_data(buf, P2P_WILDCARD_SSID, P2P_WILDCARD_SSID_LEN);
wpabuf_put_u8(buf, WLAN_EID_SUPP_RATES);
wpabuf_put_u8(buf, 8);
wpabuf_put_u8(buf, (60 / 5) | 0x80);
wpabuf_put_u8(buf, 90 / 5);
wpabuf_put_u8(buf, (120 / 5) | 0x80);
wpabuf_put_u8(buf, 180 / 5);
wpabuf_put_u8(buf, (240 / 5) | 0x80);
wpabuf_put_u8(buf, 360 / 5);
wpabuf_put_u8(buf, 480 / 5);
wpabuf_put_u8(buf, 540 / 5);
wpabuf_put_u8(buf, WLAN_EID_DS_PARAMS);
wpabuf_put_u8(buf, 1);
wpabuf_put_u8(buf, p2p->cfg->channel);
wpabuf_put_buf(buf, ies);
wpabuf_free(ies);
p2p->cfg->send_probe_resp(p2p->cfg->cb_ctx, buf);
wpabuf_free(buf);
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
return P2P_PREQ_NOT_PROCESSED;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
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
enum p2p_probe_req_status
p2p_probe_req_rx(struct p2p_data *p2p, const u8 *addr, const u8 *dst,
const u8 *bssid, const u8 *ie, size_t ie_len)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
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
enum p2p_probe_req_status res;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_add_dev_from_probe_req(p2p, addr, ie, ie_len);
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
res = p2p_reply_probe(p2p, addr, dst, bssid, ie, ie_len);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if ((p2p->state == P2P_CONNECT || p2p->state == P2P_CONNECT_LISTEN) &&
p2p->go_neg_peer &&
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
os_memcmp(addr, p2p->go_neg_peer->info.p2p_device_addr, ETH_ALEN)
P2P: Do not start new GO Neg on Probe Req when waiting for Confirm If we have already sent out GO Negotiation Response and are waiting for the peer to reply with GO Negotiation Confirm, there is no point in re-starting GO Negotiation based on Probe Request frame from the peer. Doing that would just result in confusing GO Negotiation exchange with multiple sessions running at the same time. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-26 17:02:51 +01:00
== 0 &&
!(p2p->go_neg_peer->flags & P2P_DEV_WAIT_GO_NEG_CONFIRM)) {
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/* Received a Probe Request from GO Negotiation peer */
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_dbg(p2p, "Found GO Negotiation peer - try to start GO negotiation from timeout");
P2P: Only schedule a single p2p_go_neg_start timeout at a time It is possible for the driver to indicate multiple Probe Request frames that would be processed in a single loop. If those frames happen to be from a peer which with we are trying to start GO Negotiation, multiple timeouts to start GO Negotiation (p2p_go_neg_start) could end up being scheduled. This would result in confusing burst of multiple GO Negotiation Request frames being sent once the RX loop finally concludes. Avoid this by scheduling only a single eloop timeout to trigger GO Negotiation regardless of how many Probe Request frames from the peer is received. In addition, make sure this timeout gets canceled in p2p_deinit(). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-26 17:07:17 +01:00
eloop_cancel_timeout(p2p_go_neg_start, p2p, NULL);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
eloop_register_timeout(0, 0, p2p_go_neg_start, p2p, NULL);
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
return P2P_PREQ_PROCESSED;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
if ((p2p->state == P2P_INVITE || p2p->state == P2P_INVITE_LISTEN) &&
p2p->invite_peer &&
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
os_memcmp(addr, p2p->invite_peer->info.p2p_device_addr, ETH_ALEN)
== 0) {
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/* Received a Probe Request from Invite peer */
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_dbg(p2p, "Found Invite peer - try to start Invite from timeout");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
eloop_register_timeout(0, 0, p2p_invite_start, p2p, NULL);
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
return P2P_PREQ_PROCESSED;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
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
return res;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
static int p2p_assoc_req_ie_wlan_ap(struct p2p_data *p2p, const u8 *bssid,
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
u8 *buf, size_t len, struct wpabuf *p2p_ie)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct wpabuf *tmp;
u8 *lpos;
size_t tmplen;
int res;
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
u8 group_capab;
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
if (p2p_ie == NULL)
return 0; /* WLAN AP is not a P2P manager */
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/*
* (Re)Association Request - P2P IE
* P2P Capability attribute (shall be present)
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 Interface attribute (present if concurrent device and
* P2P Management is enabled)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
*/
tmp = wpabuf_alloc(200);
if (tmp == NULL)
return -1;
lpos = p2p_buf_add_ie_hdr(tmp);
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
group_capab = 0;
if (p2p->num_groups > 0) {
group_capab |= P2P_GROUP_CAPAB_GROUP_OWNER;
if ((p2p->dev_capab & P2P_DEV_CAPAB_CONCURRENT_OPER) &&
(p2p->dev_capab & P2P_DEV_CAPAB_INFRA_MANAGED) &&
p2p->cross_connect)
group_capab |= P2P_GROUP_CAPAB_CROSS_CONN;
}
p2p_buf_add_capability(tmp, p2p->dev_capab, group_capab);
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
if ((p2p->dev_capab & P2P_DEV_CAPAB_CONCURRENT_OPER) &&
(p2p->dev_capab & P2P_DEV_CAPAB_INFRA_MANAGED))
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_buf_add_p2p_interface(tmp, p2p);
p2p_buf_update_ie_hdr(tmp, lpos);
tmplen = wpabuf_len(tmp);
if (tmplen > len)
res = -1;
else {
os_memcpy(buf, wpabuf_head(tmp), tmplen);
res = tmplen;
}
wpabuf_free(tmp);
return res;
}
int p2p_assoc_req_ie(struct p2p_data *p2p, const u8 *bssid, u8 *buf,
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
size_t len, int p2p_group, struct wpabuf *p2p_ie)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct wpabuf *tmp;
u8 *lpos;
struct p2p_device *peer;
size_t tmplen;
int res;
WFD: Add Wi-Fi Display support This commit adds control interface commands and internal storage of Wi-Fi Display related configuration. In addition, WFD IE is now added to various P2P frames, Probe Request/Response, and (Re)Association Request/Response frames. WFD subelements from peers are stored in the P2P peer table. Following control interface commands are now available: SET wifi_display <0/1> GET wifi_display WFD_SUBELEM_SET <subelem> [hexdump of length+body] WFD_SUBELEM_GET <subelem> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 16:26:01 +01:00
size_t extra = 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (!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
return p2p_assoc_req_ie_wlan_ap(p2p, bssid, buf, len, p2p_ie);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
WFD: Add Wi-Fi Display support This commit adds control interface commands and internal storage of Wi-Fi Display related configuration. In addition, WFD IE is now added to various P2P frames, Probe Request/Response, and (Re)Association Request/Response frames. WFD subelements from peers are stored in the P2P peer table. Following control interface commands are now available: SET wifi_display <0/1> GET wifi_display WFD_SUBELEM_SET <subelem> [hexdump of length+body] WFD_SUBELEM_GET <subelem> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 16:26:01 +01:00
#ifdef CONFIG_WIFI_DISPLAY
if (p2p->wfd_ie_assoc_req)
extra = wpabuf_len(p2p->wfd_ie_assoc_req);
#endif /* CONFIG_WIFI_DISPLAY */
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/*
* (Re)Association Request - P2P IE
* P2P Capability attribute (shall be present)
* Extended Listen Timing (may be present)
* P2P Device Info attribute (shall be present)
*/
WFD: Add Wi-Fi Display support This commit adds control interface commands and internal storage of Wi-Fi Display related configuration. In addition, WFD IE is now added to various P2P frames, Probe Request/Response, and (Re)Association Request/Response frames. WFD subelements from peers are stored in the P2P peer table. Following control interface commands are now available: SET wifi_display <0/1> GET wifi_display WFD_SUBELEM_SET <subelem> [hexdump of length+body] WFD_SUBELEM_GET <subelem> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 16:26:01 +01:00
tmp = wpabuf_alloc(200 + extra);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (tmp == NULL)
return -1;
WFD: Add Wi-Fi Display support This commit adds control interface commands and internal storage of Wi-Fi Display related configuration. In addition, WFD IE is now added to various P2P frames, Probe Request/Response, and (Re)Association Request/Response frames. WFD subelements from peers are stored in the P2P peer table. Following control interface commands are now available: SET wifi_display <0/1> GET wifi_display WFD_SUBELEM_SET <subelem> [hexdump of length+body] WFD_SUBELEM_GET <subelem> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 16:26:01 +01:00
#ifdef CONFIG_WIFI_DISPLAY
if (p2p->wfd_ie_assoc_req)
wpabuf_put_buf(tmp, p2p->wfd_ie_assoc_req);
#endif /* CONFIG_WIFI_DISPLAY */
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
peer = bssid ? p2p_get_device(p2p, bssid) : NULL;
lpos = p2p_buf_add_ie_hdr(tmp);
p2p_buf_add_capability(tmp, p2p->dev_capab, 0);
P2P: Include Extended Listen Timing attribute in (Re)AssocReq If extended listen timing is enabled, it should be advertised in (Re)Association Request frames sent to GOs.
2010-07-07 06:36:08 +02:00
if (p2p->ext_listen_interval)
p2p_buf_add_ext_listen_timing(tmp, p2p->ext_listen_period,
p2p->ext_listen_interval);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_buf_add_device_info(tmp, p2p, peer);
p2p_buf_update_ie_hdr(tmp, lpos);
tmplen = wpabuf_len(tmp);
if (tmplen > len)
res = -1;
else {
os_memcpy(buf, wpabuf_head(tmp), tmplen);
res = tmplen;
}
wpabuf_free(tmp);
return res;
}
int p2p_scan_result_text(const u8 *ies, size_t ies_len, char *buf, char *end)
{
struct wpabuf *p2p_ie;
int ret;
p2p_ie = ieee802_11_vendor_ie_concat(ies, ies_len, P2P_IE_VENDOR_TYPE);
if (p2p_ie == NULL)
return 0;
ret = p2p_attr_text(p2p_ie, buf, end);
wpabuf_free(p2p_ie);
return ret;
}
P2P: Add p2p_client_list support for FullMAC Persistent GO Currently, FullMAC Persistent GO can't use p2p_client_list because its own hapd->p2p_group is NULL at ap_sta_set_authorized(). This patch changes the processing to use sta->p2p_ie instead of p2p_group_get_dev_addr() on FullMAC GO. Signed-hostap: Masashi Honma <masashi.honma@gmail.com>
2012-06-17 10:58:46 +02:00
int p2p_parse_dev_addr_in_p2p_ie(struct wpabuf *p2p_ie, u8 *dev_addr)
P2P: Allow BSS entry to be fetched based on GO P2P Device Address "BSS p2p_dev_addr=<P2P Device Address>" can now be used to fetch a specific BSS entry based on the P2P Device Address of the GO to avoid having to iterate through the full BSS table when an external program needs to figure out whether a specific peer is currently operating as a GO. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-07 15:23:21 +01:00
{
struct p2p_message msg;
os_memset(&msg, 0, sizeof(msg));
P2P: Add p2p_client_list support for FullMAC Persistent GO Currently, FullMAC Persistent GO can't use p2p_client_list because its own hapd->p2p_group is NULL at ap_sta_set_authorized(). This patch changes the processing to use sta->p2p_ie instead of p2p_group_get_dev_addr() on FullMAC GO. Signed-hostap: Masashi Honma <masashi.honma@gmail.com>
2012-06-17 10:58:46 +02:00
if (p2p_parse_p2p_ie(p2p_ie, &msg))
P2P: Allow BSS entry to be fetched based on GO P2P Device Address "BSS p2p_dev_addr=<P2P Device Address>" can now be used to fetch a specific BSS entry based on the P2P Device Address of the GO to avoid having to iterate through the full BSS table when an external program needs to figure out whether a specific peer is currently operating as a GO. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-07 15:23:21 +01:00
return -1;
P2P: Use P2P Device ID attribute if Device Info not available The "BSS p2p_dev_addr=address" command uses p2p_parse_dev_addr() to figure out the P2P Device Address of the GO from scan results. This used to work only if the P2P IE was received from Probe Response frames since only those include the P2P Device Info attribute. Make this work with Beacon frames, too, by using P2P Device ID attribute if the P2P Device Info attribute is not present. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-30 14:50:33 +02:00
if (msg.p2p_device_addr) {
os_memcpy(dev_addr, msg.p2p_device_addr, ETH_ALEN);
P2P: Add p2p_client_list support for FullMAC Persistent GO Currently, FullMAC Persistent GO can't use p2p_client_list because its own hapd->p2p_group is NULL at ap_sta_set_authorized(). This patch changes the processing to use sta->p2p_ie instead of p2p_group_get_dev_addr() on FullMAC GO. Signed-hostap: Masashi Honma <masashi.honma@gmail.com>
2012-06-17 10:58:46 +02:00
return 0;
P2P: Use P2P Device ID attribute if Device Info not available The "BSS p2p_dev_addr=address" command uses p2p_parse_dev_addr() to figure out the P2P Device Address of the GO from scan results. This used to work only if the P2P IE was received from Probe Response frames since only those include the P2P Device Info attribute. Make this work with Beacon frames, too, by using P2P Device ID attribute if the P2P Device Info attribute is not present. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-30 14:50:33 +02:00
} else if (msg.device_id) {
os_memcpy(dev_addr, msg.device_id, ETH_ALEN);
P2P: Add p2p_client_list support for FullMAC Persistent GO Currently, FullMAC Persistent GO can't use p2p_client_list because its own hapd->p2p_group is NULL at ap_sta_set_authorized(). This patch changes the processing to use sta->p2p_ie instead of p2p_group_get_dev_addr() on FullMAC GO. Signed-hostap: Masashi Honma <masashi.honma@gmail.com>
2012-06-17 10:58:46 +02:00
return 0;
P2P: Allow BSS entry to be fetched based on GO P2P Device Address "BSS p2p_dev_addr=<P2P Device Address>" can now be used to fetch a specific BSS entry based on the P2P Device Address of the GO to avoid having to iterate through the full BSS table when an external program needs to figure out whether a specific peer is currently operating as a GO. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-07 15:23:21 +01:00
}
P2P: Add p2p_client_list support for FullMAC Persistent GO Currently, FullMAC Persistent GO can't use p2p_client_list because its own hapd->p2p_group is NULL at ap_sta_set_authorized(). This patch changes the processing to use sta->p2p_ie instead of p2p_group_get_dev_addr() on FullMAC GO. Signed-hostap: Masashi Honma <masashi.honma@gmail.com>
2012-06-17 10:58:46 +02:00
return -1;
}
P2P: Allow BSS entry to be fetched based on GO P2P Device Address "BSS p2p_dev_addr=<P2P Device Address>" can now be used to fetch a specific BSS entry based on the P2P Device Address of the GO to avoid having to iterate through the full BSS table when an external program needs to figure out whether a specific peer is currently operating as a GO. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-07 15:23:21 +01:00
P2P: Add p2p_client_list support for FullMAC Persistent GO Currently, FullMAC Persistent GO can't use p2p_client_list because its own hapd->p2p_group is NULL at ap_sta_set_authorized(). This patch changes the processing to use sta->p2p_ie instead of p2p_group_get_dev_addr() on FullMAC GO. Signed-hostap: Masashi Honma <masashi.honma@gmail.com>
2012-06-17 10:58:46 +02:00
int p2p_parse_dev_addr(const u8 *ies, size_t ies_len, u8 *dev_addr)
{
struct wpabuf *p2p_ie;
int ret;
p2p_ie = ieee802_11_vendor_ie_concat(ies, ies_len,
P2P_IE_VENDOR_TYPE);
if (p2p_ie == NULL)
return -1;
ret = p2p_parse_dev_addr_in_p2p_ie(p2p_ie, dev_addr);
P2P: Allow BSS entry to be fetched based on GO P2P Device Address "BSS p2p_dev_addr=<P2P Device Address>" can now be used to fetch a specific BSS entry based on the P2P Device Address of the GO to avoid having to iterate through the full BSS table when an external program needs to figure out whether a specific peer is currently operating as a GO. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-07 15:23:21 +01:00
wpabuf_free(p2p_ie);
P2P: Use P2P Device ID attribute if Device Info not available The "BSS p2p_dev_addr=address" command uses p2p_parse_dev_addr() to figure out the P2P Device Address of the GO from scan results. This used to work only if the P2P IE was received from Probe Response frames since only those include the P2P Device Info attribute. Make this work with Beacon frames, too, by using P2P Device ID attribute if the P2P Device Info attribute is not present. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-30 14:50:33 +02:00
return ret;
P2P: Allow BSS entry to be fetched based on GO P2P Device Address "BSS p2p_dev_addr=<P2P Device Address>" can now be used to fetch a specific BSS entry based on the P2P Device Address of the GO to avoid having to iterate through the full BSS table when an external program needs to figure out whether a specific peer is currently operating as a GO. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-07 15:23:21 +01:00
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
static void p2p_clear_go_neg(struct p2p_data *p2p)
{
p2p->go_neg_peer = NULL;
p2p_clear_timeout(p2p);
p2p_set_state(p2p, P2P_IDLE);
}
void p2p_wps_success_cb(struct p2p_data *p2p, const u8 *mac_addr)
{
if (p2p->go_neg_peer == NULL) {
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_dbg(p2p, "No pending Group Formation - ignore WPS registration success notification");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return; /* No pending Group Formation */
}
if (os_memcmp(mac_addr, p2p->go_neg_peer->intended_addr, ETH_ALEN) !=
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
p2p_dbg(p2p, "Ignore WPS registration success notification for "
MACSTR " (GO Negotiation peer " MACSTR ")",
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
MAC2STR(mac_addr),
MAC2STR(p2p->go_neg_peer->intended_addr));
return; /* Ignore unexpected peer address */
}
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_dbg(p2p, "Group Formation completed successfully with " MACSTR,
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
MAC2STR(mac_addr));
p2p_clear_go_neg(p2p);
}
void p2p_group_formation_failed(struct p2p_data *p2p)
{
if (p2p->go_neg_peer == NULL) {
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_dbg(p2p, "No pending Group Formation - ignore group formation failure notification");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return; /* No pending Group Formation */
}
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_dbg(p2p, "Group Formation failed with " MACSTR,
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
MAC2STR(p2p->go_neg_peer->intended_addr));
p2p_clear_go_neg(p2p);
}
struct p2p_data * p2p_init(const struct p2p_config *cfg)
{
struct p2p_data *p2p;
if (cfg->max_peers < 1)
return NULL;
p2p = os_zalloc(sizeof(*p2p) + sizeof(*cfg));
if (p2p == NULL)
return NULL;
p2p->cfg = (struct p2p_config *) (p2p + 1);
os_memcpy(p2p->cfg, cfg, sizeof(*cfg));
if (cfg->dev_name)
p2p->cfg->dev_name = os_strdup(cfg->dev_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
if (cfg->manufacturer)
p2p->cfg->manufacturer = os_strdup(cfg->manufacturer);
if (cfg->model_name)
p2p->cfg->model_name = os_strdup(cfg->model_name);
if (cfg->model_number)
p2p->cfg->model_number = os_strdup(cfg->model_number);
if (cfg->serial_number)
p2p->cfg->serial_number = os_strdup(cfg->serial_number);
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 (cfg->pref_chan) {
p2p->cfg->pref_chan = os_malloc(cfg->num_pref_chan *
sizeof(struct p2p_channel));
if (p2p->cfg->pref_chan) {
os_memcpy(p2p->cfg->pref_chan, cfg->pref_chan,
cfg->num_pref_chan *
sizeof(struct p2p_channel));
} else
p2p->cfg->num_pref_chan = 0;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->min_disc_int = 1;
p2p->max_disc_int = 3;
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_disc_tu = -1;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
os_get_random(&p2p->next_tie_breaker, 1);
p2p->next_tie_breaker &= 0x01;
if (cfg->sd_request)
p2p->dev_capab |= P2P_DEV_CAPAB_SERVICE_DISCOVERY;
p2p->dev_capab |= P2P_DEV_CAPAB_INVITATION_PROCEDURE;
if (cfg->concurrent_operations)
p2p->dev_capab |= P2P_DEV_CAPAB_CONCURRENT_OPER;
p2p->dev_capab |= P2P_DEV_CAPAB_CLIENT_DISCOVERABILITY;
dl_list_init(&p2p->devices);
eloop_register_timeout(P2P_PEER_EXPIRATION_INTERVAL, 0,
p2p_expiration_timeout, p2p, NULL);
P2P: Use larger GO config timeout if HT40 is used Increase GO config timeout if HT40 is used since it takes some time to scan channels for coex purposes before the BSS can be started. Signed-hostap: Jouni Malinen <j@w1.fi>
2012-08-15 22:19:11 +02:00
p2p->go_timeout = 100;
p2p->client_timeout = 20;
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_dbg(p2p, "initialized");
p2p_channels_dump(p2p, "channels", &p2p->cfg->channels);
p2p_channels_dump(p2p, "cli_channels", &p2p->cfg->cli_channels);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return p2p;
}
void p2p_deinit(struct p2p_data *p2p)
{
WFD: Add Wi-Fi Display support This commit adds control interface commands and internal storage of Wi-Fi Display related configuration. In addition, WFD IE is now added to various P2P frames, Probe Request/Response, and (Re)Association Request/Response frames. WFD subelements from peers are stored in the P2P peer table. Following control interface commands are now available: SET wifi_display <0/1> GET wifi_display WFD_SUBELEM_SET <subelem> [hexdump of length+body] WFD_SUBELEM_GET <subelem> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 16:26:01 +01:00
#ifdef CONFIG_WIFI_DISPLAY
wpabuf_free(p2p->wfd_ie_beacon);
wpabuf_free(p2p->wfd_ie_probe_req);
wpabuf_free(p2p->wfd_ie_probe_resp);
wpabuf_free(p2p->wfd_ie_assoc_req);
wpabuf_free(p2p->wfd_ie_invitation);
wpabuf_free(p2p->wfd_ie_prov_disc_req);
wpabuf_free(p2p->wfd_ie_prov_disc_resp);
wpabuf_free(p2p->wfd_ie_go_neg);
wpabuf_free(p2p->wfd_dev_info);
wpabuf_free(p2p->wfd_assoc_bssid);
wpabuf_free(p2p->wfd_coupled_sink_info);
#endif /* CONFIG_WIFI_DISPLAY */
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
eloop_cancel_timeout(p2p_expiration_timeout, p2p, NULL);
eloop_cancel_timeout(p2p_ext_listen_timeout, p2p, NULL);
eloop_cancel_timeout(p2p_scan_timeout, p2p, NULL);
P2P: Only schedule a single p2p_go_neg_start timeout at a time It is possible for the driver to indicate multiple Probe Request frames that would be processed in a single loop. If those frames happen to be from a peer which with we are trying to start GO Negotiation, multiple timeouts to start GO Negotiation (p2p_go_neg_start) could end up being scheduled. This would result in confusing burst of multiple GO Negotiation Request frames being sent once the RX loop finally concludes. Avoid this by scheduling only a single eloop timeout to trigger GO Negotiation regardless of how many Probe Request frames from the peer is received. In addition, make sure this timeout gets canceled in p2p_deinit(). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-26 17:07:17 +01:00
eloop_cancel_timeout(p2p_go_neg_start, p2p, NULL);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_flush(p2p);
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
p2p_free_req_dev_types(p2p);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
os_free(p2p->cfg->dev_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
os_free(p2p->cfg->manufacturer);
os_free(p2p->cfg->model_name);
os_free(p2p->cfg->model_number);
os_free(p2p->cfg->serial_number);
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
os_free(p2p->cfg->pref_chan);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
os_free(p2p->groups);
P2P: Initial support for SD fragmentation (GAS Comeback Request/Response)
2010-06-28 18:24:17 +02:00
wpabuf_free(p2p->sd_resp);
P2P: Delay send_action call if p2p_scan is in progress In order to avoid confusing the driver with a new remain-on-channel request, delay sending of a new Action frame if the driver indicates Action frame RX diromg a scan.
2010-10-20 18:41:20 +02:00
os_free(p2p->after_scan_tx);
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
p2p_remove_wps_vendor_extensions(p2p);
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
os_free(p2p->no_go_freq.range);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
os_free(p2p);
}
void p2p_flush(struct p2p_data *p2p)
{
struct p2p_device *dev, *prev;
P2P: Make p2p_flush stop P2P operations consistently p2p_flush did not explicit stop all P2P operations, i.e., the exact behavior depended on the P2P module state at the time the p2p_flush command was issued. Make this more consistent by explicitly calling p2p_stop_find() from p2p_flush(). Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-27 18:10:04 +01:00
p2p_stop_find(p2p);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
dl_list_for_each_safe(dev, prev, &p2p->devices, struct p2p_device,
list) {
dl_list_del(&dev->list);
p2p_device_free(p2p, dev);
}
p2p_free_sd_queries(p2p);
P2P: Drop pending TX frame on new p2p_connect We need to drop the pending frame to avoid issues with the new GO Negotiation, e.g., when the pending frame was from a previous attempt at starting a GO Negotiation.
2010-11-05 17:17:20 +01:00
os_free(p2p->after_scan_tx);
p2p->after_scan_tx = NULL;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
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 p2p_unauthorize(struct p2p_data *p2p, const u8 *addr)
{
struct p2p_device *dev;
dev = p2p_get_device(p2p, addr);
if (dev == NULL)
return -1;
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_dbg(p2p, "Unauthorizing " MACSTR, MAC2STR(addr));
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
if (p2p->go_neg_peer == dev)
p2p->go_neg_peer = NULL;
dev->wps_method = WPS_NOT_READY;
dev->flags &= ~P2P_DEV_WAIT_GO_NEG_RESPONSE;
dev->flags &= ~P2P_DEV_WAIT_GO_NEG_CONFIRM;
/* Check if after_scan_tx is for this peer. If so free it */
if (p2p->after_scan_tx &&
os_memcmp(addr, p2p->after_scan_tx->dst, ETH_ALEN) == 0) {
os_free(p2p->after_scan_tx);
p2p->after_scan_tx = NULL;
}
return 0;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
int p2p_set_dev_name(struct p2p_data *p2p, const char *dev_name)
{
os_free(p2p->cfg->dev_name);
if (dev_name) {
p2p->cfg->dev_name = os_strdup(dev_name);
if (p2p->cfg->dev_name == NULL)
return -1;
} else
p2p->cfg->dev_name = NULL;
return 0;
}
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
int p2p_set_manufacturer(struct p2p_data *p2p, const char *manufacturer)
{
os_free(p2p->cfg->manufacturer);
p2p->cfg->manufacturer = NULL;
if (manufacturer) {
p2p->cfg->manufacturer = os_strdup(manufacturer);
if (p2p->cfg->manufacturer == NULL)
return -1;
}
return 0;
}
int p2p_set_model_name(struct p2p_data *p2p, const char *model_name)
{
os_free(p2p->cfg->model_name);
p2p->cfg->model_name = NULL;
if (model_name) {
p2p->cfg->model_name = os_strdup(model_name);
if (p2p->cfg->model_name == NULL)
return -1;
}
return 0;
}
int p2p_set_model_number(struct p2p_data *p2p, const char *model_number)
{
os_free(p2p->cfg->model_number);
p2p->cfg->model_number = NULL;
if (model_number) {
p2p->cfg->model_number = os_strdup(model_number);
if (p2p->cfg->model_number == NULL)
return -1;
}
return 0;
}
int p2p_set_serial_number(struct p2p_data *p2p, const char *serial_number)
{
os_free(p2p->cfg->serial_number);
p2p->cfg->serial_number = NULL;
if (serial_number) {
p2p->cfg->serial_number = os_strdup(serial_number);
if (p2p->cfg->serial_number == NULL)
return -1;
}
return 0;
}
void p2p_set_config_methods(struct p2p_data *p2p, u16 config_methods)
{
p2p->cfg->config_methods = config_methods;
}
void p2p_set_uuid(struct p2p_data *p2p, const u8 *uuid)
{
os_memcpy(p2p->cfg->uuid, uuid, 16);
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
int p2p_set_pri_dev_type(struct p2p_data *p2p, const u8 *pri_dev_type)
{
os_memcpy(p2p->cfg->pri_dev_type, pri_dev_type, 8);
return 0;
}
int p2p_set_sec_dev_types(struct p2p_data *p2p, const u8 dev_types[][8],
size_t num_dev_types)
{
if (num_dev_types > P2P_SEC_DEVICE_TYPES)
num_dev_types = P2P_SEC_DEVICE_TYPES;
p2p->cfg->num_sec_dev_types = num_dev_types;
os_memcpy(p2p->cfg->sec_dev_type, dev_types, num_dev_types * 8);
return 0;
}
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
void p2p_remove_wps_vendor_extensions(struct p2p_data *p2p)
{
int i;
P2P: Use a single define for max number of vendor extensions
2011-03-19 11:20:10 +01:00
for (i = 0; i < P2P_MAX_WPS_VENDOR_EXT; i++) {
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
wpabuf_free(p2p->wps_vendor_ext[i]);
p2p->wps_vendor_ext[i] = NULL;
}
}
int p2p_add_wps_vendor_extension(struct p2p_data *p2p,
const struct wpabuf *vendor_ext)
{
int i;
if (vendor_ext == NULL)
return -1;
P2P: Use a single define for max number of vendor extensions
2011-03-19 11:20:10 +01:00
for (i = 0; i < P2P_MAX_WPS_VENDOR_EXT; i++) {
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 (p2p->wps_vendor_ext[i] == NULL)
break;
}
P2P: Use a single define for max number of vendor extensions
2011-03-19 11:20:10 +01:00
if (i >= P2P_MAX_WPS_VENDOR_EXT)
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
return -1;
p2p->wps_vendor_ext[i] = wpabuf_dup(vendor_ext);
if (p2p->wps_vendor_ext[i] == NULL)
return -1;
return 0;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
int p2p_set_country(struct p2p_data *p2p, const char *country)
{
os_memcpy(p2p->cfg->country, country, 3);
return 0;
}
void p2p_continue_find(struct p2p_data *p2p)
{
struct p2p_device *dev;
p2p_set_state(p2p, P2P_SEARCH);
dl_list_for_each(dev, &p2p->devices, struct p2p_device, list) {
if (dev->flags & P2P_DEV_SD_SCHEDULE) {
if (p2p_start_sd(p2p, dev) == 0)
return;
else
break;
P2P: Do not re-send PD Request for join-a-group after acked frame We are not actually interested in the PD Response in join-a-group case, so there is no point in trying to send PD Request until the response is received. This avoids an extra PD getting started after a join-a-group operation in some cases.
2010-10-27 18:36:10 +02:00
} else if (dev->req_config_methods &&
!(dev->flags & P2P_DEV_PD_FOR_JOIN)) {
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_dbg(p2p, "Send pending Provision Discovery Request to "
P2P: Do not re-send PD Request for join-a-group after acked frame We are not actually interested in the PD Response in join-a-group case, so there is no point in trying to send PD Request until the response is received. This avoids an extra PD getting started after a join-a-group operation in some cases.
2010-10-27 18:36:10 +02:00
MACSTR " (config methods 0x%x)",
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
MAC2STR(dev->info.p2p_device_addr),
P2P: Do not re-send PD Request for join-a-group after acked frame We are not actually interested in the PD Response in join-a-group case, so there is no point in trying to send PD Request until the response is received. This avoids an extra PD getting started after a join-a-group operation in some cases.
2010-10-27 18:36:10 +02:00
dev->req_config_methods);
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
if (p2p_send_prov_disc_req(p2p, dev, 0, 0) == 0)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return;
}
}
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_listen_in_find(p2p, 1);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
static void p2p_sd_cb(struct p2p_data *p2p, int success)
{
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_dbg(p2p, "Service Discovery Query TX callback: success=%d",
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
success);
p2p->pending_action_state = P2P_NO_PENDING_ACTION;
if (!success) {
if (p2p->sd_peer) {
p2p->sd_peer->flags &= ~P2P_DEV_SD_SCHEDULE;
p2p->sd_peer = NULL;
}
p2p_continue_find(p2p);
return;
}
if (p2p->sd_peer == NULL) {
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_dbg(p2p, "No SD peer entry known");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_continue_find(p2p);
return;
}
/* Wait for response from the peer */
p2p_set_state(p2p, P2P_SD_DURING_FIND);
p2p_set_timeout(p2p, 0, 200000);
}
P2P: Retry provision discovery requests in IDLE state Since the peer may not be in Listen state when the provision discovery request is sent, try to send the request again number of times when in IDLE state. This was already done when p2p_find is in progress, but this commit adds retries to the case where no other P2P operations are in progress. Signed-off-by: Jayant Sane <jayant.sane@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:20:39 +02:00
/**
* p2p_retry_pd - Retry any pending provision disc requests in IDLE state
* @p2p: P2P module context from p2p_init()
*/
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 p2p_retry_pd(struct p2p_data *p2p)
P2P: Retry provision discovery requests in IDLE state Since the peer may not be in Listen state when the provision discovery request is sent, try to send the request again number of times when in IDLE state. This was already done when p2p_find is in progress, but this commit adds retries to the case where no other P2P operations are in progress. Signed-off-by: Jayant Sane <jayant.sane@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:20:39 +02:00
{
struct p2p_device *dev;
if (p2p->state != P2P_IDLE)
return;
/*
* Retry the prov disc req attempt only for the peer that the user had
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
* requested.
P2P: Retry provision discovery requests in IDLE state Since the peer may not be in Listen state when the provision discovery request is sent, try to send the request again number of times when in IDLE state. This was already done when p2p_find is in progress, but this commit adds retries to the case where no other P2P operations are in progress. Signed-off-by: Jayant Sane <jayant.sane@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:20:39 +02:00
*/
dl_list_for_each(dev, &p2p->devices, struct p2p_device, list) {
if (os_memcmp(p2p->pending_pd_devaddr,
dev->info.p2p_device_addr, ETH_ALEN) != 0)
continue;
if (!dev->req_config_methods)
continue;
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_dbg(p2p, "Send pending Provision Discovery Request to "
P2P: Retry provision discovery requests in IDLE state Since the peer may not be in Listen state when the provision discovery request is sent, try to send the request again number of times when in IDLE state. This was already done when p2p_find is in progress, but this commit adds retries to the case where no other P2P operations are in progress. Signed-off-by: Jayant Sane <jayant.sane@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:20:39 +02:00
MACSTR " (config methods 0x%x)",
MAC2STR(dev->info.p2p_device_addr),
dev->req_config_methods);
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
p2p_send_prov_disc_req(p2p, dev,
P2P: Fix PD retry channel on join-a-group case Join-a-group needs to force the current operating channel of the target group as the frequency to use for the PD exchange. When the channel was selected based on a BSS entry for the GO, this worked only for the first PD Request frame while the retries reverted to a potentially different channel based on a P2P peer entry. Fix this by maintaining the forced channel through the PD retry sequence. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-10-20 17:06:15 +02:00
dev->flags & P2P_DEV_PD_FOR_JOIN,
p2p->pd_force_freq);
P2P: Retry provision discovery requests in IDLE state Since the peer may not be in Listen state when the provision discovery request is sent, try to send the request again number of times when in IDLE state. This was already done when p2p_find is in progress, but this commit adds retries to the case where no other P2P operations are in progress. Signed-off-by: Jayant Sane <jayant.sane@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:20:39 +02:00
return;
}
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
static void p2p_prov_disc_cb(struct p2p_data *p2p, int success)
{
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_dbg(p2p, "Provision Discovery Request TX callback: success=%d",
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
success);
P2P: Retry provision discovery requests in IDLE state Since the peer may not be in Listen state when the provision discovery request is sent, try to send the request again number of times when in IDLE state. This was already done when p2p_find is in progress, but this commit adds retries to the case where no other P2P operations are in progress. Signed-off-by: Jayant Sane <jayant.sane@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:20:39 +02:00
/*
* Postpone resetting the pending action state till after we actually
* time out. This allows us to take some action like notifying any
* interested parties about no response to the request.
*
* When the timer (below) goes off we check in IDLE, SEARCH, or
* LISTEN_ONLY state, which are the only allowed states to issue a PD
* requests in, if this was still pending and then raise notification.
*/
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (!success) {
P2P: Retry provision discovery requests in IDLE state Since the peer may not be in Listen state when the provision discovery request is sent, try to send the request again number of times when in IDLE state. This was already done when p2p_find is in progress, but this commit adds retries to the case where no other P2P operations are in progress. Signed-off-by: Jayant Sane <jayant.sane@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:20:39 +02:00
p2p->pending_action_state = P2P_NO_PENDING_ACTION;
P2P: Fix provision discovery retries during p2p_find Commit 6b56cc2d97fe9efd1feea8d418714b4658b056f1 added retries of provision discovery request frames in IDLE state. However, it did not make the p2p_find case behave consistently with the new limitied retry behavior. This can result in way too many and frequent PD retries. Fix this by extending the previous commit to address PD retries and maximum retry limit consistently regardless of whether p2p_find is running. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-07-23 20:59:01 +02:00
if (p2p->user_initiated_pd &&
(p2p->state == P2P_SEARCH || p2p->state == P2P_LISTEN_ONLY))
{
/* Retry request from timeout to avoid busy loops */
p2p->pending_action_state = P2P_PENDING_PD;
p2p_set_timeout(p2p, 0, 50000);
} else if (p2p->state != P2P_IDLE)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_continue_find(p2p);
P2P: Retry provision discovery requests in IDLE state Since the peer may not be in Listen state when the provision discovery request is sent, try to send the request again number of times when in IDLE state. This was already done when p2p_find is in progress, but this commit adds retries to the case where no other P2P operations are in progress. Signed-off-by: Jayant Sane <jayant.sane@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:20:39 +02:00
else if (p2p->user_initiated_pd) {
p2p->pending_action_state = P2P_PENDING_PD;
p2p_set_timeout(p2p, 0, 300000);
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return;
}
P2P: Retry provision discovery requests in IDLE state Since the peer may not be in Listen state when the provision discovery request is sent, try to send the request again number of times when in IDLE state. This was already done when p2p_find is in progress, but this commit adds retries to the case where no other P2P operations are in progress. Signed-off-by: Jayant Sane <jayant.sane@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:20:39 +02:00
/*
* This postponing, of resetting pending_action_state, needs to be
* done only for user initiated PD requests and not internal ones.
*/
if (p2p->user_initiated_pd)
p2p->pending_action_state = P2P_PENDING_PD;
else
p2p->pending_action_state = P2P_NO_PENDING_ACTION;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/* Wait for response from the peer */
if (p2p->state == P2P_SEARCH)
p2p_set_state(p2p, P2P_PD_DURING_FIND);
p2p_set_timeout(p2p, 0, 200000);
}
int p2p_scan_res_handler(struct p2p_data *p2p, const u8 *bssid, int freq,
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
struct os_time *rx_time, int level, const u8 *ies,
P2P: Consider age for the P2P scan results cfg80211 caches the scan results according the channel number. Due to the 15 sec aging this might cause the user mode to see more than one scan result with the same BSSID, e.g. - one scan result for the P2P Device and one for the P2P GO (once it's enabled). Fix this by updating the device entry only if the new peer entry is newer than the one previously stored. Signed-off-by: Yoni Divinsky <yoni.divinsky@ti.com> Signed-off-by: Victor Goldenshtein <victorg@ti.com> Signed-off-by: Igal Chernobelsky <igalc@ti.com> Signed-hostap: Arik Nemtsov <arik@wizery.com>
2012-12-25 10:22:42 +01:00
size_t ies_len)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
P2P: Do not use old scan result data for peer discovery The driver may have cached (e.g., in cfg80211 BSS table) the scan results for relatively long time. To avoid reporting stale information, update P2P peers only based on results that have based on frames received after the last p2p_find operation was started. This helps especially in detecting when a previously operating GO stops the group since the BSS entry for that could live for 30 seconds in the cfg80211 cache. Running p2p_flush followed by p2p_find will now allow wpa_supplicant to not add a P2P peer entry for that GO if the group had been terminated just before that p2p_flush command. Previously, that GO could have been indicated as a newly found device for up to 30 seconds after it had stopped the group. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-12 18:25:18 +01:00
if (os_time_before(rx_time, &p2p->find_start)) {
/*
* The driver may have cached (e.g., in cfg80211 BSS table) the
* scan results for relatively long time. To avoid reporting
* stale information, update P2P peers only based on results
* that have based on frames received after the last p2p_find
* operation was started.
*/
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_dbg(p2p, "Ignore old scan result for " MACSTR
" (rx_time=%u.%06u)",
P2P: Do not use old scan result data for peer discovery The driver may have cached (e.g., in cfg80211 BSS table) the scan results for relatively long time. To avoid reporting stale information, update P2P peers only based on results that have based on frames received after the last p2p_find operation was started. This helps especially in detecting when a previously operating GO stops the group since the BSS entry for that could live for 30 seconds in the cfg80211 cache. Running p2p_flush followed by p2p_find will now allow wpa_supplicant to not add a P2P peer entry for that GO if the group had been terminated just before that p2p_flush command. Previously, that GO could have been indicated as a newly found device for up to 30 seconds after it had stopped the group. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-12 18:25:18 +01:00
MAC2STR(bssid), (unsigned int) rx_time->sec,
(unsigned int) rx_time->usec);
return 0;
}
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
p2p_add_device(p2p, bssid, freq, rx_time, level, ies, ies_len, 1);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return 0;
}
void p2p_scan_res_handled(struct p2p_data *p2p)
{
if (!p2p->p2p_scan_running) {
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_dbg(p2p, "p2p_scan was not running, but scan results received");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
p2p->p2p_scan_running = 0;
eloop_cancel_timeout(p2p_scan_timeout, p2p, NULL);
if (p2p_run_after_scan(p2p))
return;
if (p2p->state == P2P_SEARCH)
p2p_continue_find(p2p);
}
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
void p2p_scan_ie(struct p2p_data *p2p, struct wpabuf *ies, const u8 *dev_id)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
WFD: Add Wi-Fi Display support This commit adds control interface commands and internal storage of Wi-Fi Display related configuration. In addition, WFD IE is now added to various P2P frames, Probe Request/Response, and (Re)Association Request/Response frames. WFD subelements from peers are stored in the P2P peer table. Following control interface commands are now available: SET wifi_display <0/1> GET wifi_display WFD_SUBELEM_SET <subelem> [hexdump of length+body] WFD_SUBELEM_GET <subelem> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 16:26:01 +01:00
u8 *len;
#ifdef CONFIG_WIFI_DISPLAY
if (p2p->wfd_ie_probe_req)
wpabuf_put_buf(ies, p2p->wfd_ie_probe_req);
#endif /* CONFIG_WIFI_DISPLAY */
len = p2p_buf_add_ie_hdr(ies);
P2P: Fix setting of P2P Client Discoverability bit In the P2P specification v1.1, the P2P Client Discoverability bit is described in Table 12 "Device Capability Bitmap definition". The table says "Within a P2P Group Info attribute and a (Re)association request frame the P2P Client Discoverability field shall be set to 1 when the P2P Device supports P2P Client Discoverability, and is set to 0 otherwise. This field shall be reserved and set to 0 in all other frames or uses.". To match with this, filter out P2P Client Discoverability bit from frames where its use is reserved. Signed-hostap: Masashi Honma <masashi.honma@gmail.com>
2012-06-16 18:54:47 +02:00
p2p_buf_add_capability(ies, p2p->dev_capab &
~P2P_DEV_CAPAB_CLIENT_DISCOVERABILITY, 0);
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
if (dev_id)
p2p_buf_add_device_id(ies, dev_id);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (p2p->cfg->reg_class && p2p->cfg->channel)
p2p_buf_add_listen_channel(ies, p2p->cfg->country,
p2p->cfg->reg_class,
p2p->cfg->channel);
if (p2p->ext_listen_interval)
p2p_buf_add_ext_listen_timing(ies, p2p->ext_listen_period,
p2p->ext_listen_interval);
/* TODO: p2p_buf_add_operating_channel() if GO */
p2p_buf_update_ie_hdr(ies, len);
}
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 p2p_scan_ie_buf_len(struct p2p_data *p2p)
{
WFD: Add Wi-Fi Display support This commit adds control interface commands and internal storage of Wi-Fi Display related configuration. In addition, WFD IE is now added to various P2P frames, Probe Request/Response, and (Re)Association Request/Response frames. WFD subelements from peers are stored in the P2P peer table. Following control interface commands are now available: SET wifi_display <0/1> GET wifi_display WFD_SUBELEM_SET <subelem> [hexdump of length+body] WFD_SUBELEM_GET <subelem> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 16:26:01 +01:00
size_t len = 100;
#ifdef CONFIG_WIFI_DISPLAY
if (p2p && p2p->wfd_ie_probe_req)
len += wpabuf_len(p2p->wfd_ie_probe_req);
#endif /* CONFIG_WIFI_DISPLAY */
return len;
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
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
int p2p_ie_text(struct wpabuf *p2p_ie, char *buf, char *end)
{
return p2p_attr_text(p2p_ie, buf, end);
}
static void p2p_go_neg_req_cb(struct p2p_data *p2p, int success)
{
struct p2p_device *dev = p2p->go_neg_peer;
P2P: Skip Listen phase when peer is expected to be waiting In case we have replied to a peer's GO Negotiation Request frame with a GO Negotiation Response frame using status code info-currently-unavailable (1), the peer is likely going to wait for us to initiate GO Negotiation on its Listen channel. We were previously using alternativing send-GO-Neg-Req and Listen phase when providing that response after the user had authorized the connection. However, the Listen phase here is unnecessary in this case and will make the connection take longer time to go through. Skip the Listen phase and make the wait-for-GO-Neg-Resp timeout random between 100 and 200 ms to avoid getting in sync with the peer. In practice, this will make us retry GO Negotiation Request frames more frequently and remain on the peer's Listen channel for most of the time when initiating GO Negotiation after status=1 response. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-28 21:35:11 +01:00
int timeout;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
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_dbg(p2p, "GO Negotiation Request TX callback: success=%d", success);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (dev == NULL) {
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_dbg(p2p, "No pending GO Negotiation");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return;
}
if (success) {
if (dev->flags & P2P_DEV_USER_REJECTED) {
p2p_set_state(p2p, P2P_IDLE);
return;
}
P2P: Address race condition with GO Negotiation Request TX status If both peers initiate GO Negotiation at about the same time, it is possible for the GO Negotiation Request frame from the peer to be received between the local attempt to send the GO Negotiation Request and TX status event for that. This could result in both devices sending GO Negotiation Response frames even though one of them should have skipped this based which device uses a higher MAC address. Resolve this race by incrementing go_neg_req_sent when p2p_send_action() returns success instead of doing this from the TX status callback. If the frame is not acknowledged, go_neg_req_sent is cleared in TX status handler. Signed-off-by: Neeraj Garg <neerajkg@broadcom.com>
2012-06-09 17:03:47 +02:00
} else if (dev->go_neg_req_sent) {
/* Cancel the increment from p2p_connect_send() on failure */
dev->go_neg_req_sent--;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
if (!success &&
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
(dev->info.dev_capab & P2P_DEV_CAPAB_CLIENT_DISCOVERABILITY) &&
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
!is_zero_ether_addr(dev->member_in_go_dev)) {
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_dbg(p2p, "Peer " MACSTR " did not acknowledge request - try to use device discoverability through its GO",
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
MAC2STR(dev->info.p2p_device_addr));
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->cfg->send_action_done(p2p->cfg->cb_ctx);
p2p_send_dev_disc_req(p2p, dev);
return;
}
/*
* Use P2P find, if needed, to find the other device from its listen
* channel.
*/
p2p_set_state(p2p, P2P_CONNECT);
P2P: Skip Listen phase when peer is expected to be waiting In case we have replied to a peer's GO Negotiation Request frame with a GO Negotiation Response frame using status code info-currently-unavailable (1), the peer is likely going to wait for us to initiate GO Negotiation on its Listen channel. We were previously using alternativing send-GO-Neg-Req and Listen phase when providing that response after the user had authorized the connection. However, the Listen phase here is unnecessary in this case and will make the connection take longer time to go through. Skip the Listen phase and make the wait-for-GO-Neg-Resp timeout random between 100 and 200 ms to avoid getting in sync with the peer. In practice, this will make us retry GO Negotiation Request frames more frequently and remain on the peer's Listen channel for most of the time when initiating GO Negotiation after status=1 response. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-28 21:35:11 +01:00
timeout = success ? 500000 : 100000;
if (!success && p2p->go_neg_peer &&
(p2p->go_neg_peer->flags & P2P_DEV_PEER_WAITING_RESPONSE)) {
unsigned int r;
/*
* Peer is expected to wait our response and we will skip the
* listen phase. Add some randomness to the wait time here to
* make it less likely to hit cases where we could end up in
* sync with peer not listening.
*/
os_get_random((u8 *) &r, sizeof(r));
timeout += r % 100000;
}
p2p_set_timeout(p2p, 0, timeout);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
static void p2p_go_neg_resp_cb(struct p2p_data *p2p, int success)
{
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_dbg(p2p, "GO Negotiation Response TX callback: success=%d",
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
success);
if (!p2p->go_neg_peer && p2p->state == P2P_PROVISIONING) {
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_dbg(p2p, "Ignore TX callback event - GO Negotiation is not running anymore");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return;
}
p2p_set_state(p2p, P2P_CONNECT);
P2P: Increase GO Negotiation timeouts There may be environments in which large number of devices are operating on the social channels. In such cases, it is possible for the Action frame TX operation wait for quite long time before being able to get the frame out. To avoid triggering GO Negotiation failures, increase the timeouts for GO Neg Req (with TX ACK) and GO Neg Resp (with or without TX ACK as long as status=0) to 500 ms. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-28 21:15:46 +01:00
p2p_set_timeout(p2p, 0, 500000);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Set P2P_DEV_PEER_WAITING_RESPONSE from TX status callback Commit fb8984fd6f4b49d9178dd87a880dd7add514b7d1 added a mechanism to skip the Listen state when the peer is expected to be waiting for us to initiate a new GO Negotiation. However, this flag was set when building the GO Negotiation Response frame with status 1 regardless of whether we managed to send that frame or peer receive it. This could result in GO Negotiation failures in cases where the peer did not receive the response and Listen channels of the devices were different. Fix this by setting the flag only after TX status indicating success has been received. This fixes frequent failures shown for the test_grpform_pbc hwsim test case. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-26 11:54:27 +02:00
static void p2p_go_neg_resp_failure_cb(struct p2p_data *p2p, int success,
const u8 *addr)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
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_dbg(p2p, "GO Negotiation Response (failure) TX callback: success=%d", success);
P2P: Provide local event on GO Neg Req rejection If an authorized (p2p_connect used locally) GO Negotiation is rejected when receiving GO Negotiation Request from the peer, indicate the failure with a ctrl_interface P2P-GO-NEG-FAILURE event. Previously, this event was only shown on the peer (i.e., the device receiving the GO Negotiation Response with non-zero Status code).
2010-09-06 18:00:43 +02:00
if (p2p->go_neg_peer && p2p->go_neg_peer->status != P2P_SC_SUCCESS) {
p2p_go_neg_failed(p2p, p2p->go_neg_peer,
p2p->go_neg_peer->status);
P2P: Set P2P_DEV_PEER_WAITING_RESPONSE from TX status callback Commit fb8984fd6f4b49d9178dd87a880dd7add514b7d1 added a mechanism to skip the Listen state when the peer is expected to be waiting for us to initiate a new GO Negotiation. However, this flag was set when building the GO Negotiation Response frame with status 1 regardless of whether we managed to send that frame or peer receive it. This could result in GO Negotiation failures in cases where the peer did not receive the response and Listen channels of the devices were different. Fix this by setting the flag only after TX status indicating success has been received. This fixes frequent failures shown for the test_grpform_pbc hwsim test case. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-26 11:54:27 +02:00
} else if (success) {
struct p2p_device *dev;
dev = p2p_get_device(p2p, addr);
if (dev &&
dev->status == P2P_SC_FAIL_INFO_CURRENTLY_UNAVAILABLE)
dev->flags |= P2P_DEV_PEER_WAITING_RESPONSE;
P2P: Provide local event on GO Neg Req rejection If an authorized (p2p_connect used locally) GO Negotiation is rejected when receiving GO Negotiation Request from the peer, indicate the failure with a ctrl_interface P2P-GO-NEG-FAILURE event. Previously, this event was only shown on the peer (i.e., the device receiving the GO Negotiation Response with non-zero Status code).
2010-09-06 18:00:43 +02:00
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
P2P: Skip GO Neg Conf ack failure workaround of send failures The workaround to ignore no ctrl::ack received for GO Negotiation Confirmation frame was only supposed to be used when the frame was actually transmitted and just the ack was not received. However, due to the way the driver failure on transmitting the frame were reported, this ended up getting applied for all failures in sending the GO Negotiation Confirmation frame. Improve this by providing a mechanism to indicate whether send_action operations fail locally before the frame was actually transmitted or because of not receiving ack frame after having transmitted the frame.
2010-10-19 11:47:33 +02:00
static void p2p_go_neg_conf_cb(struct p2p_data *p2p,
enum p2p_send_action_result result)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct p2p_device *dev;
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_dbg(p2p, "GO Negotiation Confirm TX callback: result=%d", result);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->cfg->send_action_done(p2p->cfg->cb_ctx);
P2P: Skip GO Neg Conf ack failure workaround of send failures The workaround to ignore no ctrl::ack received for GO Negotiation Confirmation frame was only supposed to be used when the frame was actually transmitted and just the ack was not received. However, due to the way the driver failure on transmitting the frame were reported, this ended up getting applied for all failures in sending the GO Negotiation Confirmation frame. Improve this by providing a mechanism to indicate whether send_action operations fail locally before the frame was actually transmitted or because of not receiving ack frame after having transmitted the frame.
2010-10-19 11:47:33 +02:00
if (result == P2P_SEND_ACTION_FAILED) {
p2p_go_neg_failed(p2p, p2p->go_neg_peer, -1);
return;
}
if (result == P2P_SEND_ACTION_NO_ACK) {
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
/*
* It looks like the TX status for GO Negotiation Confirm is
* often showing failure even when the peer has actually
* received the frame. Since the peer may change channels
* immediately after having received the frame, we may not see
* an Ack for retries, so just dropping a single frame may
* trigger this. To allow the group formation to succeed if the
* peer did indeed receive the frame, continue regardless of
* the TX status.
*/
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_dbg(p2p, "Assume GO Negotiation Confirm TX was actually received by the peer even though Ack was not reported");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
dev = p2p->go_neg_peer;
if (dev == NULL)
return;
p2p_go_complete(p2p, dev);
}
void p2p_send_action_cb(struct p2p_data *p2p, unsigned int freq, const u8 *dst,
P2P: Skip GO Neg Conf ack failure workaround of send failures The workaround to ignore no ctrl::ack received for GO Negotiation Confirmation frame was only supposed to be used when the frame was actually transmitted and just the ack was not received. However, due to the way the driver failure on transmitting the frame were reported, this ended up getting applied for all failures in sending the GO Negotiation Confirmation frame. Improve this by providing a mechanism to indicate whether send_action operations fail locally before the frame was actually transmitted or because of not receiving ack frame after having transmitted the frame.
2010-10-19 11:47:33 +02:00
const u8 *src, const u8 *bssid,
enum p2p_send_action_result result)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
enum p2p_pending_action_state state;
P2P: Skip GO Neg Conf ack failure workaround of send failures The workaround to ignore no ctrl::ack received for GO Negotiation Confirmation frame was only supposed to be used when the frame was actually transmitted and just the ack was not received. However, due to the way the driver failure on transmitting the frame were reported, this ended up getting applied for all failures in sending the GO Negotiation Confirmation frame. Improve this by providing a mechanism to indicate whether send_action operations fail locally before the frame was actually transmitted or because of not receiving ack frame after having transmitted the frame.
2010-10-19 11:47:33 +02:00
int success;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
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_dbg(p2p, "Action frame TX callback (state=%d freq=%u dst=" MACSTR
P2P: Skip GO Neg Conf ack failure workaround of send failures The workaround to ignore no ctrl::ack received for GO Negotiation Confirmation frame was only supposed to be used when the frame was actually transmitted and just the ack was not received. However, due to the way the driver failure on transmitting the frame were reported, this ended up getting applied for all failures in sending the GO Negotiation Confirmation frame. Improve this by providing a mechanism to indicate whether send_action operations fail locally before the frame was actually transmitted or because of not receiving ack frame after having transmitted the frame.
2010-10-19 11:47:33 +02:00
" src=" MACSTR " bssid=" MACSTR " result=%d",
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->pending_action_state, freq, MAC2STR(dst), MAC2STR(src),
P2P: Skip GO Neg Conf ack failure workaround of send failures The workaround to ignore no ctrl::ack received for GO Negotiation Confirmation frame was only supposed to be used when the frame was actually transmitted and just the ack was not received. However, due to the way the driver failure on transmitting the frame were reported, this ended up getting applied for all failures in sending the GO Negotiation Confirmation frame. Improve this by providing a mechanism to indicate whether send_action operations fail locally before the frame was actually transmitted or because of not receiving ack frame after having transmitted the frame.
2010-10-19 11:47:33 +02:00
MAC2STR(bssid), result);
success = result == P2P_SEND_ACTION_SUCCESS;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
state = p2p->pending_action_state;
p2p->pending_action_state = P2P_NO_PENDING_ACTION;
switch (state) {
case P2P_NO_PENDING_ACTION:
P2P: Fix after_scan_tx processing during ongoing operations When Action frame TX is postponed until a pending p2p_scan completes, there may be additional operations that need to be continued after the postponed Action frame TX operation completes. Fix this by starting pending operation (if any) from TX status event for after_scan_tx frames. This fixes common errors seen with the test_discovery hwsim test case. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-23 20:12:04 +02:00
if (p2p->after_scan_tx_in_progress) {
p2p->after_scan_tx_in_progress = 0;
if (p2p->start_after_scan != P2P_AFTER_SCAN_NOTHING &&
p2p_run_after_scan(p2p))
break;
if (p2p->state == P2P_SEARCH) {
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_dbg(p2p, "Continue find after after_scan_tx completion");
P2P: Fix after_scan_tx processing during ongoing operations When Action frame TX is postponed until a pending p2p_scan completes, there may be additional operations that need to be continued after the postponed Action frame TX operation completes. Fix this by starting pending operation (if any) from TX status event for after_scan_tx frames. This fixes common errors seen with the test_discovery hwsim test case. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-23 20:12:04 +02:00
p2p_continue_find(p2p);
}
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
break;
case P2P_PENDING_GO_NEG_REQUEST:
p2p_go_neg_req_cb(p2p, success);
break;
case P2P_PENDING_GO_NEG_RESPONSE:
p2p_go_neg_resp_cb(p2p, success);
break;
case P2P_PENDING_GO_NEG_RESPONSE_FAILURE:
P2P: Set P2P_DEV_PEER_WAITING_RESPONSE from TX status callback Commit fb8984fd6f4b49d9178dd87a880dd7add514b7d1 added a mechanism to skip the Listen state when the peer is expected to be waiting for us to initiate a new GO Negotiation. However, this flag was set when building the GO Negotiation Response frame with status 1 regardless of whether we managed to send that frame or peer receive it. This could result in GO Negotiation failures in cases where the peer did not receive the response and Listen channels of the devices were different. Fix this by setting the flag only after TX status indicating success has been received. This fixes frequent failures shown for the test_grpform_pbc hwsim test case. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-04-26 11:54:27 +02:00
p2p_go_neg_resp_failure_cb(p2p, success, dst);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
break;
case P2P_PENDING_GO_NEG_CONFIRM:
P2P: Skip GO Neg Conf ack failure workaround of send failures The workaround to ignore no ctrl::ack received for GO Negotiation Confirmation frame was only supposed to be used when the frame was actually transmitted and just the ack was not received. However, due to the way the driver failure on transmitting the frame were reported, this ended up getting applied for all failures in sending the GO Negotiation Confirmation frame. Improve this by providing a mechanism to indicate whether send_action operations fail locally before the frame was actually transmitted or because of not receiving ack frame after having transmitted the frame.
2010-10-19 11:47:33 +02:00
p2p_go_neg_conf_cb(p2p, result);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
break;
case P2P_PENDING_SD:
p2p_sd_cb(p2p, success);
break;
case P2P_PENDING_PD:
p2p_prov_disc_cb(p2p, success);
break;
case P2P_PENDING_INVITATION_REQUEST:
p2p_invitation_req_cb(p2p, success);
break;
case P2P_PENDING_INVITATION_RESPONSE:
p2p_invitation_resp_cb(p2p, success);
break;
case P2P_PENDING_DEV_DISC_REQUEST:
p2p_dev_disc_req_cb(p2p, success);
break;
case P2P_PENDING_DEV_DISC_RESPONSE:
p2p_dev_disc_resp_cb(p2p, success);
break;
case P2P_PENDING_GO_DISC_REQ:
p2p_go_disc_req_cb(p2p, success);
break;
}
P2P: Fix after_scan_tx processing during ongoing operations When Action frame TX is postponed until a pending p2p_scan completes, there may be additional operations that need to be continued after the postponed Action frame TX operation completes. Fix this by starting pending operation (if any) from TX status event for after_scan_tx frames. This fixes common errors seen with the test_discovery hwsim test case. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-23 20:12:04 +02:00
p2p->after_scan_tx_in_progress = 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
void p2p_listen_cb(struct p2p_data *p2p, unsigned int freq,
unsigned int duration)
{
if (freq == p2p->pending_client_disc_freq) {
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_dbg(p2p, "Client discoverability remain-awake completed");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->pending_client_disc_freq = 0;
return;
}
if (freq != p2p->pending_listen_freq) {
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_dbg(p2p, "Unexpected listen callback for freq=%u duration=%u (pending_listen_freq=%u)",
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
freq, duration, p2p->pending_listen_freq);
return;
}
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_dbg(p2p, "Starting Listen timeout(%u,%u) on freq=%u based on callback",
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->pending_listen_sec, p2p->pending_listen_usec,
p2p->pending_listen_freq);
p2p->in_listen = 1;
P2P: Do not stop Listen state if it is on correct channel This is needed to optimize response to GO Negotiation Request frames. The extra remain-on-channel cancel followed by new remain-on-channel for the same channel takes too much time with some driver/firmware designs for the response to go out quickly enough to avoid peer timing out while waiting for our response.
2010-10-20 18:37:47 +02:00
p2p->drv_in_listen = freq;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (p2p->pending_listen_sec || p2p->pending_listen_usec) {
/*
* Add 20 msec extra wait to avoid race condition with driver
* remain-on-channel end event, i.e., give driver more time to
* complete the operation before our timeout expires.
*/
p2p_set_timeout(p2p, p2p->pending_listen_sec,
p2p->pending_listen_usec + 20000);
}
p2p->pending_listen_freq = 0;
}
int p2p_listen_end(struct p2p_data *p2p, unsigned int freq)
{
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_dbg(p2p, "Driver ended Listen state (freq=%u)", freq);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->drv_in_listen = 0;
if (p2p->in_listen)
return 0; /* Internal timeout will trigger the next step */
if (p2p->state == P2P_CONNECT_LISTEN && p2p->go_neg_peer) {
P2P: Check GO Neg Req retransmit limit in p2p_listen_end This needs to be done both in the more normal location in p2p_timeout_connect_listen() (internal timeout after driver event) and in p2p_listen_end() as a workaround for the case where the driver event is delayed to happen after the internal timeout.
2011-01-12 12:48:55 +01:00
if (p2p->go_neg_peer->connect_reqs >= 120) {
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_dbg(p2p, "Timeout on sending GO Negotiation Request without getting response");
P2P: Check GO Neg Req retransmit limit in p2p_listen_end This needs to be done both in the more normal location in p2p_timeout_connect_listen() (internal timeout after driver event) and in p2p_listen_end() as a workaround for the case where the driver event is delayed to happen after the internal timeout.
2011-01-12 12:48:55 +01:00
p2p_go_neg_failed(p2p, p2p->go_neg_peer, -1);
return 0;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_set_state(p2p, P2P_CONNECT);
p2p_connect_send(p2p, p2p->go_neg_peer);
return 1;
} else if (p2p->state == P2P_SEARCH) {
P2P: Avoid re-starting p2p_search in some corner cases Search (p2p_scan) could already have been started at the point remain-on-channel end event is being processed, e.g., if an Action frame TX is reported immediately aftet the end of an earlier remain-on-channel operation and the response frame is sent using an offchannel operation while p2p_find is still in progress. Avoid trying to re-run p2p_scan while the previous one is still running. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-09 11:49:36 +01:00
if (p2p->p2p_scan_running) {
/*
* Search is already in progress. This can happen if
* an Action frame RX is reported immediately after
* the end of a remain-on-channel operation and the
* response frame to that is sent using an offchannel
* operation while in p2p_find. Avoid an attempt to
* restart a scan here.
*/
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_dbg(p2p, "p2p_scan already in progress - do not try to start a new one");
P2P: Avoid re-starting p2p_search in some corner cases Search (p2p_scan) could already have been started at the point remain-on-channel end event is being processed, e.g., if an Action frame TX is reported immediately aftet the end of an earlier remain-on-channel operation and the response frame is sent using an offchannel operation while p2p_find is still in progress. Avoid trying to re-run p2p_scan while the previous one is still running. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-02-09 11:49:36 +01:00
return 1;
}
P2P: Wait 100 ms if driver fails to start listen operation Some drivers may accept the remain-on-channel command, but instead of indicating start event for remain-on-channel, just indicate that the operation has been canceled immediately. This could result in continuous loop of search/listen states with very limited time to do anything else in wpa_supplicant if the scan command is also completed quickly (e.g., if the driver is unable to scan other channels than the current operating channel). As a workaround, do not start the next step (search) in P2P device discovery if this type of rejection of listen operation is detected. This gives some more time for wpa_supplicant to handle whatever else may be needed at to be done at the same time and reduces the amount of CPU used in a loop that does not really work correctly from the view point of being discoverable. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-05-08 10:50:03 +02:00
if (p2p->pending_listen_freq) {
/*
* Better wait a bit if the driver is unable to start
* offchannel operation for some reason. p2p_search()
* will be started from internal timeout.
*/
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_dbg(p2p, "Listen operation did not seem to start - delay search phase to avoid busy loop");
P2P: Wait 100 ms if driver fails to start listen operation Some drivers may accept the remain-on-channel command, but instead of indicating start event for remain-on-channel, just indicate that the operation has been canceled immediately. This could result in continuous loop of search/listen states with very limited time to do anything else in wpa_supplicant if the scan command is also completed quickly (e.g., if the driver is unable to scan other channels than the current operating channel). As a workaround, do not start the next step (search) in P2P device discovery if this type of rejection of listen operation is detected. This gives some more time for wpa_supplicant to handle whatever else may be needed at to be done at the same time and reduces the amount of CPU used in a loop that does not really work correctly from the view point of being discoverable. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com> intended-for: hostap-1
2012-05-08 10:50:03 +02:00
p2p_set_timeout(p2p, 0, 100000);
return 1;
}
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
if (p2p->search_delay) {
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_dbg(p2p, "Delay search operation by %u ms",
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
p2p->search_delay);
p2p_set_timeout(p2p, p2p->search_delay / 1000,
(p2p->search_delay % 1000) * 1000);
return 1;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_search(p2p);
return 1;
}
return 0;
}
static void p2p_timeout_connect(struct p2p_data *p2p)
{
p2p->cfg->send_action_done(p2p->cfg->cb_ctx);
P2P: Assume GO Negotiation failed if GO Neg Conf wait times out Stop the connection attempt if GO Negotiation Confirm is not received within 100 ms of the GO Negotiation Response getting acknowledged. Previously, we would have continued trying to connect to the peer even in this case which could result in confusing second GO Negotiation Request frame and unnecessarily long wait before indicating failure. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-06-08 17:24:08 +02:00
if (p2p->go_neg_peer &&
(p2p->go_neg_peer->flags & P2P_DEV_WAIT_GO_NEG_CONFIRM)) {
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_dbg(p2p, "Wait for GO Negotiation Confirm timed out - assume GO Negotiation failed");
P2P: Assume GO Negotiation failed if GO Neg Conf wait times out Stop the connection attempt if GO Negotiation Confirm is not received within 100 ms of the GO Negotiation Response getting acknowledged. Previously, we would have continued trying to connect to the peer even in this case which could result in confusing second GO Negotiation Request frame and unnecessarily long wait before indicating failure. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-06-08 17:24:08 +02:00
p2p_go_neg_failed(p2p, p2p->go_neg_peer, -1);
return;
}
P2P: Skip Listen phase when peer is expected to be waiting In case we have replied to a peer's GO Negotiation Request frame with a GO Negotiation Response frame using status code info-currently-unavailable (1), the peer is likely going to wait for us to initiate GO Negotiation on its Listen channel. We were previously using alternativing send-GO-Neg-Req and Listen phase when providing that response after the user had authorized the connection. However, the Listen phase here is unnecessary in this case and will make the connection take longer time to go through. Skip the Listen phase and make the wait-for-GO-Neg-Resp timeout random between 100 and 200 ms to avoid getting in sync with the peer. In practice, this will make us retry GO Negotiation Request frames more frequently and remain on the peer's Listen channel for most of the time when initiating GO Negotiation after status=1 response. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-28 21:35:11 +01:00
if (p2p->go_neg_peer &&
(p2p->go_neg_peer->flags & P2P_DEV_PEER_WAITING_RESPONSE) &&
p2p->go_neg_peer->connect_reqs < 120) {
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_dbg(p2p, "Peer expected to wait our response - skip listen");
P2P: Skip Listen phase when peer is expected to be waiting In case we have replied to a peer's GO Negotiation Request frame with a GO Negotiation Response frame using status code info-currently-unavailable (1), the peer is likely going to wait for us to initiate GO Negotiation on its Listen channel. We were previously using alternativing send-GO-Neg-Req and Listen phase when providing that response after the user had authorized the connection. However, the Listen phase here is unnecessary in this case and will make the connection take longer time to go through. Skip the Listen phase and make the wait-for-GO-Neg-Resp timeout random between 100 and 200 ms to avoid getting in sync with the peer. In practice, this will make us retry GO Negotiation Request frames more frequently and remain on the peer's Listen channel for most of the time when initiating GO Negotiation after status=1 response. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-02-28 21:35:11 +01:00
p2p_connect_send(p2p, p2p->go_neg_peer);
return;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_set_state(p2p, P2P_CONNECT_LISTEN);
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_listen_in_find(p2p, 0);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
static void p2p_timeout_connect_listen(struct p2p_data *p2p)
{
if (p2p->go_neg_peer) {
if (p2p->drv_in_listen) {
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_dbg(p2p, "Driver is still in Listen state; wait for it to complete");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return;
}
P2P: Limit the retransmission of GO Negotiation request to 120 If the peer you want to connect to is no longer available (does not acknowledge frames) when wpa_supplicant sends GO Negotition Request frames, retransmission of this frame is done until the associated p2p_device structure is removed on timeout. In that case, no signal is emitted to inform the GO Negotiation has failed. When sending an Invitation Request frame, the same retransmission mechanism is in place but limit the transmission to 100 and hitting the limit generates an event. This patch adds the same mechanism as the one in place for Invitation Request, but with limit of 120 to match the existing wait_count for for GO Negotiation.
2010-12-28 10:48:58 +01:00
if (p2p->go_neg_peer->connect_reqs >= 120) {
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_dbg(p2p, "Timeout on sending GO Negotiation Request without getting response");
P2P: Limit the retransmission of GO Negotiation request to 120 If the peer you want to connect to is no longer available (does not acknowledge frames) when wpa_supplicant sends GO Negotition Request frames, retransmission of this frame is done until the associated p2p_device structure is removed on timeout. In that case, no signal is emitted to inform the GO Negotiation has failed. When sending an Invitation Request frame, the same retransmission mechanism is in place but limit the transmission to 100 and hitting the limit generates an event. This patch adds the same mechanism as the one in place for Invitation Request, but with limit of 120 to match the existing wait_count for for GO Negotiation.
2010-12-28 10:48:58 +01:00
p2p_go_neg_failed(p2p, p2p->go_neg_peer, -1);
return;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_set_state(p2p, P2P_CONNECT);
p2p_connect_send(p2p, p2p->go_neg_peer);
} else
p2p_set_state(p2p, P2P_IDLE);
}
static void p2p_timeout_wait_peer_connect(struct p2p_data *p2p)
{
/*
* TODO: could remain constantly in Listen state for some time if there
* are no other concurrent uses for the radio. For now, go to listen
* state once per second to give other uses a chance to use the radio.
*/
p2p_set_state(p2p, P2P_WAIT_PEER_IDLE);
P2P: Reduce the idle time in Wait peer connect state When waiting for go_neg frame from the peer in WAIT_PEER_CONNECT state, I have observed that sometimes it takes 20 to 30 secs for successful GO negotiation. I also found out that it is because of 1 second idle time, in WAIT_PEER_CONNECT state. While it is good to have 1 second idle time [for doing power-save or doing some other legacy STA Scan or some other useful stuff], this makes GO Negotiation process slow. We wait for 1 second idle and then listen for a random time between 100(min)-300(max) ms. Assume P1 is in WAIT_PEER_CONNECT state and P2 is the one which is now to send go_neg frame. If P2 sends GO Negotiation frame just at the boundary of 300 ms of P1 and assume that P2 takes close to 600-800 ms for one iteration of sending go_neg request (one iteration is GO Negotiation Request frame time + dwell time + listen_time), P2 needs to transmit at least 16-18 Action frames for hitting the listen time of P1. Following patch reduces the idle time to 500 ms. Alternatively we can increase the listen time interval to 500 ms just for WAIT_PEER_CONNECT state.
2011-12-18 17:01:11 +01:00
p2p_set_timeout(p2p, 0, 500000);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
static void p2p_timeout_wait_peer_idle(struct p2p_data *p2p)
{
struct p2p_device *dev = p2p->go_neg_peer;
if (dev == NULL) {
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_dbg(p2p, "Unknown GO Neg peer - stop GO Neg wait");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return;
}
dev->wait_count++;
if (dev->wait_count >= 120) {
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_dbg(p2p, "Timeout on waiting peer to become ready for GO Negotiation");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_go_neg_failed(p2p, dev, -1);
return;
}
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_dbg(p2p, "Go to Listen state while waiting for the peer to become ready for GO Negotiation");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_set_state(p2p, P2P_WAIT_PEER_CONNECT);
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_listen_in_find(p2p, 0);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
static void p2p_timeout_sd_during_find(struct p2p_data *p2p)
{
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_dbg(p2p, "Service Discovery Query timeout");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (p2p->sd_peer) {
p2p->cfg->send_action_done(p2p->cfg->cb_ctx);
p2p->sd_peer->flags &= ~P2P_DEV_SD_SCHEDULE;
p2p->sd_peer = NULL;
}
p2p_continue_find(p2p);
}
static void p2p_timeout_prov_disc_during_find(struct p2p_data *p2p)
{
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_dbg(p2p, "Provision Discovery Request timeout");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->cfg->send_action_done(p2p->cfg->cb_ctx);
p2p_continue_find(p2p);
}
P2P: Retry provision discovery requests in IDLE state Since the peer may not be in Listen state when the provision discovery request is sent, try to send the request again number of times when in IDLE state. This was already done when p2p_find is in progress, but this commit adds retries to the case where no other P2P operations are in progress. Signed-off-by: Jayant Sane <jayant.sane@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:20:39 +02:00
static void p2p_timeout_prov_disc_req(struct p2p_data *p2p)
{
p2p->pending_action_state = P2P_NO_PENDING_ACTION;
/*
* For user initiated PD requests that we have not gotten any responses
* for while in IDLE state, we retry them a couple of times before
* giving up.
*/
if (!p2p->user_initiated_pd)
return;
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_dbg(p2p, "User initiated Provision Discovery Request timeout");
P2P: Retry provision discovery requests in IDLE state Since the peer may not be in Listen state when the provision discovery request is sent, try to send the request again number of times when in IDLE state. This was already done when p2p_find is in progress, but this commit adds retries to the case where no other P2P operations are in progress. Signed-off-by: Jayant Sane <jayant.sane@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:20:39 +02:00
if (p2p->pd_retries) {
p2p->pd_retries--;
p2p_retry_pd(p2p);
} else {
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
struct p2p_device *dev;
int for_join = 0;
dl_list_for_each(dev, &p2p->devices, struct p2p_device, list) {
if (os_memcmp(p2p->pending_pd_devaddr,
dev->info.p2p_device_addr, ETH_ALEN) != 0)
continue;
if (dev->req_config_methods &&
(dev->flags & P2P_DEV_PD_FOR_JOIN))
for_join = 1;
}
P2P: Add callback for provision discovery failure When provision discovery fails, this new callback will be called so P2P users can react to the failure. Signed-off-by: Jayant Sane <jayant.sane@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:26:22 +02:00
if (p2p->cfg->prov_disc_fail)
p2p->cfg->prov_disc_fail(p2p->cfg->cb_ctx,
p2p->pending_pd_devaddr,
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
for_join ?
P2P_PROV_DISC_TIMEOUT_JOIN :
P2P: Add callback for provision discovery failure When provision discovery fails, this new callback will be called so P2P users can react to the failure. Signed-off-by: Jayant Sane <jayant.sane@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:26:22 +02:00
P2P_PROV_DISC_TIMEOUT);
P2P: Retry provision discovery requests in IDLE state Since the peer may not be in Listen state when the provision discovery request is sent, try to send the request again number of times when in IDLE state. This was already done when p2p_find is in progress, but this commit adds retries to the case where no other P2P operations are in progress. Signed-off-by: Jayant Sane <jayant.sane@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:20:39 +02:00
p2p_reset_pending_pd(p2p);
}
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
static void p2p_timeout_invite(struct p2p_data *p2p)
{
p2p->cfg->send_action_done(p2p->cfg->cb_ctx);
p2p_set_state(p2p, P2P_INVITE_LISTEN);
P2P: Wait on operating channel between invitation requests If running in active GO mode to invite a device to join the group, wait on operating channel instead of listen channel.
2010-07-07 05:22:31 +02:00
if (p2p->inv_role == P2P_INVITE_ROLE_ACTIVE_GO) {
/*
* Better remain on operating channel instead of listen channel
* when running a group.
*/
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_dbg(p2p, "Inviting in active GO role - wait on operating channel");
P2P: Wait on operating channel between invitation requests If running in active GO mode to invite a device to join the group, wait on operating channel instead of listen channel.
2010-07-07 05:22:31 +02:00
p2p_set_timeout(p2p, 0, 100000);
return;
}
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_listen_in_find(p2p, 0);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
static void p2p_timeout_invite_listen(struct p2p_data *p2p)
{
if (p2p->invite_peer && p2p->invite_peer->invitation_reqs < 100) {
p2p_set_state(p2p, P2P_INVITE);
p2p_invite_send(p2p, p2p->invite_peer,
p2p->invite_go_dev_addr);
} else {
if (p2p->invite_peer) {
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_dbg(p2p, "Invitation Request retry limit reached");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (p2p->cfg->invitation_result)
p2p->cfg->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
p2p->cfg->cb_ctx, -1, NULL, NULL,
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
p2p->invite_peer->info.p2p_device_addr,
0);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
p2p_set_state(p2p, P2P_IDLE);
}
}
static void p2p_state_timeout(void *eloop_ctx, void *timeout_ctx)
{
struct p2p_data *p2p = eloop_ctx;
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_dbg(p2p, "Timeout (state=%s)", p2p_state_txt(p2p->state));
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->in_listen = 0;
switch (p2p->state) {
case P2P_IDLE:
P2P: Retry provision discovery requests in IDLE state Since the peer may not be in Listen state when the provision discovery request is sent, try to send the request again number of times when in IDLE state. This was already done when p2p_find is in progress, but this commit adds retries to the case where no other P2P operations are in progress. Signed-off-by: Jayant Sane <jayant.sane@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:20:39 +02:00
/* Check if we timed out waiting for PD req */
if (p2p->pending_action_state == P2P_PENDING_PD)
p2p_timeout_prov_disc_req(p2p);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
break;
case P2P_SEARCH:
P2P: Retry provision discovery requests in IDLE state Since the peer may not be in Listen state when the provision discovery request is sent, try to send the request again number of times when in IDLE state. This was already done when p2p_find is in progress, but this commit adds retries to the case where no other P2P operations are in progress. Signed-off-by: Jayant Sane <jayant.sane@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:20:39 +02:00
/* Check if we timed out waiting for PD req */
if (p2p->pending_action_state == P2P_PENDING_PD)
p2p_timeout_prov_disc_req(p2p);
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
if (p2p->search_delay && !p2p->in_search_delay) {
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_dbg(p2p, "Delay search operation by %u ms",
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
p2p->search_delay);
p2p->in_search_delay = 1;
p2p_set_timeout(p2p, p2p->search_delay / 1000,
(p2p->search_delay % 1000) * 1000);
break;
}
p2p->in_search_delay = 0;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_search(p2p);
break;
case P2P_CONNECT:
p2p_timeout_connect(p2p);
break;
case P2P_CONNECT_LISTEN:
p2p_timeout_connect_listen(p2p);
break;
case P2P_GO_NEG:
break;
case P2P_LISTEN_ONLY:
P2P: Retry provision discovery requests in IDLE state Since the peer may not be in Listen state when the provision discovery request is sent, try to send the request again number of times when in IDLE state. This was already done when p2p_find is in progress, but this commit adds retries to the case where no other P2P operations are in progress. Signed-off-by: Jayant Sane <jayant.sane@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-06-12 23:20:39 +02:00
/* Check if we timed out waiting for PD req */
if (p2p->pending_action_state == P2P_PENDING_PD)
p2p_timeout_prov_disc_req(p2p);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (p2p->ext_listen_only) {
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_dbg(p2p, "Extended Listen Timing - Listen State completed");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->ext_listen_only = 0;
p2p_set_state(p2p, P2P_IDLE);
}
break;
case P2P_WAIT_PEER_CONNECT:
p2p_timeout_wait_peer_connect(p2p);
break;
case P2P_WAIT_PEER_IDLE:
p2p_timeout_wait_peer_idle(p2p);
break;
case P2P_SD_DURING_FIND:
p2p_timeout_sd_during_find(p2p);
break;
case P2P_PROVISIONING:
break;
case P2P_PD_DURING_FIND:
p2p_timeout_prov_disc_during_find(p2p);
break;
case P2P_INVITE:
p2p_timeout_invite(p2p);
break;
case P2P_INVITE_LISTEN:
p2p_timeout_invite_listen(p2p);
break;
P2P: Wait until ongoing scan completes before starting P2P find The P2P_FIND command was failing if it was issued at the moment when a scan operation was in progress. Avoid returning failure in this case by scheduling the P2P find to start once the ongoing scan is completed. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2011-11-15 20:25:21 +01:00
case P2P_SEARCH_WHEN_READY:
break;
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
case P2P_CONTINUE_SEARCH_WHEN_READY:
break;
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
}
int p2p_reject(struct p2p_data *p2p, const u8 *peer_addr)
{
struct p2p_device *dev;
dev = p2p_get_device(p2p, peer_addr);
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_dbg(p2p, "Local request to reject connection attempts by peer "
MACSTR, MAC2STR(peer_addr));
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (dev == NULL) {
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_dbg(p2p, "Peer " MACSTR " unknown", MAC2STR(peer_addr));
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return -1;
}
dev->status = P2P_SC_FAIL_REJECTED_BY_USER;
dev->flags |= P2P_DEV_USER_REJECTED;
return 0;
}
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
const char * p2p_wps_method_text(enum p2p_wps_method method)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
switch (method) {
case WPS_NOT_READY:
return "not-ready";
case WPS_PIN_DISPLAY:
return "Display";
case WPS_PIN_KEYPAD:
return "Keypad";
case WPS_PBC:
return "PBC";
}
return "??";
}
static const char * p2p_go_state_text(enum p2p_go_state go_state)
{
switch (go_state) {
case UNKNOWN_GO:
return "unknown";
case LOCAL_GO:
return "local";
case REMOTE_GO:
return "remote";
}
return "??";
}
P2P: Move public P2P_PEER info generation into ctrl_iface The P2P module provides access to public peer data in struct p2p_peer_info. Use this to build the P2P_PEER information in ctrl_iface.c instead of providing such text format data from the P2P module. The internal data that was previously built in p2p_get_peer_info() as part of the text format peer data is now available through a separate p2p_get_peer_info_txt() function. This is still included in P2P_PEER output to maintain backwards compatibility with external programs that could have started to use this. However, it should be noted that this data is not really supposed to be used for anything else apart from debugging purposes and its format is subject to change. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-22 20:26:31 +01:00
const struct p2p_peer_info * p2p_get_peer_info(struct p2p_data *p2p,
const u8 *addr, int next)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
{
struct p2p_device *dev;
if (addr)
dev = p2p_get_device(p2p, addr);
else
dev = dl_list_first(&p2p->devices, struct p2p_device, list);
if (dev && next) {
dev = dl_list_first(&dev->list, struct p2p_device, list);
if (&dev->list == &p2p->devices)
dev = NULL;
}
if (dev == NULL)
P2P: Move public P2P_PEER info generation into ctrl_iface The P2P module provides access to public peer data in struct p2p_peer_info. Use this to build the P2P_PEER information in ctrl_iface.c instead of providing such text format data from the P2P module. The internal data that was previously built in p2p_get_peer_info() as part of the text format peer data is now available through a separate p2p_get_peer_info_txt() function. This is still included in P2P_PEER output to maintain backwards compatibility with external programs that could have started to use this. However, it should be noted that this data is not really supposed to be used for anything else apart from debugging purposes and its format is subject to change. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-22 20:26:31 +01:00
return NULL;
return &dev->info;
}
int p2p_get_peer_info_txt(const struct p2p_peer_info *info,
char *buf, size_t buflen)
{
struct p2p_device *dev;
int res;
char *pos, *end;
struct os_time now;
if (info == NULL)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return -1;
P2P: Move public P2P_PEER info generation into ctrl_iface The P2P module provides access to public peer data in struct p2p_peer_info. Use this to build the P2P_PEER information in ctrl_iface.c instead of providing such text format data from the P2P module. The internal data that was previously built in p2p_get_peer_info() as part of the text format peer data is now available through a separate p2p_get_peer_info_txt() function. This is still included in P2P_PEER output to maintain backwards compatibility with external programs that could have started to use this. However, it should be noted that this data is not really supposed to be used for anything else apart from debugging purposes and its format is subject to change. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-22 20:26:31 +01:00
dev = (struct p2p_device *) (((u8 *) info) -
offsetof(struct p2p_device, info));
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
pos = buf;
end = buf + buflen;
os_get_time(&now);
res = os_snprintf(pos, end - pos,
"age=%d\n"
"listen_freq=%d\n"
"wps_method=%s\n"
"interface_addr=" MACSTR "\n"
"member_in_go_dev=" MACSTR "\n"
"member_in_go_iface=" MACSTR "\n"
"go_neg_req_sent=%d\n"
"go_state=%s\n"
"dialog_token=%u\n"
"intended_addr=" MACSTR "\n"
"country=%c%c\n"
"oper_freq=%d\n"
"req_config_methods=0x%x\n"
P2P: Do not re-send PD Request for join-a-group after acked frame We are not actually interested in the PD Response in join-a-group case, so there is no point in trying to send PD Request until the response is received. This avoids an extra PD getting started after a join-a-group operation in some cases.
2010-10-27 18:36:10 +02:00
"flags=%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n"
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
"status=%d\n"
"wait_count=%u\n"
"invitation_reqs=%u\n",
(int) (now.sec - dev->last_seen.sec),
dev->listen_freq,
p2p_wps_method_text(dev->wps_method),
MAC2STR(dev->interface_addr),
MAC2STR(dev->member_in_go_dev),
MAC2STR(dev->member_in_go_iface),
dev->go_neg_req_sent,
p2p_go_state_text(dev->go_state),
dev->dialog_token,
MAC2STR(dev->intended_addr),
dev->country[0] ? dev->country[0] : '_',
dev->country[1] ? dev->country[1] : '_',
dev->oper_freq,
dev->req_config_methods,
dev->flags & P2P_DEV_PROBE_REQ_ONLY ?
"[PROBE_REQ_ONLY]" : "",
dev->flags & P2P_DEV_REPORTED ? "[REPORTED]" : "",
dev->flags & P2P_DEV_NOT_YET_READY ?
"[NOT_YET_READY]" : "",
dev->flags & P2P_DEV_SD_INFO ? "[SD_INFO]" : "",
dev->flags & P2P_DEV_SD_SCHEDULE ? "[SD_SCHEDULE]" :
"",
dev->flags & P2P_DEV_PD_PEER_DISPLAY ?
"[PD_PEER_DISPLAY]" : "",
dev->flags & P2P_DEV_PD_PEER_KEYPAD ?
"[PD_PEER_KEYPAD]" : "",
dev->flags & P2P_DEV_USER_REJECTED ?
"[USER_REJECTED]" : "",
dev->flags & P2P_DEV_PEER_WAITING_RESPONSE ?
"[PEER_WAITING_RESPONSE]" : "",
dev->flags & P2P_DEV_PREFER_PERSISTENT_GROUP ?
"[PREFER_PERSISTENT_GROUP]" : "",
dev->flags & P2P_DEV_WAIT_GO_NEG_RESPONSE ?
"[WAIT_GO_NEG_RESPONSE]" : "",
dev->flags & P2P_DEV_WAIT_GO_NEG_CONFIRM ?
"[WAIT_GO_NEG_CONFIRM]" : "",
dev->flags & P2P_DEV_GROUP_CLIENT_ONLY ?
"[GROUP_CLIENT_ONLY]" : "",
P2P: Fix channel forcing for p2p_connect auth
2010-07-02 17:27:00 +02:00
dev->flags & P2P_DEV_FORCE_FREQ ?
P2P: Do not re-send PD Request for join-a-group after acked frame We are not actually interested in the PD Response in join-a-group case, so there is no point in trying to send PD Request until the response is received. This avoids an extra PD getting started after a join-a-group operation in some cases.
2010-10-27 18:36:10 +02:00
"[FORCE_FREQ]" : "",
dev->flags & P2P_DEV_PD_FOR_JOIN ?
"[PD_FOR_JOIN]" : "",
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
dev->status,
dev->wait_count,
dev->invitation_reqs);
if (res < 0 || res >= end - pos)
return pos - buf;
pos += res;
if (dev->ext_listen_period) {
res = os_snprintf(pos, end - pos,
"ext_listen_period=%u\n"
"ext_listen_interval=%u\n",
dev->ext_listen_period,
dev->ext_listen_interval);
if (res < 0 || res >= end - pos)
return pos - buf;
pos += res;
}
if (dev->oper_ssid_len) {
res = os_snprintf(pos, end - pos,
"oper_ssid=%s\n",
wpa_ssid_txt(dev->oper_ssid,
dev->oper_ssid_len));
if (res < 0 || res >= end - pos)
return pos - buf;
pos += res;
}
WFD: Add Wi-Fi Display support This commit adds control interface commands and internal storage of Wi-Fi Display related configuration. In addition, WFD IE is now added to various P2P frames, Probe Request/Response, and (Re)Association Request/Response frames. WFD subelements from peers are stored in the P2P peer table. Following control interface commands are now available: SET wifi_display <0/1> GET wifi_display WFD_SUBELEM_SET <subelem> [hexdump of length+body] WFD_SUBELEM_GET <subelem> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 16:26:01 +01:00
#ifdef CONFIG_WIFI_DISPLAY
if (dev->info.wfd_subelems) {
res = os_snprintf(pos, end - pos, "wfd_subelems=");
if (res < 0 || res >= end - pos)
return pos - buf;
pos += res;
pos += wpa_snprintf_hex(pos, end - pos,
wpabuf_head(dev->info.wfd_subelems),
wpabuf_len(dev->info.wfd_subelems));
res = os_snprintf(pos, end - pos, "\n");
if (res < 0 || res >= end - pos)
return pos - buf;
pos += res;
}
#endif /* CONFIG_WIFI_DISPLAY */
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return pos - buf;
}
P2P: Replace p2p_get_peer_info with p2p_peer_known when applicable p2p_get_peer_info() was used in multiple places just to check whether a specific peer is known. This was not the designed use for the function, so introduce a simpler function for that purpose to make it obvious that the p2p_get_peer_info() function is actually used only in ctrl_iface.c. Signed-hostap: Jouni Malinen <j@w1.fi>
2011-12-22 20:04:41 +01:00
int p2p_peer_known(struct p2p_data *p2p, const u8 *addr)
{
return p2p_get_device(p2p, addr) != NULL;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
void p2p_set_client_discoverability(struct p2p_data *p2p, int enabled)
{
if (enabled) {
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_dbg(p2p, "Client discoverability enabled");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->dev_capab |= P2P_DEV_CAPAB_CLIENT_DISCOVERABILITY;
} else {
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_dbg(p2p, "Client discoverability disabled");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->dev_capab &= ~P2P_DEV_CAPAB_CLIENT_DISCOVERABILITY;
}
}
static struct wpabuf * p2p_build_presence_req(u32 duration1, u32 interval1,
u32 duration2, u32 interval2)
{
struct wpabuf *req;
struct p2p_noa_desc desc1, desc2, *ptr1 = NULL, *ptr2 = NULL;
u8 *len;
req = wpabuf_alloc(100);
if (req == NULL)
return NULL;
if (duration1 || interval1) {
os_memset(&desc1, 0, sizeof(desc1));
desc1.count_type = 1;
desc1.duration = duration1;
desc1.interval = interval1;
ptr1 = &desc1;
if (duration2 || interval2) {
os_memset(&desc2, 0, sizeof(desc2));
desc2.count_type = 2;
desc2.duration = duration2;
desc2.interval = interval2;
ptr2 = &desc2;
}
}
p2p_buf_add_action_hdr(req, P2P_PRESENCE_REQ, 1);
len = p2p_buf_add_ie_hdr(req);
p2p_buf_add_noa(req, 0, 0, 0, ptr1, ptr2);
p2p_buf_update_ie_hdr(req, len);
return req;
}
int p2p_presence_req(struct p2p_data *p2p, const u8 *go_interface_addr,
const u8 *own_interface_addr, unsigned int freq,
u32 duration1, u32 interval1, u32 duration2,
u32 interval2)
{
struct wpabuf *req;
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_dbg(p2p, "Send Presence Request to GO " MACSTR
" (own interface " MACSTR ") freq=%u dur1=%u int1=%u "
"dur2=%u int2=%u",
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
MAC2STR(go_interface_addr), MAC2STR(own_interface_addr),
freq, duration1, interval1, duration2, interval2);
req = p2p_build_presence_req(duration1, interval1, duration2,
interval2);
if (req == NULL)
return -1;
p2p->pending_action_state = P2P_NO_PENDING_ACTION;
P2P: Delay send_action call if p2p_scan is in progress In order to avoid confusing the driver with a new remain-on-channel request, delay sending of a new Action frame if the driver indicates Action frame RX diromg a scan.
2010-10-20 18:41:20 +02:00
if (p2p_send_action(p2p, freq, go_interface_addr, own_interface_addr,
go_interface_addr,
wpabuf_head(req), wpabuf_len(req), 200) < 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
p2p_dbg(p2p, "Failed to send Action frame");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
wpabuf_free(req);
return 0;
}
static struct wpabuf * p2p_build_presence_resp(u8 status, const u8 *noa,
size_t noa_len, u8 dialog_token)
{
struct wpabuf *resp;
u8 *len;
resp = wpabuf_alloc(100 + noa_len);
if (resp == NULL)
return NULL;
p2p_buf_add_action_hdr(resp, P2P_PRESENCE_RESP, dialog_token);
len = p2p_buf_add_ie_hdr(resp);
p2p_buf_add_status(resp, status);
if (noa) {
wpabuf_put_u8(resp, P2P_ATTR_NOTICE_OF_ABSENCE);
wpabuf_put_le16(resp, noa_len);
wpabuf_put_data(resp, noa, noa_len);
} else
p2p_buf_add_noa(resp, 0, 0, 0, NULL, NULL);
p2p_buf_update_ie_hdr(resp, len);
return resp;
}
static void p2p_process_presence_req(struct p2p_data *p2p, const u8 *da,
const u8 *sa, const u8 *data, size_t len,
int rx_freq)
{
struct p2p_message msg;
u8 status;
struct wpabuf *resp;
size_t g;
struct p2p_group *group = NULL;
int parsed = 0;
u8 noa[50];
int noa_len;
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_dbg(p2p, "Received P2P Action - P2P Presence Request");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
for (g = 0; g < p2p->num_groups; g++) {
if (os_memcmp(da, p2p_group_get_interface_addr(p2p->groups[g]),
ETH_ALEN) == 0) {
group = p2p->groups[g];
break;
}
}
if (group == NULL) {
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_dbg(p2p, "Ignore P2P Presence Request for unknown group "
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
MACSTR, MAC2STR(da));
return;
}
if (p2p_parse(data, len, &msg) < 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
p2p_dbg(p2p, "Failed to parse P2P Presence Request");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
status = P2P_SC_FAIL_INVALID_PARAMS;
goto fail;
}
parsed = 1;
if (msg.noa == NULL) {
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_dbg(p2p, "No NoA attribute in P2P Presence Request");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
status = P2P_SC_FAIL_INVALID_PARAMS;
goto fail;
}
status = p2p_group_presence_req(group, sa, msg.noa, msg.noa_len);
fail:
if (p2p->cfg->get_noa)
noa_len = p2p->cfg->get_noa(p2p->cfg->cb_ctx, da, noa,
sizeof(noa));
else
noa_len = -1;
resp = p2p_build_presence_resp(status, noa_len > 0 ? noa : NULL,
noa_len > 0 ? noa_len : 0,
msg.dialog_token);
if (parsed)
p2p_parse_free(&msg);
if (resp == NULL)
return;
p2p->pending_action_state = P2P_NO_PENDING_ACTION;
P2P: Delay send_action call if p2p_scan is in progress In order to avoid confusing the driver with a new remain-on-channel request, delay sending of a new Action frame if the driver indicates Action frame RX diromg a scan.
2010-10-20 18:41:20 +02:00
if (p2p_send_action(p2p, rx_freq, sa, da, da,
wpabuf_head(resp), wpabuf_len(resp), 200) < 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
p2p_dbg(p2p, "Failed to send Action frame");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
}
wpabuf_free(resp);
}
static void p2p_process_presence_resp(struct p2p_data *p2p, const u8 *da,
const u8 *sa, const u8 *data, size_t len)
{
struct p2p_message 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_dbg(p2p, "Received P2P Action - P2P Presence Response");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (p2p_parse(data, len, &msg) < 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
p2p_dbg(p2p, "Failed to parse P2P Presence Response");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return;
}
if (msg.status == NULL || msg.noa == NULL) {
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_dbg(p2p, "No Status or NoA attribute in P2P Presence Response");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p_parse_free(&msg);
return;
}
if (*msg.status) {
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_dbg(p2p, "P2P Presence Request was rejected: status %u",
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
*msg.status);
p2p_parse_free(&msg);
return;
}
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_dbg(p2p, "P2P Presence Request was accepted");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
wpa_hexdump(MSG_DEBUG, "P2P: P2P Presence Response - NoA",
msg.noa, msg.noa_len);
/* TODO: process NoA */
p2p_parse_free(&msg);
}
static void p2p_ext_listen_timeout(void *eloop_ctx, void *timeout_ctx)
{
struct p2p_data *p2p = eloop_ctx;
if (p2p->ext_listen_interval) {
/* Schedule next extended listen timeout */
eloop_register_timeout(p2p->ext_listen_interval_sec,
p2p->ext_listen_interval_usec,
p2p_ext_listen_timeout, p2p, NULL);
}
P2P: Add a workaround for Extended Listen Timing getting stuck This should not really happen, but it looks like the Listen command may fail is something else (e.g., a scan) was running at an inconvenient time. As a workaround, allow new Extended Listen operation to be started if this state is detected.
2010-08-04 18:02:27 +02:00
if (p2p->state == P2P_LISTEN_ONLY && p2p->ext_listen_only) {
/*
* This should not really happen, but it looks like the Listen
* command may fail is something else (e.g., a scan) was
* running at an inconvenient time. As a workaround, allow new
* Extended Listen operation to be started.
*/
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_dbg(p2p, "Previous Extended Listen operation had not been completed - try again");
P2P: Add a workaround for Extended Listen Timing getting stuck This should not really happen, but it looks like the Listen command may fail is something else (e.g., a scan) was running at an inconvenient time. As a workaround, allow new Extended Listen operation to be started if this state is detected.
2010-08-04 18:02:27 +02:00
p2p->ext_listen_only = 0;
p2p_set_state(p2p, P2P_IDLE);
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (p2p->state != P2P_IDLE) {
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_dbg(p2p, "Skip Extended Listen timeout in active state (%s)", p2p_state_txt(p2p->state));
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return;
}
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_dbg(p2p, "Extended Listen timeout");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->ext_listen_only = 1;
if (p2p_listen(p2p, p2p->ext_listen_period) < 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
p2p_dbg(p2p, "Failed to start Listen state for Extended Listen Timing");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->ext_listen_only = 0;
}
}
int p2p_ext_listen(struct p2p_data *p2p, unsigned int period,
unsigned int interval)
{
if (period > 65535 || interval > 65535 || period > interval ||
(period == 0 && interval > 0) || (period > 0 && interval == 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
p2p_dbg(p2p, "Invalid Extended Listen Timing request: period=%u interval=%u",
period, interval);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return -1;
}
eloop_cancel_timeout(p2p_ext_listen_timeout, p2p, NULL);
if (interval == 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
p2p_dbg(p2p, "Disabling Extended Listen Timing");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->ext_listen_period = 0;
p2p->ext_listen_interval = 0;
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
p2p_dbg(p2p, "Enabling Extended Listen Timing: period %u msec, interval %u msec",
period, interval);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->ext_listen_period = period;
p2p->ext_listen_interval = interval;
p2p->ext_listen_interval_sec = interval / 1000;
p2p->ext_listen_interval_usec = (interval % 1000) * 1000;
eloop_register_timeout(p2p->ext_listen_interval_sec,
p2p->ext_listen_interval_usec,
p2p_ext_listen_timeout, p2p, NULL);
return 0;
}
void p2p_deauth_notif(struct p2p_data *p2p, const u8 *bssid, u16 reason_code,
const u8 *ie, size_t ie_len)
{
struct p2p_message msg;
if (bssid == NULL || ie == NULL)
return;
os_memset(&msg, 0, sizeof(msg));
if (p2p_parse_ies(ie, ie_len, &msg))
return;
if (msg.minor_reason_code == NULL)
return;
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_dbg(p2p, "Deauthentication notification BSSID " MACSTR
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
" reason_code=%u minor_reason_code=%u",
MAC2STR(bssid), reason_code, *msg.minor_reason_code);
p2p_parse_free(&msg);
}
void p2p_disassoc_notif(struct p2p_data *p2p, const u8 *bssid, u16 reason_code,
const u8 *ie, size_t ie_len)
{
struct p2p_message msg;
if (bssid == NULL || ie == NULL)
return;
os_memset(&msg, 0, sizeof(msg));
if (p2p_parse_ies(ie, ie_len, &msg))
return;
if (msg.minor_reason_code == NULL)
return;
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_dbg(p2p, "Disassociation notification BSSID " MACSTR
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
" reason_code=%u minor_reason_code=%u",
MAC2STR(bssid), reason_code, *msg.minor_reason_code);
p2p_parse_free(&msg);
}
void p2p_set_managed_oper(struct p2p_data *p2p, int enabled)
{
if (enabled) {
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_dbg(p2p, "Managed P2P Device operations enabled");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->dev_capab |= P2P_DEV_CAPAB_INFRA_MANAGED;
} else {
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_dbg(p2p, "Managed P2P Device operations disabled");
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->dev_capab &= ~P2P_DEV_CAPAB_INFRA_MANAGED;
}
}
int p2p_set_listen_channel(struct p2p_data *p2p, u8 reg_class, u8 channel)
{
P2P: Clean up channel--frequency conversion functions All P2P use cases are required to use the global operating table and there is no need to need to try to maintain some backwards compatibility with country code -specific values. Clean up the implementation by removing the unnecessary country parameter. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-27 20:03:16 +02:00
if (p2p_channel_to_freq(reg_class, channel) < 0)
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
return -1;
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_dbg(p2p, "Set Listen channel: reg_class %u channel %u",
reg_class, channel);
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
p2p->cfg->reg_class = reg_class;
p2p->cfg->channel = channel;
return 0;
}
int p2p_set_ssid_postfix(struct p2p_data *p2p, const u8 *postfix, size_t len)
{
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_dbg(p2p, "New SSID postfix: %s", wpa_ssid_txt(postfix, len));
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
if (postfix == NULL) {
p2p->cfg->ssid_postfix_len = 0;
return 0;
}
if (len > sizeof(p2p->cfg->ssid_postfix))
return -1;
os_memcpy(p2p->cfg->ssid_postfix, postfix, len);
p2p->cfg->ssid_postfix_len = len;
return 0;
}
P2P: Update listen and operating channel from P2P D-Bus Some P2PDevice properties were not updated in p2p->cfg structure: reg_class, channel, op_reg_class, and op_channel. Hence, update p2p->cfg parameters through p2p core calls in wpas_p2p_update_config(). Signed-off-by: Jean-Michel.Bachot <jean-michelx.bachot@intel.com> Signed-off-by: Jayant Sane <jayant.sane@intel.com>
2011-06-25 11:08:43 +02:00
int p2p_set_oper_channel(struct p2p_data *p2p, u8 op_reg_class, u8 op_channel,
int cfg_op_channel)
{
P2P: Clean up channel--frequency conversion functions All P2P use cases are required to use the global operating table and there is no need to need to try to maintain some backwards compatibility with country code -specific values. Clean up the implementation by removing the unnecessary country parameter. Signed-hostap: Jouni Malinen <j@w1.fi>
2013-04-27 20:03:16 +02:00
if (p2p_channel_to_freq(op_reg_class, op_channel) < 0)
P2P: Update listen and operating channel from P2P D-Bus Some P2PDevice properties were not updated in p2p->cfg structure: reg_class, channel, op_reg_class, and op_channel. Hence, update p2p->cfg parameters through p2p core calls in wpas_p2p_update_config(). Signed-off-by: Jean-Michel.Bachot <jean-michelx.bachot@intel.com> Signed-off-by: Jayant Sane <jayant.sane@intel.com>
2011-06-25 11:08:43 +02:00
return -1;
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_dbg(p2p, "Set Operating channel: reg_class %u channel %u",
op_reg_class, op_channel);
P2P: Update listen and operating channel from P2P D-Bus Some P2PDevice properties were not updated in p2p->cfg structure: reg_class, channel, op_reg_class, and op_channel. Hence, update p2p->cfg parameters through p2p core calls in wpas_p2p_update_config(). Signed-off-by: Jean-Michel.Bachot <jean-michelx.bachot@intel.com> Signed-off-by: Jayant Sane <jayant.sane@intel.com>
2011-06-25 11:08:43 +02:00
p2p->cfg->op_reg_class = op_reg_class;
p2p->cfg->op_channel = op_channel;
p2p->cfg->cfg_op_channel = cfg_op_channel;
return 0;
}
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
int p2p_set_pref_chan(struct p2p_data *p2p, unsigned int num_pref_chan,
const struct p2p_channel *pref_chan)
{
struct p2p_channel *n;
if (pref_chan) {
n = os_malloc(num_pref_chan * sizeof(struct p2p_channel));
if (n == NULL)
return -1;
os_memcpy(n, pref_chan,
num_pref_chan * sizeof(struct p2p_channel));
} else
n = NULL;
os_free(p2p->cfg->pref_chan);
p2p->cfg->pref_chan = n;
p2p->cfg->num_pref_chan = num_pref_chan;
return 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
int p2p_set_no_go_freq(struct p2p_data *p2p,
const struct wpa_freq_range_list *list)
{
struct wpa_freq_range *tmp;
if (list == NULL || list->num == 0) {
os_free(p2p->no_go_freq.range);
p2p->no_go_freq.range = NULL;
p2p->no_go_freq.num = 0;
return 0;
}
tmp = os_calloc(list->num, sizeof(struct wpa_freq_range));
if (tmp == NULL)
return -1;
os_memcpy(tmp, list->range, list->num * sizeof(struct wpa_freq_range));
os_free(p2p->no_go_freq.range);
p2p->no_go_freq.range = tmp;
p2p->no_go_freq.num = list->num;
p2p_dbg(p2p, "Updated no GO chan list");
return 0;
}
P2P: Add initial version of P2P Module
2010-07-18 23:30:25 +02:00
int p2p_get_interface_addr(struct p2p_data *p2p, const u8 *dev_addr,
u8 *iface_addr)
{
struct p2p_device *dev = p2p_get_device(p2p, dev_addr);
if (dev == NULL || is_zero_ether_addr(dev->interface_addr))
return -1;
os_memcpy(iface_addr, dev->interface_addr, ETH_ALEN);
return 0;
}
P2P: Add test command for filtering which peers are discovered "wpa_cli p2p_set peer_filter <MAC address>" can now be used to only allow a single P2P Device (based on P2P Device Address) to be discovered for testing. Setting the address to 00:00:00:00:00:00 disables the filter.
2010-06-29 07:11:39 +02:00
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
int p2p_get_dev_addr(struct p2p_data *p2p, const u8 *iface_addr,
u8 *dev_addr)
{
struct p2p_device *dev = p2p_get_device_interface(p2p, iface_addr);
if (dev == NULL)
return -1;
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
os_memcpy(dev_addr, dev->info.p2p_device_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
return 0;
}
P2P: Add test command for filtering which peers are discovered "wpa_cli p2p_set peer_filter <MAC address>" can now be used to only allow a single P2P Device (based on P2P Device Address) to be discovered for testing. Setting the address to 00:00:00:00:00:00 disables the filter.
2010-06-29 07:11:39 +02:00
void p2p_set_peer_filter(struct p2p_data *p2p, const u8 *addr)
{
os_memcpy(p2p->peer_filter, addr, ETH_ALEN);
if (is_zero_ether_addr(p2p->peer_filter))
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_dbg(p2p, "Disable peer filter");
P2P: Add test command for filtering which peers are discovered "wpa_cli p2p_set peer_filter <MAC address>" can now be used to only allow a single P2P Device (based on P2P Device Address) to be discovered for testing. Setting the address to 00:00:00:00:00:00 disables the filter.
2010-06-29 07:11:39 +02:00
else
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_dbg(p2p, "Enable peer filter for " MACSTR,
MAC2STR(p2p->peer_filter));
P2P: Add test command for filtering which peers are discovered "wpa_cli p2p_set peer_filter <MAC address>" can now be used to only allow a single P2P Device (based on P2P Device Address) to be discovered for testing. Setting the address to 00:00:00:00:00:00 disables the filter.
2010-06-29 07:11:39 +02:00
}
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 p2p_set_cross_connect(struct p2p_data *p2p, int enabled)
{
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_dbg(p2p, "Cross connection %s", enabled ? "enabled" : "disabled");
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 (p2p->cross_connect == enabled)
return;
p2p->cross_connect = enabled;
/* TODO: may need to tear down any action group where we are GO(?) */
}
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 p2p_get_oper_freq(struct p2p_data *p2p, const u8 *iface_addr)
{
struct p2p_device *dev = p2p_get_device_interface(p2p, iface_addr);
if (dev == NULL)
return -1;
if (dev->oper_freq <= 0)
return -1;
return dev->oper_freq;
}
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
void p2p_set_intra_bss_dist(struct p2p_data *p2p, int enabled)
{
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_dbg(p2p, "Intra BSS distribution %s",
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
enabled ? "enabled" : "disabled");
p2p->cfg->p2p_intra_bss = enabled;
}
P2P: Add mechanism for updating P2P channel list based on driver events This allows P2P channel list to be updated whenever the driver changes its list of allowed channels, e.g., based on country code from scan results.
2010-10-15 17:55:22 +02:00
P2P: Add option to allow additional client channels The new p2p_add_cli_chan=1 configuration parameter can be used to request passive-scan channels to be included in P2P channel lists for cases where the local end may become the P2P client in a group. This allows more options for the peer to use channels, e.g., if the local device is not aware of its current location and has marked most channels to require passive scanning. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2013-10-22 20:00:49 +02:00
void p2p_update_channel_list(struct p2p_data *p2p,
const struct p2p_channels *chan,
const struct p2p_channels *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: 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_dbg(p2p, "Update channel list");
P2P: Add mechanism for updating P2P channel list based on driver events This allows P2P channel list to be updated whenever the driver changes its list of allowed channels, e.g., based on country code from scan results.
2010-10-15 17:55:22 +02:00
os_memcpy(&p2p->cfg->channels, chan, sizeof(struct p2p_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
p2p_channels_dump(p2p, "channels", &p2p->cfg->channels);
os_memcpy(&p2p->cfg->cli_channels, cli_chan,
sizeof(struct p2p_channels));
p2p_channels_dump(p2p, "cli_channels", &p2p->cfg->cli_channels);
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: Delay send_action call if p2p_scan is in progress In order to avoid confusing the driver with a new remain-on-channel request, delay sending of a new Action frame if the driver indicates Action frame RX diromg a scan.
2010-10-20 18:41:20 +02:00
int p2p_send_action(struct p2p_data *p2p, unsigned int freq, const u8 *dst,
const u8 *src, const u8 *bssid, const u8 *buf,
size_t len, unsigned int wait_time)
{
if (p2p->p2p_scan_running) {
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_dbg(p2p, "Delay Action frame TX until p2p_scan completes");
P2P: Delay send_action call if p2p_scan is in progress In order to avoid confusing the driver with a new remain-on-channel request, delay sending of a new Action frame if the driver indicates Action frame RX diromg a scan.
2010-10-20 18:41:20 +02:00
if (p2p->after_scan_tx) {
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_dbg(p2p, "Dropped previous pending Action frame TX");
P2P: Delay send_action call if p2p_scan is in progress In order to avoid confusing the driver with a new remain-on-channel request, delay sending of a new Action frame if the driver indicates Action frame RX diromg a scan.
2010-10-20 18:41:20 +02:00
os_free(p2p->after_scan_tx);
}
p2p->after_scan_tx = os_malloc(sizeof(*p2p->after_scan_tx) +
len);
if (p2p->after_scan_tx == NULL)
return -1;
p2p->after_scan_tx->freq = freq;
os_memcpy(p2p->after_scan_tx->dst, dst, ETH_ALEN);
os_memcpy(p2p->after_scan_tx->src, src, ETH_ALEN);
os_memcpy(p2p->after_scan_tx->bssid, bssid, ETH_ALEN);
p2p->after_scan_tx->len = len;
p2p->after_scan_tx->wait_time = wait_time;
os_memcpy(p2p->after_scan_tx + 1, buf, len);
return 0;
}
return p2p->cfg->send_action(p2p->cfg->cb_ctx, freq, dst, src, bssid,
buf, len, wait_time);
}
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 p2p_set_best_channels(struct p2p_data *p2p, int freq_24, int freq_5,
int freq_overall)
{
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_dbg(p2p, "Best channel: 2.4 GHz: %d, 5 GHz: %d, overall: %d",
freq_24, freq_5, freq_overall);
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->best_freq_24 = freq_24;
p2p->best_freq_5 = freq_5;
p2p->best_freq_overall = freq_overall;
}
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: 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
void p2p_set_own_freq_preference(struct p2p_data *p2p, int freq)
{
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_dbg(p2p, "Own frequency preference: %d MHz", freq);
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->own_freq_preference = freq;
}
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 * p2p_get_go_neg_peer(struct p2p_data *p2p)
{
if (p2p == NULL || p2p->go_neg_peer == NULL)
return NULL;
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
return p2p->go_neg_peer->info.p2p_device_addr;
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: Add p2p_get_peer_found to get peer info This will only retrieve information about peers that have been fully discovered, not peers that are only half-discovered based on their Probe Request frames. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2011-02-24 21:05:22 +01:00
const struct p2p_peer_info *
p2p_get_peer_found(struct p2p_data *p2p, const u8 *addr, int next)
{
struct p2p_device *dev;
if (addr) {
dev = p2p_get_device(p2p, addr);
if (!dev)
return NULL;
if (!next) {
if (dev->flags & P2P_DEV_PROBE_REQ_ONLY)
return NULL;
return &dev->info;
} else {
do {
dev = dl_list_first(&dev->list,
struct p2p_device,
list);
if (&dev->list == &p2p->devices)
return NULL;
} while (dev->flags & P2P_DEV_PROBE_REQ_ONLY);
}
} else {
dev = dl_list_first(&p2p->devices, struct p2p_device, list);
if (!dev)
return NULL;
while (dev->flags & P2P_DEV_PROBE_REQ_ONLY) {
dev = dl_list_first(&dev->list,
struct p2p_device,
list);
if (&dev->list == &p2p->devices)
return NULL;
}
}
return &dev->info;
}
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 p2p_in_progress(struct p2p_data *p2p)
{
if (p2p == NULL)
return 0;
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
if (p2p->state == P2P_SEARCH || p2p->state == P2P_SEARCH_WHEN_READY ||
p2p->state == P2P_CONTINUE_SEARCH_WHEN_READY)
return 2;
P2P: Fix group formation after previous commit p2p_in_progress() have to ignore P2P_PROVISIONING state to allow station mode (which includes P2P client) scan to work.
2011-09-29 20:48:07 +02:00
return p2p->state != P2P_IDLE && p2p->state != P2P_PROVISIONING;
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: 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
void p2p_set_config_timeout(struct p2p_data *p2p, u8 go_timeout,
u8 client_timeout)
{
if (p2p) {
p2p->go_timeout = go_timeout;
p2p->client_timeout = client_timeout;
}
}
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
void p2p_increase_search_delay(struct p2p_data *p2p, unsigned int delay)
{
if (p2p && p2p->search_delay < delay)
p2p->search_delay = delay;
}
WFD: Add Wi-Fi Display support This commit adds control interface commands and internal storage of Wi-Fi Display related configuration. In addition, WFD IE is now added to various P2P frames, Probe Request/Response, and (Re)Association Request/Response frames. WFD subelements from peers are stored in the P2P peer table. Following control interface commands are now available: SET wifi_display <0/1> GET wifi_display WFD_SUBELEM_SET <subelem> [hexdump of length+body] WFD_SUBELEM_GET <subelem> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 16:26:01 +01:00
#ifdef CONFIG_WIFI_DISPLAY
static void p2p_update_wfd_ie_groups(struct p2p_data *p2p)
{
size_t g;
struct p2p_group *group;
for (g = 0; g < p2p->num_groups; g++) {
group = p2p->groups[g];
wpa_supplicant: Fix updating GO beacons on WFD subelements change When WFD Subelements are set, the IE in the Beacon frames of already existing groups are not updated. This patch fixes this issue by setting beacon_update to be 1 on WFD IE update. Signed-hostap: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
2013-11-03 14:24:13 +01:00
p2p_group_force_beacon_update_ies(group);
WFD: Add Wi-Fi Display support This commit adds control interface commands and internal storage of Wi-Fi Display related configuration. In addition, WFD IE is now added to various P2P frames, Probe Request/Response, and (Re)Association Request/Response frames. WFD subelements from peers are stored in the P2P peer table. Following control interface commands are now available: SET wifi_display <0/1> GET wifi_display WFD_SUBELEM_SET <subelem> [hexdump of length+body] WFD_SUBELEM_GET <subelem> Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
2012-03-02 16:26:01 +01:00
}
}
int p2p_set_wfd_ie_beacon(struct p2p_data *p2p, struct wpabuf *ie)
{
wpabuf_free(p2p->wfd_ie_beacon);
p2p->wfd_ie_beacon = ie;
p2p_update_wfd_ie_groups(p2p);
return 0;
}
int p2p_set_wfd_ie_probe_req(struct p2p_data *p2p, struct wpabuf *ie)
{
wpabuf_free(p2p->wfd_ie_probe_req);
p2p->wfd_ie_probe_req = ie;
return 0;
}
int p2p_set_wfd_ie_probe_resp(struct p2p_data *p2p, struct wpabuf *ie)
{
wpabuf_free(p2p->wfd_ie_probe_resp);
p2p->wfd_ie_probe_resp = ie;
p2p_update_wfd_ie_groups(p2p);
return 0;
}
int p2p_set_wfd_ie_assoc_req(struct p2p_data *p2p, struct wpabuf *ie)
{
wpabuf_free(p2p->wfd_ie_assoc_req);
p2p->wfd_ie_assoc_req = ie;
return 0;
}
int p2p_set_wfd_ie_invitation(struct p2p_data *p2p, struct wpabuf *ie)
{
wpabuf_free(p2p->wfd_ie_invitation);
p2p->wfd_ie_invitation = ie;
return 0;
}
int p2p_set_wfd_ie_prov_disc_req(struct p2p_data *p2p, struct wpabuf *ie)
{
wpabuf_free(p2p->wfd_ie_prov_disc_req);
p2p->wfd_ie_prov_disc_req = ie;
return 0;
}
int p2p_set_wfd_ie_prov_disc_resp(struct p2p_data *p2p, struct wpabuf *ie)
{
wpabuf_free(p2p->wfd_ie_prov_disc_resp);
p2p->wfd_ie_prov_disc_resp = ie;
return 0;
}
int p2p_set_wfd_ie_go_neg(struct p2p_data *p2p, struct wpabuf *ie)
{
wpabuf_free(p2p->wfd_ie_go_neg);
p2p->wfd_ie_go_neg = ie;
return 0;
}
int p2p_set_wfd_dev_info(struct p2p_data *p2p, const struct wpabuf *elem)
{
wpabuf_free(p2p->wfd_dev_info);
if (elem) {
p2p->wfd_dev_info = wpabuf_dup(elem);
if (p2p->wfd_dev_info == NULL)
return -1;
} else
p2p->wfd_dev_info = NULL;
return 0;
}
int p2p_set_wfd_assoc_bssid(struct p2p_data *p2p, const struct wpabuf *elem)
{
wpabuf_free(p2p->wfd_assoc_bssid);
if (elem) {
p2p->wfd_assoc_bssid = wpabuf_dup(elem);
if (p2p->wfd_assoc_bssid == NULL)
return -1;
} else
p2p->wfd_assoc_bssid = NULL;
return 0;
}
int p2p_set_wfd_coupled_sink_info(struct p2p_data *p2p,
const struct wpabuf *elem)
{
wpabuf_free(p2p->wfd_coupled_sink_info);
if (elem) {
p2p->wfd_coupled_sink_info = wpabuf_dup(elem);
if (p2p->wfd_coupled_sink_info == NULL)
return -1;
} else
p2p->wfd_coupled_sink_info = NULL;
return 0;
}
#endif /* CONFIG_WIFI_DISPLAY */
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
int p2p_set_disc_int(struct p2p_data *p2p, int min_disc_int, int max_disc_int,
int max_disc_tu)
{
if (min_disc_int > max_disc_int || min_disc_int < 0 || max_disc_int < 0)
return -1;
p2p->min_disc_int = min_disc_int;
p2p->max_disc_int = max_disc_int;
p2p->max_disc_tu = max_disc_tu;
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_dbg(p2p, "Set discoverable interval: min=%d max=%d max_tu=%d",
min_disc_int, max_disc_int, max_disc_tu);
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
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
void p2p_dbg(struct p2p_data *p2p, const char *fmt, ...)
{
va_list ap;
char buf[500];
if (!p2p->cfg->debug_print)
return;
va_start(ap, fmt);
vsnprintf(buf, sizeof(buf), fmt, ap);
buf[sizeof(buf) - 1] = '\0';
va_end(ap);
p2p->cfg->debug_print(p2p->cfg->cb_ctx, MSG_DEBUG, buf);
}
void p2p_info(struct p2p_data *p2p, const char *fmt, ...)
{
va_list ap;
char buf[500];
if (!p2p->cfg->debug_print)
return;
va_start(ap, fmt);
vsnprintf(buf, sizeof(buf), fmt, ap);
buf[sizeof(buf) - 1] = '\0';
va_end(ap);
p2p->cfg->debug_print(p2p->cfg->cb_ctx, MSG_INFO, buf);
}
void p2p_err(struct p2p_data *p2p, const char *fmt, ...)
{
va_list ap;
char buf[500];
if (!p2p->cfg->debug_print)
return;
va_start(ap, fmt);
vsnprintf(buf, sizeof(buf), fmt, ap);
buf[sizeof(buf) - 1] = '\0';
va_end(ap);
p2p->cfg->debug_print(p2p->cfg->cb_ctx, MSG_ERROR, buf);
}
Reference in a new issue Copy permalink