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

mesh: Document Mesh Peering Management element structure in more detail

Browse source 
Provide details on the pointers to the subfields and rename "pmk" to
"chosen_pmk" and use SAE_PMKID_LEN macro with it to make the code more
readable.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2015-12-28 16:25:10 +02:00 committed by Jouni Malinen
parent b2817cd5c2
commit c2ed779748
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
wpa_supplicant/mesh_mpm.c
View file

@ -20,11 +20,11 @@
#include "mesh_rsn.h" #include "mesh_rsn.h"
struct mesh_peer_mgmt_ie { struct mesh_peer_mgmt_ie {
const u8 *proto_id; const u8 *proto_id; /* Mesh Peering Protocol Identifier (2 octets) */
const u8 *llid; const u8 *llid; /* Local Link ID (2 octets) */
const u8 *plid; const u8 *plid; /* Peer Link ID (conditional, 2 octets) */
const u8 *reason; const u8 *reason; /* Reason Code (conditional, 2 octets) */
const u8 *pmk; const u8 *chosen_pmk; /* Chosen PMK (optional, 16 octets) */
}; };
static void plink_timer(void *eloop_ctx, void *user_data); static void plink_timer(void *eloop_ctx, void *user_data);
@ -72,10 +72,10 @@ static int mesh_mpm_parse_peer_mgmt(struct wpa_supplicant *wpa_s,
{ {
os_memset(mpm_ie, 0, sizeof(*mpm_ie)); os_memset(mpm_ie, 0, sizeof(*mpm_ie));
/* remove optional PMK at end */ /* Remove optional Chosen PMK field at end */
if (len >= 16) { if (len >= SAE_PMKID_LEN) {
mpm_ie->pmk = ie + len - 16; mpm_ie->chosen_pmk = ie + len - SAE_PMKID_LEN;
len -= 16; len -= SAE_PMKID_LEN;
} }
if ((action_field == PLINK_OPEN && len != 4) || if ((action_field == PLINK_OPEN && len != 4) ||
@ -101,8 +101,8 @@ static int mesh_mpm_parse_peer_mgmt(struct wpa_supplicant *wpa_s,
len -= 2; len -= 2;
} }
/* plid, present for confirm, and possibly close */ /* Peer Link ID, present for confirm, and possibly close */
if (len) if (len >= 2)
mpm_ie->plid = ie; mpm_ie->plid = ie;
return 0; return 0;
@ -1014,7 +1014,7 @@ void mesh_mpm_action_rx(struct wpa_supplicant *wpa_s,
if ((mconf->security & MESH_CONF_SEC_AMPE) && if ((mconf->security & MESH_CONF_SEC_AMPE) &&
mesh_rsn_process_ampe(wpa_s, sta, &elems, mesh_rsn_process_ampe(wpa_s, sta, &elems,
&mgmt->u.action.category, &mgmt->u.action.category,
peer_mgmt_ie.pmk, peer_mgmt_ie.chosen_pmk,
ies, ie_len)) { ies, ie_len)) {
wpa_printf(MSG_DEBUG, "MPM: RSN process rejected frame"); wpa_printf(MSG_DEBUG, "MPM: RSN process rejected frame");
return; return;