[wpa_supplicant] Cumulative patch from commit c54a5e96b
Bug: 154862045
Test: Confirm random dialog token usage from logs
Test: Verify Passpoint ANQP functionality and Passpoint association
Test: act.py -c ../WifiDppConfig.json -tc WifiDppTest
Test: Connect to Passpoint, Open, WPA2, WPA3 networks and run traffic
c54a5e96b Randomize GAS dialog token
a803ba4f9 Use more specific reason codes for 4-way handshake timeouts
ff0b87304 nl80211: Process unprotected Beacon frame RX events
a39e9af90 nl80211: DPP listen mode callback
e81e2091b Remove now unused Boolean/TRUE/FALSE definitions
3d58e8286 FILS: Convert Boolean to C99 bool
86ea761e9 mesh: Convert Boolean to C99 bool
71140cd5b RADIUS: Convert Boolean to C99 bool
2c55e67aa airtime_policy: Convert Boolean to C99 bool
f75a0339d state_machine: Convert Boolean to C99 bool
0365458eb HE: Replace Boolean with C99 bool
5e5eb5a31 MACsec: Convert Boolean to C99 bool
d15e109e2 EAP peer: Convert Boolean to C99 bool
c9d70dd32 RSN supp: Convert Boolean to C99 bool
da8478a1a EAPOL supp: Convert Boolean to C99 bool
37e3501bf FST: Convert Boolean to C99 bool
3dc69721e EAPOL auth: Convert Boolean to C99 bool
56024a233 WPA auth: Convert Boolean to C99 bool
4d9c313f2 WPA: Fix wpa_parse_kde_ies() handling with vendor specific elements
1025a9052 Sync with mac80211-next.git include/uapi/linux/nl80211.h
Change-Id: I4fc553d84810ba82fdc626767c2e8a5640e4ca51
diff --git a/src/fst/fst_session.c b/src/fst/fst_session.c
index a02a93e..e42a85c 100644
--- a/src/fst/fst_session.c
+++ b/src/fst/fst_session.c
@@ -71,7 +71,7 @@
* specific session object */
struct fst_group *group;
enum fst_session_state state;
- Boolean stt_armed;
+ bool stt_armed;
};
static struct dl_list global_sessions_list;
@@ -145,12 +145,12 @@
struct fst_session *s;
for (i = 0; i < (u32) -1; i++) {
- Boolean in_use = FALSE;
+ bool in_use = false;
foreach_fst_session(s) {
if (s->id == global_session_id) {
fst_session_global_inc_id();
- in_use = TRUE;
+ in_use = true;
break;
}
}
@@ -184,7 +184,7 @@
/* Action frames sometimes get delayed. Use relaxed timeout (2*) */
eloop_register_timeout(0, 2 * TU_TO_US(FST_DEFAULT_SESSION_TIMEOUT_TU),
fst_session_timeout_handler, NULL, s);
- s->stt_armed = TRUE;
+ s->stt_armed = true;
}
@@ -192,12 +192,12 @@
{
if (s->stt_armed) {
eloop_cancel_timeout(fst_session_timeout_handler, NULL, s);
- s->stt_armed = FALSE;
+ s->stt_armed = false;
}
}
-static Boolean fst_session_is_in_transition(struct fst_session *s)
+static bool fst_session_is_in_transition(struct fst_session *s)
{
/* See spec, 10.32.2.2 Transitioning between states */
return s->stt_armed;
@@ -267,7 +267,7 @@
}
-static int fst_session_send_action(struct fst_session *s, Boolean old_iface,
+static int fst_session_send_action(struct fst_session *s, bool old_iface,
const void *payload, size_t size,
const struct wpabuf *extra_buf)
{
@@ -344,11 +344,11 @@
td.action = FST_ACTION_TEAR_DOWN;
td.fsts_id = host_to_le32(s->data.fsts_id);
- res = fst_session_send_action(s, TRUE, &td, sizeof(td), NULL);
+ res = fst_session_send_action(s, true, &td, sizeof(td), NULL);
if (!res)
- fst_printf_sframe(s, TRUE, MSG_INFO, "FST TearDown sent");
+ fst_printf_sframe(s, true, MSG_INFO, "FST TearDown sent");
else
- fst_printf_sframe(s, TRUE, MSG_ERROR,
+ fst_printf_sframe(s, true, MSG_ERROR,
"failed to send FST TearDown");
return res;
@@ -481,10 +481,10 @@
return;
}
- fst_session_set_iface(s, iface, TRUE);
- fst_session_set_peer_addr(s, mgmt->sa, TRUE);
- fst_session_set_iface(s, new_iface, FALSE);
- fst_session_set_peer_addr(s, new_iface_peer_addr, FALSE);
+ fst_session_set_iface(s, iface, true);
+ fst_session_set_peer_addr(s, mgmt->sa, true);
+ fst_session_set_iface(s, new_iface, false);
+ fst_session_set_peer_addr(s, new_iface_peer_addr, false);
fst_session_set_llt(s, FST_LLT_VAL_TO_MS(le_to_host32(req->llt)));
s->data.pending_setup_req_dlgt = req->dialog_token;
s->data.fsts_id = le_to_host32(req->stie.fsts_id);
@@ -687,8 +687,8 @@
res.dialog_token = req->dialog_token;
res.fsts_id = req->fsts_id;
- if (!fst_session_send_action(s, FALSE, &res, sizeof(res), NULL)) {
- fst_printf_sframe(s, FALSE, MSG_INFO, "FST Ack Response sent");
+ if (!fst_session_send_action(s, false, &res, sizeof(res), NULL)) {
+ fst_printf_sframe(s, false, MSG_INFO, "FST Ack Response sent");
fst_session_stt_disarm(s);
fst_session_set_state(s, FST_SESSION_STATE_TRANSITION_DONE,
NULL);
@@ -785,7 +785,7 @@
void fst_session_set_iface(struct fst_session *s, struct fst_iface *iface,
- Boolean is_old)
+ bool is_old)
{
if (is_old)
s->data.old_iface = iface;
@@ -802,7 +802,7 @@
void fst_session_set_peer_addr(struct fst_session *s, const u8 *addr,
- Boolean is_old)
+ bool is_old)
{
u8 *a = is_old ? s->data.old_peer_addr : s->data.new_peer_addr;
@@ -850,14 +850,14 @@
}
if (!fst_iface_is_connected(s->data.old_iface, s->data.old_peer_addr,
- FALSE)) {
+ false)) {
fst_printf_session(s, MSG_ERROR,
"The preset old peer address is not connected");
return -EINVAL;
}
if (!fst_iface_is_connected(s->data.new_iface, s->data.new_peer_addr,
- FALSE)) {
+ false)) {
fst_printf_session(s, MSG_ERROR,
"The preset new peer address is not connected");
return -EINVAL;
@@ -905,12 +905,12 @@
req.stie.old_band_op = 1;
req.stie.old_band_setup = 0;
- res = fst_session_send_action(s, TRUE, &req, sizeof(req),
+ res = fst_session_send_action(s, true, &req, sizeof(req),
fst_iface_get_mbie(s->data.old_iface));
if (!res) {
s->data.fsts_id = fsts_id;
s->data.pending_setup_req_dlgt = dialog_token;
- fst_printf_sframe(s, TRUE, MSG_INFO, "FST Setup Request sent");
+ fst_printf_sframe(s, true, MSG_INFO, "FST Setup Request sent");
fst_session_set_state(s, FST_SESSION_STATE_SETUP_COMPLETION,
NULL);
@@ -955,7 +955,7 @@
}
if (!fst_iface_is_connected(s->data.old_iface,
- s->data.old_peer_addr, FALSE)) {
+ s->data.old_peer_addr, false)) {
fst_printf_session(s, MSG_ERROR,
"The preset peer address is not in the peer list");
return -EINVAL;
@@ -1000,15 +1000,15 @@
status_code);
}
- if (fst_session_send_action(s, TRUE, &res, sizeof(res),
+ if (fst_session_send_action(s, true, &res, sizeof(res),
fst_iface_get_mbie(s->data.old_iface))) {
- fst_printf_sframe(s, TRUE, MSG_ERROR,
+ fst_printf_sframe(s, true, MSG_ERROR,
"cannot send FST Setup Response with code %d",
status_code);
return -EINVAL;
}
- fst_printf_sframe(s, TRUE, MSG_INFO, "FST Setup Response sent");
+ fst_printf_sframe(s, true, MSG_INFO, "FST Setup Response sent");
if (status_code != WLAN_STATUS_SUCCESS) {
union fst_session_state_switch_extra evext = {
@@ -1053,14 +1053,14 @@
req.dialog_token = dialog_token;
req.fsts_id = host_to_le32(s->data.fsts_id);
- res = fst_session_send_action(s, FALSE, &req, sizeof(req), NULL);
+ res = fst_session_send_action(s, false, &req, sizeof(req), NULL);
if (!res) {
- fst_printf_sframe(s, FALSE, MSG_INFO, "FST Ack Request sent");
+ fst_printf_sframe(s, false, MSG_INFO, "FST Ack Request sent");
fst_session_set_state(s, FST_SESSION_STATE_TRANSITION_DONE,
NULL);
fst_session_stt_arm(s);
} else {
- fst_printf_sframe(s, FALSE, MSG_ERROR,
+ fst_printf_sframe(s, false, MSG_ERROR,
"Cannot send FST Ack Request");
}
@@ -1091,7 +1091,7 @@
break;
case FST_ACTION_ON_CHANNEL_TUNNEL:
default:
- fst_printf_sframe(s, FALSE, MSG_ERROR,
+ fst_printf_sframe(s, false, MSG_ERROR,
"Unsupported FST Action frame");
break;
}
@@ -1137,7 +1137,7 @@
}
-struct fst_iface * fst_session_get_iface(struct fst_session *s, Boolean is_old)
+struct fst_iface * fst_session_get_iface(struct fst_session *s, bool is_old)
{
return is_old ? s->data.old_iface : s->data.new_iface;
}
@@ -1149,7 +1149,7 @@
}
-const u8 * fst_session_get_peer_addr(struct fst_session *s, Boolean is_old)
+const u8 * fst_session_get_peer_addr(struct fst_session *s, bool is_old)
{
return is_old ? s->data.old_peer_addr : s->data.new_peer_addr;
}
@@ -1232,7 +1232,7 @@
int fst_session_set_str_ifname(struct fst_session *s, const char *ifname,
- Boolean is_old)
+ bool is_old)
{
struct fst_group *g = fst_session_get_group(s);
struct fst_iface *i;
@@ -1252,7 +1252,7 @@
int fst_session_set_str_peer_addr(struct fst_session *s, const char *mac,
- Boolean is_old)
+ bool is_old)
{
u8 peer_addr[ETH_ALEN];
int res = fst_read_peer_addr(mac, peer_addr);
@@ -1330,11 +1330,11 @@
if (!s->data.old_iface)
return -EINVAL;
- old_addr = fst_iface_get_peer_first(s->data.old_iface, &ctx, TRUE);
+ old_addr = fst_iface_get_peer_first(s->data.old_iface, &ctx, true);
if (!old_addr)
return -EINVAL;
- new_addr = fst_iface_get_peer_first(s->data.new_iface, &ctx, TRUE);
+ new_addr = fst_iface_get_peer_first(s->data.new_iface, &ctx, true);
if (!new_addr)
return -EINVAL;
@@ -1350,7 +1350,7 @@
int fst_test_req_send_fst_request(const char *params)
{
int fsts_id;
- Boolean is_valid;
+ bool is_valid;
char *endp;
struct fst_setup_req req;
struct fst_session s;
@@ -1394,7 +1394,7 @@
req.stie.new_band_id = req.stie.old_band_id;
}
- return fst_session_send_action(&s, TRUE, &req, sizeof(req),
+ return fst_session_send_action(&s, true, &req, sizeof(req),
s.data.old_iface->mb_ie);
}
@@ -1402,7 +1402,7 @@
int fst_test_req_send_fst_response(const char *params)
{
int fsts_id;
- Boolean is_valid;
+ bool is_valid;
char *endp;
struct fst_setup_res res;
struct fst_session s;
@@ -1437,7 +1437,7 @@
* If some session has just received an FST Setup Request, then
* use the correct dialog token copied from this request.
*/
- _s = fst_find_session_in_progress(fst_session_get_peer_addr(&s, TRUE),
+ _s = fst_find_session_in_progress(fst_session_get_peer_addr(&s, true),
g);
res.dialog_token = (_s && fst_session_is_ready_pending(_s)) ?
_s->data.pending_setup_req_dlgt : g->dialog_token;
@@ -1469,7 +1469,7 @@
res.stie.new_band_id = res.stie.old_band_id;
}
- return fst_session_send_action(&s, TRUE, &res, sizeof(res),
+ return fst_session_send_action(&s, true, &res, sizeof(res),
s.data.old_iface->mb_ie);
}
@@ -1477,7 +1477,7 @@
int fst_test_req_send_ack_request(const char *params)
{
int fsts_id;
- Boolean is_valid;
+ bool is_valid;
char *endp;
struct fst_ack_req req;
struct fst_session s;
@@ -1498,14 +1498,14 @@
req.dialog_token = g->dialog_token;
req.fsts_id = host_to_le32(fsts_id);
- return fst_session_send_action(&s, FALSE, &req, sizeof(req), NULL);
+ return fst_session_send_action(&s, false, &req, sizeof(req), NULL);
}
int fst_test_req_send_ack_response(const char *params)
{
int fsts_id;
- Boolean is_valid;
+ bool is_valid;
char *endp;
struct fst_ack_res res;
struct fst_session s;
@@ -1526,14 +1526,14 @@
res.dialog_token = g->dialog_token;
res.fsts_id = host_to_le32(fsts_id);
- return fst_session_send_action(&s, FALSE, &res, sizeof(res), NULL);
+ return fst_session_send_action(&s, false, &res, sizeof(res), NULL);
}
int fst_test_req_send_tear_down(const char *params)
{
int fsts_id;
- Boolean is_valid;
+ bool is_valid;
char *endp;
struct fst_tear_down td;
struct fst_session s;
@@ -1553,14 +1553,14 @@
td.action = FST_ACTION_TEAR_DOWN;
td.fsts_id = host_to_le32(fsts_id);
- return fst_session_send_action(&s, TRUE, &td, sizeof(td), NULL);
+ return fst_session_send_action(&s, true, &td, sizeof(td), NULL);
}
u32 fst_test_req_get_fsts_id(const char *params)
{
int sid;
- Boolean is_valid;
+ bool is_valid;
char *endp;
struct fst_session *s;