Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

peap: Rename AVPs to TLVs 

Most of the literature seems to refer to AVPs as TLVs. Rename the
variables to follow the common nomenclature.
This commit is contained in:
Tim Kourt 2019-12-05 13:13:51 -08:00 committed by Denis Kenzior
parent 9bf0b756c8
commit 24b6a95366
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/eap-peap.c
View File

@ -110,13 +110,13 @@ static void eap_peap_phase2_complete(enum eap_result result, void *user_data)
* PEAPv0: draft-kamath-pppext-peapv0-00, Section 2
*/
#define EAP_EXTENSIONS_HEADER_LEN 5
#define EAP_EXTENSIONS_AVP_HEADER_LEN 4
#define EAP_EXTENSIONS_TLV_HEADER_LEN 4
enum eap_extensions_avp_type {
enum eap_extensions_tlv_type {
/* Reserved = 0x0000, */
/* Reserved = 0x0001, */
/* Reserved = 0x0002, */
EAP_EXTENSIONS_AVP_TYPE_RESULT = 0x8003,
EAP_EXTENSIONS_TLV_TYPE_RESULT = 0x8003,
};
enum eap_extensions_result {
@ -124,7 +124,7 @@ enum eap_extensions_result {
EAP_EXTENSIONS_RESULT_FAILURE = 2,
};
static int eap_extensions_handle_result_avp(struct eap_state *eap,
static int eap_extensions_handle_result_tlv(struct eap_state *eap,
const uint8_t *data,
size_t data_len,
uint8_t *response)
@ -134,12 +134,12 @@ static int eap_extensions_handle_result_avp(struct eap_state *eap,
uint16_t len;
uint16_t result;
if (data_len < EAP_EXTENSIONS_AVP_HEADER_LEN + 2)
if (data_len < EAP_EXTENSIONS_TLV_HEADER_LEN + 2)
return -ENOENT;
type = l_get_be16(data);
if (type != EAP_EXTENSIONS_AVP_TYPE_RESULT)
if (type != EAP_EXTENSIONS_TLV_TYPE_RESULT)
return -ENOENT;
data += 2;
@ -169,11 +169,11 @@ static int eap_extensions_handle_result_avp(struct eap_state *eap,
return -ENOENT;
}
l_put_be16(EAP_EXTENSIONS_AVP_TYPE_RESULT,
l_put_be16(EAP_EXTENSIONS_TLV_TYPE_RESULT,
&response[EAP_EXTENSIONS_HEADER_LEN]);
l_put_be16(2, &response[EAP_EXTENSIONS_HEADER_LEN + 2]);
l_put_be16(result, &response[EAP_EXTENSIONS_HEADER_LEN +
EAP_EXTENSIONS_AVP_HEADER_LEN]);
EAP_EXTENSIONS_TLV_HEADER_LEN]);
return result;
}
@ -185,8 +185,8 @@ static void eap_extensions_handle_request(struct eap_state *eap,
{
struct peap_state *peap_state;
uint8_t response[EAP_EXTENSIONS_HEADER_LEN +
EAP_EXTENSIONS_AVP_HEADER_LEN + 2];
int r = eap_extensions_handle_result_avp(eap, pkt, len, response);
EAP_EXTENSIONS_TLV_HEADER_LEN + 2];
int r = eap_extensions_handle_result_tlv(eap, pkt, len, response);
if (r < 0)
return;