osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

EAP: use enum for pdata instead of magic numbers 

Later for packet-peap.c, need to use pdata to pick into the parent
dissector so here we set up packet-eap.c to use enum.
This commit is contained in:
Alexander Clouter 2022-03-09 18:06:38 +00:00 committed by A Wireshark GitLab Utility
parent b9681002c5
commit 49c730cc23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/dissectors/packet-eap.c
View File

@ -1817,10 +1817,10 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
*last_eap_id = eap_identifier;
if (is_duplicate_id) {
// Use a dummy value to remember that this packet is a duplicate.
p_add_proto_data(wmem_file_scope(), pinfo, proto_eap, 1, GINT_TO_POINTER(1));
p_add_proto_data(wmem_file_scope(), pinfo, proto_eap, PROTO_DATA_EAP_DUPLICATE_ID, GINT_TO_POINTER(1));
}
} else {
is_duplicate_id = !!p_get_proto_data(wmem_file_scope(), pinfo, proto_eap, 1);
is_duplicate_id = !!p_get_proto_data(wmem_file_scope(), pinfo, proto_eap, PROTO_DATA_EAP_DUPLICATE_ID);
}
if (is_duplicate_id) {
expert_add_info(pinfo, ti_id, &ei_eap_retransmission);
@ -2025,7 +2025,7 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
first pass through the capture.
*/
/* See if we have a remembered defragmentation EAP ID. */
packet_state = (frame_state_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_eap, 0);
packet_state = (frame_state_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_eap, PROTO_DATA_EAP_FRAME_STATE);
if (packet_state == NULL) {
/*
* We haven't - does this message require reassembly?
@ -2088,7 +2088,7 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
*/
packet_state = wmem_new(wmem_file_scope(), frame_state_t);
packet_state->info = eap_reass_cookie;
p_add_proto_data(wmem_file_scope(), pinfo, proto_eap, 0, packet_state);
p_add_proto_data(wmem_file_scope(), pinfo, proto_eap, PROTO_DATA_EAP_FRAME_STATE, packet_state);
}
}
} else {
@ -2217,7 +2217,7 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
* If so, should we stop here to avoid modifying conversation_state? */
/* See if we've already remembered the state. */
packet_state = (frame_state_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_eap, 0);
packet_state = (frame_state_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_eap, PROTO_DATA_EAP_FRAME_STATE);
if (packet_state == NULL) {
/*
* We haven't - compute the state based on the current
@ -2238,7 +2238,7 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
*/
packet_state = wmem_new(wmem_file_scope(), frame_state_t);
packet_state->info = leap_state;
p_add_proto_data(wmem_file_scope(), pinfo, proto_eap, 0, packet_state);
p_add_proto_data(wmem_file_scope(), pinfo, proto_eap, PROTO_DATA_EAP_FRAME_STATE, packet_state);
/*
* Update the conversation's state.

5
epan/eap.h
View File

@ -75,6 +75,11 @@ WS_DLL_PUBLIC const value_string eap_aka_subtype_vals[];
WS_DLL_PUBLIC const value_string eap_ms_chap_v2_opcode_vals[];
typedef enum {
PROTO_DATA_EAP_DUPLICATE_ID,
PROTO_DATA_EAP_FRAME_STATE,
} proto_data_eap;
typedef struct _eap_vendor_context {
guint32 vendor_type;
guint32 vendor_id;