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

mesh: Connection and group started/removed events into debug log

Browse source 
The messages were sent out with wpa_msg_ctrl() so they were not visible
in the debug log. However, these would be quite helpful strings to
search for in the debug log, so change these messages to use wpa_msg().

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2016-01-06 13:13:13 +02:00
parent 2da4a56f22
commit 6174de663c
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
wpa_supplicant/mesh_mpm.c
View file

@ -715,8 +715,8 @@ static void mesh_mpm_plink_estab(struct wpa_supplicant *wpa_s,
eloop_cancel_timeout(plink_timer, wpa_s, sta); eloop_cancel_timeout(plink_timer, wpa_s, sta);
/* Send ctrl event */ /* Send ctrl event */
wpa_msg_ctrl(wpa_s, MSG_INFO, MESH_PEER_CONNECTED MACSTR, wpa_msg(wpa_s, MSG_INFO, MESH_PEER_CONNECTED MACSTR,
MAC2STR(sta->addr)); MAC2STR(sta->addr));
} }
@ -854,9 +854,8 @@ static void mesh_mpm_fsm(struct wpa_supplicant *wpa_s, struct sta_info *sta,
" closed with reason %d", " closed with reason %d",
MAC2STR(sta->addr), reason); MAC2STR(sta->addr), reason);
wpa_msg_ctrl(wpa_s, MSG_INFO, wpa_msg(wpa_s, MSG_INFO, MESH_PEER_DISCONNECTED MACSTR,
MESH_PEER_DISCONNECTED MACSTR, MAC2STR(sta->addr));
MAC2STR(sta->addr));
hapd->num_plinks--; hapd->num_plinks--;

11
wpa_supplicant/wpa_supplicant.c
View file

@ -1684,10 +1684,9 @@ void wpa_supplicant_associate(struct wpa_supplicant *wpa_s,
return; return;
} }
wpa_s->current_bss = bss; wpa_s->current_bss = bss;
wpa_msg_ctrl(wpa_s, MSG_INFO, MESH_GROUP_STARTED wpa_msg(wpa_s, MSG_INFO, MESH_GROUP_STARTED "ssid=\"%s\" id=%d",
"ssid=\"%s\" id=%d", wpa_ssid_txt(ssid->ssid, ssid->ssid_len),
wpa_ssid_txt(ssid->ssid, ssid->ssid_len), ssid->id);
ssid->id);
#else /* CONFIG_MESH */ #else /* CONFIG_MESH */
wpa_msg(wpa_s, MSG_ERROR, wpa_msg(wpa_s, MSG_ERROR,
"mesh mode support not included in the build"); "mesh mode support not included in the build");
@ -2610,8 +2609,8 @@ void wpa_supplicant_deauthenticate(struct wpa_supplicant *wpa_s,
#ifdef CONFIG_MESH #ifdef CONFIG_MESH
if (wpa_s->ifmsh) { if (wpa_s->ifmsh) {
wpa_msg_ctrl(wpa_s, MSG_INFO, MESH_GROUP_REMOVED "%s", wpa_msg(wpa_s, MSG_INFO, MESH_GROUP_REMOVED "%s",
wpa_s->ifname); wpa_s->ifname);
wpa_supplicant_leave_mesh(wpa_s); wpa_supplicant_leave_mesh(wpa_s);
} }
#endif /* CONFIG_MESH */ #endif /* CONFIG_MESH */