From 59fec34d9c99e0059c98aa7cf616060bc898229d Mon Sep 17 00:00:00 2001 From: Krishna Vamsi Date: Wed, 10 Dec 2014 15:44:18 +0530 Subject: [PATCH] P2PS: Allow p2p_build_ssid() to use pre-set SSID This is needed to allow P2PS PD to prepare SSID for the group. Signed-off-by: Jouni Malinen --- src/p2p/p2p.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index 1847cf52b..5a7352a01 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -1735,7 +1735,14 @@ void p2p_build_ssid(struct p2p_data *p2p, u8 *ssid, size_t *ssid_len) int p2p_go_params(struct p2p_data *p2p, struct p2p_go_neg_results *params) { - p2p_build_ssid(p2p, params->ssid, ¶ms->ssid_len); + if (p2p->ssid_set) { + os_memcpy(params->ssid, p2p->ssid, p2p->ssid_len); + params->ssid_len = p2p->ssid_len; + } else { + p2p_build_ssid(p2p, params->ssid, ¶ms->ssid_len); + } + p2p->ssid_set = 0; + p2p_random(params->passphrase, p2p->cfg->passphrase_len); return 0; }