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

P2P: Fix GO Probe Response IEs when Wi-Fi Display is enabled

Browse source 
Commit 1a9f6509b3 added support for
fragmenting the P2P IE in Probe Response frames from a GO. However, it
did not take into account the possibility of Wi-Fi Display IE being
included in the same buffer and caused a regression for the cases where
Wi-Fi Display is enabled. Fix this by building the possibly fragmented
P2P IE first and then concatenating the separate IEs together.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2013-02-08 00:10:39 +02:00 committed by Jouni Malinen
parent 66fe0f703c
commit 78441a48af
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/p2p/p2p_group.c
View file

@ -402,22 +402,11 @@ static struct wpabuf * p2p_group_build_probe_resp_ie(struct p2p_group *group)
u8 *group_info; u8 *group_info;
struct wpabuf *p2p_subelems, *ie; struct wpabuf *p2p_subelems, *ie;
struct p2p_group_member *m; struct p2p_group_member *m;
size_t extra = 0;
#ifdef CONFIG_WIFI_DISPLAY p2p_subelems = wpabuf_alloc(500);
if (group->wfd_ie)
extra += wpabuf_len(group->wfd_ie);
#endif /* CONFIG_WIFI_DISPLAY */
p2p_subelems = wpabuf_alloc(500 + extra);
if (p2p_subelems == NULL) if (p2p_subelems == NULL)
return NULL; return NULL;
#ifdef CONFIG_WIFI_DISPLAY
if (group->wfd_ie)
wpabuf_put_buf(p2p_subelems, group->wfd_ie);
#endif /* CONFIG_WIFI_DISPLAY */
p2p_group_add_common_ies(group, p2p_subelems); p2p_group_add_common_ies(group, p2p_subelems);
p2p_group_add_noa(p2p_subelems, group->noa); p2p_group_add_noa(p2p_subelems, group->noa);
@ -436,6 +425,13 @@ static struct wpabuf * p2p_group_build_probe_resp_ie(struct p2p_group *group)
ie = p2p_group_encaps_probe_resp(p2p_subelems); ie = p2p_group_encaps_probe_resp(p2p_subelems);
wpabuf_free(p2p_subelems); wpabuf_free(p2p_subelems);
#ifdef CONFIG_WIFI_DISPLAY
if (group->wfd_ie) {
struct wpabuf *wfd = wpabuf_dup(group->wfd_ie);
ie = wpabuf_concat(wfd, ie);
}
#endif /* CONFIG_WIFI_DISPLAY */
return ie; return ie;
} }