diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2012-02-27 23:14:35 +0200 |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2012-02-27 23:14:35 +0200 |
| commit | 360182ed7c0d1dd6807e6b6d8a84eeb595011cc2 (patch) | |
| tree | 9a744c685636a2488e4960f96713b5c33ca7f908 /src/p2p/p2p.c | |
| parent | 78db55b800f0fe48ad5afcb4c7e0c58636a56e39 (diff) | |
| download | external_wpa_supplicant_8_ti-360182ed7c0d1dd6807e6b6d8a84eeb595011cc2.zip external_wpa_supplicant_8_ti-360182ed7c0d1dd6807e6b6d8a84eeb595011cc2.tar.gz external_wpa_supplicant_8_ti-360182ed7c0d1dd6807e6b6d8a84eeb595011cc2.tar.bz2 | |
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>
Diffstat (limited to 'src/p2p/p2p.c')
| -rw-r--r-- | src/p2p/p2p.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index 6a48dba..b9c431f 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -775,6 +775,7 @@ static void p2p_search(struct p2p_data *p2p) { int freq = 0; enum p2p_scan_type type; + u16 pw_id = DEV_PW_DEFAULT; if (p2p->drv_in_listen) { wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Driver is still " @@ -795,6 +796,9 @@ static void p2p_search(struct p2p_data *p2p) type = P2P_SCAN_SPECIFIC; wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Starting search " "for freq %u (GO Neg)", freq); + + /* Advertise immediate availability of WPS credential */ + pw_id = p2p_wps_method_pw_id(p2p->go_neg_peer->wps_method); } else if (p2p->invite_peer) { /* * Only scan the known listen frequency of the peer @@ -818,7 +822,7 @@ static void p2p_search(struct p2p_data *p2p) if (p2p->cfg->p2p_scan(p2p->cfg->cb_ctx, type, freq, p2p->num_req_dev_types, p2p->req_dev_types, - p2p->find_dev_id)) { + p2p->find_dev_id, pw_id)) { wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Scan request failed"); p2p_continue_find(p2p); @@ -962,12 +966,14 @@ int p2p_find(struct p2p_data *p2p, unsigned int timeout, case P2P_FIND_PROGRESSIVE: res = p2p->cfg->p2p_scan(p2p->cfg->cb_ctx, P2P_SCAN_FULL, 0, p2p->num_req_dev_types, - p2p->req_dev_types, dev_id); + p2p->req_dev_types, dev_id, + DEV_PW_DEFAULT); break; case P2P_FIND_ONLY_SOCIAL: res = p2p->cfg->p2p_scan(p2p->cfg->cb_ctx, P2P_SCAN_SOCIAL, 0, p2p->num_req_dev_types, - p2p->req_dev_types, dev_id); + p2p->req_dev_types, dev_id, + DEV_PW_DEFAULT); break; default: return -1; @@ -1765,12 +1771,18 @@ struct wpabuf * p2p_build_probe_resp_ies(struct p2p_data *p2p) { struct wpabuf *buf; u8 *len; + int pw_id = -1; buf = wpabuf_alloc(1000); if (buf == NULL) return NULL; - p2p_build_wps_ie(p2p, buf, DEV_PW_DEFAULT, 1); + if (p2p->go_neg_peer) { + /* Advertise immediate availability of WPS credential */ + pw_id = p2p_wps_method_pw_id(p2p->go_neg_peer->wps_method); + } + + p2p_build_wps_ie(p2p, buf, pw_id, 1); /* P2P IE */ len = p2p_buf_add_ie_hdr(buf); |