jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

P2P NFC: Define WPS_NFC config method

Browse source 
This will be used to track NFC as config method in P2P operations.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2013-02-15 17:07:28 +02:00 committed by Jouni Malinen
parent 0deab087cd
commit c00ab85f7e
3 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p2p/p2p.c
View file

@ -3387,6 +3387,8 @@ const char * p2p_wps_method_text(enum p2p_wps_method method)
return "Keypad"; return "Keypad";
case WPS_PBC: case WPS_PBC:
return "PBC"; return "PBC";
case WPS_NFC:
return "NFC";
} }
return "??"; return "??";

2
src/p2p/p2p.h
View file

@ -50,7 +50,7 @@ struct p2p_channels {
}; };
enum p2p_wps_method { enum p2p_wps_method {
WPS_NOT_READY, WPS_PIN_DISPLAY, WPS_PIN_KEYPAD, WPS_PBC WPS_NOT_READY, WPS_PIN_DISPLAY, WPS_PIN_KEYPAD, WPS_PBC, WPS_NFC
}; };
/** /**

19
src/p2p/p2p_go_neg.c
View file

@ -103,6 +103,8 @@ u16 p2p_wps_method_pw_id(enum p2p_wps_method wps_method)
return DEV_PW_USER_SPECIFIED; return DEV_PW_USER_SPECIFIED;
case WPS_PBC: case WPS_PBC:
return DEV_PW_PUSHBUTTON; return DEV_PW_PUSHBUTTON;
case WPS_NFC:
return DEV_PW_NFC_CONNECTION_HANDOVER;
default: default:
return DEV_PW_DEFAULT; return DEV_PW_DEFAULT;
} }
@ -118,6 +120,8 @@ static const char * p2p_wps_method_str(enum p2p_wps_method wps_method)
return "Keypad"; return "Keypad";
case WPS_PBC: case WPS_PBC:
return "PBC"; return "PBC";
case WPS_NFC:
return "NFC";
default: default:
return "??"; return "??";
} }
@ -131,6 +135,7 @@ static struct wpabuf * p2p_build_go_neg_req(struct p2p_data *p2p,
u8 *len; u8 *len;
u8 group_capab; u8 group_capab;
size_t extra = 0; size_t extra = 0;
u16 pw_id;
#ifdef CONFIG_WIFI_DISPLAY #ifdef CONFIG_WIFI_DISPLAY
if (p2p->wfd_ie_go_neg) if (p2p->wfd_ie_go_neg)
@ -172,8 +177,10 @@ static struct wpabuf * p2p_build_go_neg_req(struct p2p_data *p2p,
p2p_buf_update_ie_hdr(buf, len); p2p_buf_update_ie_hdr(buf, len);
/* WPS IE with Device Password ID attribute */ /* WPS IE with Device Password ID attribute */
if (p2p_build_wps_ie(p2p, buf, p2p_wps_method_pw_id(peer->wps_method), pw_id = p2p_wps_method_pw_id(peer->wps_method);
0) < 0) { if (peer->oob_pw_id)
pw_id = peer->oob_pw_id;
if (p2p_build_wps_ie(p2p, buf, pw_id, 0) < 0) {
p2p_dbg(p2p, "Failed to build WPS IE for GO Negotiation Request"); p2p_dbg(p2p, "Failed to build WPS IE for GO Negotiation Request");
wpabuf_free(buf); wpabuf_free(buf);
return NULL; return NULL;
@ -250,6 +257,7 @@ static struct wpabuf * p2p_build_go_neg_resp(struct p2p_data *p2p,
u8 *len; u8 *len;
u8 group_capab; u8 group_capab;
size_t extra = 0; size_t extra = 0;
u16 pw_id;
p2p_dbg(p2p, "Building GO Negotiation Response"); p2p_dbg(p2p, "Building GO Negotiation Response");
@ -312,9 +320,10 @@ static struct wpabuf * p2p_build_go_neg_resp(struct p2p_data *p2p,
p2p_buf_update_ie_hdr(buf, len); p2p_buf_update_ie_hdr(buf, len);
/* WPS IE with Device Password ID attribute */ /* WPS IE with Device Password ID attribute */
if (p2p_build_wps_ie(p2p, buf, pw_id = p2p_wps_method_pw_id(peer ? peer->wps_method : WPS_NOT_READY);
p2p_wps_method_pw_id(peer ? peer->wps_method : if (peer && peer->oob_pw_id)
WPS_NOT_READY), 0) < 0) { pw_id = peer->oob_pw_id;
if (p2p_build_wps_ie(p2p, buf, pw_id, 0) < 0) {
p2p_dbg(p2p, "Failed to build WPS IE for GO Negotiation Response"); p2p_dbg(p2p, "Failed to build WPS IE for GO Negotiation Response");
wpabuf_free(buf); wpabuf_free(buf);
return NULL; return NULL;