2010-07-18 17:30:25 -04:00
|
|
|
/*
|
|
|
|
* Wi-Fi Direct - P2P provision discovery
|
|
|
|
* Copyright (c) 2009-2010, Atheros Communications
|
|
|
|
*
|
2012-02-11 09:31:36 -05:00
|
|
|
* This software may be distributed under the terms of the BSD license.
|
|
|
|
* See README for more details.
|
2010-07-18 17:30:25 -04:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include "includes.h"
|
|
|
|
|
|
|
|
#include "common.h"
|
|
|
|
#include "common/ieee802_11_defs.h"
|
|
|
|
#include "wps/wps_defs.h"
|
|
|
|
#include "p2p_i.h"
|
|
|
|
#include "p2p.h"
|
|
|
|
|
|
|
|
|
2011-06-12 17:20:39 -04:00
|
|
|
/*
|
|
|
|
* Number of retries to attempt for provision discovery requests during IDLE
|
|
|
|
* state in case the peer is not listening.
|
|
|
|
*/
|
|
|
|
#define MAX_PROV_DISC_REQ_RETRIES 10
|
|
|
|
|
|
|
|
|
2010-07-18 17:30:25 -04:00
|
|
|
static void p2p_build_wps_ie_config_methods(struct wpabuf *buf,
|
|
|
|
u16 config_methods)
|
|
|
|
{
|
|
|
|
u8 *len;
|
|
|
|
wpabuf_put_u8(buf, WLAN_EID_VENDOR_SPECIFIC);
|
|
|
|
len = wpabuf_put(buf, 1);
|
|
|
|
wpabuf_put_be32(buf, WPS_DEV_OUI_WFA);
|
|
|
|
|
|
|
|
/* Config Methods */
|
|
|
|
wpabuf_put_be16(buf, ATTR_CONFIG_METHODS);
|
|
|
|
wpabuf_put_be16(buf, 2);
|
|
|
|
wpabuf_put_be16(buf, config_methods);
|
|
|
|
|
|
|
|
p2p_buf_update_ie_hdr(buf, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static struct wpabuf * p2p_build_prov_disc_req(struct p2p_data *p2p,
|
|
|
|
u8 dialog_token,
|
|
|
|
u16 config_methods,
|
|
|
|
struct p2p_device *go)
|
|
|
|
{
|
|
|
|
struct wpabuf *buf;
|
|
|
|
u8 *len;
|
|
|
|
|
|
|
|
buf = wpabuf_alloc(1000);
|
|
|
|
if (buf == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
p2p_buf_add_public_action_hdr(buf, P2P_PROV_DISC_REQ, dialog_token);
|
|
|
|
|
|
|
|
len = p2p_buf_add_ie_hdr(buf);
|
|
|
|
p2p_buf_add_capability(buf, p2p->dev_capab, 0);
|
|
|
|
p2p_buf_add_device_info(buf, p2p, NULL);
|
|
|
|
if (go) {
|
2011-02-24 14:51:17 -05:00
|
|
|
p2p_buf_add_group_id(buf, go->info.p2p_device_addr,
|
|
|
|
go->oper_ssid, go->oper_ssid_len);
|
2010-07-18 17:30:25 -04:00
|
|
|
}
|
|
|
|
p2p_buf_update_ie_hdr(buf, len);
|
|
|
|
|
|
|
|
/* WPS IE with Config Methods attribute */
|
|
|
|
p2p_build_wps_ie_config_methods(buf, config_methods);
|
|
|
|
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static struct wpabuf * p2p_build_prov_disc_resp(struct p2p_data *p2p,
|
|
|
|
u8 dialog_token,
|
|
|
|
u16 config_methods)
|
|
|
|
{
|
|
|
|
struct wpabuf *buf;
|
|
|
|
|
|
|
|
buf = wpabuf_alloc(100);
|
|
|
|
if (buf == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
p2p_buf_add_public_action_hdr(buf, P2P_PROV_DISC_RESP, dialog_token);
|
|
|
|
|
|
|
|
/* WPS IE with Config Methods attribute */
|
|
|
|
p2p_build_wps_ie_config_methods(buf, config_methods);
|
|
|
|
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void p2p_process_prov_disc_req(struct p2p_data *p2p, const u8 *sa,
|
|
|
|
const u8 *data, size_t len, int rx_freq)
|
|
|
|
{
|
|
|
|
struct p2p_message msg;
|
|
|
|
struct p2p_device *dev;
|
|
|
|
int freq;
|
|
|
|
int reject = 1;
|
|
|
|
struct wpabuf *resp;
|
|
|
|
|
|
|
|
if (p2p_parse(data, len, &msg))
|
|
|
|
return;
|
|
|
|
|
|
|
|
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
|
|
|
|
"P2P: Received Provision Discovery Request from " MACSTR
|
|
|
|
" with config methods 0x%x (freq=%d)",
|
|
|
|
MAC2STR(sa), msg.wps_config_methods, rx_freq);
|
|
|
|
|
|
|
|
dev = p2p_get_device(p2p, sa);
|
2011-12-18 10:42:11 -05:00
|
|
|
if (dev == NULL || (dev->flags & P2P_DEV_PROBE_REQ_ONLY)) {
|
2010-07-18 17:30:25 -04:00
|
|
|
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
|
|
|
|
"P2P: Provision Discovery Request from "
|
|
|
|
"unknown peer " MACSTR, MAC2STR(sa));
|
2012-04-26 09:11:17 -04:00
|
|
|
if (p2p_add_device(p2p, sa, rx_freq, 0, data + 1, len - 1, 0))
|
|
|
|
{
|
2010-09-06 09:51:46 -04:00
|
|
|
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
|
|
|
|
"P2P: Provision Discovery Request add device "
|
|
|
|
"failed " MACSTR, MAC2STR(sa));
|
|
|
|
}
|
2010-07-18 17:30:25 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!(msg.wps_config_methods &
|
|
|
|
(WPS_CONFIG_DISPLAY | WPS_CONFIG_KEYPAD |
|
|
|
|
WPS_CONFIG_PUSHBUTTON))) {
|
|
|
|
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Unsupported "
|
|
|
|
"Config Methods in Provision Discovery Request");
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2012-05-08 10:34:19 -04:00
|
|
|
if (msg.group_id) {
|
|
|
|
size_t i;
|
|
|
|
for (i = 0; i < p2p->num_groups; i++) {
|
|
|
|
if (p2p_group_is_group_id_match(p2p->groups[i],
|
|
|
|
msg.group_id,
|
|
|
|
msg.group_id_len))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (i == p2p->num_groups) {
|
|
|
|
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: PD "
|
|
|
|
"request for unknown P2P Group ID - reject");
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-07-18 17:30:25 -04:00
|
|
|
if (dev)
|
|
|
|
dev->flags &= ~(P2P_DEV_PD_PEER_DISPLAY |
|
|
|
|
P2P_DEV_PD_PEER_KEYPAD);
|
|
|
|
if (msg.wps_config_methods & WPS_CONFIG_DISPLAY) {
|
|
|
|
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Peer " MACSTR
|
|
|
|
" requested us to show a PIN on display", MAC2STR(sa));
|
|
|
|
if (dev)
|
|
|
|
dev->flags |= P2P_DEV_PD_PEER_KEYPAD;
|
|
|
|
} else if (msg.wps_config_methods & WPS_CONFIG_KEYPAD) {
|
|
|
|
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Peer " MACSTR
|
|
|
|
" requested us to write its PIN using keypad",
|
|
|
|
MAC2STR(sa));
|
|
|
|
if (dev)
|
|
|
|
dev->flags |= P2P_DEV_PD_PEER_DISPLAY;
|
|
|
|
}
|
|
|
|
|
|
|
|
reject = 0;
|
|
|
|
|
|
|
|
out:
|
|
|
|
resp = p2p_build_prov_disc_resp(p2p, msg.dialog_token,
|
|
|
|
reject ? 0 : msg.wps_config_methods);
|
|
|
|
if (resp == NULL) {
|
|
|
|
p2p_parse_free(&msg);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
|
|
|
|
"P2P: Sending Provision Discovery Response");
|
|
|
|
if (rx_freq > 0)
|
|
|
|
freq = rx_freq;
|
|
|
|
else
|
|
|
|
freq = p2p_channel_to_freq(p2p->cfg->country,
|
|
|
|
p2p->cfg->reg_class,
|
|
|
|
p2p->cfg->channel);
|
|
|
|
if (freq < 0) {
|
|
|
|
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
|
|
|
|
"P2P: Unknown regulatory class/channel");
|
|
|
|
wpabuf_free(resp);
|
|
|
|
p2p_parse_free(&msg);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
p2p->pending_action_state = P2P_NO_PENDING_ACTION;
|
2010-10-20 12:41:20 -04:00
|
|
|
if (p2p_send_action(p2p, freq, sa, p2p->cfg->dev_addr,
|
|
|
|
p2p->cfg->dev_addr,
|
|
|
|
wpabuf_head(resp), wpabuf_len(resp), 200) < 0) {
|
2010-07-18 17:30:25 -04:00
|
|
|
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
|
|
|
|
"P2P: Failed to send Action frame");
|
|
|
|
}
|
|
|
|
|
|
|
|
wpabuf_free(resp);
|
|
|
|
|
|
|
|
if (!reject && p2p->cfg->prov_disc_req) {
|
|
|
|
const u8 *dev_addr = sa;
|
|
|
|
if (msg.p2p_device_addr)
|
|
|
|
dev_addr = msg.p2p_device_addr;
|
|
|
|
p2p->cfg->prov_disc_req(p2p->cfg->cb_ctx, sa,
|
|
|
|
msg.wps_config_methods,
|
|
|
|
dev_addr, msg.pri_dev_type,
|
|
|
|
msg.device_name, msg.config_methods,
|
|
|
|
msg.capability ? msg.capability[0] : 0,
|
|
|
|
msg.capability ? msg.capability[1] :
|
2011-12-06 14:57:17 -05:00
|
|
|
0,
|
|
|
|
msg.group_id, msg.group_id_len);
|
2010-07-18 17:30:25 -04:00
|
|
|
}
|
|
|
|
p2p_parse_free(&msg);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void p2p_process_prov_disc_resp(struct p2p_data *p2p, const u8 *sa,
|
|
|
|
const u8 *data, size_t len)
|
|
|
|
{
|
|
|
|
struct p2p_message msg;
|
|
|
|
struct p2p_device *dev;
|
|
|
|
u16 report_config_methods = 0;
|
2012-05-08 10:02:28 -04:00
|
|
|
int success = 0;
|
2010-07-18 17:30:25 -04:00
|
|
|
|
|
|
|
if (p2p_parse(data, len, &msg))
|
|
|
|
return;
|
|
|
|
|
|
|
|
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
|
2011-12-11 10:36:38 -05:00
|
|
|
"P2P: Received Provision Discovery Response from " MACSTR
|
2010-07-18 17:30:25 -04:00
|
|
|
" with config methods 0x%x",
|
|
|
|
MAC2STR(sa), msg.wps_config_methods);
|
|
|
|
|
|
|
|
dev = p2p_get_device(p2p, sa);
|
|
|
|
if (dev == NULL || !dev->req_config_methods) {
|
|
|
|
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
|
2011-12-11 10:36:38 -05:00
|
|
|
"P2P: Ignore Provision Discovery Response from "
|
2010-07-18 17:30:25 -04:00
|
|
|
MACSTR " with no pending request", MAC2STR(sa));
|
|
|
|
p2p_parse_free(&msg);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2011-06-12 17:20:39 -04:00
|
|
|
if (p2p->pending_action_state == P2P_PENDING_PD) {
|
|
|
|
os_memset(p2p->pending_pd_devaddr, 0, ETH_ALEN);
|
|
|
|
p2p->pending_action_state = P2P_NO_PENDING_ACTION;
|
|
|
|
}
|
|
|
|
|
2010-07-18 17:30:25 -04:00
|
|
|
if (dev->dialog_token != msg.dialog_token) {
|
|
|
|
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
|
2011-12-11 10:36:38 -05:00
|
|
|
"P2P: Ignore Provision Discovery Response with "
|
2010-07-18 17:30:25 -04:00
|
|
|
"unexpected Dialog Token %u (expected %u)",
|
|
|
|
msg.dialog_token, dev->dialog_token);
|
|
|
|
p2p_parse_free(&msg);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2011-06-12 17:20:39 -04:00
|
|
|
/*
|
|
|
|
* If the response is from the peer to whom a user initiated request
|
|
|
|
* was sent earlier, we reset that state info here.
|
|
|
|
*/
|
|
|
|
if (p2p->user_initiated_pd &&
|
|
|
|
os_memcmp(p2p->pending_pd_devaddr, sa, ETH_ALEN) == 0)
|
|
|
|
p2p_reset_pending_pd(p2p);
|
|
|
|
|
2010-07-18 17:30:25 -04:00
|
|
|
if (msg.wps_config_methods != dev->req_config_methods) {
|
|
|
|
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Peer rejected "
|
2011-12-11 10:36:38 -05:00
|
|
|
"our Provision Discovery Request");
|
2011-06-12 17:26:22 -04:00
|
|
|
if (p2p->cfg->prov_disc_fail)
|
|
|
|
p2p->cfg->prov_disc_fail(p2p->cfg->cb_ctx, sa,
|
|
|
|
P2P_PROV_DISC_REJECTED);
|
2010-07-18 17:30:25 -04:00
|
|
|
p2p_parse_free(&msg);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
report_config_methods = dev->req_config_methods;
|
|
|
|
dev->flags &= ~(P2P_DEV_PD_PEER_DISPLAY |
|
|
|
|
P2P_DEV_PD_PEER_KEYPAD);
|
|
|
|
if (dev->req_config_methods & WPS_CONFIG_DISPLAY) {
|
|
|
|
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Peer " MACSTR
|
|
|
|
" accepted to show a PIN on display", MAC2STR(sa));
|
|
|
|
dev->flags |= P2P_DEV_PD_PEER_DISPLAY;
|
|
|
|
} else if (msg.wps_config_methods & WPS_CONFIG_KEYPAD) {
|
|
|
|
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Peer " MACSTR
|
|
|
|
" accepted to write our PIN using keypad",
|
|
|
|
MAC2STR(sa));
|
|
|
|
dev->flags |= P2P_DEV_PD_PEER_KEYPAD;
|
|
|
|
}
|
2011-12-06 14:44:57 -05:00
|
|
|
|
|
|
|
/* Store the provisioning info */
|
|
|
|
dev->wps_prov_info = msg.wps_config_methods;
|
|
|
|
|
2010-07-18 17:30:25 -04:00
|
|
|
p2p_parse_free(&msg);
|
2012-05-08 10:02:28 -04:00
|
|
|
success = 1;
|
2010-07-18 17:30:25 -04:00
|
|
|
|
|
|
|
out:
|
|
|
|
dev->req_config_methods = 0;
|
|
|
|
p2p->cfg->send_action_done(p2p->cfg->cb_ctx);
|
2012-05-11 09:25:47 -04:00
|
|
|
if (dev->flags & P2P_DEV_PD_BEFORE_GO_NEG) {
|
|
|
|
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
|
|
|
|
"P2P: Start GO Neg after the PD-before-GO-Neg "
|
|
|
|
"workaround with " MACSTR,
|
|
|
|
MAC2STR(dev->info.p2p_device_addr));
|
|
|
|
dev->flags &= ~P2P_DEV_PD_BEFORE_GO_NEG;
|
|
|
|
p2p_connect_send(p2p, dev);
|
|
|
|
return;
|
|
|
|
}
|
2012-05-08 10:02:28 -04:00
|
|
|
if (success && p2p->cfg->prov_disc_resp)
|
2010-07-18 17:30:25 -04:00
|
|
|
p2p->cfg->prov_disc_resp(p2p->cfg->cb_ctx, sa,
|
|
|
|
report_config_methods);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int p2p_send_prov_disc_req(struct p2p_data *p2p, struct p2p_device *dev,
|
2011-12-18 10:21:25 -05:00
|
|
|
int join, int force_freq)
|
2010-07-18 17:30:25 -04:00
|
|
|
{
|
|
|
|
struct wpabuf *req;
|
|
|
|
int freq;
|
|
|
|
|
2011-12-18 10:21:25 -05:00
|
|
|
if (force_freq > 0)
|
|
|
|
freq = force_freq;
|
|
|
|
else
|
|
|
|
freq = dev->listen_freq > 0 ? dev->listen_freq :
|
|
|
|
dev->oper_freq;
|
2010-07-18 17:30:25 -04:00
|
|
|
if (freq <= 0) {
|
|
|
|
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
|
|
|
|
"P2P: No Listen/Operating frequency known for the "
|
|
|
|
"peer " MACSTR " to send Provision Discovery Request",
|
2011-02-24 14:51:17 -05:00
|
|
|
MAC2STR(dev->info.p2p_device_addr));
|
2010-07-18 17:30:25 -04:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dev->flags & P2P_DEV_GROUP_CLIENT_ONLY) {
|
2011-02-24 14:51:17 -05:00
|
|
|
if (!(dev->info.dev_capab &
|
|
|
|
P2P_DEV_CAPAB_CLIENT_DISCOVERABILITY)) {
|
2010-07-18 17:30:25 -04:00
|
|
|
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
|
|
|
|
"P2P: Cannot use PD with P2P Device " MACSTR
|
|
|
|
" that is in a group and is not discoverable",
|
2011-02-24 14:51:17 -05:00
|
|
|
MAC2STR(dev->info.p2p_device_addr));
|
2010-07-18 17:30:25 -04:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
/* TODO: use device discoverability request through GO */
|
|
|
|
}
|
|
|
|
|
|
|
|
dev->dialog_token++;
|
|
|
|
if (dev->dialog_token == 0)
|
|
|
|
dev->dialog_token = 1;
|
|
|
|
req = p2p_build_prov_disc_req(p2p, dev->dialog_token,
|
|
|
|
dev->req_config_methods,
|
|
|
|
join ? dev : NULL);
|
|
|
|
if (req == NULL)
|
|
|
|
return -1;
|
|
|
|
|
2012-02-27 10:23:41 -05:00
|
|
|
if (p2p->state != P2P_IDLE)
|
|
|
|
p2p_stop_listen_for_freq(p2p, freq);
|
2010-07-18 17:30:25 -04:00
|
|
|
p2p->pending_action_state = P2P_PENDING_PD;
|
2011-02-24 14:51:17 -05:00
|
|
|
if (p2p_send_action(p2p, freq, dev->info.p2p_device_addr,
|
|
|
|
p2p->cfg->dev_addr, dev->info.p2p_device_addr,
|
2010-10-20 12:41:20 -04:00
|
|
|
wpabuf_head(req), wpabuf_len(req), 200) < 0) {
|
2010-07-18 17:30:25 -04:00
|
|
|
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
|
|
|
|
"P2P: Failed to send Action frame");
|
|
|
|
wpabuf_free(req);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2011-06-12 17:20:39 -04:00
|
|
|
os_memcpy(p2p->pending_pd_devaddr, dev->info.p2p_device_addr, ETH_ALEN);
|
|
|
|
|
2010-07-18 17:30:25 -04:00
|
|
|
wpabuf_free(req);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int p2p_prov_disc_req(struct p2p_data *p2p, const u8 *peer_addr,
|
2011-12-18 10:21:25 -05:00
|
|
|
u16 config_methods, int join, int force_freq)
|
2010-07-18 17:30:25 -04:00
|
|
|
{
|
|
|
|
struct p2p_device *dev;
|
|
|
|
|
|
|
|
dev = p2p_get_device(p2p, peer_addr);
|
|
|
|
if (dev == NULL)
|
|
|
|
dev = p2p_get_device_interface(p2p, peer_addr);
|
|
|
|
if (dev == NULL || (dev->flags & P2P_DEV_PROBE_REQ_ONLY)) {
|
|
|
|
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Provision "
|
|
|
|
"Discovery Request destination " MACSTR
|
|
|
|
" not yet known", MAC2STR(peer_addr));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Provision Discovery "
|
|
|
|
"Request with " MACSTR " (config methods 0x%x)",
|
|
|
|
MAC2STR(peer_addr), config_methods);
|
|
|
|
if (config_methods == 0)
|
|
|
|
return -1;
|
|
|
|
|
2011-12-06 14:44:57 -05:00
|
|
|
/* Reset provisioning info */
|
|
|
|
dev->wps_prov_info = 0;
|
|
|
|
|
2010-07-18 17:30:25 -04:00
|
|
|
dev->req_config_methods = config_methods;
|
2010-10-27 12:36:10 -04:00
|
|
|
if (join)
|
|
|
|
dev->flags |= P2P_DEV_PD_FOR_JOIN;
|
|
|
|
else
|
|
|
|
dev->flags &= ~P2P_DEV_PD_FOR_JOIN;
|
2010-07-18 17:30:25 -04:00
|
|
|
|
2012-02-05 12:05:45 -05:00
|
|
|
if (p2p->state != P2P_IDLE && p2p->state != P2P_SEARCH &&
|
|
|
|
p2p->state != P2P_LISTEN_ONLY) {
|
2010-07-18 17:30:25 -04:00
|
|
|
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Busy with other "
|
|
|
|
"operations; postpone Provision Discovery Request "
|
|
|
|
"with " MACSTR " (config methods 0x%x)",
|
|
|
|
MAC2STR(peer_addr), config_methods);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-06-12 17:20:39 -04:00
|
|
|
/*
|
|
|
|
* We use the join param as a cue to differentiate between user
|
|
|
|
* initiated PD request and one issued during finds (internal).
|
|
|
|
*/
|
|
|
|
p2p->user_initiated_pd = !join;
|
|
|
|
|
|
|
|
/* Also set some retries to attempt in case of IDLE state */
|
|
|
|
if (p2p->user_initiated_pd && p2p->state == P2P_IDLE)
|
|
|
|
p2p->pd_retries = MAX_PROV_DISC_REQ_RETRIES;
|
|
|
|
|
2011-12-18 10:21:25 -05:00
|
|
|
return p2p_send_prov_disc_req(p2p, dev, join, force_freq);
|
2010-07-18 17:30:25 -04:00
|
|
|
}
|
2011-06-12 17:20:39 -04:00
|
|
|
|
|
|
|
|
|
|
|
void p2p_reset_pending_pd(struct p2p_data *p2p)
|
|
|
|
{
|
2011-12-11 10:43:17 -05:00
|
|
|
struct p2p_device *dev;
|
|
|
|
|
|
|
|
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))
|
|
|
|
continue;
|
|
|
|
if (!dev->req_config_methods)
|
|
|
|
continue;
|
|
|
|
if (dev->flags & P2P_DEV_PD_FOR_JOIN)
|
|
|
|
continue;
|
|
|
|
/* Reset the config methods of the device */
|
|
|
|
dev->req_config_methods = 0;
|
|
|
|
}
|
|
|
|
|
2011-06-12 17:20:39 -04:00
|
|
|
p2p->user_initiated_pd = 0;
|
|
|
|
os_memset(p2p->pending_pd_devaddr, 0, ETH_ALEN);
|
|
|
|
p2p->pd_retries = 0;
|
|
|
|
}
|