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

P2P: Use group formation timeout on persistent group GO

Browse source 
Previously, GO considered the group to be fully re-invoked after
starting beaconing on successful invitation exchange. This would leave
the group running until idle timeout (which may not be enabled) or
explicit removal if the client fails to connect for any reason. Since
the client is expected to connect immediately after the invitation
exchange that ends with status=0 (i.e., either client initiated the
exchange or it responded with success), extend group formation timeout
to cover that period until the first successfully completed data
connection. This allows the GO to remove the group automatically if the
client devices does not connect within
P2P_MAX_INITIAL_CONN_WAIT_GO_REINVOKE (15) seconds.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2013-09-26 21:24:09 +03:00 committed by Jouni Malinen
parent 41f853235f
commit bbc6c729a5
5 changed files with 41 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
wpa_supplicant/ctrl_iface.c
View file

@ -4206,7 +4206,8 @@ static int p2p_ctrl_group_add_persistent(struct wpa_supplicant *wpa_s,
return -1;
}
return wpas_p2p_group_add_persistent(wpa_s, ssid, 0, freq, ht40, NULL);
return wpas_p2p_group_add_persistent(wpa_s, ssid, 0, freq, ht40, NULL,
0);
}

2
wpa_supplicant/dbus/dbus_new_handlers_p2p.c
View file

@ -347,7 +347,7 @@ DBusMessage * wpas_dbus_handler_p2p_group_add(DBusMessage *message,
goto inv_args;
if (wpas_p2p_group_add_persistent(wpa_s, ssid, 0, freq, 0,
NULL)) {
NULL, 0)) {
reply = wpas_dbus_error_unknown_error(
message,
"Failed to reinvoke a persistent group");

38
wpa_supplicant/p2p_supplicant.c
View file

@ -69,6 +69,15 @@
#define P2P_MAX_INITIAL_CONN_WAIT_GO 10
#endif /* P2P_MAX_INITIAL_CONN_WAIT_GO */
#ifndef P2P_MAX_INITIAL_CONN_WAIT_GO_REINVOKE
/*
* How many seconds to wait for initial 4-way handshake to get completed after
* re-invocation of a persistent group on the GO when the client is expected
* to connect automatically (no user interaction).
*/
#define P2P_MAX_INITIAL_CONN_WAIT_GO_REINVOKE 15
#endif /* P2P_MAX_INITIAL_CONN_WAIT_GO_REINVOKE */
#ifndef P2P_CONCURRENT_SEARCH_DELAY
#define P2P_CONCURRENT_SEARCH_DELAY 500
#endif /* P2P_CONCURRENT_SEARCH_DELAY */
@ -984,6 +993,21 @@ static void p2p_go_configured(void *ctx, void *data)
wpas_notify_p2p_group_started(wpa_s, ssid, network_id, 0);
wpas_p2p_cross_connect_setup(wpa_s);
wpas_p2p_set_group_idle_timeout(wpa_s);
if (wpa_s->p2p_first_connection_timeout) {
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P: Start group formation timeout of %d seconds until first data connection on GO",
wpa_s->p2p_first_connection_timeout);
wpa_s->p2p_go_group_formation_completed = 0;
wpa_s->global->p2p_group_formation = wpa_s;
eloop_cancel_timeout(wpas_p2p_group_formation_timeout,
wpa_s->parent, NULL);
eloop_register_timeout(
wpa_s->p2p_first_connection_timeout, 0,
wpas_p2p_group_formation_timeout,
wpa_s->parent, NULL);
}
return;
}
@ -2673,7 +2697,8 @@ static void wpas_invitation_received(void *ctx, const u8 *sa, const u8 *bssid,
if (s) {
int go = s->mode == WPAS_MODE_P2P_GO;
wpas_p2p_group_add_persistent(
wpa_s, s, go, go ? op_freq : 0, 0, NULL);
wpa_s, s, go, go ? op_freq : 0, 0, NULL,
go ? P2P_MAX_INITIAL_CONN_WAIT_GO_REINVOKE : 0);
} else if (bssid) {
wpa_s->user_initiated_pd = 0;
wpas_p2p_join(wpa_s, bssid, go_dev_addr,
@ -2842,7 +2867,10 @@ static void wpas_invitation_result(void *ctx, int status, const u8 *bssid,
wpas_p2p_group_add_persistent(wpa_s, ssid,
ssid->mode == WPAS_MODE_P2P_GO,
wpa_s->p2p_persistent_go_freq,
wpa_s->p2p_go_ht40, channels);
wpa_s->p2p_go_ht40, channels,
ssid->mode == WPAS_MODE_P2P_GO ?
P2P_MAX_INITIAL_CONN_WAIT_GO_REINVOKE :
0);
}
@ -4456,6 +4484,7 @@ wpas_p2p_get_group_iface(struct wpa_supplicant *wpa_s, int addr_allocated,
if (!wpas_p2p_create_iface(wpa_s)) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Use same interface for group "
"operations");
wpa_s->p2p_first_connection_timeout = 0;
return wpa_s;
}
@ -4475,6 +4504,7 @@ wpas_p2p_get_group_iface(struct wpa_supplicant *wpa_s, int addr_allocated,
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Use separate group interface %s",
group_wpa_s->ifname);
group_wpa_s->p2p_first_connection_timeout = 0;
return group_wpa_s;
}
@ -4577,7 +4607,8 @@ static int wpas_start_p2p_client(struct wpa_supplicant *wpa_s,
int wpas_p2p_group_add_persistent(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid, int addr_allocated,
int freq, int ht40,
const struct p2p_channels *channels)
const struct p2p_channels *channels,
int connection_timeout)
{
struct p2p_go_neg_results params;
int go = 0;
@ -4634,6 +4665,7 @@ int wpas_p2p_group_add_persistent(struct wpa_supplicant *wpa_s,
if (wpa_s == NULL)
return -1;
wpa_s->p2p_first_connection_timeout = connection_timeout;
wpas_start_wps_go(wpa_s, &params, 0);
return 0;

3
wpa_supplicant/p2p_supplicant.h
View file

@ -35,7 +35,8 @@ int wpas_p2p_group_add(struct wpa_supplicant *wpa_s, int persistent_group,
int wpas_p2p_group_add_persistent(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid, int addr_allocated,
int freq, int ht40,
const struct p2p_channels *channels);
const struct p2p_channels *channels,
int connection_timeout);
struct p2p_group * wpas_p2p_group_init(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid);
void wpas_p2p_wps_success(struct wpa_supplicant *wpa_s, const u8 *peer_addr,

1
wpa_supplicant/wpa_supplicant_i.h
View file

@ -648,6 +648,7 @@ struct wpa_supplicant {
unsigned int p2p_go_ht40:1;
unsigned int user_initiated_pd:1;
unsigned int p2p_go_group_formation_completed:1;
int p2p_first_connection_timeout;
int p2p_persistent_go_freq;
int p2p_persistent_id;
int p2p_go_intent;