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

P2P2: GO Negotiation Action frame contents for wrapped case

Browse source 
Support generation of the GO Negotiation frames with contents that is
needed for P2P2 wrapped case.

Signed-off-by: Shivani Baranwal <quic_shivbara@quicinc.com>
This commit is contained in:
Shivani Baranwal 2024-08-05 02:26:10 +05:30 • committed by Jouni Malinen
parent 64bfba98bd
commit c958a571a4
3 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p2p/p2p.c
View file

@ -1925,7 +1925,7 @@ static void p2p_rx_p2p_action(struct p2p_data *p2p, const u8 *sa,
p2p_handle_go_neg_resp(p2p, sa, data + 1, len - 1, rx_freq); p2p_handle_go_neg_resp(p2p, sa, data + 1, len - 1, rx_freq);
break; break;
case P2P_GO_NEG_CONF: case P2P_GO_NEG_CONF:
p2p_handle_go_neg_conf(p2p, sa, data + 1, len - 1); p2p_handle_go_neg_conf(p2p, sa, data + 1, len - 1, false);
break; break;
case P2P_INVITATION_REQ: case P2P_INVITATION_REQ:
p2p_handle_invitation_req(p2p, sa, data + 1, len - 1, rx_freq); p2p_handle_invitation_req(p2p, sa, data + 1, len - 1, rx_freq);

26
src/p2p/p2p_go_neg.c
View file

@ -802,7 +802,8 @@ void p2p_check_pref_chan(struct p2p_data *p2p, int go,
struct wpabuf * p2p_process_go_neg_req(struct p2p_data *p2p, const u8 *sa, struct wpabuf * p2p_process_go_neg_req(struct p2p_data *p2p, const u8 *sa,
const u8 *data, size_t len, int rx_freq) const u8 *data, size_t len, int rx_freq,
bool p2p2)
{ {
struct p2p_device *dev = NULL; struct p2p_device *dev = NULL;
struct wpabuf *resp; struct wpabuf *resp;
@ -921,7 +922,7 @@ struct wpabuf * p2p_process_go_neg_req(struct p2p_data *p2p, const u8 *sa,
p2p_dbg(p2p, "User has rejected this peer"); p2p_dbg(p2p, "User has rejected this peer");
status = P2P_SC_FAIL_REJECTED_BY_USER; status = P2P_SC_FAIL_REJECTED_BY_USER;
} else if (dev == NULL || } else if (dev == NULL ||
(dev->wps_method == WPS_NOT_READY && (dev->wps_method == WPS_NOT_READY && !p2p2 &&
(p2p->authorized_oob_dev_pw_id == 0 || (p2p->authorized_oob_dev_pw_id == 0 ||
p2p->authorized_oob_dev_pw_id != p2p->authorized_oob_dev_pw_id !=
msg.dev_password_id))) { msg.dev_password_id))) {
@ -992,6 +993,9 @@ struct wpabuf * p2p_process_go_neg_req(struct p2p_data *p2p, const u8 *sa,
goto fail; goto fail;
} }
if (p2p2)
goto skip;
switch (msg.dev_password_id) { switch (msg.dev_password_id) {
case DEV_PW_REGISTRAR_SPECIFIED: case DEV_PW_REGISTRAR_SPECIFIED:
p2p_dbg(p2p, "PIN from peer Display"); p2p_dbg(p2p, "PIN from peer Display");
@ -1059,6 +1063,7 @@ struct wpabuf * p2p_process_go_neg_req(struct p2p_data *p2p, const u8 *sa,
goto fail; goto fail;
} }
skip:
if (go && p2p_go_select_channel(p2p, dev, &status) < 0) if (go && p2p_go_select_channel(p2p, dev, &status) < 0)
goto fail; goto fail;
@ -1127,7 +1132,7 @@ void p2p_handle_go_neg_req(struct p2p_data *p2p, const u8 *sa, const u8 *data,
int freq; int freq;
struct wpabuf *resp; struct wpabuf *resp;
resp = p2p_process_go_neg_req(p2p, sa, data, len, rx_freq); resp = p2p_process_go_neg_req(p2p, sa, data, len, rx_freq, false);
if (!resp) if (!resp)
return; return;
@ -1230,7 +1235,8 @@ static struct wpabuf * p2p_build_go_neg_conf(struct p2p_data *p2p,
struct wpabuf * p2p_process_go_neg_resp(struct p2p_data *p2p, const u8 *sa, struct wpabuf * p2p_process_go_neg_resp(struct p2p_data *p2p, const u8 *sa,
const u8 *data, size_t len, int rx_freq) const u8 *data, size_t len,
int rx_freq, bool p2p2)
{ {
struct p2p_device *dev; struct p2p_device *dev;
int go = -1; int go = -1;
@ -1242,7 +1248,7 @@ struct wpabuf * p2p_process_go_neg_resp(struct p2p_data *p2p, const u8 *sa,
p2p_dbg(p2p, "Received GO Negotiation Response from " MACSTR p2p_dbg(p2p, "Received GO Negotiation Response from " MACSTR
" (freq=%d)", MAC2STR(sa), rx_freq); " (freq=%d)", MAC2STR(sa), rx_freq);
dev = p2p_get_device(p2p, sa); dev = p2p_get_device(p2p, sa);
if (dev == NULL || dev->wps_method == WPS_NOT_READY || if (dev == NULL || (!p2p2 && dev->wps_method == WPS_NOT_READY) ||
dev != p2p->go_neg_peer) { dev != p2p->go_neg_peer) {
p2p_dbg(p2p, "Not ready for GO negotiation with " MACSTR, p2p_dbg(p2p, "Not ready for GO negotiation with " MACSTR,
MAC2STR(sa)); MAC2STR(sa));
@ -1394,6 +1400,9 @@ struct wpabuf * p2p_process_go_neg_resp(struct p2p_data *p2p, const u8 *sa,
} else } else
dev->oper_freq = 0; dev->oper_freq = 0;
if (p2p2)
goto skip;
switch (msg.dev_password_id) { switch (msg.dev_password_id) {
case DEV_PW_REGISTRAR_SPECIFIED: case DEV_PW_REGISTRAR_SPECIFIED:
p2p_dbg(p2p, "PIN from peer Display"); p2p_dbg(p2p, "PIN from peer Display");
@ -1449,6 +1458,7 @@ struct wpabuf * p2p_process_go_neg_resp(struct p2p_data *p2p, const u8 *sa,
goto fail; goto fail;
} }
skip:
if (go && p2p_go_select_channel(p2p, dev, &status) < 0) if (go && p2p_go_select_channel(p2p, dev, &status) < 0)
goto fail; goto fail;
@ -1506,7 +1516,7 @@ void p2p_handle_go_neg_resp(struct p2p_data *p2p, const u8 *sa, const u8 *data,
struct p2p_device *dev; struct p2p_device *dev;
struct wpabuf *conf; struct wpabuf *conf;
conf = p2p_process_go_neg_resp(p2p, sa, data, len, rx_freq); conf = p2p_process_go_neg_resp(p2p, sa, data, len, rx_freq, false);
if (!conf) if (!conf)
return; return;
wpabuf_free(conf); wpabuf_free(conf);
@ -1537,7 +1547,7 @@ void p2p_handle_go_neg_resp(struct p2p_data *p2p, const u8 *sa, const u8 *data,
void p2p_handle_go_neg_conf(struct p2p_data *p2p, const u8 *sa, void p2p_handle_go_neg_conf(struct p2p_data *p2p, const u8 *sa,
const u8 *data, size_t len) const u8 *data, size_t len, bool p2p2)
{ {
struct p2p_device *dev; struct p2p_device *dev;
struct p2p_message msg; struct p2p_message msg;
@ -1545,7 +1555,7 @@ void p2p_handle_go_neg_conf(struct p2p_data *p2p, const u8 *sa,
p2p_dbg(p2p, "Received GO Negotiation Confirm from " MACSTR, p2p_dbg(p2p, "Received GO Negotiation Confirm from " MACSTR,
MAC2STR(sa)); MAC2STR(sa));
dev = p2p_get_device(p2p, sa); dev = p2p_get_device(p2p, sa);
if (dev == NULL || dev->wps_method == WPS_NOT_READY || if (dev == NULL || (!p2p2 && dev->wps_method == WPS_NOT_READY) ||
dev != p2p->go_neg_peer) { dev != p2p->go_neg_peer) {
p2p_dbg(p2p, "Not ready for GO negotiation with " MACSTR, p2p_dbg(p2p, "Not ready for GO negotiation with " MACSTR,
MAC2STR(sa)); MAC2STR(sa));

7
src/p2p/p2p_i.h
View file

@ -896,12 +896,13 @@ void p2p_handle_go_neg_req(struct p2p_data *p2p, const u8 *sa, const u8 *data,
void p2p_handle_go_neg_resp(struct p2p_data *p2p, const u8 *sa, const u8 *data, void p2p_handle_go_neg_resp(struct p2p_data *p2p, const u8 *sa, const u8 *data,
size_t len, int rx_freq); size_t len, int rx_freq);
void p2p_handle_go_neg_conf(struct p2p_data *p2p, const u8 *sa, const u8 *data, void p2p_handle_go_neg_conf(struct p2p_data *p2p, const u8 *sa, const u8 *data,
size_t len); size_t len, bool p2p2);
struct wpabuf * p2p_process_go_neg_req(struct p2p_data *p2p, const u8 *sa, struct wpabuf * p2p_process_go_neg_req(struct p2p_data *p2p, const u8 *sa,
const u8 *data, size_t len, int rx_freq); const u8 *data, size_t len, int rx_freq,
bool p2p2);
struct wpabuf * p2p_process_go_neg_resp(struct p2p_data *p2p, const u8 *sa, struct wpabuf * p2p_process_go_neg_resp(struct p2p_data *p2p, const u8 *sa,
const u8 *data, size_t len, const u8 *data, size_t len,
int rx_freq); int rx_freq, bool p2p2);
int p2p_connect_send(struct p2p_data *p2p, struct p2p_device *dev); int p2p_connect_send(struct p2p_data *p2p, struct p2p_device *dev);
u16 p2p_wps_method_pw_id(enum p2p_wps_method wps_method); u16 p2p_wps_method_pw_id(enum p2p_wps_method wps_method);
void p2p_reselect_channel(struct p2p_data *p2p, void p2p_reselect_channel(struct p2p_data *p2p,