From 3ee859573cde5ea0f87573f94111b6ed29c004c0 Mon Sep 17 00:00:00 2001 From: Swapnil Roy Date: Thu, 6 Jun 2019 21:41:15 +0530 Subject: [PATCH] NAS 5GS: Payload container type added in Registration Request Change-Id: I935b2b18a7636eb4e9708a248be9c8df0d935ac0 Reviewed-on: https://code.wireshark.org/review/33512 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/dissectors/packet-nas_5gs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/epan/dissectors/packet-nas_5gs.c b/epan/dissectors/packet-nas_5gs.c index ab3c17a20e..62bb748775 100644 --- a/epan/dissectors/packet-nas_5gs.c +++ b/epan/dissectors/packet-nas_5gs.c @@ -1585,7 +1585,7 @@ static const value_string nas_5gs_mm_pld_cont_type_vals[] = { { 0x04, "SOR transparent container" }, { 0x05, "UE policy container" }, { 0x06, "UE parameters update transparent container" }, - { 0x07, "Multiple payloads" }, + { 0x0f, "Multiple payloads" }, { 0, NULL } }; static guint16 @@ -3863,10 +3863,10 @@ nas_5gs_mm_registration_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, /*C- Non-current native NAS KSI NAS key set identifier 9.11.3.32 O TV 1*/ ELEM_OPT_TV_SHORT(0xc0, NAS_5GS_PDU_TYPE_MM, DE_NAS_5GS_MM_NAS_KEY_SET_ID, " - native KSI"); - /*10 5GMM capability 5GMM capability 9.11.3.1 O TLV 4-15*/ + /*10 5GMM capability 5GMM capability 9.11.3.1 O TLV 3-15*/ ELEM_OPT_TLV(0x10, NAS_5GS_PDU_TYPE_MM, DE_NAS_5GS_MM_5GMM_CAP, NULL); - /*2E UE security capability UE security capability 9.11.3.54 O TLV 4-6*/ + /*2E UE security capability UE security capability 9.11.3.54 O TLV 4-10*/ ELEM_OPT_TLV(0x2e, NAS_5GS_PDU_TYPE_MM, DE_NAS_5GS_MM_UE_SEC_CAP, NULL); /*2F Requested NSSAI NSSAI 9.11.3.37 O TLV 4-74*/ @@ -3908,6 +3908,9 @@ nas_5gs_mm_registration_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, /* 74 LADN indication LADN indication 9.11.3.29 O TLV-E 3-811 */ ELEM_OPT_TLV_E(0x74, NAS_5GS_PDU_TYPE_MM, DE_NAS_5GS_MM_LADN_INF, NULL); + /* 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 */ ELEM_OPT_TLV_E(0x7B, NAS_5GS_PDU_TYPE_MM, DE_NAS_5GS_MM_PLD_CONT, NULL);