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

NAS 5GS: upgrade dissector to v16.7.0

This commit is contained in:
Pascal Quantin 2020-12-23 20:10:32 +01:00 committed by Wireshark GitLab Utility
parent ca971264a0
commit a9ce232c37
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
* References: 3GPP TS 24.501 16.6.0
* References: 3GPP TS 24.501 16.7.0
*/
#include "config.h"
@ -6609,8 +6609,8 @@ nas_5gs_sm_pdu_ses_est_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _
ELEM_OPT_TLV(0x6E, NAS_5GS_PDU_TYPE_SM, DE_NAS_5GS_SM_DS_TT_ETH_PORT_MAC_ADDR, NULL);
/* 6F UE-DS-TT residence time UE-DS-TT residence time 9.11.4.26 O TLV 10 */
ELEM_OPT_TLV(0x6F, NAS_5GS_PDU_TYPE_SM, DE_NAS_5GS_SM_UE_DS_TT_RESIDENCE_T, NULL);
/* 7C Port management information container Port management information container 9.11.4.27 O TLV-E 8-65538 */
ELEM_OPT_TLV(0x7C, NAS_5GS_PDU_TYPE_SM, DE_NAS_5GS_SM_PORT_MGNT_INF_CONT, NULL);
/* 74 Port management information container Port management information container 9.11.4.27 O TLV-E 8-65538 */
ELEM_OPT_TLV(0x74, NAS_5GS_PDU_TYPE_SM, DE_NAS_5GS_SM_PORT_MGNT_INF_CONT, NULL);
/* 1F Ethernet header compression configuration Ethernet header compression configuration 9.11.4.28 O TLV 3 */
ELEM_OPT_TLV(0x1F, NAS_5GS_PDU_TYPE_SM, DE_NAS_5GS_SM_ETH_HDR_COMP_CONF, NULL);
/* 29 Suggested interface identifier PDU address 9.11.4.10 O TLV 11 */
@ -6845,8 +6845,8 @@ 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);
/* 7C Port management information container Port management information container 9.11.4.27 O TLV-E 4-65538 */
ELEM_OPT_TLV(0x7C, NAS_5GS_PDU_TYPE_SM, DE_NAS_5GS_SM_PORT_MGNT_INF_CONT, NULL);
/* 74 Port management information container Port management information container 9.11.4.27 O TLV-E 4-65538 */
ELEM_OPT_TLV(0x74, NAS_5GS_PDU_TYPE_SM, DE_NAS_5GS_SM_PORT_MGNT_INF_CONT, NULL);
/* 66 IP header compression configuration Header compression configuration 9.11.4.24 O TLV 5-257 */
ELEM_OPT_TLV(0x66, NAS_5GS_PDU_TYPE_SM, DE_NAS_5GS_SM_IP_HDR_COMP_CONF, NULL);
@ -6933,8 +6933,8 @@ nas_5gs_sm_pdu_ses_mod_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _
/* 66 66 IP header compression configuration IP header compression configuration 9.11.4.24 O TLV 5-257 */
ELEM_OPT_TLV(0x66, NAS_5GS_PDU_TYPE_SM, DE_NAS_5GS_SM_IP_HDR_COMP_CONF, NULL);
/* 7C Port management information container Port management information container 9.11.4.27 O TLV-E 4-65538 */
ELEM_OPT_TLV(0x7C, NAS_5GS_PDU_TYPE_SM, DE_NAS_5GS_SM_PORT_MGNT_INF_CONT, NULL);
/* 74 Port management information container Port management information container 9.11.4.27 O TLV-E 4-65538 */
ELEM_OPT_TLV(0x74, NAS_5GS_PDU_TYPE_SM, DE_NAS_5GS_SM_PORT_MGNT_INF_CONT, NULL);
/* 1E Serving PLMN rate control Serving PLMN rate control 9.11.4.20 O TLV 4 */
ELEM_OPT_TLV(0x1E, NAS_PDU_TYPE_ESM, DE_ESM_SERV_PLMN_RATE_CTRL, NULL);
@ -6968,8 +6968,8 @@ nas_5gs_sm_pdu_ses_mod_comp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo
ELEM_OPT_TV(0x59, NAS_5GS_PDU_TYPE_SM, DE_NAS_5GS_SM_5GSM_CAUSE, NULL);
/* 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 */
ELEM_OPT_TLV(0x7C, NAS_5GS_PDU_TYPE_SM, DE_NAS_5GS_SM_PORT_MGNT_INF_CONT, NULL);
/* 74 Port management information container Port management information container 9.11.4.27 O TLV-E 4-65538 */
ELEM_OPT_TLV(0x74, NAS_5GS_PDU_TYPE_SM, DE_NAS_5GS_SM_PORT_MGNT_INF_CONT, NULL);
EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_nas_5gs_extraneous_data);