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

P2P: Add frequency into group started ctrl_interface events

Browse source
This commit is contained in:
Ardong Chen 2010-09-06 16:57:19 +03:00 committed by Jouni Malinen
parent 17bef1e97a
commit c481048f7c
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
wpa_supplicant/p2p_supplicant.c
View file

@ -445,15 +445,17 @@ static void wpas_group_formation_completed(struct wpa_supplicant *wpa_s,
char psk[65]; char psk[65];
wpa_snprintf_hex(psk, sizeof(psk), ssid->psk, 32); wpa_snprintf_hex(psk, sizeof(psk), ssid->psk, 32);
wpa_msg(wpa_s->parent, MSG_INFO, P2P_EVENT_GROUP_STARTED wpa_msg(wpa_s->parent, MSG_INFO, P2P_EVENT_GROUP_STARTED
"%s GO ssid=\"%s\" psk=%s go_dev_addr=" MACSTR "%s", "%s GO ssid=\"%s\" freq=%d psk=%s go_dev_addr=" MACSTR
wpa_s->ifname, ssid_txt, psk, MAC2STR(go_dev_addr), "%s",
wpa_s->ifname, ssid_txt, ssid->frequency, psk,
MAC2STR(go_dev_addr),
persistent ? " [PERSISTENT]" : ""); persistent ? " [PERSISTENT]" : "");
wpas_p2p_cross_connect_setup(wpa_s); wpas_p2p_cross_connect_setup(wpa_s);
} else { } else {
wpa_msg(wpa_s->parent, MSG_INFO, P2P_EVENT_GROUP_STARTED wpa_msg(wpa_s->parent, MSG_INFO, P2P_EVENT_GROUP_STARTED
"%s GO ssid=\"%s\" passphrase=\"%s\" go_dev_addr=" "%s GO ssid=\"%s\" freq=%d passphrase=\"%s\" "
MACSTR "%s", "go_dev_addr=" MACSTR "%s",
wpa_s->ifname, ssid_txt, wpa_s->ifname, ssid_txt, ssid->frequency,
ssid && ssid->passphrase ? ssid->passphrase : "", ssid && ssid->passphrase ? ssid->passphrase : "",
MAC2STR(go_dev_addr), MAC2STR(go_dev_addr),
persistent ? " [PERSISTENT]" : ""); persistent ? " [PERSISTENT]" : "");
@ -725,10 +727,11 @@ static void p2p_go_configured(void *ctx, void *data)
if (ssid && ssid->mode == WPAS_MODE_P2P_GO) { if (ssid && ssid->mode == WPAS_MODE_P2P_GO) {
wpa_printf(MSG_DEBUG, "P2P: Group setup without provisioning"); wpa_printf(MSG_DEBUG, "P2P: Group setup without provisioning");
wpa_msg(wpa_s->parent, MSG_INFO, P2P_EVENT_GROUP_STARTED wpa_msg(wpa_s->parent, MSG_INFO, P2P_EVENT_GROUP_STARTED
"%s GO ssid=\"%s\" passphrase=\"%s\" go_dev_addr=" "%s GO ssid=\"%s\" freq=%d passphrase=\"%s\" "
MACSTR "%s", "go_dev_addr=" MACSTR "%s",
wpa_s->ifname, wpa_s->ifname,
wpa_ssid_txt(ssid->ssid, ssid->ssid_len), wpa_ssid_txt(ssid->ssid, ssid->ssid_len),
ssid->frequency,
params->passphrase ? params->passphrase : "", params->passphrase ? params->passphrase : "",
MAC2STR(wpa_s->parent->own_addr), MAC2STR(wpa_s->parent->own_addr),
params->persistent_group ? " [PERSISTENT]" : ""); params->persistent_group ? " [PERSISTENT]" : "");
@ -3260,15 +3263,16 @@ void wpas_p2p_completed(struct wpa_supplicant *wpa_s)
char psk[65]; char psk[65];
wpa_snprintf_hex(psk, sizeof(psk), ssid->psk, 32); wpa_snprintf_hex(psk, sizeof(psk), ssid->psk, 32);
wpa_msg(wpa_s->parent, MSG_INFO, P2P_EVENT_GROUP_STARTED wpa_msg(wpa_s->parent, MSG_INFO, P2P_EVENT_GROUP_STARTED
"%s client ssid=\"%s\" psk=%s go_dev_addr=" MACSTR "%s client ssid=\"%s\" freq=%d psk=%s go_dev_addr="
"%s", MACSTR "%s",
wpa_s->ifname, ssid_txt, psk, MAC2STR(go_dev_addr), wpa_s->ifname, ssid_txt, ssid->frequency, psk,
MAC2STR(go_dev_addr),
persistent ? " [PERSISTENT]" : ""); persistent ? " [PERSISTENT]" : "");
} else { } else {
wpa_msg(wpa_s->parent, MSG_INFO, P2P_EVENT_GROUP_STARTED wpa_msg(wpa_s->parent, MSG_INFO, P2P_EVENT_GROUP_STARTED
"%s client ssid=\"%s\" passphrase=\"%s\" go_dev_addr=" "%s client ssid=\"%s\" freq=%d passphrase=\"%s\" "
MACSTR "%s", "go_dev_addr=" MACSTR "%s",
wpa_s->ifname, ssid_txt, wpa_s->ifname, ssid_txt, ssid->frequency,
ssid->passphrase ? ssid->passphrase : "", ssid->passphrase ? ssid->passphrase : "",
MAC2STR(go_dev_addr), MAC2STR(go_dev_addr),
persistent ? " [PERSISTENT]" : ""); persistent ? " [PERSISTENT]" : "");