Interworking: Define control interface message prefixes in wpa_ctrl.h
These control interface event message are used by external programs, so define them a bit more formally in the header file. Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
parent
3e5f781800
commit
f465c32dc2
3 changed files with 22 additions and 17 deletions
|
@ -228,6 +228,11 @@ extern "C" {
|
|||
/* parameters: <addr> <result> */
|
||||
#define ANQP_QUERY_DONE "ANQP-QUERY-DONE "
|
||||
|
||||
#define RX_ANQP "RX-ANQP "
|
||||
#define RX_HS20_ANQP "RX-HS20-ANQP "
|
||||
#define RX_HS20_ANQP_ICON "RX-HS20-ANQP-ICON "
|
||||
#define RX_HS20_ICON "RX-HS20-ICON "
|
||||
|
||||
#define HS20_SUBSCRIPTION_REMEDIATION "HS20-SUBSCRIPTION-REMEDIATION "
|
||||
#define HS20_DEAUTH_IMMINENT_NOTICE "HS20-DEAUTH-IMMINENT-NOTICE "
|
||||
|
||||
|
|
|
@ -436,14 +436,14 @@ static int hs20_process_icon_binary_file(struct wpa_supplicant *wpa_s,
|
|||
icon->image_len = slen;
|
||||
hs20_remove_duplicate_icons(wpa_s, icon);
|
||||
wpa_msg(wpa_s, MSG_INFO,
|
||||
"RX-HS20-ICON " MACSTR " %s %u",
|
||||
RX_HS20_ICON MACSTR " %s %u",
|
||||
MAC2STR(sa), icon->file_name,
|
||||
(unsigned int) icon->image_len);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
wpa_msg(wpa_s, MSG_INFO, "RX-HS20-ANQP " MACSTR " Icon Binary File",
|
||||
wpa_msg(wpa_s, MSG_INFO, RX_HS20_ANQP MACSTR " Icon Binary File",
|
||||
MAC2STR(sa));
|
||||
|
||||
if (slen < 4) {
|
||||
|
@ -506,7 +506,7 @@ static int hs20_process_icon_binary_file(struct wpa_supplicant *wpa_s,
|
|||
}
|
||||
fclose(f);
|
||||
|
||||
wpa_msg(wpa_s, MSG_INFO, "RX-HS20-ANQP-ICON %s", fname);
|
||||
wpa_msg(wpa_s, MSG_INFO, RX_HS20_ANQP_ICON "%s", fname);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -570,7 +570,7 @@ void hs20_parse_rx_hs20_anqp_resp(struct wpa_supplicant *wpa_s,
|
|||
|
||||
switch (subtype) {
|
||||
case HS20_STYPE_CAPABILITY_LIST:
|
||||
wpa_msg(wpa_s, MSG_INFO, "RX-HS20-ANQP " MACSTR
|
||||
wpa_msg(wpa_s, MSG_INFO, RX_HS20_ANQP MACSTR
|
||||
" HS Capability List", MAC2STR(sa));
|
||||
wpa_hexdump_ascii(MSG_DEBUG, "HS Capability List", pos, slen);
|
||||
if (anqp) {
|
||||
|
@ -580,7 +580,7 @@ void hs20_parse_rx_hs20_anqp_resp(struct wpa_supplicant *wpa_s,
|
|||
}
|
||||
break;
|
||||
case HS20_STYPE_OPERATOR_FRIENDLY_NAME:
|
||||
wpa_msg(wpa_s, MSG_INFO, "RX-HS20-ANQP " MACSTR
|
||||
wpa_msg(wpa_s, MSG_INFO, RX_HS20_ANQP MACSTR
|
||||
" Operator Friendly Name", MAC2STR(sa));
|
||||
wpa_hexdump_ascii(MSG_DEBUG, "oper friendly name", pos, slen);
|
||||
if (anqp) {
|
||||
|
@ -596,7 +596,7 @@ void hs20_parse_rx_hs20_anqp_resp(struct wpa_supplicant *wpa_s,
|
|||
"Metrics value from " MACSTR, MAC2STR(sa));
|
||||
break;
|
||||
}
|
||||
wpa_msg(wpa_s, MSG_INFO, "RX-HS20-ANQP " MACSTR
|
||||
wpa_msg(wpa_s, MSG_INFO, RX_HS20_ANQP MACSTR
|
||||
" WAN Metrics %02x:%u:%u:%u:%u:%u", MAC2STR(sa),
|
||||
pos[0], WPA_GET_LE32(pos + 1), WPA_GET_LE32(pos + 5),
|
||||
pos[9], pos[10], WPA_GET_LE16(pos + 11));
|
||||
|
@ -606,7 +606,7 @@ void hs20_parse_rx_hs20_anqp_resp(struct wpa_supplicant *wpa_s,
|
|||
}
|
||||
break;
|
||||
case HS20_STYPE_CONNECTION_CAPABILITY:
|
||||
wpa_msg(wpa_s, MSG_INFO, "RX-HS20-ANQP " MACSTR
|
||||
wpa_msg(wpa_s, MSG_INFO, RX_HS20_ANQP MACSTR
|
||||
" Connection Capability", MAC2STR(sa));
|
||||
wpa_hexdump_ascii(MSG_DEBUG, "conn capability", pos, slen);
|
||||
if (anqp) {
|
||||
|
@ -616,7 +616,7 @@ void hs20_parse_rx_hs20_anqp_resp(struct wpa_supplicant *wpa_s,
|
|||
}
|
||||
break;
|
||||
case HS20_STYPE_OPERATING_CLASS:
|
||||
wpa_msg(wpa_s, MSG_INFO, "RX-HS20-ANQP " MACSTR
|
||||
wpa_msg(wpa_s, MSG_INFO, RX_HS20_ANQP MACSTR
|
||||
" Operating Class", MAC2STR(sa));
|
||||
wpa_hexdump_ascii(MSG_DEBUG, "Operating Class", pos, slen);
|
||||
if (anqp) {
|
||||
|
@ -626,7 +626,7 @@ void hs20_parse_rx_hs20_anqp_resp(struct wpa_supplicant *wpa_s,
|
|||
}
|
||||
break;
|
||||
case HS20_STYPE_OSU_PROVIDERS_LIST:
|
||||
wpa_msg(wpa_s, MSG_INFO, "RX-HS20-ANQP " MACSTR
|
||||
wpa_msg(wpa_s, MSG_INFO, RX_HS20_ANQP MACSTR
|
||||
" OSU Providers list", MAC2STR(sa));
|
||||
wpa_s->num_prov_found++;
|
||||
if (anqp) {
|
||||
|
|
|
@ -2796,7 +2796,7 @@ static void interworking_parse_rx_anqp_resp(struct wpa_supplicant *wpa_s,
|
|||
|
||||
switch (info_id) {
|
||||
case ANQP_CAPABILITY_LIST:
|
||||
wpa_msg(wpa_s, MSG_INFO, "RX-ANQP " MACSTR
|
||||
wpa_msg(wpa_s, MSG_INFO, RX_ANQP MACSTR
|
||||
" ANQP Capability list", MAC2STR(sa));
|
||||
wpa_hexdump_ascii(MSG_DEBUG, "ANQP: Capability list",
|
||||
pos, slen);
|
||||
|
@ -2806,7 +2806,7 @@ static void interworking_parse_rx_anqp_resp(struct wpa_supplicant *wpa_s,
|
|||
}
|
||||
break;
|
||||
case ANQP_VENUE_NAME:
|
||||
wpa_msg(wpa_s, MSG_INFO, "RX-ANQP " MACSTR
|
||||
wpa_msg(wpa_s, MSG_INFO, RX_ANQP MACSTR
|
||||
" Venue Name", MAC2STR(sa));
|
||||
wpa_hexdump_ascii(MSG_DEBUG, "ANQP: Venue Name", pos, slen);
|
||||
if (anqp) {
|
||||
|
@ -2815,7 +2815,7 @@ static void interworking_parse_rx_anqp_resp(struct wpa_supplicant *wpa_s,
|
|||
}
|
||||
break;
|
||||
case ANQP_NETWORK_AUTH_TYPE:
|
||||
wpa_msg(wpa_s, MSG_INFO, "RX-ANQP " MACSTR
|
||||
wpa_msg(wpa_s, MSG_INFO, RX_ANQP MACSTR
|
||||
" Network Authentication Type information",
|
||||
MAC2STR(sa));
|
||||
wpa_hexdump_ascii(MSG_DEBUG, "ANQP: Network Authentication "
|
||||
|
@ -2826,7 +2826,7 @@ static void interworking_parse_rx_anqp_resp(struct wpa_supplicant *wpa_s,
|
|||
}
|
||||
break;
|
||||
case ANQP_ROAMING_CONSORTIUM:
|
||||
wpa_msg(wpa_s, MSG_INFO, "RX-ANQP " MACSTR
|
||||
wpa_msg(wpa_s, MSG_INFO, RX_ANQP MACSTR
|
||||
" Roaming Consortium list", MAC2STR(sa));
|
||||
wpa_hexdump_ascii(MSG_DEBUG, "ANQP: Roaming Consortium",
|
||||
pos, slen);
|
||||
|
@ -2836,7 +2836,7 @@ static void interworking_parse_rx_anqp_resp(struct wpa_supplicant *wpa_s,
|
|||
}
|
||||
break;
|
||||
case ANQP_IP_ADDR_TYPE_AVAILABILITY:
|
||||
wpa_msg(wpa_s, MSG_INFO, "RX-ANQP " MACSTR
|
||||
wpa_msg(wpa_s, MSG_INFO, RX_ANQP MACSTR
|
||||
" IP Address Type Availability information",
|
||||
MAC2STR(sa));
|
||||
wpa_hexdump(MSG_MSGDUMP, "ANQP: IP Address Availability",
|
||||
|
@ -2848,7 +2848,7 @@ static void interworking_parse_rx_anqp_resp(struct wpa_supplicant *wpa_s,
|
|||
}
|
||||
break;
|
||||
case ANQP_NAI_REALM:
|
||||
wpa_msg(wpa_s, MSG_INFO, "RX-ANQP " MACSTR
|
||||
wpa_msg(wpa_s, MSG_INFO, RX_ANQP MACSTR
|
||||
" NAI Realm list", MAC2STR(sa));
|
||||
wpa_hexdump_ascii(MSG_DEBUG, "ANQP: NAI Realm", pos, slen);
|
||||
if (anqp) {
|
||||
|
@ -2857,7 +2857,7 @@ static void interworking_parse_rx_anqp_resp(struct wpa_supplicant *wpa_s,
|
|||
}
|
||||
break;
|
||||
case ANQP_3GPP_CELLULAR_NETWORK:
|
||||
wpa_msg(wpa_s, MSG_INFO, "RX-ANQP " MACSTR
|
||||
wpa_msg(wpa_s, MSG_INFO, RX_ANQP MACSTR
|
||||
" 3GPP Cellular Network information", MAC2STR(sa));
|
||||
wpa_hexdump_ascii(MSG_DEBUG, "ANQP: 3GPP Cellular Network",
|
||||
pos, slen);
|
||||
|
@ -2867,7 +2867,7 @@ static void interworking_parse_rx_anqp_resp(struct wpa_supplicant *wpa_s,
|
|||
}
|
||||
break;
|
||||
case ANQP_DOMAIN_NAME:
|
||||
wpa_msg(wpa_s, MSG_INFO, "RX-ANQP " MACSTR
|
||||
wpa_msg(wpa_s, MSG_INFO, RX_ANQP MACSTR
|
||||
" Domain Name list", MAC2STR(sa));
|
||||
wpa_hexdump_ascii(MSG_MSGDUMP, "ANQP: Domain Name", pos, slen);
|
||||
if (anqp) {
|
||||
|
|
Loading…
Reference in a new issue