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

NAS-5GS: Start upgrading to release 17.0

This commit is contained in:
Anders Broman 2020-11-13 15:53:03 +01:00 committed by Wireshark GitLab Utility
parent 8c29bfe8b2
commit 62730dc4fe
2 changed files with 341 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1751,31 +1751,42 @@ typedef enum
DE_NAS_5GS_MM_ABBA, /* 9.11.3.10 ABBA */
DE_NAS_5GS_MM_ACCESS_TYPE, /* 9.11.3.11 Access type */
DE_NAS_5GS_MM_ADD_5G_SEC_INF, /* 9.11.3.12 Additional 5G security information */
DE_NAS_5GS_MM_ADD_INF_REQ, /* 9.11.3.12A Additional information requested */
DE_NAS_5GS_MM_ALLOW_PDU_SES_STS, /* 9.11.3.13 Allowed PDU session status*/
DE_NAS_5GS_MM_AUT_FAIL_PAR, /* 9.11.3.14 Authentication failure parameter */
DE_NAS_5GS_MM_AUT_PAR_AUTN, /* 9.11.3.15 Authentication parameter AUTN*/
DE_NAS_5GS_MM_AUT_PAR_RAND, /* 9.11.3.16 Authentication parameter RAND*/
DE_NAS_5GS_MM_AUT_RESP_PAR, /* 9.11.3.17 Authentication response parameter */
DE_NAS_5GS_MM_CONF_UPD_IND, /* 9.11.3.18 Configuration update indication*/
DE_NAS_5GS_MM_CAG_INFORMATION_LIST, /* 9.11.3.18A CAG information list*/
DE_NAS_5GS_MM_CIOT_SMALL_DATA_CONT, /* 9.11.3.18B CIoT small data container */
DE_NAS_5GS_MM_CIPHERING_KEY_DATA, /* 9.11.3.18C Ciphering key data*/
DE_NAS_5GS_MM_CTRL_PLANE_SERVICE_TYPE, /* 9.11.3.18D Control plane service type*/
DE_NAS_5GS_MM_DLGT_SAVING_TIME, /* 9.11.3.19 Daylight saving time*/
DE_NAS_5GS_MM_DE_REG_TYPE, /* 9.11.3.20 De-registration type*/
/* 9.11.3.21 Void */
/* 9.11.3.22 Void*/
DE_NAS_5GS_MM_EMRG_NR_LIST, /* 9.11.3.23 Emergency number list */
DE_NAS_5GS_MM_EPS_BEARER_CTX_STATUS, /* 9.11.3.23A EPS bearer context status */
DE_NAS_5GS_MM_EPS_NAS_MSG_CONT, /* 9.11.3.24 EPS NAS message container */
DE_NAS_5GS_MM_EPS_NAS_SEC_ALGO, /* 9.11.3.25 EPS NAS security algorithms */
DE_NAS_5GS_MM_EXT_EMERG_NUM_LIST, /* 9.11.3.26 Extended emergency number list */
DE_NAS_5GS_MM_EXTENDED_DRX_PARAMETERS, /* 9.11.3.26A Extended DRX parameters */
/* 9.11.3.27 Void*/
DE_NAS_5GS_MM_IMEISV_REQ, /* 9.11.3.28 IMEISV request*/
DE_NAS_5GS_MM_LADN_INDIC, /* 9.11.3.29 LADN indication*/
DE_NAS_5GS_MM_LADN_INF, /* 9.11.3.30 LADN information */
DE_NAS_5GS_MM_MICO_IND, /* 9.11.3.31 MICO indication*/
DE_NAS_5GS_MM_MA_PDU_SES_INF, /* 9.11.3.31A MA PDU session information */
DE_NAS_5GS_MM_MAPPED_NSSAI, /* 9.11.3.31B Mapped NSSAI */
DE_NAS_5GS_MM_MOBILE_STATION_CLSMK_2, /* 9.11.3.31C Mobile station classmark 2 */
DE_NAS_5GS_MM_NAS_KEY_SET_ID, /* 9.11.3.32 NAS key set identifier*/
DE_NAS_5GS_MM_NAS_KEY_SET_ID_H1, /* 9.11.3.32 NAS key set identifier*/
DE_NAS_5GS_MM_NAS_MSG_CONT, /* 9.11.3.33 NAS message container*/
DE_NAS_5GS_MM_NAS_SEC_ALGO, /* 9.11.3.34 NAS security algorithms*/
DE_NAS_5GS_MM_NW_NAME, /* 9.11.3.35 Network name*/
DE_NAS_5GS_MM_NW_SLICING_IND, /* 9.11.3.36 Network slicing indication */
DE_NAS_5GS_MM_NW_NON_3GPP_NW_PROV_POL, /* 9.11.3.36A Non-3GPP NW provided policies */
DE_NAS_5GS_MM_NSSAI, /* 9.11.3.37 NSSAI*/
DE_NAS_5GS_MM_NSSAI_INC_MODE, /* 9.11.3.37A NSSAI inclusion mode */
DE_NAS_5GS_MM_OP_DEF_ACC_CAT_DEF, /* 9.11.3.38 Operator-defined access category definitions */
@ -1787,13 +1798,15 @@ typedef enum
DE_NAS_5GS_MM_PDU_SES_STATUS, /* 9.11.3.44 PDU session status */
DE_NAS_5GS_MM_PLMN_LIST, /* 9.11.3.45 PLMN list*/
DE_NAS_5GS_MM_REJ_NSSAI, /* 9.11.3.46 Rejected NSSAI*/
DE_NAS_5GS_MM_REL_ASS_IND, /* 9.11.3.46A Release assistance indication*/
DE_NAS_5GS_MM_REQ_TYPE, /* 9.11.3.47 Request type */
DE_NAS_5GS_MM_S1_UE_NW_CAP, /* 9.11.3.48 S1 UE network capability*/
DE_NAS_5GS_MM_S1_UE_SEC_CAP, /* 9.11.3.48A S1 UE security capability*/
DE_NAS_5GS_MM_SAL, /* 9.11.3.49 Service area list*/
DE_NAS_5GS_MM_SERV_TYPE, /* 9.11.3.50 Service type,*/ /* Used inline Half octet IE*/
DE_NAS_5GS_MM_SERV_TYPE, /* 9.11.3.50 Service type,*/
DE_NAS_5GS_MM_SMS_IND, /* 9.11.3.50A SMS indication */
DE_NAS_5GS_MM_SOR_TRASP_CONT, /* 9.11.3.51 SOR transparent container */
DE_NAS_5GS_MM_SUPPORTED_CODEC_LIST, /* 9.11.3.51A Supported codec list */
DE_NAS_5GS_MM_TZ, /* 9.11.3.52 Time zone*/
DE_NAS_5GS_MM_TZ_AND_T, /* 9.11.3.53 Time zone and time*/
DE_NAS_5GS_MM_UE_PAR_UPD_TRASNSP_CONT, /* 9.11.3.53A UE parameters update transparent container */
@ -1803,7 +1816,15 @@ typedef enum
DE_NAS_5GS_MM_UL_DATA_STATUS, /* 9.11.3.57 Uplink data status */
DE_NAS_5GS_MM_CP_SERVICE_TYPE, /* 9.11.3.65 Control plane service type*/
DE_NAS_5GS_MM_UE_RADIO_CAP_ID, /* 9.11.3.68 UE radio capability ID*/
DE_NAS_5GS_MM_NONE /* NONE */}
DE_NAS_5GS_MM_UE_RADIO_CAP_ID_DEL_IND, /* 9.11.3.69 UE radio capability ID deletion indication*/
DE_NAS_5GS_MM_TRUNCATED_5G_S_TMSI_CONF, /* 9.11.3.70 Truncated 5G-S-TMSI configuration*/
DE_NAS_5GS_MM_WUS_ASSISTANCE_INF, /* 9.11.3.71 WUS assistance information*/
DE_NAS_5GS_MM_N5GC_INDICATION, /* 9.11.3.72 N5GC indication*/
DE_NAS_5GS_MM_NB_N1_MODE_DRX_PARS, /* 9.11.3.73 NB-N1 mode DRX parameters*/
DE_NAS_5GS_MM_ADDITIONAL_CONF_IND, /* 9.11.3.74 Additional configuration indication*/
DE_NAS_5GS_MM_EXTENDED_REJECTED_NSSAI, /* 9.11.3.75 Extended rejected NSSAI*/
DE_NAS_5GS_MM_NONE /* NONE */
}
nas_5gs_mm_elem_idx_t;

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

