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

P2P: Use global->p2p_dev_addr instead of parent->own_addr

Browse source 
Start using global->p2p_dev_addr more consistently as the P2P Device
Address.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2011-12-25 23:58:03 +02:00
parent 8945cc451f
commit d7e70476f2
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
wpa_supplicant/p2p_supplicant.c
View file

@ -553,7 +553,7 @@ static void wpas_group_formation_completed(struct wpa_supplicant *wpa_s,
client = ssid->mode == WPAS_MODE_INFRA; client = ssid->mode == WPAS_MODE_INFRA;
if (ssid->mode == WPAS_MODE_P2P_GO) { if (ssid->mode == WPAS_MODE_P2P_GO) {
persistent = ssid->p2p_persistent_group; persistent = ssid->p2p_persistent_group;
os_memcpy(go_dev_addr, wpa_s->parent->own_addr, os_memcpy(go_dev_addr, wpa_s->global->p2p_dev_addr,
ETH_ALEN); ETH_ALEN);
} else } else
persistent = wpas_p2p_persistent_group(wpa_s, persistent = wpas_p2p_persistent_group(wpa_s,
@ -719,13 +719,13 @@ static void p2p_go_configured(void *ctx, void *data)
wpa_ssid_txt(ssid->ssid, ssid->ssid_len), wpa_ssid_txt(ssid->ssid, ssid->ssid_len),
ssid->frequency, ssid->frequency,
params->passphrase ? params->passphrase : "", params->passphrase ? params->passphrase : "",
MAC2STR(wpa_s->parent->own_addr), MAC2STR(wpa_s->global->p2p_dev_addr),
params->persistent_group ? " [PERSISTENT]" : ""); params->persistent_group ? " [PERSISTENT]" : "");
if (params->persistent_group) if (params->persistent_group)
network_id = wpas_p2p_store_persistent_group( network_id = wpas_p2p_store_persistent_group(
wpa_s->parent, ssid, wpa_s->parent, ssid,
wpa_s->parent->own_addr); wpa_s->global->p2p_dev_addr);
if (network_id < 0) if (network_id < 0)
network_id = ssid->id; network_id = ssid->id;
wpas_notify_p2p_group_started(wpa_s, ssid, network_id, 0); wpas_notify_p2p_group_started(wpa_s, ssid, network_id, 0);
@ -2267,7 +2267,7 @@ int wpas_p2p_init(struct wpa_global *global, struct wpa_supplicant *wpa_s)
p2p.get_noa = wpas_get_noa; p2p.get_noa = wpas_get_noa;
os_memcpy(wpa_s->global->p2p_dev_addr, wpa_s->own_addr, ETH_ALEN); os_memcpy(wpa_s->global->p2p_dev_addr, wpa_s->own_addr, ETH_ALEN);
os_memcpy(p2p.dev_addr, wpa_s->own_addr, ETH_ALEN); os_memcpy(p2p.dev_addr, wpa_s->global->p2p_dev_addr, ETH_ALEN);
p2p.dev_name = wpa_s->conf->device_name; p2p.dev_name = wpa_s->conf->device_name;
p2p.manufacturer = wpa_s->conf->manufacturer; p2p.manufacturer = wpa_s->conf->manufacturer;
p2p.model_name = wpa_s->conf->model_name; p2p.model_name = wpa_s->conf->model_name;
@ -3684,7 +3684,7 @@ int wpas_p2p_invite_group(struct wpa_supplicant *wpa_s, const char *ifname,
role = P2P_INVITE_ROLE_ACTIVE_GO; role = P2P_INVITE_ROLE_ACTIVE_GO;
bssid = wpa_s->own_addr; bssid = wpa_s->own_addr;
if (go_dev_addr == NULL) if (go_dev_addr == NULL)
go_dev_addr = wpa_s->parent->own_addr; go_dev_addr = wpa_s->global->p2p_dev_addr;
} else { } else {
role = P2P_INVITE_ROLE_CLIENT; role = P2P_INVITE_ROLE_CLIENT;
if (wpa_s->wpa_state < WPA_ASSOCIATED) { if (wpa_s->wpa_state < WPA_ASSOCIATED) {