osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

NAS 5GS: Dissect more IEs 

Change-Id: I79016ef7791ee7d535861222168e3e2f244ef6f4
Reviewed-on: https://code.wireshark.org/review/36075
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Anders Broman 2020-02-11 11:00:05 +01:00 committed by Anders Broman
parent 0fed3e2681
commit 912be1a298
3 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
epan/dissectors/packet-gsm_a_common.h
View File

@ -1547,6 +1547,24 @@ typedef enum
}
rr_elem_idx_t;
typedef enum
{
DE_EPS_CMN_ADD_INFO, /* 9.9.2.0 Additional information */
DE_EPS_CMN_DEVICE_PROPERTIES, /* 9.9.2.0A Device properties */
DE_EPS_CMN_EPS_BE_CTX_STATUS, /* 9.9.2.1 EPS bearer context status */
DE_EPS_CMN_LOC_AREA_ID, /* 9.9.2.2 Location area identification */
DE_EPS_CMN_MOB_ID, /* 9.9.2.3 Mobile identity */
DE_EPS_MS_CM_2, /* 9.9.2.4 Mobile station classmark 2 */
DE_EPS_MS_CM_3, /* 9.9.2.5 Mobile station classmark 3 */
DE_EPS_NAS_SEC_PAR_FROM_EUTRA, /* 9.9.2.6 NAS security parameters from E-UTRA */
DE_EPS_NAS_SEC_PAR_TO_EUTRA, /* 9.9.2.7 NAS security parameters to E-UTRA */
DE_EPS_CMN_PLM_LST, /* 9.9.2.8 PLMN list */
DE_EPS_CMN_SUP_CODEC_LST, /* 9.9.2.6 9.9.2.10 Supported codec list */
DE_EPS_COMMON_NONE /* NONE */
}
nas_eps_common_elem_idx_t;
typedef enum
{
/* 9.9.3 EPS Mobility Management (EMM) information elements */

13
epan/dissectors/packet-nas_5gs.c
View File

@ -2111,6 +2111,7 @@ static const value_string nas_5gs_mm_serv_type_vals[] = {
{ 0x03, "Emergency services" },
{ 0x04, "Emergency services fallback" },
{ 0x05, "High priority access" },
{ 0x06, "Elevated signalling" },
{ 0, NULL } };
@ -4299,9 +4300,16 @@ nas_5gs_mm_registration_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo,
/* 71 NAS message container NAS message container 9.11.3.33 O TLV-E 4-n */
ELEM_OPT_TLV_E(0x71, NAS_5GS_PDU_TYPE_MM, DE_NAS_5GS_MM_NAS_MSG_CONT, NULL);
/* 60 EPS bearer context status EPS bearer context status 9.11.3.23A O TLV 4 */
ELEM_OPT_TLV(0x60, NAS_PDU_TYPE_COMMON, DE_EPS_CMN_EPS_BE_CTX_STATUS, NULL);
/* 6E Requested extended DRX parameters Extended DRX parameters 9.11.3.60 O TLV 3 */
ELEM_OPT_TLV(0x6E, GSM_A_PDU_TYPE_GM, DE_EXT_DRX_PARAMS, NULL);
/* 6A T3324 value GPRS timer 3 9.11.2.5 O TLV 3 */
/* 67 UE radio capability ID UE radio capability ID 9.11.3.68 O TLV 3-n */
/* 35 Requested mapped NSSAI Mapped NSSAI 9.11.3.31B O TLV 3-42 */
/* 48 Additional information requested Additional information requested 9.11.3.12A O TLV 3 */
EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_nas_5gs_extraneous_data);
@ -4373,10 +4381,15 @@ nas_5gs_mm_registration_accept(tvbuff_t *tvb, proto_tree *tree, packet_info *pin
ELEM_OPT_TLV(0x51, NAS_5GS_PDU_TYPE_MM, DE_NAS_5GS_MM_5GS_DRX_PARAM, " - Negotiated DRX parameters");
/* D- Non-3GPP NW policies Non-3GPP NW provided policies 9.11.3.58 O TV 1 */
/* 60 EPS bearer context status EPS bearer context status 9.11.3.59 O TLV 4 */
ELEM_OPT_TLV(0x60, NAS_PDU_TYPE_COMMON, DE_EPS_CMN_EPS_BE_CTX_STATUS, NULL);
/* 6E Negotiated extended DRX parameters Extended DRX parameters 9.11.3.60 O TLV 3 */
ELEM_OPT_TLV(0x6E, GSM_A_PDU_TYPE_GM, DE_EXT_DRX_PARAMS, NULL);
/* 6C T3447 value GPRS timer 3 9.11.2.5 O TLV 3 */
ELEM_OPT_TLV(0x6C, GSM_A_PDU_TYPE_GM, DE_GPRS_TIMER_3, " - T3447 value");
/* 6B T3448 value GPRS timer 3 9.11.2.4 O TLV 3 */
ELEM_OPT_TLV(0x6B, GSM_A_PDU_TYPE_GM, DE_GPRS_TIMER_2, " - T3448 value");
/* 6A T3324 value GPRS timer 3 9.11.2.5 O TLV 3 */
ELEM_OPT_TLV(0x6A, GSM_A_PDU_TYPE_GM, DE_GPRS_TIMER_2, " - T3324 value");
/* 67 UE radio capability ID UE radio capability ID 9.11.3.yy O TLV 3-n */
/* 68 UE radio capability ID deletion indication UE radio capability ID deletion indication 9.11.3.69 O TV 1 */

26
epan/dissectors/packet-nas_eps.c
View File

@ -528,23 +528,25 @@ static const value_string security_header_type_vals[] = {
};
static value_string_ext security_header_type_vals_ext = VALUE_STRING_EXT_INIT(security_header_type_vals);
/*
typedef enum
{
DE_EPS_CMN_ADD_INFO, /* 9.9.2.0 Additional information */
DE_EPS_CMN_DEVICE_PROPERTIES, /* 9.9.2.0A Device properties */
DE_EPS_CMN_EPS_BE_CTX_STATUS, /* 9.9.2.1 EPS bearer context status */
DE_EPS_CMN_LOC_AREA_ID, /* 9.9.2.2 Location area identification */
DE_EPS_CMN_MOB_ID, /* 9.9.2.3 Mobile identity */
DE_EPS_MS_CM_2, /* 9.9.2.4 Mobile station classmark 2 */
DE_EPS_MS_CM_3, /* 9.9.2.5 Mobile station classmark 3 */
DE_EPS_NAS_SEC_PAR_FROM_EUTRA, /* 9.9.2.6 NAS security parameters from E-UTRA */
DE_EPS_NAS_SEC_PAR_TO_EUTRA, /* 9.9.2.7 NAS security parameters to E-UTRA */
DE_EPS_CMN_ADD_INFO, 9.9.2.0 Additional information
DE_EPS_CMN_DEVICE_PROPERTIES, 9.9.2.0A Device properties
DE_EPS_CMN_EPS_BE_CTX_STATUS, 9.9.2.1 EPS bearer context status
DE_EPS_CMN_LOC_AREA_ID, 9.9.2.2 Location area identification
DE_EPS_CMN_MOB_ID, 9.9.2.3 Mobile identity
DE_EPS_MS_CM_2, 9.9.2.4 Mobile station classmark 2
DE_EPS_MS_CM_3, 9.9.2.5 Mobile station classmark 3
DE_EPS_NAS_SEC_PAR_FROM_EUTRA, 9.9.2.6 NAS security parameters from E-UTRA
DE_EPS_NAS_SEC_PAR_TO_EUTRA, 9.9.2.7 NAS security parameters to E-UTRA
DE_EPS_CMN_PLM_LST, /* 9.9.2.8 PLMN list */
DE_EPS_CMN_SUP_CODEC_LST, /* 9.9.2.6 9.9.2.10 Supported codec list */
DE_EPS_COMMON_NONE /* NONE */
DE_EPS_CMN_PLM_LST, 9.9.2.8 PLMN list
DE_EPS_CMN_SUP_CODEC_LST, 9.9.2.6 9.9.2.10 Supported codec list
DE_EPS_COMMON_NONE NONE
}
nas_eps_common_elem_idx_t;
*/
static const value_string nas_eps_common_elem_strings[] = {
{ DE_EPS_CMN_ADD_INFO, "Additional information" }, /* 9.9.2.0 Additional information */