@ -1,7 +1,7 @@
/* packet-nas_5gs.c
* Routines for Non-Access-Stratum (NAS) protocol for Evolved Packet System (EPS) dissection
*
* Copyright 2018-2019, Anders Broman <anders.broman@ericsson.com>
* Copyright 2018-2020, Anders Broman <anders.broman@ericsson.com>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@ -1405,7 +1405,7 @@ de_nas_5gs_mm_ladn_indic(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_
while ((curr_offset - offset) < len) {
sub_tree = proto_tree_add_subtree_format(tree, tvb, curr_offset, 2, ett_nas_5gs_mm_ladn_indic, &item, "LADN DNN value %u", i);
/*LADN DNN value is coded as the length and value part of DNN information element as specified in subclause 9.11.2.1A starting with the second octet*/
/*LADN DNN value is coded as the length and value part of DNN information element as specified in subclause 9.11.2.1B starting with the second octet*/
proto_tree_add_item_ret_uint(sub_tree, hf_nas_5gs_mm_length, tvb, curr_offset, 1, ENC_BIG_ENDIAN, &length);
curr_offset++;
curr_offset += de_nas_5gs_cmn_dnn(tvb, sub_tree, pinfo, curr_offset, length, NULL, 0);
@ -1439,7 +1439,7 @@ de_nas_5gs_mm_ladn_inf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo,
sub_tree = proto_tree_add_subtree_format(tree, tvb, curr_offset, 2, ett_nas_5gs_mm_ladn_indic, &item, "LADN %u", i);
/* DNN value (octet 5 to octet m):
* LADN DNN value is coded as the length and value part of DNN information element as specified in
* subclause 9.11.2.1A starting with the second octet
* subclause 9.11.2.1B starting with the second octet
*/
proto_tree_add_item_ret_uint(sub_tree, hf_nas_5gs_mm_length, tvb, curr_offset, 1, ENC_BIG_ENDIAN, &length);
curr_offset++;
@ -3686,13 +3686,29 @@ de_nas_5gs_sm_ssc_mode(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_,
/*
* 9.11.4.17 Re-attempt indicator
*/
static guint16
de_nas_5gs_sm_re_attempt_ind(tvbuff_t* tvb, proto_tree* tree, packet_info* pinfo,
guint32 offset, guint len,
gchar* add_string _U_, int string_len _U_)
{
proto_tree_add_expert(tree, pinfo, &ei_nas_5gs_ie_not_dis, tvb, offset, len);
return len;
}
/*
* 9.11.4.18 5GSM network feature support
*/
static guint16
de_nas_5gs_sm_5gsm_nw_feature_sup(tvbuff_t* tvb, proto_tree* tree, packet_info* pinfo,
guint32 offset, guint len,
gchar* add_string _U_, int string_len _U_)
{
proto_tree_add_expert(tree, pinfo, &ei_nas_5gs_ie_not_dis, tvb, offset, len);
return len;
}
/*
* 9.11.4.19 Session-TMBR
* 9.11.4.19 Void
*/
/*
@ -3700,33 +3716,115 @@ de_nas_5gs_sm_ssc_mode(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_,
* See subclause 9.9.4.28 in 3GPP TS 24.301 [13].
*/
static guint16
de_nas_5gs_sm_serving_plmn_rte_ctl(tvbuff_t* tvb, proto_tree* tree, packet_info* pinfo,
guint32 offset, guint len,
gchar* add_string _U_, int string_len _U_)
{
proto_tree_add_expert(tree, pinfo, &ei_nas_5gs_ie_not_dis, tvb, offset, len);
return len;
}
/*
* 9.11.4.21 5GSM congestion re-attempt indicator
*/
static guint16
de_nas_5gs_sm_5gsm_cong_re_attempt_ind(tvbuff_t* tvb, proto_tree* tree, packet_info* pinfo,
guint32 offset, guint len,
gchar* add_string _U_, int string_len _U_)
{
proto_tree_add_expert(tree, pinfo, &ei_nas_5gs_ie_not_dis, tvb, offset, len);
return len;
}
/*
* 9.11.4.22 ATSSS container
*/
static guint16
de_nas_5gs_sm_atsss_cont(tvbuff_t* tvb, proto_tree* tree, packet_info* pinfo,
guint32 offset, guint len,
gchar* add_string _U_, int string_len _U_)
{
proto_tree_add_expert(tree, pinfo, &ei_nas_5gs_ie_not_dis, tvb, offset, len);
return len;
}
/*
* 9.11.4.23 Control plane only indication
*/
static guint16
de_nas_5gs_sm_ctl_plane_only_ind(tvbuff_t* tvb, proto_tree* tree, packet_info* pinfo,
guint32 offset, guint len,
gchar* add_string _U_, int string_len _U_)
{
proto_tree_add_expert(tree, pinfo, &ei_nas_5gs_ie_not_dis, tvb, offset, len);
return len;
}
/*
* 9.11.4.24 Header compression configuration
*/
static guint16
de_nas_5gs_sm_ip_hdr_comp_conf(tvbuff_t* tvb, proto_tree* tree, packet_info* pinfo,
guint32 offset, guint len,
gchar* add_string _U_, int string_len _U_)
{
proto_tree_add_expert(tree, pinfo, &ei_nas_5gs_ie_not_dis, tvb, offset, len);
return len;
}
/*
* 9.11.4.25 DS-TT Ethernet port MAC address
*/
static guint16
de_nas_5gs_sm_ds_tt_eth_port_mac_addr(tvbuff_t* tvb, proto_tree* tree, packet_info* pinfo,
guint32 offset, guint len,
gchar* add_string _U_, int string_len _U_)
{
proto_tree_add_expert(tree, pinfo, &ei_nas_5gs_ie_not_dis, tvb, offset, len);
return len;
}
/*
* 9.11.4.26 DS-TT residence time
*/
static guint16
de_nas_5gs_sm_ue_ds_tt_residence_t(tvbuff_t* tvb, proto_tree* tree, packet_info* pinfo,
guint32 offset, guint len,
gchar* add_string _U_, int string_len _U_)
{
proto_tree_add_expert(tree, pinfo, &ei_nas_5gs_ie_not_dis, tvb, offset, len);
return len;
}
/*
* 9.11.4.27 Port management information container
*/
static guint16
de_nas_5gs_sm_port_mgnt_inf_cont(tvbuff_t* tvb, proto_tree* tree, packet_info* pinfo,
guint32 offset, guint len,
gchar* add_string _U_, int string_len _U_)
{
proto_tree_add_expert(tree, pinfo, &ei_nas_5gs_ie_not_dis, tvb, offset, len);
return len;
}
/*
* 9.11.4.28 Ethernet header compression configuration
*/
static guint16
de_nas_5gs_sm_eth_hdr_comp_conf(tvbuff_t* tvb, proto_tree* tree, packet_info* pinfo,
guint32 offset, guint len,
gchar* add_string _U_, int string_len _U_)
{
proto_tree_add_expert(tree, pinfo, &ei_nas_5gs_ie_not_dis, tvb, offset, len);
return len;
}
/*
* 9.10.2 Common information elements
@ -3745,7 +3843,11 @@ de_nas_5gs_cmn_add_inf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_,
}
/*
* 9.11.2.1A DNN
* 9.11.2.1A Access type
*/
/*
* 9.11.2.1B DNN
*/
static guint16
@ -3845,6 +3947,14 @@ de_nas_5gs_cmn_s_nssai(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_,
return len;
}
/*
* 9.11.2.9 S1 mode to N1 mode NAS transparent container
*/
/* Message authentication code */
/* Type of ciphering algorithmType of integrity protection algorithm */
/* 0 Spare NCC TSC Key set identifier in 5G */
/* Spare */
/* Spare */
/*
* Note this enum must be of the same size as the element decoding list
@ -3852,7 +3962,8 @@ de_nas_5gs_cmn_s_nssai(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_,
typedef enum
{
DE_NAS_5GS_CMN_ADD_INF, /* 9.11.2.1 Additional information*/
DE_NAS_5GS_CMN_DNN, /* 9.11.2.1A DNN*/
DE_NAS_5GS_ACCESS_TYPE, /* 9.11.2.1A Access type */
DE_NAS_5GS_CMN_DNN, /* 9.11.2.1B DNN*/
DE_NAS_5GS_CMN_EAP_MESSAGE, /* 9.11.2.2 EAP message*/
DE_NAS_5GS_CMN_GPRS_TIMER, /* 9.11.2.3 GPRS timer */
DE_NAS_5GS_CMN_GPRS_TIMER2, /* 9.11.2.4 GPRS timer 2*/
@ -3867,7 +3978,8 @@ nas_5gs_common_elem_idx_t;
static const value_string nas_5gs_common_elem_strings[] = {
{ DE_NAS_5GS_CMN_ADD_INF, "Additional information" }, /* 9.11.2.1 Additional information*/
{ DE_NAS_5GS_CMN_DNN, "DNN" }, /* 9.11.2.1A DNN*/
{ DE_NAS_5GS_ACCESS_TYPE, "Access type"}, /* 9.11.2.1A Access type */
{ DE_NAS_5GS_CMN_DNN, "DNN" }, /* 9.11.2.1B DNN*/
{ DE_NAS_5GS_CMN_EAP_MESSAGE, "EAP message" }, /* 9.11.2.2 EAP message*/
{ DE_NAS_5GS_CMN_GPRS_TIMER, "GPRS timer" }, /* 9.11.2.3 GPRS timer*/
{ DE_NAS_5GS_CMN_GPRS_TIMER2, "GPRS timer 2" }, /* 9.11.2.4 GPRS timer 2*/
@ -3889,7 +4001,7 @@ guint16(*nas_5gs_common_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info
gchar *add_string, int string_len) = {
/* 9.10.2 Common information elements */
de_nas_5gs_cmn_add_inf, /* 9.11.2.1 Additional information*/
de_nas_5gs_cmn_dnn, /* 9.11.2.1A DNN*/
NULL, /* 9.11.2.1B DNN*/
de_nas_5gs_cmn_eap_msg, /* 9.11.2.2 EAP message*/
NULL, /* 9.11.2.3 GPRS timer*/
NULL, /* 9.11.2.4 GPRS timer 2*/
@ -3923,31 +4035,42 @@ typedef enum
DE_NAS_5GS_MM_ABBA, /* 9.11.3.10 ABBA */
DE_NAS_5GS_MM_ACCESS_TYPE, /* 9.11.3.11 Access type */
DE_NAS_5GS_MM_ADD_5G_SEC_INF, /* 9.11.3.12 Additional 5G security information */
DE_NAS_5GS_MM_ADD_INF_REQ, /* 9.11.3.12A Additional information requested */
DE_NAS_5GS_MM_ALLOW_PDU_SES_STS, /* 9.11.3.13 Allowed PDU session status*/
DE_NAS_5GS_MM_AUT_FAIL_PAR, /* 9.11.3.14 Authentication failure parameter */
DE_NAS_5GS_MM_AUT_PAR_AUTN, /* 9.11.3.15 Authentication parameter AUTN*/
DE_NAS_5GS_MM_AUT_PAR_RAND, /* 9.11.3.16 Authentication parameter RAND*/
DE_NAS_5GS_MM_AUT_RESP_PAR, /* 9.11.3.17 Authentication response parameter */
DE_NAS_5GS_MM_CONF_UPD_IND, /* 9.11.3.18 Configuration update indication*/
DE_NAS_5GS_MM_CAG_INFORMATION_LIST, /* 9.11.3.18A CAG information list*/
DE_NAS_5GS_MM_CIOT_SMALL_DATA_CONT, /* 9.11.3.18B CIoT small data container */
DE_NAS_5GS_MM_CIPHERING_KEY_DATA, /* 9.11.3.18C Ciphering key data*/
DE_NAS_5GS_MM_CTRL_PLANE_SERVICE_TYPE, /* 9.11.3.18D Control plane service type*/
DE_NAS_5GS_MM_DLGT_SAVING_TIME, /* 9.11.3.19 Daylight saving time*/
DE_NAS_5GS_MM_DE_REG_TYPE, /* 9.11.3.20 De-registration type*/
/* 9.11.3.21 Void */
/* 9.11.3.22 Void*/
DE_NAS_5GS_MM_EMRG_NR_LIST, /* 9.11.3.23 Emergency number list */
DE_NAS_5GS_MM_EPS_BEARER_CTX_STATUS, /* 9.11.3.23A EPS bearer context status */
DE_NAS_5GS_MM_EPS_NAS_MSG_CONT, /* 9.11.3.24 EPS NAS message container */
DE_NAS_5GS_MM_EPS_NAS_SEC_ALGO, /* 9.11.3.25 EPS NAS security algorithms */
DE_NAS_5GS_MM_EXT_EMERG_NUM_LIST, /* 9.11.3.26 Extended emergency number list */
DE_NAS_5GS_MM_EXTENDED_DRX_PARAMETERS, /* 9.11.3.26A Extended DRX parameters */
/* 9.11.3.27 Void*/
DE_NAS_5GS_MM_IMEISV_REQ, /* 9.11.3.28 IMEISV request*/
DE_NAS_5GS_MM_LADN_INDIC, /* 9.11.3.29 LADN indication*/
DE_NAS_5GS_MM_LADN_INF, /* 9.11.3.30 LADN information */
DE_NAS_5GS_MM_MICO_IND, /* 9.11.3.31 MICO indication*/
DE_NAS_5GS_MM_MA_PDU_SES_INF, /* 9.11.3.31A MA PDU session information */
DE_NAS_5GS_MM_MAPPED_NSSAI, /* 9.11.3.31B Mapped NSSAI */
DE_NAS_5GS_MM_MOBILE_STATION_CLSMK_2, /* 9.11.3.31C Mobile station classmark 2 */
DE_NAS_5GS_MM_NAS_KEY_SET_ID, /* 9.11.3.32 NAS key set identifier*/
DE_NAS_5GS_MM_NAS_KEY_SET_ID_H1, /* 9.11.3.32 NAS key set identifier*/
DE_NAS_5GS_MM_NAS_MSG_CONT, /* 9.11.3.33 NAS message container*/
DE_NAS_5GS_MM_NAS_SEC_ALGO, /* 9.11.3.34 NAS security algorithms*/
DE_NAS_5GS_MM_NW_NAME, /* 9.11.3.35 Network name*/
DE_NAS_5GS_MM_NW_SLICING_IND, /* 9.11.3.36 Network slicing indication */
DE_NAS_5GS_MM_NW_NON_3GPP_NW_PROV_POL, /* 9.11.3.36A Non-3GPP NW provided policies */
DE_NAS_5GS_MM_NSSAI, /* 9.11.3.37 NSSAI*/
DE_NAS_5GS_MM_NSSAI_INC_MODE, /* 9.11.3.37A NSSAI inclusion mode */
DE_NAS_5GS_MM_OP_DEF_ACC_CAT_DEF, /* 9.11.3.38 Operator-defined access category definitions */
@ -3959,6 +4082,7 @@ typedef enum
DE_NAS_5GS_MM_PDU_SES_STATUS, /* 9.11.3.44 PDU session status */
DE_NAS_5GS_MM_PLMN_LIST, /* 9.11.3.45 PLMN list*/
DE_NAS_5GS_MM_REJ_NSSAI, /* 9.11.3.46 Rejected NSSAI*/
DE_NAS_5GS_MM_REL_ASS_IND, /* 9.11.3.46A Release assistance indication*/
DE_NAS_5GS_MM_REQ_TYPE, /* 9.11.3.47 Request type */
DE_NAS_5GS_MM_S1_UE_NW_CAP, /* 9.11.3.48 S1 UE network capability*/
DE_NAS_5GS_MM_S1_UE_SEC_CAP, /* 9.11.3.48A S1 UE security capability*/
@ -3966,6 +4090,7 @@ typedef enum
DE_NAS_5GS_MM_SERV_TYPE, /* 9.11.3.50 Service type,*/
DE_NAS_5GS_MM_SMS_IND, /* 9.11.3.50A SMS indication */
DE_NAS_5GS_MM_SOR_TRASP_CONT, /* 9.11.3.51 SOR transparent container */
DE_NAS_5GS_MM_SUPPORTED_CODEC_LIST, /* 9.11.3.51A Supported codec list */
DE_NAS_5GS_MM_TZ, /* 9.11.3.52 Time zone*/
DE_NAS_5GS_MM_TZ_AND_T, /* 9.11.3.53 Time zone and time*/
DE_NAS_5GS_MM_UE_PAR_UPD_TRASNSP_CONT, /* 9.11.3.53A UE parameters update transparent container */
@ -3975,6 +4100,14 @@ typedef enum
DE_NAS_5GS_MM_UL_DATA_STATUS, /* 9.11.3.57 Uplink data status */
DE_NAS_5GS_MM_CP_SERVICE_TYPE, /* 9.11.3.65 Control plane service type*/
DE_NAS_5GS_MM_UE_RADIO_CAP_ID, /* 9.11.3.68 UE radio capability ID*/
DE_NAS_5GS_MM_UE_RADIO_CAP_ID_DEL_IND, /* 9.11.3.69 UE radio capability ID deletion indication*/
DE_NAS_5GS_MM_TRUNCATED_5G_S_TMSI_CONF, /* 9.11.3.70 Truncated 5G-S-TMSI configuration*/
DE_NAS_5GS_MM_WUS_ASSISTANCE_INF, /* 9.11.3.71 WUS assistance information*/
DE_NAS_5GS_MM_N5GC_INDICATION, /* 9.11.3.72 N5GC indication*/
DE_NAS_5GS_MM_NB_N1_MODE_DRX_PARS, /* 9.11.3.73 NB-N1 mode DRX parameters*/
DE_NAS_5GS_MM_ADDITIONAL_CONF_IND, /* 9.11.3.74 Additional configuration indication*/
DE_NAS_5GS_MM_EXTENDED_REJECTED_NSSAI, /* 9.11.3.75 Extended rejected NSSAI*/
DE_NAS_5GS_MM_NONE /* NONE */
}
nas_5gs_mm_elem_idx_t;
@ -3995,31 +4128,42 @@ static const value_string nas_5gs_mm_elem_strings[] = {
{ DE_NAS_5GS_MM_ABBA, "ABBA" }, /* 9.11.3.10 ABBA */
{ DE_NAS_5GS_MM_ACCESS_TYPE, "Access type" }, /* 9.11.3.11 Access type */
{ DE_NAS_5GS_MM_ADD_5G_SEC_INF, "Additional 5G security information" }, /* 9.11.3.12 Additional 5G security information */
{ DE_NAS_5GS_MM_ADD_INF_REQ, "Additional information requested" }, /* 9.11.3.12A Additional information requested */
{ DE_NAS_5GS_MM_ALLOW_PDU_SES_STS, "Allowed PDU session status" }, /* 9.11.3.13 Allowed PDU session status*/
{ DE_NAS_5GS_MM_AUT_FAIL_PAR, "Authentication failure parameter" }, /* 9.11.3.14 Authentication failure parameter*/
{ DE_NAS_5GS_MM_AUT_PAR_AUTN, "Authentication parameter AUTN" }, /* 9.11.3.15 Authentication parameter AUTN*/
{ DE_NAS_5GS_MM_AUT_PAR_RAND, "Authentication parameter RAND" }, /* 9.11.3.16 Authentication parameter RAND*/
{ DE_NAS_5GS_MM_AUT_RESP_PAR, "Authentication response parameter" }, /* 9.11.3.17 Authentication response parameter*/
{ DE_NAS_5GS_MM_CONF_UPD_IND, "Configuration update indication" }, /* 9.11.3.18 Configuration update indication*/
{ DE_NAS_5GS_MM_CAG_INFORMATION_LIST, "CAG information list" }, /* 9.11.3.18A CAG information list*/
{ DE_NAS_5GS_MM_CIOT_SMALL_DATA_CONT, "CIoT small data container" }, /* 9.11.3.18B CIoT small data container */
{ DE_NAS_5GS_MM_CIPHERING_KEY_DATA, "Ciphering key data" }, /* 9.11.3.18C Ciphering key data*/
{ DE_NAS_5GS_MM_CTRL_PLANE_SERVICE_TYPE, "Control plane service type" }, /* 9.11.3.18D Control plane service type*/
{ DE_NAS_5GS_MM_DLGT_SAVING_TIME, "Daylight saving time" }, /* 9.11.3.19 Daylight saving time*/
{ DE_NAS_5GS_MM_DE_REG_TYPE, "De-registration type" }, /* 9.11.3.20 De-registration type*/
/* 9.11.3.21 Void */
/* 9.11.3.22 Void*/
{ DE_NAS_5GS_MM_EMRG_NR_LIST, "Emergency number list" }, /* 9.11.3.23 Emergency number list*/
{ DE_NAS_5GS_MM_EPS_BEARER_CTX_STATUS, "EPS bearer context status" }, /* 9.11.3.23A EPS bearer context status */
{ DE_NAS_5GS_MM_EPS_NAS_MSG_CONT, "EPS NAS message container" }, /* 9.11.3.24 EPS NAS message container*/
{ DE_NAS_5GS_MM_EPS_NAS_SEC_ALGO, "EPS NAS security algorithms" }, /* 9.11.3.25 EPS NAS security algorithms*/
{ DE_NAS_5GS_MM_EXT_EMERG_NUM_LIST, "Extended emergency number list" }, /* 9.11.3.26 Extended emergency number list */
{ DE_NAS_5GS_MM_EXTENDED_DRX_PARAMETERS, "Extended DRX parameters" }, /* 9.11.3.26A Extended DRX parameters */
/* 9.11.3.27 Void*/
{ DE_NAS_5GS_MM_IMEISV_REQ, "IMEISV request" }, /* 9.11.3.28 IMEISV request*/
{ DE_NAS_5GS_MM_LADN_INDIC, "LADN indication" }, /* 9.11.3.29 LADN indication*/
{ DE_NAS_5GS_MM_LADN_INF, "LADN information" }, /* 9.11.3.30 LADN information*/
{ DE_NAS_5GS_MM_MICO_IND, "MICO indication" }, /* 9.11.3.31 MICO indication*/
{ DE_NAS_5GS_MM_MA_PDU_SES_INF, "MA PDU session information" }, /* 9.11.3.31A MA PDU session information */
{ DE_NAS_5GS_MM_MAPPED_NSSAI, "Mapped NSSAI" }, /* 9.11.3.31B Mapped NSSAI */
{ DE_NAS_5GS_MM_MOBILE_STATION_CLSMK_2, "Mobile station classmark 2" }, /* 9.11.3.31C Mobile station classmark 2 */
{ DE_NAS_5GS_MM_NAS_KEY_SET_ID, "NAS key set identifier" }, /* 9.11.3.32 NAS key set identifier*/
{ DE_NAS_5GS_MM_NAS_KEY_SET_ID_H1, "NAS key set identifier" }, /* 9.11.3.32 NAS key set identifier*/
{ DE_NAS_5GS_MM_NAS_MSG_CONT, "NAS message container" }, /* 9.11.3.33 NAS message container*/
{ DE_NAS_5GS_MM_NAS_SEC_ALGO, "NAS security algorithms" }, /* 9.11.3.34 NAS security algorithms*/
{ DE_NAS_5GS_MM_NW_NAME, "Network name" }, /* 9.11.3.35 Network name*/
{ DE_NAS_5GS_MM_NW_SLICING_IND, "Network slicing indication" }, /* 9.11.3.36 Network slicing indication */
{ DE_NAS_5GS_MM_NW_NON_3GPP_NW_PROV_POL, "Non-3GPP NW provided policies" }, /* 9.11.3.36A Non-3GPP NW provided policies */
{ DE_NAS_5GS_MM_NSSAI, "NSSAI" }, /* 9.11.3.37 NSSAI*/
{ DE_NAS_5GS_MM_NSSAI_INC_MODE, "NSSAI inclusion mode" }, /* 9.11.3.37A NSSAI inclusion mode */
{ DE_NAS_5GS_MM_OP_DEF_ACC_CAT_DEF, "Operator-defined access category definitions" },/* 9.11.3.38 Operator-defined access category definitions */
@ -4032,6 +4176,7 @@ static const value_string nas_5gs_mm_elem_strings[] = {
{ DE_NAS_5GS_MM_PDU_SES_STATUS, "PDU session status" }, /* 9.11.3.44 PDU session status*/
{ DE_NAS_5GS_MM_PLMN_LIST, "PLMN list" }, /* 9.11.3.45 PLMN list*/
{ DE_NAS_5GS_MM_REJ_NSSAI, "Rejected NSSAI" }, /* 9.11.3.46 Rejected NSSAI*/
{ DE_NAS_5GS_MM_REL_ASS_IND, "Release assistance indication" }, /* 9.11.3.46A Release assistance indication*/
{ DE_NAS_5GS_MM_REQ_TYPE, "Request type" }, /* 9.11.3.47 Request type*/
{ DE_NAS_5GS_MM_S1_UE_NW_CAP, "S1 UE network capability" }, /* 9.11.3.48 S1 UE network capability*/
{ DE_NAS_5GS_MM_S1_UE_SEC_CAP, "S1 UE security capability" }, /* 9.11.3.48A S1 UE security capability*/
@ -4039,6 +4184,7 @@ static const value_string nas_5gs_mm_elem_strings[] = {
{ DE_NAS_5GS_MM_SERV_TYPE, "Service type" }, /* 9.11.3.50 Service type*/
{ DE_NAS_5GS_MM_SMS_IND, "SMS indication" }, /* 9.11.3.50A SMS indication */
{ DE_NAS_5GS_MM_SOR_TRASP_CONT, "SOR transparent container" }, /* 9.11.3.51 SOR transparent container */
{ DE_NAS_5GS_MM_SUPPORTED_CODEC_LIST, "Supported codec list" }, /* 9.11.3.51A Supported codec list */
{ DE_NAS_5GS_MM_TZ, "Time zone" }, /* 9.11.3.52 Time zone*/
{ DE_NAS_5GS_MM_TZ_AND_T, "Time zone and time" }, /* 9.11.3.53 Time zone and time*/
{ DE_NAS_5GS_MM_UE_PAR_UPD_TRASNSP_CONT, "UE parameters update transparent container" }, /* 9.11.3.53A UE parameters update transparent container */
@ -4048,6 +4194,13 @@ static const value_string nas_5gs_mm_elem_strings[] = {
{ DE_NAS_5GS_MM_UL_DATA_STATUS, "Uplink data status" }, /* 9.11.3.57 Uplink data status*/
{ DE_NAS_5GS_MM_CP_SERVICE_TYPE, "Control plane service type" }, /* 9.11.3.65 Control plane service type*/
{ DE_NAS_5GS_MM_UE_RADIO_CAP_ID, "UE radio capability ID" }, /* 9.11.3.68 UE radio capability ID*/
{ DE_NAS_5GS_MM_UE_RADIO_CAP_ID_DEL_IND, "UE radio capability ID deletion indication" },/* 9.11.3.69 UE radio capability ID deletion indication*/
{ DE_NAS_5GS_MM_TRUNCATED_5G_S_TMSI_CONF, "Truncated 5G-S-TMSI configuration" }, /* 9.11.3.70 Truncated 5G-S-TMSI configuration*/
{ DE_NAS_5GS_MM_WUS_ASSISTANCE_INF, "WUS assistance information" }, /* 9.11.3.71 WUS assistance information*/
{ DE_NAS_5GS_MM_N5GC_INDICATION, "N5GC indication" }, /* 9.11.3.72 N5GC indication*/
{ DE_NAS_5GS_MM_NB_N1_MODE_DRX_PARS, "NB-N1 mode DRX parameters" }, /* 9.11.3.73 NB-N1 mode DRX parameters*/
{ DE_NAS_5GS_MM_ADDITIONAL_CONF_IND, "Additional configuration indication" },/* 9.11.3.74 Additional configuration indication*/
{ DE_NAS_5GS_MM_EXTENDED_REJECTED_NSSAI, "Extended rejected NSSAI" }, /* 9.11.3.75 Extended rejected NSSAI*/
{ 0, NULL }
};
@ -4074,31 +4227,44 @@ guint16(*nas_5gs_mm_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pi
de_nas_5gs_mm_abba, /* 9.11.3.10 ABBA */
de_nas_5gs_mm_access_type, /* 9.11.3.11 Access type */
de_nas_5gs_mm_add_5g_sec_inf, /* 9.11.3.12 Additional 5G security information */
NULL,/*de_nas_5gs_mm_add_inf_req*/ /* 9.11.3.12A Additional information requested */
de_nas_5gs_mm_allow_pdu_ses_sts, /* 9.11.3.13 Allowed PDU session status*/
NULL, /* 9.11.3.14 Authentication failure parameter */
NULL, /* 9.11.3.15 Authentication parameter AUTN*/
NULL, /* 9.11.3.16 Authentication parameter RAND*/
NULL, /* 9.11.3.17 Authentication response parameter */
de_nas_5gs_mm_conf_upd_ind, /* 9.11.3.18 Configuration update indication*/
NULL, /*de_nas_5gs_mm_cag_information_list,*/ /* 9.11.3.18A CAG information list*/
NULL, /*de_nas_5gs_mm_ciot_small_data_cont,*/ /* 9.11.3.18B CIoT small data container */
NULL, /*de_nas_5gs_mm_ciphering_key_data,*/ /* 9.11.3.18C Ciphering key data*/
NULL, /*de_nas_5gs_mm_ctrl_plane_service_type,*/ /* 9.11.3.18D Control plane service type*/
NULL, /* 9.11.3.19 Daylight saving time*/
de_nas_5gs_mm_de_reg_type, /* 9.11.3.20 De-registration type*/
/* 9.11.3.21 Void */
/* 9.11.3.22 Void*/
NULL, /* 9.11.3.23 Emergency number list*/
NULL, /* 9.11.3.23A EPS bearer context status */
de_nas_5gs_mm_eps_nas_msg_cont, /* 9.11.3.24 EPS NAS message container*/
NULL, /* 9.11.3.25 EPS NAS security algorithms*/
NULL, /* 9.11.3.26 Extended emergency number list*/
NULL, /* 9.11.3.26A Extended DRX parameters */
/* 9.11.3.27 Void*/
NULL, /* 9.11.3.28 IMEISV request*/
de_nas_5gs_mm_ladn_indic, /* 9.11.3.29 LADN indication*/
de_nas_5gs_mm_ladn_inf, /* 9.11.3.30 LADN information*/
de_nas_5gs_mm_mico_ind, /* 9.11.3.31 MICO indication*/
NULL,/*de_nas_5gs_mm_ma_pdu_ses_inf,*/ /* 9.11.3.31A MA PDU session information */
NULL, /*de_nas_5gs_mm_mapped_nssai,*/ /* 9.11.3.31B Mapped NSSAI */
NULL, /* 9.11.3.31C Mobile station classmark 2 */
de_nas_5gs_mm_nas_key_set_id, /* 9.11.3.32 NAS key set identifier*/
de_nas_5gs_mm_nas_key_set_id_h1, /* 9.11.3.32 NAS key set identifier*/
de_nas_5gs_mm_nas_msg_cont, /* 9.11.3.33 NAS message container*/
de_nas_5gs_mm_nas_sec_algo, /* 9.11.3.34 NAS security algorithms*/
NULL, /* 9.11.3.35 Network name*/
de_nas_5gs_mm_nw_slicing_ind, /* 9.11.3.36 Network slicing indication */
NULL, /* 9.11.3.36A Non-3GPP NW provided policies */
de_nas_5gs_mm_nssai, /* 9.11.3.37 NSSAI*/
de_nas_5gs_mm_nssai_inc_mode, /* 9.11.3.37A NSSAI inclusion mode */
de_nas_5gs_mm_op_def_acc_cat_def, /* 9.11.3.38 Operator-defined access category definitions */
@ -4110,6 +4276,7 @@ guint16(*nas_5gs_mm_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pi
de_nas_5gs_mm_pdu_ses_status, /* 9.11.3.44 PDU session status*/
NULL, /* 9.11.3.45 PLMN list*/
de_nas_5gs_mm_rej_nssai, /* 9.11.3.46 Rejected NSSAI*/
NULL, /* 9.11.3.46A Release assistance indication*/
de_nas_5gs_mm_req_type, /* 9.11.3.47 Request type*/
NULL, /* 9.11.3.48 S1 UE network capability*/
NULL, /* 9.11.3.48A S1 UE security capability*/
@ -4117,6 +4284,7 @@ guint16(*nas_5gs_mm_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pi
de_nas_5gs_mm_serv_type, /* 9.11.3.50 Service type*/
de_nas_5gs_mm_sms_ind, /* 9.11.3.50A SMS indication */
de_nas_5gs_mm_sor_trasp_cont, /* 9.11.3.51 SOR transparent container */
NULL, /* 9.11.3.51A Supported codec list */
NULL, /* 9.11.3.52 Time zone*/
NULL, /* 9.11.3.53 Time zone and time*/
de_nas_5gs_mm_ue_par_upd_trasnsp_cont, /* 9.11.3.53A UE parameters update transparent container */
@ -4127,6 +4295,13 @@ guint16(*nas_5gs_mm_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pi
de_nas_5gs_mm_cp_service_type, /* 9.11.3.65 Control plane service type*/
de_nas_5gs_mm_cp_service_type, /* 9.11.3.65 Control plane service type*/
de_nas_5gs_mm_ue_radio_cap_id, /* 9.11.3.68 UE radio capability ID*/
NULL,/*de_nas_5gs_mm_ue_radio_cap_id_del_ind,*/ /* 9.11.3.69 UE radio capability ID deletion indication*/
NULL,/*de_nas_5gs_mm_truncated_5g_s_tmsi_conf,*/ /* 9.11.3.70 Truncated 5G-S-TMSI configuration*/
NULL,/*de_nas_5gs_mm_wus_assistance_inf,*/ /* 9.11.3.71 WUS assistance information*/
NULL,/*de_nas_5gs_mm_n5gc_indication,*/ /* 9.11.3.72 N5GC indication*/
NULL,/*de_nas_5gs_mm_nb_n1_mode_drx_pars,*/ /* 9.11.3.73 NB-N1 mode DRX parameters*/
NULL,/*de_nas_5gs_mm_additional_conf_ind,*/ /* 9.11.3.74 Additional configuration indication*/
NULL,/*de_nas_5gs_mm_extended_rejected_nssai,*/ /* 9.11.3.75 Extended rejected NSSAI*/
NULL, /* NONE */
};
@ -4155,6 +4330,19 @@ typedef enum
DE_NAS_5GS_SM_SESSION_AMBR, /* 9.11.4.14 Session-AMBR */
DE_NAS_5GS_SM_PDU_DN_REQ_CONT, /* 9.11.4.15 SM PDU DN request container */
DE_NAS_5GS_SM_SSC_MODE, /* 9.11.4.16 SSC mode */
DE_NAS_5GS_SM_RE_ATTEMPT_IND, /* 9.11.4.17 Re-attempt indicator */
DE_NAS_5GS_SM_5GSM_NW_FEATURE_SUP, /* 9.11.4.18 5GSM network feature support */
/* 9.11.4.19 Void */
DE_NAS_5GS_SM_SERVING_PLMN_RTE_CTL, /* 9.11.4.20 Serving PLMN rate control */
DE_NAS_5GS_SM_5GSM_CONG_RE_ATTEMPT_IND, /* 9.11.4.21 5GSM congestion re-attempt indicator */
DE_NAS_5GS_SM_ATSSS_CONT, /* 9.11.4.22 ATSSS container */
DE_NAS_5GS_SM_CTL_PLANE_ONLY_IND, /* 9.11.4.23 Control plane only indication */
DE_NAS_5GS_SM_IP_HDR_COMP_CONF, /* 9.11.4.24 IP header compression configuration */
DE_NAS_5GS_SM_DS_TT_ETH_PORT_MAC_ADDR, /* 9.11.4.25 DS-TT Ethernet port MAC address */
DE_NAS_5GS_SM_UE_DS_TT_RESIDENCE_T, /* 9.11.4.26 UE-DS-TT residence time */
DE_NAS_5GS_SM_PORT_MGNT_INF_CONT, /* 9.11.4.27 Port management information container */
DE_NAS_5GS_SM_ETH_HDR_COMP_CONF, /* 9.11.4.28 Ethernet header compression configuration */
DE_NAS_5GS_SM_NONE /* NONE */
}
nas_5gs_sm_elem_idx_t;
@ -4177,6 +4365,18 @@ static const value_string nas_5gs_sm_elem_strings[] = {
{ DE_NAS_5GS_SM_SESSION_AMBR, "Session-AMBR" }, /* 9.11.4.14 Session-AMBR */
{ DE_NAS_5GS_SM_PDU_DN_REQ_CONT, "SM PDU DN request container" }, /* 9.11.4.15 SM PDU DN request container */
{ DE_NAS_5GS_SM_SSC_MODE, "SSC mode" }, /* 9.11.4.16 SSC mode */
{ DE_NAS_5GS_SM_RE_ATTEMPT_IND, "Re-attempt indicator" }, /* 9.11.4.17 Re-attempt indicator */
{ DE_NAS_5GS_SM_5GSM_NW_FEATURE_SUP, "5GSM network feature support" }, /* 9.11.4.18 5GSM network feature support */
/* 9.11.4.19 Void */
{ DE_NAS_5GS_SM_SERVING_PLMN_RTE_CTL, "Serving PLMN rate control" }, /* 9.11.4.20 Serving PLMN rate control */
{ DE_NAS_5GS_SM_5GSM_CONG_RE_ATTEMPT_IND, "5GSM congestion re-attempt indicator" }, /* 9.11.4.21 5GSM congestion re-attempt indicator */
{ DE_NAS_5GS_SM_ATSSS_CONT, "ATSSS container" }, /* 9.11.4.22 ATSSS container */
{ DE_NAS_5GS_SM_CTL_PLANE_ONLY_IND, "Control plane only indication" }, /* 9.11.4.23 Control plane only indication */
{ DE_NAS_5GS_SM_IP_HDR_COMP_CONF, "IP header compression configuration" }, /* 9.11.4.24 IP header compression configuration */
{ DE_NAS_5GS_SM_DS_TT_ETH_PORT_MAC_ADDR, " DS-TT Ethernet port MAC address" }, /* 9.11.4.25 DS-TT Ethernet port MAC address */
{ DE_NAS_5GS_SM_UE_DS_TT_RESIDENCE_T, "UE-DS-TT residence time" }, /* 9.11.4.26 UE-DS-TT residence time */
{ DE_NAS_5GS_SM_PORT_MGNT_INF_CONT, "Port management information container" }, /* 9.11.4.27 Port management information container */
{ DE_NAS_5GS_SM_ETH_HDR_COMP_CONF, "Ethernet header compression configuration" }, /* 9.11.4.28 Ethernet header compression configuration */
{ 0, NULL }
};
@ -4189,22 +4389,35 @@ guint16(*nas_5gs_sm_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pi
guint32 offset, guint len,
gchar *add_string, int string_len) = {
/* 5GS session management (5GSM) information elements */
de_nas_5gs_sm_5gsm_cap, /* 9.11.4.1 5GSM capability */
de_nas_5gs_sm_5gsm_cause, /* 9.11.4.2 5GSM cause */
de_nas_5gs_sm_always_on_pdu_ses_ind, /* 9.11.4.3 Always-on PDU session indication */
de_nas_5gs_sm_always_on_pdu_ses_req, /* 9.11.4.4 Always-on PDU session requested */
de_nas_5gs_sm_5gsm_allowed_ssc_mode, /* 9.11.4.5 Allowed SSC mode */
NULL, /* 9.11.4.6 Extended protocol configuration options */
de_nas_5gs_sm_int_prot_max_data_rte, /* 9.11.4.7 Integrity protection maximum data rate */
de_nas_5gs_sm_mapped_eps_b_cont, /* 9.11.4.8 Mapped EPS bearer contexts */
de_nas_5gs_sm_max_num_sup_pkt_flt, /* 9.11.4.9 Maximum number of supported packet filters */
de_nas_5gs_sm_pdu_address, /* 9.11.4.10 PDU address */
de_nas_5gs_sm_pdu_session_type, /* 9.11.4.11 PDU session type */
de_nas_5gs_sm_qos_flow_des, /* 9.11.4.12 QoS flow descriptions */
de_nas_5gs_sm_qos_rules, /* 9.11.4.13 QoS rules */
de_nas_5gs_sm_session_ambr, /* 9.11.4.14 Session-AMBR */
de_nas_5gs_sm_pdu_dn_req_cont, /* 9.11.4.15 SM PDU DN request container */
de_nas_5gs_sm_ssc_mode, /* 9.11.4.16 SSC mode */
de_nas_5gs_sm_5gsm_cap, /* 9.11.4.1 5GSM capability */
de_nas_5gs_sm_5gsm_cause, /* 9.11.4.2 5GSM cause */
de_nas_5gs_sm_always_on_pdu_ses_ind, /* 9.11.4.3 Always-on PDU session indication */
de_nas_5gs_sm_always_on_pdu_ses_req, /* 9.11.4.4 Always-on PDU session requested */
de_nas_5gs_sm_5gsm_allowed_ssc_mode, /* 9.11.4.5 Allowed SSC mode */
NULL, /* 9.11.4.6 Extended protocol configuration options */
de_nas_5gs_sm_int_prot_max_data_rte, /* 9.11.4.7 Integrity protection maximum data rate */
de_nas_5gs_sm_mapped_eps_b_cont, /* 9.11.4.8 Mapped EPS bearer contexts */
de_nas_5gs_sm_max_num_sup_pkt_flt, /* 9.11.4.9 Maximum number of supported packet filters */
de_nas_5gs_sm_pdu_address, /* 9.11.4.10 PDU address */
de_nas_5gs_sm_pdu_session_type, /* 9.11.4.11 PDU session type */
de_nas_5gs_sm_qos_flow_des, /* 9.11.4.12 QoS flow descriptions */
de_nas_5gs_sm_qos_rules, /* 9.11.4.13 QoS rules */
de_nas_5gs_sm_session_ambr, /* 9.11.4.14 Session-AMBR */
de_nas_5gs_sm_pdu_dn_req_cont, /* 9.11.4.15 SM PDU DN request container */
de_nas_5gs_sm_ssc_mode, /* 9.11.4.16 SSC mode */
de_nas_5gs_sm_re_attempt_ind, /* 9.11.4.17 Re-attempt indicator */
de_nas_5gs_sm_5gsm_nw_feature_sup, /* 9.11.4.18 5GSM network feature support */
/* 9.11.4.19 Void */
de_nas_5gs_sm_serving_plmn_rte_ctl, /* 9.11.4.20 Serving PLMN rate control */
de_nas_5gs_sm_5gsm_cong_re_attempt_ind, /* 9.11.4.21 5GSM congestion re-attempt indicator */
de_nas_5gs_sm_atsss_cont, /* 9.11.4.22 ATSSS container */
de_nas_5gs_sm_ctl_plane_only_ind, /* 9.11.4.23 Control plane only indication */
de_nas_5gs_sm_ip_hdr_comp_conf, /* 9.11.4.24 IP header compression configuration */
de_nas_5gs_sm_ds_tt_eth_port_mac_addr, /* 9.11.4.25 DS-TT Ethernet port MAC address */
de_nas_5gs_sm_ue_ds_tt_residence_t, /* 9.11.4.26 UE-DS-TT residence time */
de_nas_5gs_sm_port_mgnt_inf_cont, /* 9.11.4.27 Port management information container */
de_nas_5gs_sm_eth_hdr_comp_conf, /* 9.11.4.28 Ethernet header compression configuration */
NULL, /* NONE */
};
@ -4440,7 +4653,9 @@ nas_5gs_mm_registration_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo,
ELEM_OPT_TLV(0x67, NAS_5GS_PDU_TYPE_MM, DE_NAS_5GS_MM_UE_RADIO_CAP_ID, NULL);
/* 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 */
/* 1A Requested WUS assistance information WUS assistance information 9.11.3.71 O TLV 3-n */
/* A- N5GC indication N5GC indication 9.11.3.72 O T 1 */
/* 30 Requested NB-N1 mode DRX parameters NB-N1 mode DRX parameters 9.11.3.73 O TLV 3 */
EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_nas_5gs_extraneous_data);
}
@ -4522,7 +4737,14 @@ nas_5gs_mm_registration_accept(tvbuff_t *tvb, proto_tree *tree, packet_info *pin
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 */
ELEM_OPT_TLV(0x67, NAS_5GS_PDU_TYPE_MM, DE_NAS_5GS_MM_UE_RADIO_CAP_ID, NULL);
/* 68 UE radio capability ID deletion indication UE radio capability ID deletion indication 9.11.3.69 O TV 1 */
/* E- UE radio capability ID deletion indication UE radio capability ID deletion indication 9.11.3.69 O TV 1 */
/* 39 Pending NSSAI NSSAI 9.11.3.37 O TLV 4-146 */
/* 74 Ciphering key data Ciphering key data 9.11.3.18C O TLV-E 34-n */
/* 75 CAG information list CAG information list 9.11.3.18A O TLV-E 3-n */
/* 1B Truncated 5G-S-TMSI configuration Truncated 5G-S-TMSI configuration 9.11.3.70 O TLV 3 */
/* 1C Negotiated WUS assistance information WUS assistance information 9.11.3.71 O TLV 3-n */
/* 29 Negotiated NB-N1 mode DRX parameters NB-N1 mode DRX parameters 9.11.3.73 O TLV 3 */
/* 68 Extended rejected NSSAI Extended rejected NSSAI 9.11.3.75 O TLV 4-74 */
EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_nas_5gs_extraneous_data);
@ -4570,7 +4792,8 @@ nas_5gs_mm_registration_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo
ELEM_OPT_TLV_E(0x78, NAS_5GS_PDU_TYPE_COMMON, DE_NAS_5GS_CMN_EAP_MESSAGE, NULL);
/* 69 Rejected NSSAI Rejected NSSAI 9.11.3.46 O TLV 4-42 */
/* 75 CAG information list CAG information list 9.11.3.18A O TLV-E 3-n */
/* 68 Extended rejected NSSAI Extended rejected NSSAI 9.11.3.75 O TLV 4-74 */
EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_nas_5gs_extraneous_data);
}
@ -4608,11 +4831,12 @@ nas_5gs_mm_ul_nas_transp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gu
ELEM_OPT_TV_SHORT(0x80, NAS_5GS_PDU_TYPE_MM, DE_NAS_5GS_MM_REQ_TYPE, NULL);
/*22 S-NSSAI S-NSSAI 9.11.3.37 O TLV 3-10 */
ELEM_OPT_TLV(0x22, NAS_5GS_PDU_TYPE_COMMON, DE_NAS_5GS_CMN_S_NSSAI, NULL);
/*25 DNN DNN 9.11.2.1A O TLV 3-102 */
/*25 DNN DNN 9.11.2.1B O TLV 3-102 */
ELEM_OPT_TLV(0x25, NAS_5GS_PDU_TYPE_COMMON, DE_NAS_5GS_CMN_DNN, NULL);
/*24 Additional information Additional information 9.10.2.1 O TLV 3-n */
ELEM_OPT_TLV(0x24, NAS_5GS_PDU_TYPE_COMMON, DE_NAS_5GS_CMN_ADD_INF, NULL);
/* Z MA PDU session information MA PDU session information O TV 1 */
/* A- MA PDU session information MA PDU session information 9.11.3.31A O TV 1 */
/* F- Release assistance indication Release assistance indication 9.11.3.46A O TV 1 */
EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_nas_5gs_extraneous_data);
@ -4706,6 +4930,9 @@ nas_5gs_mm_de_registration_req_ue_term(tvbuff_t *tvb, proto_tree *tree, packet_i
/* 5F T3346 value GPRS timer 2 9.11.2.4 O TLV 3 */
ELEM_OPT_TLV(0x5F, GSM_A_PDU_TYPE_GM, DE_GPRS_TIMER_2, " - T3346 value");
/* 6D Rejected NSSAI Rejected NSSAI 9.11.3.46 O TLV 4-42 */
/* 75 CAG information list CAG information list 9.11.3.18A O TLV-E 3-n */
/* 68 Extended rejected NSSAI Extended rejected NSSAI 9.11.3.75 O TLV 4-74 */
EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_nas_5gs_extraneous_data);
}
@ -4769,7 +4996,8 @@ nas_5gs_mm_service_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_,
ELEM_OPT_TLV_E(0x72, NAS_5GS_PDU_TYPE_MM, DE_NAS_5GS_MM_PDU_SES_REACT_RES_ERR_C, NULL);
/*78 EAP message EAP message 9.11.2.2 O TLV-E 7-1503*/
ELEM_OPT_TLV_E(0x78, NAS_5GS_PDU_TYPE_COMMON, DE_NAS_5GS_CMN_EAP_MESSAGE, NULL);
/* 6B T3448 value GPRS timer 3 9.11.2.4 O TLV 3 */
/* 6B T3448 value GPRS timer 2 9.11.2.4 O TLV 3 */
ELEM_OPT_TLV(0x6B, GSM_A_PDU_TYPE_GM, DE_GPRS_TIMER_2, " - T3448 value");
EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_nas_5gs_extraneous_data);
}
@ -4789,17 +5017,15 @@ nas_5gs_mm_service_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_,
/* 5GMM cause 5GMM cause 9.11.3.2 M V 1 */
ELEM_MAND_V(NAS_5GS_PDU_TYPE_MM, DE_NAS_5GS_MM_5GMM_CAUSE, NULL, ei_nas_5gs_missing_mandatory_elemen);
/*50 PDU session status PDU session status 9.11.3.44 O TLV 4*/
ELEM_OPT_TLV(0x50, NAS_5GS_PDU_TYPE_MM, DE_NAS_5GS_MM_PDU_SES_STATUS, NULL);
/* 5F T3346 value GPRS timer 2 9.11.2.4 O TLV 3 */
ELEM_OPT_TLV(0x5F, GSM_A_PDU_TYPE_GM, DE_GPRS_TIMER_2, " - T3346 value");
/* 78 EAP message EAP message 9.11.2.2 O TLV-E 7-1503 */
ELEM_OPT_TLV_E(0x78, NAS_5GS_PDU_TYPE_COMMON, DE_NAS_5GS_CMN_EAP_MESSAGE, NULL);
/* 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");
/* 75 CAG information list CAG information list 9.11.3.18A O TLV-E 3-n */
EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_nas_5gs_extraneous_data);
@ -4854,10 +5080,14 @@ nas_5gs_mm_conf_upd_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_,
ELEM_OPT_TV_SHORT(0xF0, NAS_5GS_PDU_TYPE_MM, DE_NAS_5GS_MM_SMS_IND, 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");
/* 44 CAG information list CAG information list 9.11.3.64 O TLV-E 3-n */
/* 67 UE radio capability ID UE radio capability ID 9.11.3.yy O TLV 3-n */
/* 75 C75 CAG information list CAG information list 9.11.3.18A O TLV-E 3-n */
/* 67 UE radio capability ID UE radio capability ID 9.11.3.68 O TLV 3-n */
ELEM_OPT_TLV(0x67, NAS_5GS_PDU_TYPE_MM, DE_NAS_5GS_MM_UE_RADIO_CAP_ID, NULL);
/* 68 UE radio capability ID deletion indication UE radio capability ID deletion indication 9.11.3.69 O TV 1 */
/* A- UE radio capability ID deletion indication UE radio capability ID deletion indication 9.11.3.69 O TV 1 */
/* 44 5GS registration result 5GS registration result 9.11.3.6 O TLV 3 */
/* 1B Truncated 5G-S-TMSI configuration Truncated 5G-S-TMSI configuration 9.11.3.70 O TLV 3 */
/* C- Additional configuration indication Additional configuration indication 9.11.3.74 O TV 1 */
/* 68 Extended rejected NSSAI Extended rejected NSSAI 9.11.3.75 O TLV 4-74 */
EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_nas_5gs_extraneous_data);
@ -5026,6 +5256,7 @@ nas_5gs_mm_sec_mode_comp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_
ELEM_OPT_TLV_E(0x77, NAS_5GS_PDU_TYPE_MM, DE_NAS_5GS_MM_5GS_MOBILE_ID, NULL);
/* 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);
/* 78 non-IMEISV PEI 5GS mobile identity 9.11.3.4 O TLV-E 7-n */
EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_nas_5gs_extraneous_data);
@ -5096,7 +5327,7 @@ nas_5gs_mm_control_plane_service_req(tvbuff_t* tvb, proto_tree* tree, packet_inf
/* Control plane service type Control plane service type 9.11.3.65 M V 1/2 */
/* ngKSI NAS key set identifier 9.11.3.32 M V 1/2 */
ELEM_MAND_VV_SHORT(NAS_5GS_PDU_TYPE_MM, DE_NAS_5GS_MM_CP_SERVICE_TYPE, NAS_5GS_PDU_TYPE_MM, DE_NAS_5GS_MM_NAS_KEY_SET_ID_H1, ei_nas_5gs_missing_mandatory_elemen);
/* xx CIoT small data container CIoT small data container 9.11.3.z O TLV 4-257 */
/* 6F CIoT small data container CIoT small data container 9.11.3.18B O TLV 4-257 */
/* 8- Payload container type Payload container type 9.11.3.40 O TV 1 */
ELEM_OPT_TV_SHORT(0x80, NAS_5GS_PDU_TYPE_MM, DE_NAS_5GS_MM_PLD_CONT_TYPE, NULL);
/* 7B Payload container Payload container 9.11.3.39 O TLV-E 4-65538 */
@ -5105,10 +5336,29 @@ nas_5gs_mm_control_plane_service_req(tvbuff_t* tvb, proto_tree* tree, packet_inf
/* F- Release assistance indication Release assistance indication 9.11.3.y O TV 1 */
/* 40 Uplink data status Uplink data status 9.11.3.57 O TLV 4-34 */
/* 71 NAS message container NAS message container 9.11.3.33 O TLV-E 4-n */
/* 24 Additional information Additional information 9.11.2.1 O TLV 3-n */
EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_nas_5gs_extraneous_data);
}
/*
* 8.2.31 Network slice-specific authentication command
*/
/*S-NSSAI S-NSSAI 9.11.2.8 M LV 2-5*/
/*EAP message EAP message 9.11.2.2 M LV-E 6-1502*/
/*
* 8.2.32 Network slice-specific authentication complete
*/
/*S-NSSAI S-NSSAI 9.11.2.8 M LV 2-5*/
/*EAP message EAP message 9.11.2.2 M LV-E 6-1502*/
/*
* 8.2.33 Network slice-specific authentication result
*/
/*S-NSSAI S-NSSAI 9.11.2.8 M LV 2-5*/
/*EAP message EAP message 9.11.2.2 M LV-E 6-1502*/
/* 8.3 5GS session management messages */
@ -5153,8 +5403,11 @@ nas_5gs_sm_pdu_ses_est_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _
ELEM_OPT_TLV_E(0x7B, NAS_PDU_TYPE_ESM, DE_ESM_EXT_PCO, NULL);
/* 66 Header compression configuration Header compression configuration 9.11.4.24 O TLV 5-257 */
/* XX DS-TT Ethernet port MAC address DS-TT Ethernet port MAC address 9.11.4.25 O TLV 8 */
/* YY DS-TT residence time DS-TT residence time 9.11.4.26 O TLV 10 */
/* 6E DS-TT Ethernet port MAC address DS-TT Ethernet port MAC address 9.11.4.25 O TLV 8 */
/* 6F UE-DS-TT residence time UE-DS-TT residence time 9.11.4.26 O TLV 10 */
/* 7C Port management information container Port management information container 9.11.4.27 O TLV-E 8-65538 */
/* 1F Ethernet header compression configuration Ethernet header compression configuration 9.11.4.28 O TLV 3 */
/* 29 Suggested interface identifier PDU address 9.11.4.10 O TLV 11 */
EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_nas_5gs_extraneous_data);
@ -5205,14 +5458,14 @@ nas_5gs_sm_pdu_ses_est_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _
ELEM_OPT_TLV_E(0x79, NAS_5GS_PDU_TYPE_SM, DE_NAS_5GS_SM_QOS_FLOW_DES, " - Authorized");
/*7B Extended protocol configuration options Extended protocol configuration options 9.11.4.2 O TLV-E 4-65538*/
ELEM_OPT_TLV_E(0x7B, NAS_PDU_TYPE_ESM, DE_ESM_EXT_PCO, NULL);
/* 25 DNN DNN 9.11.2.1A O TLV 3-102 */
/* 25 DNN DNN 9.11.2.1B O TLV 3-102 */
ELEM_OPT_TLV(0x25, NAS_5GS_PDU_TYPE_COMMON, DE_NAS_5GS_CMN_DNN, NULL);
/* xx 5GSM network feature support 5GSM network feature support 9.11.4.18 O TLV 3-15 */
/* xx Session-TMBR Session-TMBR 9.11.4.19 O TLV 8 */
/* TBD Serving PLMN rate control Serving PLMN rate control 9.11.4.20 O TLV 4 */
/* XX ATSSS container ATSSS container 9.11.4.22 O TLV-E 3-65538 */
/* XX Control plane only indication Control plane only indication 9.11.4.23 O TV 1 */
/* 17 5GSM network feature support 5GSM network feature support 9.11.4.18 O TLV 3-15 */
/* 18 Serving PLMN rate control Serving PLMN rate control 9.11.4.20 O TLV 4 */
/* 77 ATSSS container ATSSS container 9.11.4.22 O TLV-E 3-65538 */
/* C- Control plane only indication Control plane only indication 9.11.4.23 O TV 1 */
/* 66 Header compression configuration Header compression configuration 9.11.4.24 O TLV 5-257 */
/* 1F Ethernet header compression configuration Ethernet header compression configuration 9.11.4.28 O TLV 3 */
EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_nas_5gs_extraneous_data);
@ -5237,20 +5490,16 @@ nas_5gs_sm_pdu_ses_est_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _
/* 5GSM cause 5GSM cause 9.11.4.2 M V 1 */
ELEM_MAND_V(NAS_5GS_PDU_TYPE_SM, DE_NAS_5GS_SM_5GSM_CAUSE, " - ESM cause", ei_nas_5gs_missing_mandatory_elemen);
/*37 Back-off timer value GPRS timer 3 9.11.2.5 O TLV 3 */
ELEM_OPT_TLV(0x37, GSM_A_PDU_TYPE_GM, DE_GPRS_TIMER_3, " - Back-off timer value");
/*F- Allowed SSC mode Allowed SSC mode 9.11.4.3 O TV 1*/
ELEM_OPT_TV_SHORT(0xF0, NAS_5GS_PDU_TYPE_SM, DE_NAS_5GS_SM_5GSM_ALLOWED_SSC_MODE, NULL);
/*78 EAP message EAP message 9.11.3.14 O TLV - E 7 - 1503*/
ELEM_OPT_TLV_E(0x78, NAS_5GS_PDU_TYPE_COMMON, DE_NAS_5GS_CMN_EAP_MESSAGE, NULL);
/*7B Extended protocol configuration options Extended protocol configuration options 9.11.4.2 O TLV - E 4 - 65538*/
ELEM_OPT_TLV_E(0x7B, NAS_PDU_TYPE_ESM, DE_ESM_EXT_PCO, NULL);
/*TBD Re-attempt indicator Re-attempt indicator 9.11.4.17 O TLV 3 */
/* 1D Re-attempt indicator Re-attempt indicator 9.11.4.17 O TLV 3 */
/* 61 5GSM congestion re-attempt indicator 5GSM congestion re-attempt indicator 9.11.4.21 O TLV 3 */
@ -5335,7 +5584,7 @@ nas_5gs_sm_pdu_ses_auth_res(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo
/*7B Extended protocol configuration options Extended protocol configuration options 9.11.4.2 O TLV - E 4 - 65538*/
ELEM_OPT_TLV_E(0x7B, NAS_PDU_TYPE_ESM, DE_ESM_EXT_PCO, NULL);
/*7B Extended protocol configuration options Extended protocol configuration options 9.11.4.6 O TLV-E 4-65538 */
EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_nas_5gs_extraneous_data);
@ -5373,7 +5622,7 @@ nas_5gs_sm_pdu_ses_mod_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _
/* 13 Integrity protection maximum data rate Integrity protection maximum data rate 9.11.4.7 O TV 3 */
ELEM_OPT_TV(0x13, NAS_5GS_PDU_TYPE_SM, DE_NAS_5GS_SM_INT_PROT_MAX_DATA_RTE, NULL);
/*7A Requested QoS rules QoS rules 9.11.4.6 O TLV-E 3-65538 */
/* 7A Requested QoS rules QoS rules 9.11.4.6 O TLV-E 3-65538 */
ELEM_OPT_TLV_E(0x7A, NAS_5GS_PDU_TYPE_SM, DE_NAS_5GS_SM_QOS_RULES, " - Requested QoS rules");
/* 79 Requested QoS flow descriptions QoS flow descriptions 9.11.4.12 O TLV-E 5-65538 */
@ -5384,7 +5633,9 @@ nas_5gs_sm_pdu_ses_mod_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _
/* 7B Extended protocol configuration options Extended protocol configuration options 9.11.4.2 O TLV - E 4 - 65538*/
ELEM_OPT_TLV_E(0x7B, NAS_PDU_TYPE_ESM, DE_ESM_EXT_PCO, NULL);
/* TBD Port management information container Port management information container 9.11.4.27 O TLV-E 4-65538 */
/* 7C Port management information container Port management information container 9.11.4.27 O TLV-E 4-65538 */
/* 66 IP header compression configuration Header compression configuration 9.11.4.24 O TLV 5-257 */
/* 1F Ethernet header compression configuration Ethernet header compression configuration 9.11.4.28 O TLV 3 */
EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_nas_5gs_extraneous_data);
@ -5416,7 +5667,7 @@ nas_5gs_sm_pdu_ses_mod_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _
/*7B Extended protocol configuration options Extended protocol configuration options 9.11.4.6 O TLV - E 4 - 65538*/
ELEM_OPT_TLV_E(0x7B, NAS_PDU_TYPE_ESM, DE_ESM_EXT_PCO, NULL);
/* TBD Re-attempt indicator Re-attempt indicator 9.11.4.17 O TLV 3 */
/* 1D Re-attempt indicator Re-attempt indicator 9.11.4.17 O TLV 3 */
/* 61 5GSM congestion re-attempt indicator 5GSM congestion re-attempt indicator 9.11.4.21 O TLV 3 */
EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_nas_5gs_extraneous_data);
@ -5457,11 +5708,11 @@ nas_5gs_sm_pdu_ses_mod_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _
/*7B Extended protocol configuration options Extended protocol configuration options 9.11.4.2 O TLV-E 4-65538*/
ELEM_OPT_TLV_E(0x7B, NAS_PDU_TYPE_ESM, DE_ESM_EXT_PCO, NULL);
/* xx Session-TMBR Session-TMBR 9.11.4.19 O TLV 8 */
/* XX ATSSS container ATSSS container 9.11.4.22 O TLV-E 3-65538 */
/* 66 Header compression configuration Header compression configuration 9.11.4.24 O TLV 5-257 */
/* TBD Port management information container Port management information container 9.11.4.27 O TLV-E 3-65538 */
/* 77 ATSSS container ATSSS container 9.11.4.22 O TLV-E 3-65538 */
/* 66 66 IP header compression configuration IP header compression configuration 9.11.4.24 O TLV 5-257 */
/* 7C Port management information container Port management information container 9.11.4.27 O TLV-E 4-65538 */
/* 1E Serving PLMN rate control Serving PLMN rate control 9.11.4.20 O TLV 4 */
/* 1F Ethernet header compression configuration Ethernet heaer compression configuration 9.11.4.28 O TLV 3 */
EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_nas_5gs_extraneous_data);
}
@ -5483,12 +5734,13 @@ nas_5gs_sm_pdu_ses_mod_comp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo
/* Direction: UE to network */
pinfo->link_dir = P2P_DIR_UL;
/*7B Extended protocol configuration options Extended protocol configuration options 9.11.4.2 O TLV - E 4 - 65538*/
/* 7B Extended protocol configuration options Extended protocol configuration options 9.11.4.2 O TLV - E 4 - 65538*/
ELEM_OPT_TLV_E(0x7B, NAS_PDU_TYPE_ESM, DE_ESM_EXT_PCO, NULL);
/*59 5GSM cause 5GSM cause 9.11.4.2 O TV 2*/
/* 59 5GSM cause 5GSM cause 9.11.4.2 O TV 2*/
ELEM_OPT_TV(0x59, NAS_5GS_PDU_TYPE_SM, DE_NAS_5GS_SM_5GSM_CAUSE, NULL);
/* TBD Port management information container Port management information container 9.11.4.27 O TLV-E 3-65538 */
/* 7B Extended protocol configuration options Extended protocol configuration options 9.11.4.6 O TLV-E 4-65538 */
ELEM_OPT_TLV_E(0x7B, NAS_PDU_TYPE_ESM, DE_ESM_EXT_PCO, NULL);
/* 7C Port management information container Port management information container 9.11.4.27 O TLV-E 4-65538 */
EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_nas_5gs_extraneous_data);
@ -5513,7 +5765,6 @@ nas_5gs_sm_pdu_ses_mod_com_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pin
/* 5GSM cause 5GSM cause 9.11.4.1 M V 1 */
ELEM_MAND_V(NAS_5GS_PDU_TYPE_SM, DE_NAS_5GS_SM_5GSM_CAUSE, NULL, ei_nas_5gs_missing_mandatory_elemen);
/*7B Extended protocol configuration options Extended protocol configuration options 9.11.4.2 O TLV - E 4 - 65538*/
ELEM_OPT_TLV_E(0x7B, NAS_PDU_TYPE_ESM, DE_ESM_EXT_PCO, NULL);
@ -5602,8 +5853,9 @@ nas_5gs_sm_pdu_ses_rel_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _
/* 61 5GSM congestion re-attempt indicator 5GSM congestion re-attempt indicator 9.11.4.21 O TLV 3 */
/*7B Extended protocol configuration options Extended protocol configuration options 9.11.4.2 O TLV - E 4 - 65538*/
/* 7B Extended protocol configuration options Extended protocol configuration options 9.11.4.2 O TLV - E 4 - 65538*/
ELEM_OPT_TLV_E(0x7B, NAS_PDU_TYPE_ESM, DE_ESM_EXT_PCO, NULL);
/* D- Access type Access type 9.11.2.1A O TV 1 */
EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_nas_5gs_extraneous_data);