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

P2P: Simplify code in wpas_p2p_connect()

Browse source 
There's some duplicated code there that can be simplified
with just a single new variable.

Signed-hostap: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2011-11-18 23:32:03 +02:00 committed by Jouni Malinen
parent 98ac6763ff
commit 6cad95db72
1 changed files with 20 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
wpa_supplicant/p2p_supplicant.c
View file

@ -2670,6 +2670,7 @@ int wpas_p2p_connect(struct wpa_supplicant *wpa_s, const u8 *peer_addr,
u8 bssid[ETH_ALEN]; u8 bssid[ETH_ALEN];
int ret = 0; int ret = 0;
enum wpa_driver_if_type iftype; enum wpa_driver_if_type iftype;
const u8 *if_addr;
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL) if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
return -1; return -1;
@ -2765,22 +2766,7 @@ int wpas_p2p_connect(struct wpa_supplicant *wpa_s, const u8 *peer_addr,
wpa_s->create_p2p_iface = wpas_p2p_create_iface(wpa_s); wpa_s->create_p2p_iface = wpas_p2p_create_iface(wpa_s);
if (!wpa_s->create_p2p_iface) { if (wpa_s->create_p2p_iface) {
if (auth) {
if (wpas_p2p_auth_go_neg(wpa_s, peer_addr, wps_method,
go_intent, wpa_s->own_addr,
force_freq, persistent_group)
< 0)
return -1;
return ret;
}
if (wpas_p2p_start_go_neg(wpa_s, peer_addr, wps_method,
go_intent, wpa_s->own_addr,
force_freq, persistent_group) < 0)
return -1;
return ret;
}
/* Prepare to add a new interface for the group */ /* Prepare to add a new interface for the group */
iftype = WPA_IF_P2P_GROUP; iftype = WPA_IF_P2P_GROUP;
if (go_intent == 15) if (go_intent == 15)
@ -2791,17 +2777,22 @@ int wpas_p2p_connect(struct wpa_supplicant *wpa_s, const u8 *peer_addr,
return -1; return -1;
} }
if_addr = wpa_s->pending_interface_addr;
} else
if_addr = wpa_s->own_addr;
if (auth) { if (auth) {
if (wpas_p2p_auth_go_neg(wpa_s, peer_addr, wps_method, if (wpas_p2p_auth_go_neg(wpa_s, peer_addr, wps_method,
go_intent, go_intent, if_addr,
wpa_s->pending_interface_addr,
force_freq, persistent_group) < 0) force_freq, persistent_group) < 0)
return -1; return -1;
return ret; return ret;
} }
if (wpas_p2p_start_go_neg(wpa_s, peer_addr, wps_method, go_intent,
wpa_s->pending_interface_addr, if (wpas_p2p_start_go_neg(wpa_s, peer_addr, wps_method,
force_freq, persistent_group) < 0) { go_intent, if_addr, force_freq,
persistent_group) < 0) {
if (wpa_s->create_p2p_iface)
wpas_p2p_remove_pending_group_interface(wpa_s); wpas_p2p_remove_pending_group_interface(wpa_s);
return -1; return -1;
} }