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

P2P: Fix Provision Discovery name in debug messages

Browse source 
Some debug messages used incorrect name for Provision Discovery.
Replace "Provisioning Discovery" with "Provision Discovery".

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2011-12-11 17:36:38 +02:00
parent 36ba8581f7
commit e3a0706b47
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p2p/p2p.c
View file

@ -2366,7 +2366,7 @@ void p2p_continue_find(struct p2p_data *p2p)
} else if (dev->req_config_methods && } else if (dev->req_config_methods &&
!(dev->flags & P2P_DEV_PD_FOR_JOIN)) { !(dev->flags & P2P_DEV_PD_FOR_JOIN)) {
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Send " wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Send "
"pending Provisioning Discovery Request to " "pending Provision Discovery Request to "
MACSTR " (config methods 0x%x)", MACSTR " (config methods 0x%x)",
MAC2STR(dev->info.p2p_device_addr), MAC2STR(dev->info.p2p_device_addr),
dev->req_config_methods); dev->req_config_methods);
@ -2435,7 +2435,7 @@ static void p2p_retry_pd(struct p2p_data *p2p)
continue; continue;
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Send " wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Send "
"pending Provisioning Discovery Request to " "pending Provision Discovery Request to "
MACSTR " (config methods 0x%x)", MACSTR " (config methods 0x%x)",
MAC2STR(dev->info.p2p_device_addr), MAC2STR(dev->info.p2p_device_addr),
dev->req_config_methods); dev->req_config_methods);

2
src/p2p/p2p_i.h
View file

@ -67,7 +67,7 @@ struct p2p_device {
size_t oper_ssid_len; size_t oper_ssid_len;
/** /**
* req_config_methods - Pending provisioning discovery methods * req_config_methods - Pending provision discovery methods
*/ */
u16 req_config_methods; u16 req_config_methods;

8
src/p2p/p2p_pd.c
View file

@ -209,14 +209,14 @@ void p2p_process_prov_disc_resp(struct p2p_data *p2p, const u8 *sa,
return; return;
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: Received Provisioning Discovery Response from " MACSTR "P2P: Received Provision Discovery Response from " MACSTR
" with config methods 0x%x", " with config methods 0x%x",
MAC2STR(sa), msg.wps_config_methods); MAC2STR(sa), msg.wps_config_methods);
dev = p2p_get_device(p2p, sa); dev = p2p_get_device(p2p, sa);
if (dev == NULL || !dev->req_config_methods) { if (dev == NULL || !dev->req_config_methods) {
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: Ignore Provisioning Discovery Response from " "P2P: Ignore Provision Discovery Response from "
MACSTR " with no pending request", MAC2STR(sa)); MACSTR " with no pending request", MAC2STR(sa));
p2p_parse_free(&msg); p2p_parse_free(&msg);
return; return;
@ -229,7 +229,7 @@ void p2p_process_prov_disc_resp(struct p2p_data *p2p, const u8 *sa,
if (dev->dialog_token != msg.dialog_token) { if (dev->dialog_token != msg.dialog_token) {
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG,
"P2P: Ignore Provisioning Discovery Response with " "P2P: Ignore Provision Discovery Response with "
"unexpected Dialog Token %u (expected %u)", "unexpected Dialog Token %u (expected %u)",
msg.dialog_token, dev->dialog_token); msg.dialog_token, dev->dialog_token);
p2p_parse_free(&msg); p2p_parse_free(&msg);
@ -246,7 +246,7 @@ void p2p_process_prov_disc_resp(struct p2p_data *p2p, const u8 *sa,
if (msg.wps_config_methods != dev->req_config_methods) { if (msg.wps_config_methods != dev->req_config_methods) {
wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Peer rejected " wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: Peer rejected "
"our Provisioning Discovery Request"); "our Provision Discovery Request");
if (p2p->cfg->prov_disc_fail) if (p2p->cfg->prov_disc_fail)
p2p->cfg->prov_disc_fail(p2p->cfg->cb_ctx, sa, p2p->cfg->prov_disc_fail(p2p->cfg->cb_ctx, sa,
P2P_PROV_DISC_REJECTED); P2P_PROV_DISC_REJECTED);

2
wpa_supplicant/p2p_supplicant.c
View file

@ -2537,7 +2537,7 @@ static void wpas_p2p_scan_res_join(struct wpa_supplicant *wpa_s,
* We have already performed provision discovery for * We have already performed provision discovery for
* joining the group. Proceed directly to join * joining the group. Proceed directly to join
* operation without duplicated provision discovery. */ * operation without duplicated provision discovery. */
wpa_printf(MSG_DEBUG, "P2P: Provisioning discovery " wpa_printf(MSG_DEBUG, "P2P: Provision discovery "
"with " MACSTR " already done - proceed to " "with " MACSTR " already done - proceed to "
"join", "join",
MAC2STR(wpa_s->pending_join_dev_addr)); MAC2STR(wpa_s->pending_join_dev_addr));