diff options
author | Pascal Quantin <pascal@wireshark.org> | 2020-01-12 16:24:52 +0100 |
---|---|---|
committer | Pascal Quantin <pascal@wireshark.org> | 2020-01-12 16:02:37 +0000 |
commit | 23801f0ce21985224d70c08261ab15c5bd212a7d (patch) | |
tree | 907f766d850f1d4f03cffd1abfd6242aeb526316 /epan | |
parent | a8c90e1767970e7b91e98bef7ea60a6f5af4f4d7 (diff) |
NGAP: upgrade dissector to v15.6.0
Change-Id: I6ec36162cff358cbbad81744ad8064b3835a066c
Reviewed-on: https://code.wireshark.org/review/35755
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/asn1/ngap/NGAP-CommonDataTypes.asn | 2 | ||||
-rw-r--r-- | epan/dissectors/asn1/ngap/NGAP-Constants.asn | 8 | ||||
-rw-r--r-- | epan/dissectors/asn1/ngap/NGAP-Containers.asn | 2 | ||||
-rw-r--r-- | epan/dissectors/asn1/ngap/NGAP-IEs.asn | 20 | ||||
-rw-r--r-- | epan/dissectors/asn1/ngap/NGAP-PDU-Contents.asn | 2 | ||||
-rw-r--r-- | epan/dissectors/asn1/ngap/NGAP-PDU-Descriptions.asn | 2 | ||||
-rw-r--r-- | epan/dissectors/asn1/ngap/ngap.cnf | 4 | ||||
-rw-r--r-- | epan/dissectors/asn1/ngap/packet-ngap-template.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ngap.c | 201 |
9 files changed, 149 insertions, 94 deletions
diff --git a/epan/dissectors/asn1/ngap/NGAP-CommonDataTypes.asn b/epan/dissectors/asn1/ngap/NGAP-CommonDataTypes.asn index f836581b08..bf09fb4ed7 100644 --- a/epan/dissectors/asn1/ngap/NGAP-CommonDataTypes.asn +++ b/epan/dissectors/asn1/ngap/NGAP-CommonDataTypes.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.413 V15.5.0 (2019-09) +-- 3GPP TS 38.413 V15.6.0 (2019-12) -- 9.4.6 Common Definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/ngap/NGAP-Constants.asn b/epan/dissectors/asn1/ngap/NGAP-Constants.asn index 606b8366bf..d170194af3 100644 --- a/epan/dissectors/asn1/ngap/NGAP-Constants.asn +++ b/epan/dissectors/asn1/ngap/NGAP-Constants.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.413 V15.5.0 (2019-09) +-- 3GPP TS 38.413 V15.6.0 (2019-12) -- 9.4.7 Constant Definitions -- ************************************************************** -- @@ -142,9 +142,9 @@ maxProtocolIEs INTEGER ::= 65535 maxnoofTAIinAoI INTEGER ::= 16 maxnoofTimePeriods INTEGER ::= 2 maxnoofTNLAssociations INTEGER ::= 32 - maxnoofXnExtTLAs INTEGER ::= 2 + maxnoofXnExtTLAs INTEGER ::= 16 maxnoofXnGTP-TLAs INTEGER ::= 16 - maxnoofXnTLAs INTEGER ::= 16 + maxnoofXnTLAs INTEGER ::= 2 -- ************************************************************** -- @@ -325,6 +325,8 @@ maxProtocolIEs INTEGER ::= 65535 id-EndpointIPAddressAndPort ProtocolIE-ID ::= 169 id-LocationReportingAdditionalInfo ProtocolIE-ID ::= 170 id-SourceToTarget-AMFInformationReroute ProtocolIE-ID ::= 171 + id-AdditionalULForwardingUPTNLInformation ProtocolIE-ID ::= 172 + id-SCTP-TLAs ProtocolIE-ID ::= 173 END diff --git a/epan/dissectors/asn1/ngap/NGAP-Containers.asn b/epan/dissectors/asn1/ngap/NGAP-Containers.asn index 9a2fec5dcf..1e6f9be13a 100644 --- a/epan/dissectors/asn1/ngap/NGAP-Containers.asn +++ b/epan/dissectors/asn1/ngap/NGAP-Containers.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.413 V15.5.0 (2019-09) +-- 3GPP TS 38.413 V15.6.0 (2019-12) -- 9.4.8 Container Definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/ngap/NGAP-IEs.asn b/epan/dissectors/asn1/ngap/NGAP-IEs.asn index 949d1ccf81..d2387534eb 100644 --- a/epan/dissectors/asn1/ngap/NGAP-IEs.asn +++ b/epan/dissectors/asn1/ngap/NGAP-IEs.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.413 V15.5.0 (2019-09) +-- 3GPP TS 38.413 V15.6.0 (2019-12) -- 9.4.5 Information Element Definitions -- ************************************************************** -- @@ -17,6 +17,7 @@ BEGIN IMPORTS id-AdditionalDLForwardingUPTNLInformation, + id-AdditionalULForwardingUPTNLInformation, id-AdditionalDLQosFlowPerTNLInformation, id-AdditionalDLUPTNLInformationForHOList, id-AdditionalNGU-UP-TNLInformation, @@ -41,6 +42,7 @@ IMPORTS id-QosFlowAddOrModifyRequestList, id-QosFlowSetupRequestList, id-QosFlowToReleaseList, + id-SCTP-TLAs, id-SecondaryRATUsageInformation, id-SecurityIndication, id-SecurityResult, @@ -519,7 +521,8 @@ CauseRadioNetwork ::= ENUMERATED { release-due-to-cn-detected-mobility, ..., n26-interface-not-available, - release-due-to-pre-emption + release-due-to-pre-emption, + multiple-location-reporting-reference-ID-instances } CauseTransport ::= ENUMERATED { @@ -1279,8 +1282,9 @@ HandoverCommandTransfer ::= SEQUENCE { } HandoverCommandTransfer-ExtIEs NGAP-PROTOCOL-EXTENSION ::= { - { ID id-AdditionalDLForwardingUPTNLInformation CRITICALITY ignore EXTENSION QosFlowPerTNLInformationList PRESENCE optional}| - { ID id-ULForwardingUP-TNLInformation CRITICALITY reject EXTENSION UPTransportLayerInformation PRESENCE optional}, + { ID id-AdditionalDLForwardingUPTNLInformation CRITICALITY ignore EXTENSION QosFlowPerTNLInformationList PRESENCE optional}| + { ID id-ULForwardingUP-TNLInformation CRITICALITY reject EXTENSION UPTransportLayerInformation PRESENCE optional}| + { ID id-AdditionalULForwardingUPTNLInformation CRITICALITY reject EXTENSION UPTransportLayerInformationList PRESENCE optional}, ... } @@ -1311,8 +1315,9 @@ HandoverRequestAcknowledgeTransfer ::= SEQUENCE { } HandoverRequestAcknowledgeTransfer-ExtIEs NGAP-PROTOCOL-EXTENSION ::= { - { ID id-AdditionalDLUPTNLInformationForHOList CRITICALITY ignore EXTENSION AdditionalDLUPTNLInformationForHOList PRESENCE optional }| - {ID id-ULForwardingUP-TNLInformation CRITICALITY reject EXTENSION UPTransportLayerInformation PRESENCE optional}, + { ID id-AdditionalDLUPTNLInformationForHOList CRITICALITY ignore EXTENSION AdditionalDLUPTNLInformationForHOList PRESENCE optional }| + { ID id-ULForwardingUP-TNLInformation CRITICALITY reject EXTENSION UPTransportLayerInformation PRESENCE optional}| + { ID id-AdditionalULForwardingUPTNLInformation CRITICALITY reject EXTENSION UPTransportLayerInformationList PRESENCE optional}, ... } @@ -2764,6 +2769,8 @@ RRCState ::= ENUMERATED { -- S +SCTP-TLAs ::= SEQUENCE (SIZE(1..maxnoofXnTLAs)) OF TransportLayerAddress + SD ::= OCTET STRING (SIZE(3)) SecondaryRATUsageInformation ::= SEQUENCE { @@ -3507,6 +3514,7 @@ XnExtTLA-Item ::= SEQUENCE { } XnExtTLA-Item-ExtIEs NGAP-PROTOCOL-EXTENSION ::= { + { ID id-SCTP-TLAs CRITICALITY ignore EXTENSION SCTP-TLAs PRESENCE optional }, ... } diff --git a/epan/dissectors/asn1/ngap/NGAP-PDU-Contents.asn b/epan/dissectors/asn1/ngap/NGAP-PDU-Contents.asn index d18a9f77fb..81c372f9cf 100644 --- a/epan/dissectors/asn1/ngap/NGAP-PDU-Contents.asn +++ b/epan/dissectors/asn1/ngap/NGAP-PDU-Contents.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.413 V15.5.0 (2019-09) +-- 3GPP TS 38.413 V15.6.0 (2019-12) -- 9.4.4 PDU Definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/ngap/NGAP-PDU-Descriptions.asn b/epan/dissectors/asn1/ngap/NGAP-PDU-Descriptions.asn index 8523fb3f95..449baf9f45 100644 --- a/epan/dissectors/asn1/ngap/NGAP-PDU-Descriptions.asn +++ b/epan/dissectors/asn1/ngap/NGAP-PDU-Descriptions.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.413 V15.5.0 (2019-09) +-- 3GPP TS 38.413 V15.6.0 (2019-12) -- 9.4.3 Elementary Procedure Definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/ngap/ngap.cnf b/epan/dissectors/asn1/ngap/ngap.cnf index f8bbb488a1..c13e3223f6 100644 --- a/epan/dissectors/asn1/ngap/ngap.cnf +++ b/epan/dissectors/asn1/ngap/ngap.cnf @@ -984,6 +984,8 @@ id-TNLAssociationTransportLayerAddressNGRAN ProtocolIE-ID id-EndpointIPAddressAndPort ProtocolIE-ID id-LocationReportingAdditionalInfo ProtocolIE-ID id-SourceToTarget-AMFInformationReroute ProtocolIE-ID +id-AdditionalULForwardingUPTNLInformation ProtocolIE-ID +id-SCTP-TLAs ProtocolIE-ID #.END @@ -1164,6 +1166,8 @@ ULForwarding N ngap.extension id-ULFor UPTransportLayerInformation N ngap.extension id-ULForwardingUP-TNLInformation CPTransportLayerInformation N ngap.extension id-TNLAssociationTransportLayerAddressNGRAN LocationReportingAdditionalInfo N ngap.extension id-LocationReportingAdditionalInfo +UPTransportLayerInformationList N ngap.extension id-AdditionalULForwardingUPTNLInformation +SCTP-TLAs N ngap.extension id-SCTP-TLAs #NGAP-ELEMENTARY-PROCEDURE diff --git a/epan/dissectors/asn1/ngap/packet-ngap-template.c b/epan/dissectors/asn1/ngap/packet-ngap-template.c index e6b0dfa97e..e213d6ffbd 100644 --- a/epan/dissectors/asn1/ngap/packet-ngap-template.c +++ b/epan/dissectors/asn1/ngap/packet-ngap-template.c @@ -8,7 +8,7 @@ * * SPDX-License-Identifier: GPL-2.0-or-later * - * References: 3GPP TS 38.413 v15.5.0 (2019-09) + * References: 3GPP TS 38.413 v15.6.0 (2019-12) */ #include "config.h" diff --git a/epan/dissectors/packet-ngap.c b/epan/dissectors/packet-ngap.c index 4f64795014..f666c767e3 100644 --- a/epan/dissectors/packet-ngap.c +++ b/epan/dissectors/packet-ngap.c @@ -16,7 +16,7 @@ * * SPDX-License-Identifier: GPL-2.0-or-later * - * References: 3GPP TS 38.413 v15.5.0 (2019-09) + * References: 3GPP TS 38.413 v15.6.0 (2019-12) */ #include "config.h" @@ -113,9 +113,9 @@ static int proto_json = -1; #define maxnoofTAIinAoI 16 #define maxnoofTimePeriods 2 #define maxnoofTNLAssociations 32 -#define maxnoofXnExtTLAs 2 +#define maxnoofXnExtTLAs 16 #define maxnoofXnGTP_TLAs 16 -#define maxnoofXnTLAs 16 +#define maxnoofXnTLAs 2 typedef enum _ProcedureCode_enum { id_AMFConfigurationUpdate = 0, @@ -345,7 +345,9 @@ typedef enum _ProtocolIE_ID_enum { id_TNLAssociationTransportLayerAddressNGRAN = 168, id_EndpointIPAddressAndPort = 169, id_LocationReportingAdditionalInfo = 170, - id_SourceToTarget_AMFInformationReroute = 171 + id_SourceToTarget_AMFInformationReroute = 171, + id_AdditionalULForwardingUPTNLInformation = 172, + id_SCTP_TLAs = 173 } ProtocolIE_ID_enum; typedef enum _GlobalRANNodeID_enum { @@ -536,6 +538,7 @@ static int hf_ngap_RoutingID_PDU = -1; /* RoutingID */ static int hf_ngap_RRCEstablishmentCause_PDU = -1; /* RRCEstablishmentCause */ static int hf_ngap_RRCInactiveTransitionReportRequest_PDU = -1; /* RRCInactiveTransitionReportRequest */ static int hf_ngap_RRCState_PDU = -1; /* RRCState */ +static int hf_ngap_SCTP_TLAs_PDU = -1; /* SCTP_TLAs */ static int hf_ngap_SecondaryRATUsageInformation_PDU = -1; /* SecondaryRATUsageInformation */ static int hf_ngap_SecurityContext_PDU = -1; /* SecurityContext */ static int hf_ngap_SecurityIndication_PDU = -1; /* SecurityIndication */ @@ -1031,6 +1034,7 @@ static int hf_ngap_RecommendedRANNodeList_item = -1; /* RecommendedRANNodeItem static int hf_ngap_aMFPagingTarget = -1; /* AMFPagingTarget */ static int hf_ngap_nG_Interface = -1; /* ResetAll */ static int hf_ngap_partOfNG_Interface = -1; /* UE_associatedLogicalNG_connectionList */ +static int hf_ngap_SCTP_TLAs_item = -1; /* TransportLayerAddress */ static int hf_ngap_pDUSessionUsageReport = -1; /* PDUSessionUsageReport */ static int hf_ngap_qosFlowsUsageReportList = -1; /* QoSFlowsUsageReportList */ static int hf_ngap_secondaryRATUsageInformation = -1; /* SecondaryRATUsageInformation */ @@ -1450,6 +1454,7 @@ static gint ett_ngap_RecommendedRANNodesForPaging = -1; static gint ett_ngap_RecommendedRANNodeList = -1; static gint ett_ngap_RecommendedRANNodeItem = -1; static gint ett_ngap_ResetType = -1; +static gint ett_ngap_SCTP_TLAs = -1; static gint ett_ngap_SecondaryRATUsageInformation = -1; static gint ett_ngap_SecondaryRATDataUsageReportTransfer = -1; static gint ett_ngap_SecurityContext = -1; @@ -2166,6 +2171,8 @@ static const value_string ngap_ProtocolIE_ID_vals[] = { { id_EndpointIPAddressAndPort, "id-EndpointIPAddressAndPort" }, { id_LocationReportingAdditionalInfo, "id-LocationReportingAdditionalInfo" }, { id_SourceToTarget_AMFInformationReroute, "id-SourceToTarget-AMFInformationReroute" }, + { id_AdditionalULForwardingUPTNLInformation, "id-AdditionalULForwardingUPTNLInformation" }, + { id_SCTP_TLAs, "id-SCTP-TLAs" }, { 0, NULL } }; @@ -4409,6 +4416,7 @@ static const value_string ngap_CauseRadioNetwork_vals[] = { { 44, "release-due-to-cn-detected-mobility" }, { 45, "n26-interface-not-available" }, { 46, "release-due-to-pre-emption" }, + { 47, "multiple-location-reporting-reference-ID-instances" }, { 0, NULL } }; @@ -4418,7 +4426,7 @@ static value_string_ext ngap_CauseRadioNetwork_vals_ext = VALUE_STRING_EXT_INIT( static int dissect_ngap_CauseRadioNetwork(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, - 45, NULL, TRUE, 2, NULL); + 45, NULL, TRUE, 3, NULL); return offset; } @@ -9552,6 +9560,20 @@ dissect_ngap_RRCState(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p } +static const per_sequence_t SCTP_TLAs_sequence_of[1] = { + { &hf_ngap_SCTP_TLAs_item , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_ngap_TransportLayerAddress }, +}; + +static int +dissect_ngap_SCTP_TLAs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, + ett_ngap_SCTP_TLAs, SCTP_TLAs_sequence_of, + 1, maxnoofXnTLAs, FALSE); + + return offset; +} + + static const per_sequence_t SecondaryRATUsageInformation_sequence[] = { { &hf_ngap_pDUSessionUsageReport, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_PDUSessionUsageReport }, { &hf_ngap_qosFlowsUsageReportList, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ngap_QoSFlowsUsageReportList }, @@ -10781,7 +10803,7 @@ static const per_sequence_t PDUSessionResourceSetupRequest_sequence[] = { static int dissect_ngap_PDUSessionResourceSetupRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1473 "./asn1/ngap/ngap.cnf" +#line 1477 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceSetupRequest"); @@ -10799,7 +10821,7 @@ static const per_sequence_t PDUSessionResourceSetupResponse_sequence[] = { static int dissect_ngap_PDUSessionResourceSetupResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1476 "./asn1/ngap/ngap.cnf" +#line 1480 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceSetupResponse"); @@ -10817,7 +10839,7 @@ static const per_sequence_t PDUSessionResourceReleaseCommand_sequence[] = { static int dissect_ngap_PDUSessionResourceReleaseCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1467 "./asn1/ngap/ngap.cnf" +#line 1471 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceReleaseCommand"); @@ -10835,7 +10857,7 @@ static const per_sequence_t PDUSessionResourceReleaseResponse_sequence[] = { static int dissect_ngap_PDUSessionResourceReleaseResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1470 "./asn1/ngap/ngap.cnf" +#line 1474 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceReleaseResponse"); @@ -10853,7 +10875,7 @@ static const per_sequence_t PDUSessionResourceModifyRequest_sequence[] = { static int dissect_ngap_PDUSessionResourceModifyRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1452 "./asn1/ngap/ngap.cnf" +#line 1456 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceModifyRequest"); @@ -10871,7 +10893,7 @@ static const per_sequence_t PDUSessionResourceModifyResponse_sequence[] = { static int dissect_ngap_PDUSessionResourceModifyResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1455 "./asn1/ngap/ngap.cnf" +#line 1459 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceModifyResponse"); @@ -10889,7 +10911,7 @@ static const per_sequence_t PDUSessionResourceNotify_sequence[] = { static int dissect_ngap_PDUSessionResourceNotify(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1464 "./asn1/ngap/ngap.cnf" +#line 1468 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceNotify"); @@ -10907,7 +10929,7 @@ static const per_sequence_t PDUSessionResourceModifyIndication_sequence[] = { static int dissect_ngap_PDUSessionResourceModifyIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1458 "./asn1/ngap/ngap.cnf" +#line 1462 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceModifyIndication"); @@ -10925,7 +10947,7 @@ static const per_sequence_t PDUSessionResourceModifyConfirm_sequence[] = { static int dissect_ngap_PDUSessionResourceModifyConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1461 "./asn1/ngap/ngap.cnf" +#line 1465 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PDUSessionResourceModifyConfirm"); @@ -10943,7 +10965,7 @@ static const per_sequence_t InitialContextSetupRequest_sequence[] = { static int dissect_ngap_InitialContextSetupRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1395 "./asn1/ngap/ngap.cnf" +#line 1399 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "InitialContextSetupRequest"); @@ -10961,7 +10983,7 @@ static const per_sequence_t InitialContextSetupResponse_sequence[] = { static int dissect_ngap_InitialContextSetupResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1398 "./asn1/ngap/ngap.cnf" +#line 1402 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "InitialContextSetupResponse"); @@ -10979,7 +11001,7 @@ static const per_sequence_t InitialContextSetupFailure_sequence[] = { static int dissect_ngap_InitialContextSetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1401 "./asn1/ngap/ngap.cnf" +#line 1405 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "InitialContextSetupFailure"); @@ -10997,7 +11019,7 @@ static const per_sequence_t UEContextReleaseRequest_sequence[] = { static int dissect_ngap_UEContextReleaseRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1533 "./asn1/ngap/ngap.cnf" +#line 1537 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextReleaseRequest"); @@ -11015,7 +11037,7 @@ static const per_sequence_t UEContextReleaseCommand_sequence[] = { static int dissect_ngap_UEContextReleaseCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1527 "./asn1/ngap/ngap.cnf" +#line 1531 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextReleaseCommand"); @@ -11033,7 +11055,7 @@ static const per_sequence_t UEContextReleaseComplete_sequence[] = { static int dissect_ngap_UEContextReleaseComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1530 "./asn1/ngap/ngap.cnf" +#line 1534 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextReleaseComplete"); @@ -11051,7 +11073,7 @@ static const per_sequence_t UEContextModificationRequest_sequence[] = { static int dissect_ngap_UEContextModificationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1518 "./asn1/ngap/ngap.cnf" +#line 1522 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationRequest"); @@ -11069,7 +11091,7 @@ static const per_sequence_t UEContextModificationResponse_sequence[] = { static int dissect_ngap_UEContextModificationResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1521 "./asn1/ngap/ngap.cnf" +#line 1525 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationResponse"); @@ -11087,7 +11109,7 @@ static const per_sequence_t UEContextModificationFailure_sequence[] = { static int dissect_ngap_UEContextModificationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1524 "./asn1/ngap/ngap.cnf" +#line 1528 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextModificationFailure"); @@ -11105,7 +11127,7 @@ static const per_sequence_t RRCInactiveTransitionReport_sequence[] = { static int dissect_ngap_RRCInactiveTransitionReport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1506 "./asn1/ngap/ngap.cnf" +#line 1510 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RRCInactiveTransitionReport"); @@ -11123,7 +11145,7 @@ static const per_sequence_t HandoverRequired_sequence[] = { static int dissect_ngap_HandoverRequired(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1377 "./asn1/ngap/ngap.cnf" +#line 1381 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverRequired"); @@ -11141,7 +11163,7 @@ static const per_sequence_t HandoverCommand_sequence[] = { static int dissect_ngap_HandoverCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1380 "./asn1/ngap/ngap.cnf" +#line 1384 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverCommand"); @@ -11159,7 +11181,7 @@ static const per_sequence_t HandoverPreparationFailure_sequence[] = { static int dissect_ngap_HandoverPreparationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1383 "./asn1/ngap/ngap.cnf" +#line 1387 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverPreparationFailure"); @@ -11198,7 +11220,7 @@ static const per_sequence_t HandoverRequestAcknowledge_sequence[] = { static int dissect_ngap_HandoverRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1389 "./asn1/ngap/ngap.cnf" +#line 1393 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverRequestAcknowledge"); @@ -11216,7 +11238,7 @@ static const per_sequence_t HandoverFailure_sequence[] = { static int dissect_ngap_HandoverFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1392 "./asn1/ngap/ngap.cnf" +#line 1396 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverFailure"); @@ -11234,7 +11256,7 @@ static const per_sequence_t HandoverNotify_sequence[] = { static int dissect_ngap_HandoverNotify(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1374 "./asn1/ngap/ngap.cnf" +#line 1378 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverNotify"); @@ -11252,7 +11274,7 @@ static const per_sequence_t PathSwitchRequest_sequence[] = { static int dissect_ngap_PathSwitchRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1443 "./asn1/ngap/ngap.cnf" +#line 1447 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PathSwitchRequest"); @@ -11270,7 +11292,7 @@ static const per_sequence_t PathSwitchRequestAcknowledge_sequence[] = { static int dissect_ngap_PathSwitchRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1446 "./asn1/ngap/ngap.cnf" +#line 1450 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PathSwitchRequestAcknowledge"); @@ -11288,7 +11310,7 @@ static const per_sequence_t PathSwitchRequestFailure_sequence[] = { static int dissect_ngap_PathSwitchRequestFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1449 "./asn1/ngap/ngap.cnf" +#line 1453 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PathSwitchRequestFailure"); @@ -11306,7 +11328,7 @@ static const per_sequence_t HandoverCancel_sequence[] = { static int dissect_ngap_HandoverCancel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1368 "./asn1/ngap/ngap.cnf" +#line 1372 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverCancel"); @@ -11324,7 +11346,7 @@ static const per_sequence_t HandoverCancelAcknowledge_sequence[] = { static int dissect_ngap_HandoverCancelAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1371 "./asn1/ngap/ngap.cnf" +#line 1375 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "HandoverCancelAcknowledge"); @@ -11342,7 +11364,7 @@ static const per_sequence_t UplinkRANStatusTransfer_sequence[] = { static int dissect_ngap_UplinkRANStatusTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1557 "./asn1/ngap/ngap.cnf" +#line 1561 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UplinkRANStatusTransfer"); @@ -11360,7 +11382,7 @@ static const per_sequence_t DownlinkRANStatusTransfer_sequence[] = { static int dissect_ngap_DownlinkRANStatusTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1359 "./asn1/ngap/ngap.cnf" +#line 1363 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "DownlinkRANStatusTransfer"); @@ -11378,7 +11400,7 @@ static const per_sequence_t Paging_sequence[] = { static int dissect_ngap_Paging(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1440 "./asn1/ngap/ngap.cnf" +#line 1444 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Paging"); @@ -11459,7 +11481,7 @@ static const per_sequence_t NASNonDeliveryIndication_sequence[] = { static int dissect_ngap_NASNonDeliveryIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1416 "./asn1/ngap/ngap.cnf" +#line 1420 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "NASNonDeliveryIndication"); @@ -11477,7 +11499,7 @@ static const per_sequence_t RerouteNASRequest_sequence[] = { static int dissect_ngap_RerouteNASRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1503 "./asn1/ngap/ngap.cnf" +#line 1507 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RerouteNASRequest"); @@ -11517,7 +11539,7 @@ static const per_sequence_t NGSetupRequest_sequence[] = { static int dissect_ngap_NGSetupRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1425 "./asn1/ngap/ngap.cnf" +#line 1429 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "NGSetupRequest"); @@ -11535,7 +11557,7 @@ static const per_sequence_t NGSetupResponse_sequence[] = { static int dissect_ngap_NGSetupResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1428 "./asn1/ngap/ngap.cnf" +#line 1432 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "NGSetupResponse"); @@ -11553,7 +11575,7 @@ static const per_sequence_t NGSetupFailure_sequence[] = { static int dissect_ngap_NGSetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1431 "./asn1/ngap/ngap.cnf" +#line 1435 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "NGSetupFailure"); @@ -11571,7 +11593,7 @@ static const per_sequence_t RANConfigurationUpdate_sequence[] = { static int dissect_ngap_RANConfigurationUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1494 "./asn1/ngap/ngap.cnf" +#line 1498 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RANConfigurationUpdate"); @@ -11589,7 +11611,7 @@ static const per_sequence_t RANConfigurationUpdateAcknowledge_sequence[] = { static int dissect_ngap_RANConfigurationUpdateAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1497 "./asn1/ngap/ngap.cnf" +#line 1501 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RANConfigurationUpdateAcknowledge"); @@ -11607,7 +11629,7 @@ static const per_sequence_t RANConfigurationUpdateFailure_sequence[] = { static int dissect_ngap_RANConfigurationUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1500 "./asn1/ngap/ngap.cnf" +#line 1504 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "RANConfigurationUpdateFailure"); @@ -11625,7 +11647,7 @@ static const per_sequence_t AMFConfigurationUpdate_sequence[] = { static int dissect_ngap_AMFConfigurationUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1332 "./asn1/ngap/ngap.cnf" +#line 1336 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "AMFConfigurationUpdate"); @@ -11643,7 +11665,7 @@ static const per_sequence_t AMFConfigurationUpdateAcknowledge_sequence[] = { static int dissect_ngap_AMFConfigurationUpdateAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1335 "./asn1/ngap/ngap.cnf" +#line 1339 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "AMFConfigurationUpdateAcknowledge"); @@ -11661,7 +11683,7 @@ static const per_sequence_t AMFConfigurationUpdateFailure_sequence[] = { static int dissect_ngap_AMFConfigurationUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1338 "./asn1/ngap/ngap.cnf" +#line 1342 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "AMFConfigurationUpdateFailure"); @@ -11679,7 +11701,7 @@ static const per_sequence_t AMFStatusIndication_sequence[] = { static int dissect_ngap_AMFStatusIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1341 "./asn1/ngap/ngap.cnf" +#line 1345 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "AMFStatusIndication"); @@ -11697,7 +11719,7 @@ static const per_sequence_t NGReset_sequence[] = { static int dissect_ngap_NGReset(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1419 "./asn1/ngap/ngap.cnf" +#line 1423 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "NGReset"); @@ -11715,7 +11737,7 @@ static const per_sequence_t NGResetAcknowledge_sequence[] = { static int dissect_ngap_NGResetAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1422 "./asn1/ngap/ngap.cnf" +#line 1426 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "NGResetAcknowledge"); @@ -11733,7 +11755,7 @@ static const per_sequence_t ErrorIndication_sequence[] = { static int dissect_ngap_ErrorIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1365 "./asn1/ngap/ngap.cnf" +#line 1369 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ErrorIndication"); @@ -11751,7 +11773,7 @@ static const per_sequence_t OverloadStart_sequence[] = { static int dissect_ngap_OverloadStart(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1434 "./asn1/ngap/ngap.cnf" +#line 1438 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "OverloadStart"); @@ -11769,7 +11791,7 @@ static const per_sequence_t OverloadStop_sequence[] = { static int dissect_ngap_OverloadStop(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1437 "./asn1/ngap/ngap.cnf" +#line 1441 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "OverloadStop"); @@ -11787,7 +11809,7 @@ static const per_sequence_t UplinkRANConfigurationTransfer_sequence[] = { static int dissect_ngap_UplinkRANConfigurationTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1554 "./asn1/ngap/ngap.cnf" +#line 1558 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UplinkRANConfigurationTransfer"); @@ -11805,7 +11827,7 @@ static const per_sequence_t DownlinkRANConfigurationTransfer_sequence[] = { static int dissect_ngap_DownlinkRANConfigurationTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1356 "./asn1/ngap/ngap.cnf" +#line 1360 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "DownlinkRANConfigurationTransfer"); @@ -11823,7 +11845,7 @@ static const per_sequence_t WriteReplaceWarningRequest_sequence[] = { static int dissect_ngap_WriteReplaceWarningRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1563 "./asn1/ngap/ngap.cnf" +#line 1567 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "WriteReplaceWarningRequest"); @@ -11841,7 +11863,7 @@ static const per_sequence_t WriteReplaceWarningResponse_sequence[] = { static int dissect_ngap_WriteReplaceWarningResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1566 "./asn1/ngap/ngap.cnf" +#line 1570 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "WriteReplaceWarningResponse"); @@ -11860,7 +11882,7 @@ static const per_sequence_t PWSCancelRequest_sequence[] = { static int dissect_ngap_PWSCancelRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1482 "./asn1/ngap/ngap.cnf" +#line 1486 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PWSCancelRequest"); @@ -11878,7 +11900,7 @@ static const per_sequence_t PWSCancelResponse_sequence[] = { static int dissect_ngap_PWSCancelResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1485 "./asn1/ngap/ngap.cnf" +#line 1489 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PWSCancelResponse"); @@ -11896,7 +11918,7 @@ static const per_sequence_t PWSRestartIndication_sequence[] = { static int dissect_ngap_PWSRestartIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1491 "./asn1/ngap/ngap.cnf" +#line 1495 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PWSRestartIndication"); @@ -11914,7 +11936,7 @@ static const per_sequence_t PWSFailureIndication_sequence[] = { static int dissect_ngap_PWSFailureIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1488 "./asn1/ngap/ngap.cnf" +#line 1492 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PWSFailureIndication"); @@ -11932,7 +11954,7 @@ static const per_sequence_t DownlinkUEAssociatedNRPPaTransport_sequence[] = { static int dissect_ngap_DownlinkUEAssociatedNRPPaTransport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1362 "./asn1/ngap/ngap.cnf" +#line 1366 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "DownlinkUEAssociatedNRPPaTransport"); @@ -11950,7 +11972,7 @@ static const per_sequence_t UplinkUEAssociatedNRPPaTransport_sequence[] = { static int dissect_ngap_UplinkUEAssociatedNRPPaTransport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1560 "./asn1/ngap/ngap.cnf" +#line 1564 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UplinkUEAssociatedNRPPaTransport"); @@ -11968,7 +11990,7 @@ static const per_sequence_t DownlinkNonUEAssociatedNRPPaTransport_sequence[] = { static int dissect_ngap_DownlinkNonUEAssociatedNRPPaTransport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1353 "./asn1/ngap/ngap.cnf" +#line 1357 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "DownlinkNonUEAssociatedNRPPaTransport"); @@ -11986,7 +12008,7 @@ static const per_sequence_t UplinkNonUEAssociatedNRPPaTransport_sequence[] = { static int dissect_ngap_UplinkNonUEAssociatedNRPPaTransport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1551 "./asn1/ngap/ngap.cnf" +#line 1555 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UplinkNonUEAssociatedNRPPaTransport"); @@ -12004,7 +12026,7 @@ static const per_sequence_t TraceStart_sequence[] = { static int dissect_ngap_TraceStart(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1515 "./asn1/ngap/ngap.cnf" +#line 1519 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "TraceStart"); @@ -12022,7 +12044,7 @@ static const per_sequence_t TraceFailureIndication_sequence[] = { static int dissect_ngap_TraceFailureIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1512 "./asn1/ngap/ngap.cnf" +#line 1516 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "TraceFailureIndication"); @@ -12040,7 +12062,7 @@ static const per_sequence_t DeactivateTrace_sequence[] = { static int dissect_ngap_DeactivateTrace(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1347 "./asn1/ngap/ngap.cnf" +#line 1351 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "DeactivateTrace"); @@ -12058,7 +12080,7 @@ static const per_sequence_t CellTrafficTrace_sequence[] = { static int dissect_ngap_CellTrafficTrace(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1344 "./asn1/ngap/ngap.cnf" +#line 1348 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "CellTrafficTrace"); @@ -12076,7 +12098,7 @@ static const per_sequence_t LocationReportingControl_sequence[] = { static int dissect_ngap_LocationReportingControl(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1410 "./asn1/ngap/ngap.cnf" +#line 1414 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "LocationReportingControl"); @@ -12094,7 +12116,7 @@ static const per_sequence_t LocationReportingFailureIndication_sequence[] = { static int dissect_ngap_LocationReportingFailureIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1413 "./asn1/ngap/ngap.cnf" +#line 1417 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "LocationReportingFailureIndication"); @@ -12112,7 +12134,7 @@ static const per_sequence_t LocationReport_sequence[] = { static int dissect_ngap_LocationReport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1407 "./asn1/ngap/ngap.cnf" +#line 1411 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "LocationReport"); @@ -12130,7 +12152,7 @@ static const per_sequence_t UETNLABindingReleaseRequest_sequence[] = { static int dissect_ngap_UETNLABindingReleaseRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1542 "./asn1/ngap/ngap.cnf" +#line 1546 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UETNLABindingReleaseRequest"); @@ -12148,7 +12170,7 @@ static const per_sequence_t UERadioCapabilityInfoIndication_sequence[] = { static int dissect_ngap_UERadioCapabilityInfoIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1545 "./asn1/ngap/ngap.cnf" +#line 1549 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UERadioCapabilityInfoIndication"); @@ -12166,7 +12188,7 @@ static const per_sequence_t UERadioCapabilityCheckRequest_sequence[] = { static int dissect_ngap_UERadioCapabilityCheckRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1536 "./asn1/ngap/ngap.cnf" +#line 1540 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UERadioCapabilityCheckRequest"); @@ -12184,7 +12206,7 @@ static const per_sequence_t UERadioCapabilityCheckResponse_sequence[] = { static int dissect_ngap_UERadioCapabilityCheckResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1539 "./asn1/ngap/ngap.cnf" +#line 1543 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UERadioCapabilityCheckResponse"); @@ -12202,7 +12224,7 @@ static const per_sequence_t PrivateMessage_sequence[] = { static int dissect_ngap_PrivateMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1479 "./asn1/ngap/ngap.cnf" +#line 1483 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PrivateMessage"); @@ -12220,7 +12242,7 @@ static const per_sequence_t SecondaryRATDataUsageReport_sequence[] = { static int dissect_ngap_SecondaryRATDataUsageReport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1509 "./asn1/ngap/ngap.cnf" +#line 1513 "./asn1/ngap/ngap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SecondaryRATDataUsageReport"); @@ -13445,6 +13467,14 @@ static int dissect_RRCState_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto offset += 7; offset >>= 3; return offset; } +static int dissect_SCTP_TLAs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_ngap_SCTP_TLAs(tvb, offset, &asn1_ctx, tree, hf_ngap_SCTP_TLAs_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_SecondaryRATUsageInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -14883,6 +14913,8 @@ proto_reg_handoff_ngap(void) dissector_add_uint("ngap.extension", id_ULForwardingUP_TNLInformation, create_dissector_handle(dissect_UPTransportLayerInformation_PDU, proto_ngap)); dissector_add_uint("ngap.extension", id_TNLAssociationTransportLayerAddressNGRAN, create_dissector_handle(dissect_CPTransportLayerInformation_PDU, proto_ngap)); dissector_add_uint("ngap.extension", id_LocationReportingAdditionalInfo, create_dissector_handle(dissect_LocationReportingAdditionalInfo_PDU, proto_ngap)); + dissector_add_uint("ngap.extension", id_AdditionalULForwardingUPTNLInformation, create_dissector_handle(dissect_UPTransportLayerInformationList_PDU, proto_ngap)); + dissector_add_uint("ngap.extension", id_SCTP_TLAs, create_dissector_handle(dissect_SCTP_TLAs_PDU, proto_ngap)); dissector_add_uint("ngap.proc.imsg", id_AMFConfigurationUpdate, create_dissector_handle(dissect_AMFConfigurationUpdate_PDU, proto_ngap)); dissector_add_uint("ngap.proc.sout", id_AMFConfigurationUpdate, create_dissector_handle(dissect_AMFConfigurationUpdateAcknowledge_PDU, proto_ngap)); dissector_add_uint("ngap.proc.uout", id_AMFConfigurationUpdate, create_dissector_handle(dissect_AMFConfigurationUpdateFailure_PDU, proto_ngap)); @@ -15687,6 +15719,10 @@ void proto_register_ngap(void) { { "RRCState", "ngap.RRCState", FT_UINT32, BASE_DEC, VALS(ngap_RRCState_vals), 0, NULL, HFILL }}, + { &hf_ngap_SCTP_TLAs_PDU, + { "SCTP-TLAs", "ngap.SCTP_TLAs", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, { &hf_ngap_SecondaryRATUsageInformation_PDU, { "SecondaryRATUsageInformation", "ngap.SecondaryRATUsageInformation_element", FT_NONE, BASE_NONE, NULL, 0, @@ -17667,6 +17703,10 @@ void proto_register_ngap(void) { { "partOfNG-Interface", "ngap.partOfNG_Interface", FT_UINT32, BASE_DEC, NULL, 0, "UE_associatedLogicalNG_connectionList", HFILL }}, + { &hf_ngap_SCTP_TLAs_item, + { "TransportLayerAddress", "ngap.TransportLayerAddress", + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_ngap_pDUSessionUsageReport, { "pDUSessionUsageReport", "ngap.pDUSessionUsageReport_element", FT_NONE, BASE_NONE, NULL, 0, @@ -18424,6 +18464,7 @@ void proto_register_ngap(void) { &ett_ngap_RecommendedRANNodeList, &ett_ngap_RecommendedRANNodeItem, &ett_ngap_ResetType, + &ett_ngap_SCTP_TLAs, &ett_ngap_SecondaryRATUsageInformation, &ett_ngap_SecondaryRATDataUsageReportTransfer, &ett_ngap_SecurityContext, |