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

mesh: Fix peer link counting when a mesh peer reconnects

Browse source 
When a mesh point reconnects by starting from Authentication frame
sequence, the plink count was not decremented from its last connection.
This resulted in leaking peer link count and causing wpa_supplicant to
reject the connection after max_peer_links (default: 99) reconnects.

This was reproduced by pre-configuring 2 mesh points with mesh
credentials. Boot both mesh points and make sure they connect to each
other. Then in a loop reboot one of the mesh points after it
successfully connects while leaving the other mesh point up and running.
After 99 iterations the supplicant on mesh point that is not rebooting
will reject the connection request from the other mesh point.

Fix this by decrementing num_plinks when freeing a STA entry that is
still in PLINK_ESTAB state.

Signed-off-by: Srinivasa Duvvuri <sduvvuri@chromium.org>
This commit is contained in:
Srinivasa Duvvuri 2016-01-30 18:45:30 -08:00 committed by Jouni Malinen
parent 83fe38b011
commit 9684c7567e
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ap/hostapd.h
View file

@ -258,7 +258,8 @@ struct hostapd_data {
#ifdef CONFIG_MESH #ifdef CONFIG_MESH
int num_plinks; int num_plinks;
int max_plinks; int max_plinks;
void (*mesh_sta_free_cb)(struct sta_info *sta); void (*mesh_sta_free_cb)(struct hostapd_data *hapd,
struct sta_info *sta);
struct wpabuf *mesh_pending_auth; struct wpabuf *mesh_pending_auth;
struct os_reltime mesh_pending_auth_time; struct os_reltime mesh_pending_auth_time;
#endif /* CONFIG_MESH */ #endif /* CONFIG_MESH */

2
src/ap/sta_info.c
View file

@ -238,7 +238,7 @@ void ap_free_sta(struct hostapd_data *hapd, struct sta_info *sta)
#ifdef CONFIG_MESH #ifdef CONFIG_MESH
if (hapd->mesh_sta_free_cb) if (hapd->mesh_sta_free_cb)
hapd->mesh_sta_free_cb(sta); hapd->mesh_sta_free_cb(hapd, sta);
#endif /* CONFIG_MESH */ #endif /* CONFIG_MESH */
if (set_beacon) if (set_beacon)

4
wpa_supplicant/mesh_mpm.c
View file

@ -1095,8 +1095,10 @@ void mesh_mpm_action_rx(struct wpa_supplicant *wpa_s,
/* called by ap_free_sta */ /* called by ap_free_sta */
void mesh_mpm_free_sta(struct sta_info *sta) void mesh_mpm_free_sta(struct hostapd_data *hapd, struct sta_info *sta)
{ {
if (sta->plink_state == PLINK_ESTAB)
hapd->num_plinks--;
eloop_cancel_timeout(plink_timer, ELOOP_ALL_CTX, sta); eloop_cancel_timeout(plink_timer, ELOOP_ALL_CTX, sta);
eloop_cancel_timeout(mesh_auth_timer, ELOOP_ALL_CTX, sta); eloop_cancel_timeout(mesh_auth_timer, ELOOP_ALL_CTX, sta);
} }

2
wpa_supplicant/mesh_mpm.h
View file

@ -14,7 +14,7 @@ void wpa_mesh_new_mesh_peer(struct wpa_supplicant *wpa_s, const u8 *addr,
struct ieee802_11_elems *elems); struct ieee802_11_elems *elems);
void mesh_mpm_deinit(struct wpa_supplicant *wpa_s, struct hostapd_iface *ifmsh); void mesh_mpm_deinit(struct wpa_supplicant *wpa_s, struct hostapd_iface *ifmsh);
void mesh_mpm_auth_peer(struct wpa_supplicant *wpa_s, const u8 *addr); void mesh_mpm_auth_peer(struct wpa_supplicant *wpa_s, const u8 *addr);
void mesh_mpm_free_sta(struct sta_info *sta); void mesh_mpm_free_sta(struct hostapd_data *hapd, struct sta_info *sta);
void wpa_mesh_set_plink_state(struct wpa_supplicant *wpa_s, void wpa_mesh_set_plink_state(struct wpa_supplicant *wpa_s,
struct sta_info *sta, struct sta_info *sta,
enum mesh_plink_state state); enum mesh_plink_state state);