Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

p2putil: Add WFD IEs when building P2P Action frames

This commit is contained in:
Andrew Zaborowski 2020-07-11 03:00:45 +02:00 committed by Denis Kenzior
parent b924b1da61
commit 8b64fa97f0
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/p2putil.c
View File

@ -2238,7 +2238,8 @@ static uint8_t *p2p_build_action_frame(bool public, uint8_t frame_subtype,
uint8_t dialog_token, uint8_t dialog_token,
struct p2p_attr_builder *p2p_attrs, struct p2p_attr_builder *p2p_attrs,
const struct wsc_p2p_attrs *wsc_attrs, const struct wsc_p2p_attrs *wsc_attrs,
size_t *out_len) const uint8_t *wfd_ie,
size_t wfd_ie_len, size_t *out_len)
{ {
uint8_t *p2p_ie, *wsc_ie, *ret; uint8_t *p2p_ie, *wsc_ie, *ret;
size_t p2p_ie_len, wsc_ie_len; size_t p2p_ie_len, wsc_ie_len;
@ -2267,7 +2268,7 @@ static uint8_t *p2p_build_action_frame(bool public, uint8_t frame_subtype,
wsc_ie = NULL; wsc_ie = NULL;
*out_len = (public ? 8 : 7) + (p2p_ie ? p2p_ie_len : 0) + *out_len = (public ? 8 : 7) + (p2p_ie ? p2p_ie_len : 0) +
(wsc_ie ? wsc_ie_len : 0); (wsc_ie ? wsc_ie_len : 0) + (wfd_ie ? wfd_ie_len : 0);
ret = l_malloc(*out_len); ret = l_malloc(*out_len);
if (public) { if (public) {
@ -2292,8 +2293,12 @@ static uint8_t *p2p_build_action_frame(bool public, uint8_t frame_subtype,
if (wsc_ie) { if (wsc_ie) {
memcpy(ret + pos, wsc_ie, wsc_ie_len); memcpy(ret + pos, wsc_ie, wsc_ie_len);
l_free(wsc_ie); l_free(wsc_ie);
pos += wsc_ie_len;
} }
if (wfd_ie)
memcpy(ret + pos, wfd_ie, wfd_ie_len);
return ret; return ret;
} }
@ -2323,7 +2328,7 @@ uint8_t *p2p_build_go_negotiation_req(const struct p2p_go_negotiation_req *data,
return p2p_build_action_frame(true, P2P_ACTION_GO_NEGOTIATION_REQ, return p2p_build_action_frame(true, P2P_ACTION_GO_NEGOTIATION_REQ,
data->dialog_token, builder, &wsc_attrs, data->dialog_token, builder, &wsc_attrs,
out_len); data->wfd, data->wfd_size, out_len);
} }
/* Section 4.2.9.3 */ /* Section 4.2.9.3 */
@ -2353,7 +2358,7 @@ uint8_t *p2p_build_go_negotiation_resp(
return p2p_build_action_frame(true, P2P_ACTION_GO_NEGOTIATION_RESP, return p2p_build_action_frame(true, P2P_ACTION_GO_NEGOTIATION_RESP,
data->dialog_token, builder, &wsc_attrs, data->dialog_token, builder, &wsc_attrs,
out_len); data->wfd, data->wfd_size, out_len);
} }
/* Section 4.2.9.4 */ /* Section 4.2.9.4 */
@ -2374,7 +2379,7 @@ uint8_t *p2p_build_go_negotiation_confirmation(
return p2p_build_action_frame(true, P2P_ACTION_GO_NEGOTIATION_CONFIRM, return p2p_build_action_frame(true, P2P_ACTION_GO_NEGOTIATION_CONFIRM,
data->dialog_token, builder, NULL, data->dialog_token, builder, NULL,
out_len); data->wfd, data->wfd_size, out_len);
} }
/* Section 4.2.9.5 */ /* Section 4.2.9.5 */
@ -2404,7 +2409,8 @@ uint8_t *p2p_build_invitation_req(const struct p2p_invitation_req *data,
return p2p_build_action_frame(true, P2P_ACTION_INVITATION_REQ, return p2p_build_action_frame(true, P2P_ACTION_INVITATION_REQ,
data->dialog_token, builder, data->dialog_token, builder,
data->device_password_id ? data->device_password_id ?
&wsc_attrs : NULL, out_len); &wsc_attrs : NULL,
data->wfd, data->wfd_size, out_len);
} }
/* Section 4.2.9.6 */ /* Section 4.2.9.6 */
@ -2428,7 +2434,7 @@ uint8_t *p2p_build_invitation_resp(const struct p2p_invitation_resp *data,
return p2p_build_action_frame(true, P2P_ACTION_INVITATION_RESP, return p2p_build_action_frame(true, P2P_ACTION_INVITATION_RESP,
data->dialog_token, builder, NULL, data->dialog_token, builder, NULL,
out_len); data->wfd, data->wfd_size, out_len);
} }
/* Section 4.2.9.7 */ /* Section 4.2.9.7 */
@ -2447,7 +2453,7 @@ uint8_t *p2p_build_device_disc_req(
return p2p_build_action_frame(true, return p2p_build_action_frame(true,
P2P_ACTION_DEVICE_DISCOVERABILITY_REQ, P2P_ACTION_DEVICE_DISCOVERABILITY_REQ,
data->dialog_token, builder, NULL, data->dialog_token, builder, NULL,
out_len); NULL, 0, out_len);
} }
/* Section 4.2.9.8 */ /* Section 4.2.9.8 */
@ -2463,7 +2469,7 @@ uint8_t *p2p_build_device_disc_resp(
return p2p_build_action_frame(true, return p2p_build_action_frame(true,
P2P_ACTION_DEVICE_DISCOVERABILITY_RESP, P2P_ACTION_DEVICE_DISCOVERABILITY_RESP,
data->dialog_token, builder, NULL, data->dialog_token, builder, NULL,
out_len); NULL, 0, out_len);
} }
/* Section 4.2.9.9 */ /* Section 4.2.9.9 */
@ -2507,7 +2513,7 @@ uint8_t *p2p_build_provision_disc_req(
return p2p_build_action_frame(true, P2P_ACTION_PROVISION_DISCOVERY_REQ, return p2p_build_action_frame(true, P2P_ACTION_PROVISION_DISCOVERY_REQ,
data->dialog_token, builder, &wsc_attrs, data->dialog_token, builder, &wsc_attrs,
out_len); data->wfd, data->wfd_size, out_len);
} }
/* Section 4.2.9.10 */ /* Section 4.2.9.10 */
@ -2553,7 +2559,7 @@ uint8_t *p2p_build_provision_disc_resp(
return p2p_build_action_frame(true, P2P_ACTION_PROVISION_DISCOVERY_RESP, return p2p_build_action_frame(true, P2P_ACTION_PROVISION_DISCOVERY_RESP,
data->dialog_token, builder, &wsc_attrs, data->dialog_token, builder, &wsc_attrs,
out_len); data->wfd, data->wfd_size, out_len);
} }
/* Section 4.2.10.2 */ /* Section 4.2.10.2 */
@ -2567,7 +2573,7 @@ uint8_t *p2p_build_notice_of_absence(const struct p2p_notice_of_absence *data,
&data->notice_of_absence); &data->notice_of_absence);
return p2p_build_action_frame(false, P2P_ACTION_NOTICE_OF_ABSENCE, return p2p_build_action_frame(false, P2P_ACTION_NOTICE_OF_ABSENCE,
0, builder, NULL, out_len); 0, builder, NULL, NULL, 0, out_len);
} }
/* Section 4.2.10.3 */ /* Section 4.2.10.3 */
@ -2581,7 +2587,7 @@ uint8_t *p2p_build_presence_req(const struct p2p_presence_req *data,
&data->notice_of_absence); &data->notice_of_absence);
return p2p_build_action_frame(false, P2P_ACTION_PRESENCE_REQ, return p2p_build_action_frame(false, P2P_ACTION_PRESENCE_REQ,
0, builder, NULL, out_len); 0, builder, NULL, NULL, 0, out_len);
} }
/* Section 4.2.10.4 */ /* Section 4.2.10.4 */
@ -2596,12 +2602,12 @@ uint8_t *p2p_build_presence_resp(const struct p2p_presence_resp *data,
&data->notice_of_absence); &data->notice_of_absence);
return p2p_build_action_frame(false, P2P_ACTION_PRESENCE_RESP, return p2p_build_action_frame(false, P2P_ACTION_PRESENCE_RESP,
0, builder, NULL, out_len); 0, builder, NULL, NULL, 0, out_len);
} }
/* Section 4.2.10.5 */ /* Section 4.2.10.5 */
uint8_t *p2p_build_go_disc_req(size_t *out_len) uint8_t *p2p_build_go_disc_req(size_t *out_len)
{ {
return p2p_build_action_frame(false, P2P_ACTION_GO_DISCOVERABILITY_REQ, return p2p_build_action_frame(false, P2P_ACTION_GO_DISCOVERABILITY_REQ,
0, NULL, NULL, out_len); 0, NULL, NULL, NULL, 0, out_len);
} }