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

P2P: Fix wpas_p2p_add_persistent_group_client() to use P2P mgmt interface

Browse source 
The function used wpa_s->parent->conf to iterate the P2P networks and
update the configuration file. However, wpa_s->parent is not
necessarily the interface used to manage the P2P Device operations.

Fix this by accessing the configuration file of the interface initialized
to managed the P2P Device operations.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
This commit is contained in:
Ilan Peer 2015-05-12 17:40:00 +03:00 committed by Jouni Malinen
parent 86b91c89af
commit 1e0a02942b
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
wpa_supplicant/p2p_supplicant.c
View file

@ -1113,13 +1113,14 @@ static void wpas_p2p_add_persistent_group_client(struct wpa_supplicant *wpa_s,
u8 *n; u8 *n;
size_t i; size_t i;
int found = 0; int found = 0;
struct wpa_supplicant *p2p_wpa_s = wpa_s->global->p2p_init_wpa_s;
ssid = wpa_s->current_ssid; ssid = wpa_s->current_ssid;
if (ssid == NULL || ssid->mode != WPAS_MODE_P2P_GO || if (ssid == NULL || ssid->mode != WPAS_MODE_P2P_GO ||
!ssid->p2p_persistent_group) !ssid->p2p_persistent_group)
return; return;
for (s = wpa_s->parent->conf->ssid; s; s = s->next) { for (s = p2p_wpa_s->conf->ssid; s; s = s->next) {
if (s->disabled != 2 || s->mode != WPAS_MODE_P2P_GO) if (s->disabled != 2 || s->mode != WPAS_MODE_P2P_GO)
continue; continue;
@ -1178,8 +1179,8 @@ static void wpas_p2p_add_persistent_group_client(struct wpa_supplicant *wpa_s,
0xff, ETH_ALEN); 0xff, ETH_ALEN);
} }
if (wpa_s->parent->conf->update_config && if (p2p_wpa_s->conf->update_config &&
wpa_config_write(wpa_s->parent->confname, wpa_s->parent->conf)) wpa_config_write(p2p_wpa_s->confname, p2p_wpa_s->conf))
wpa_printf(MSG_DEBUG, "P2P: Failed to update configuration"); wpa_printf(MSG_DEBUG, "P2P: Failed to update configuration");
} }