diff mbox

mesh: Use appropriate BLOCKED state duration

Message ID 1457685445-991-1-git-send-email-masashi.honma@gmail.com
State Accepted
Headers show

Commit Message

Masashi Honma March 11, 2016, 8:37 a.m. UTC 
Previously, BLOCKED state duration slightly increased up to 3600. Though
the BLOCKED state could be canceled by ap_handle_timer(). Because the
timer timeouts in ap_max_inactivity(default=300sec) and remove sta
objects (the object retains BLOCKED state).

This patch re-design my commit bf51f4f82bdb50356de5501acac53fe1b91a7b86
to replace mesh_auth_block_duration by ap_max_inactivity and remove
incremental duration.

Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
---
 wpa_supplicant/mesh_rsn.c         | 16 ++++++----------
 wpa_supplicant/wpa_supplicant_i.h |  1 -
 2 files changed, 6 insertions(+), 11 deletions(-)

Comments

Jouni Malinen March 20, 2016, 6:35 p.m. UTC | #1 
On Fri, Mar 11, 2016 at 05:37:25PM +0900, Masashi Honma wrote:
> Previously, BLOCKED state duration slightly increased up to 3600. Though
> the BLOCKED state could be canceled by ap_handle_timer(). Because the
> timer timeouts in ap_max_inactivity(default=300sec) and remove sta
> objects (the object retains BLOCKED state).
> 
> This patch re-design my commit bf51f4f82bdb50356de5501acac53fe1b91a7b86
> to replace mesh_auth_block_duration by ap_max_inactivity and remove
> incremental duration.

Thanks, applied.
diff mbox

Patch

diff --git a/wpa_supplicant/mesh_rsn.c b/wpa_supplicant/mesh_rsn.c
index 5d88274..3076971 100644
--- a/wpa_supplicant/mesh_rsn.c
+++ b/wpa_supplicant/mesh_rsn.c
@@ -27,12 +27,12 @@ 
 
 #define MESH_AUTH_TIMEOUT 10
 #define MESH_AUTH_RETRY 3
-#define MESH_AUTH_BLOCK_DURATION 3600
 
 void mesh_auth_timer(void *eloop_ctx, void *user_data)
 {
 	struct wpa_supplicant *wpa_s = eloop_ctx;
 	struct sta_info *sta = user_data;
+	struct hostapd_data *hapd;
 
 	if (sta->sae->state != SAE_ACCEPTED) {
 		wpa_printf(MSG_DEBUG, "AUTH: Re-authenticate with " MACSTR
@@ -43,23 +43,19 @@  void mesh_auth_timer(void *eloop_ctx, void *user_data)
 		if (sta->sae_auth_retry < MESH_AUTH_RETRY) {
 			mesh_rsn_auth_sae_sta(wpa_s, sta);
 		} else {
+			hapd = wpa_s->ifmsh->bss[0];
+
 			if (sta->sae_auth_retry > MESH_AUTH_RETRY) {
-				ap_free_sta(wpa_s->ifmsh->bss[0], sta);
+				ap_free_sta(hapd, sta);
 				return;
 			}
 
 			/* block the STA if exceeded the number of attempts */
 			wpa_mesh_set_plink_state(wpa_s, sta, PLINK_BLOCKED);
 			sta->sae->state = SAE_NOTHING;
-			if (wpa_s->mesh_auth_block_duration <
-			    MESH_AUTH_BLOCK_DURATION)
-				wpa_s->mesh_auth_block_duration += 60;
-			eloop_register_timeout(wpa_s->mesh_auth_block_duration,
-					       0, mesh_auth_timer, wpa_s, sta);
 			wpa_msg(wpa_s, MSG_INFO, MESH_SAE_AUTH_BLOCKED "addr="
-				MACSTR " duration=%d",
-				MAC2STR(sta->addr),
-				wpa_s->mesh_auth_block_duration);
+				MACSTR " duration=%d", MAC2STR(sta->addr),
+				hapd->conf->ap_max_inactivity);
 		}
 		sta->sae_auth_retry++;
 	}
diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index 269bac0..9acc359 100644
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -754,7 +754,6 @@  struct wpa_supplicant {
 	unsigned int mesh_if_created:1;
 	unsigned int mesh_ht_enabled:1;
 	unsigned int mesh_vht_enabled:1;
-	int mesh_auth_block_duration; /* sec */
 #endif /* CONFIG_MESH */
 
 	unsigned int off_channel_freq;