diff options
| author | Julien Massot <jmassot@aldebaran-robotics.com> | 2012-08-14 16:21:46 +0200 |
|---|---|---|
| committer | Patrik Flykt <patrik.flykt@linux.intel.com> | 2012-08-15 11:11:08 +0300 |
| commit | e0a27dece6b34ae162559d88ce632b3b35324469 (patch) | |
| tree | 6c5abb56865eb238303724cb076a1666b0a91c95 /plugins/wifi.c | |
| parent | 0a6bdbe4c83eccdbac6a80e7db5c24519b9f37e3 (diff) | |
| download | connman-e0a27dece6b34ae162559d88ce632b3b35324469.tar.gz connman-e0a27dece6b34ae162559d88ce632b3b35324469.tar.bz2 connman-e0a27dece6b34ae162559d88ce632b3b35324469.zip | |
wifi: Try only twice when connecting to a non-favorite service
Diffstat (limited to 'plugins/wifi.c')
| -rw-r--r-- | plugins/wifi.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/plugins/wifi.c b/plugins/wifi.c index 8f3fc6cf..6329bf37 100644 --- a/plugins/wifi.c +++ b/plugins/wifi.c @@ -47,6 +47,7 @@ #include <connman/device.h> #include <connman/rtnl.h> #include <connman/technology.h> +#include <connman/service.h> #include <connman/log.h> #include <connman/option.h> #include <connman/storage.h> @@ -57,7 +58,8 @@ #define CLEANUP_TIMEOUT 8 /* in seconds */ #define INACTIVE_TIMEOUT 12 /* in seconds */ -#define MAXIMUM_RETRIES 4 +#define MAXIMUM_RETRIES 2 +#define FAVORITE_MAXIMUM_RETRIES 4 #define BGSCAN_DEFAULT "simple:30:-45:300" #define AUTOSCAN_DEFAULT "exponential:3:300" @@ -1423,12 +1425,21 @@ static connman_bool_t handle_4way_handshake_failure(GSupplicantInterface *interf struct connman_network *network, struct wifi_data *wifi) { + struct connman_service *service; + if (wifi->state != G_SUPPLICANT_STATE_4WAY_HANDSHAKE) return FALSE; + service = connman_service_lookup_from_network(network); + if (service == NULL) + return FALSE; + wifi->retries++; - if (wifi->retries < MAXIMUM_RETRIES) + if (connman_service_get_favorite(service) == TRUE) { + if (wifi->retries < FAVORITE_MAXIMUM_RETRIES) + return TRUE; + } else if (wifi->retries < MAXIMUM_RETRIES) return TRUE; connman_network_set_error(network, CONNMAN_NETWORK_ERROR_INVALID_KEY); |