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

Add GAS-QUERY-START and GAS-QUERY-DONE event messages

Browse source 
External programs can use these new control interface events to better
track progress of GAS operations.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2013-12-26 08:38:42 +02:00
parent 93827f456a
commit 6ffa1687ee
2 changed files with 35 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/wpa_ctrl.h
View file

@ -154,6 +154,10 @@ extern "C" {
#define INTERWORKING_ALREADY_CONNECTED "INTERWORKING-ALREADY-CONNECTED " #define INTERWORKING_ALREADY_CONNECTED "INTERWORKING-ALREADY-CONNECTED "
#define GAS_RESPONSE_INFO "GAS-RESPONSE-INFO " #define GAS_RESPONSE_INFO "GAS-RESPONSE-INFO "
/* parameters: <addr> <dialog_token> <freq> */
#define GAS_QUERY_START "GAS-QUERY-START "
/* parameters: <addr> <dialog_token> <freq> <status_code> <result> */
#define GAS_QUERY_DONE "GAS-QUERY-DONE "
/* hostapd control interface - fixed message prefixes */ /* hostapd control interface - fixed message prefixes */
#define WPS_EVENT_PIN_NEEDED "WPS-PIN-NEEDED " #define WPS_EVENT_PIN_NEEDED "WPS-PIN-NEEDED "

33
wpa_supplicant/gas_query.c
View file

@ -13,6 +13,7 @@
#include "utils/eloop.h" #include "utils/eloop.h"
#include "common/ieee802_11_defs.h" #include "common/ieee802_11_defs.h"
#include "common/gas.h" #include "common/gas.h"
#include "common/wpa_ctrl.h"
#include "wpa_supplicant_i.h" #include "wpa_supplicant_i.h"
#include "driver_i.h" #include "driver_i.h"
#include "offchannel.h" #include "offchannel.h"
@ -82,10 +83,37 @@ struct gas_query * gas_query_init(struct wpa_supplicant *wpa_s)
} }
static const char * gas_result_txt(enum gas_query_result result)
{
switch (result) {
case GAS_QUERY_SUCCESS:
return "SUCCESS";
case GAS_QUERY_FAILURE:
return "FAILURE";
case GAS_QUERY_TIMEOUT:
return "TIMEOUT";
case GAS_QUERY_PEER_ERROR:
return "PEER_ERROR";
case GAS_QUERY_INTERNAL_ERROR:
return "INTERNAL_ERROR";
case GAS_QUERY_CANCELLED:
return "CANCELLED";
case GAS_QUERY_DELETED_AT_DEINIT:
return "DELETED_AT_DEINIT";
}
return "N/A";
}
static void gas_query_done(struct gas_query *gas, static void gas_query_done(struct gas_query *gas,
struct gas_query_pending *query, struct gas_query_pending *query,
enum gas_query_result result) enum gas_query_result result)
{ {
wpa_msg(gas->wpa_s, MSG_INFO, GAS_QUERY_DONE "addr=" MACSTR
" dialog_token=%u freq=%d status_code=%u result=%s",
MAC2STR(query->addr), query->dialog_token, query->freq,
query->status_code, gas_result_txt(result));
if (gas->current == query) if (gas->current == query)
gas->current = NULL; gas->current = NULL;
if (query->offchannel_tx_started) if (query->offchannel_tx_started)
@ -581,8 +609,9 @@ int gas_query_req(struct gas_query *gas, const u8 *dst, int freq,
*(wpabuf_mhead_u8(req) + 2) = dialog_token; *(wpabuf_mhead_u8(req) + 2) = dialog_token;
wpa_printf(MSG_DEBUG, "GAS: Starting request for " MACSTR wpa_msg(gas->wpa_s, MSG_INFO, GAS_QUERY_START "addr=" MACSTR
" dialog_token %u", MAC2STR(dst), dialog_token); " dialog_token=%u freq=%d",
MAC2STR(query->addr), query->dialog_token, query->freq);
eloop_register_timeout(0, 0, gas_service_timeout, gas, query); eloop_register_timeout(0, 0, gas_service_timeout, gas, query);