From 7460e6c9ec3046aa66a413e6710e0d0c3fcbbf69 Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Wed, 28 Jun 2017 22:30:13 +0200 Subject: X2AP: upgrade dissector to v13.7.0 Change-Id: I1580bf4da1a31a6e0f77080e0835eb0dd5b3936c Reviewed-on: https://code.wireshark.org/review/22450 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn | 2 +- epan/dissectors/asn1/x2ap/X2AP-Constants.asn | 3 ++- epan/dissectors/asn1/x2ap/X2AP-Containers.asn | 2 +- epan/dissectors/asn1/x2ap/X2AP-IEs.asn | 2 +- epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn | 4 +++- epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn | 2 +- epan/dissectors/asn1/x2ap/packet-x2ap-template.c | 2 +- epan/dissectors/asn1/x2ap/x2ap.cnf | 2 ++ epan/dissectors/packet-x2ap.c | 20 ++++++++++++++++++-- 9 files changed, 30 insertions(+), 9 deletions(-) diff --git a/epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn b/epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn index 110ffb41d1..b50fe6fecc 100644 --- a/epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn +++ b/epan/dissectors/asn1/x2ap/X2AP-CommonDataTypes.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.423 V13.6.0 (2017-01) +-- 3GPP TS 36.423 V13.7.0 (2017-06) -- 9.3.6 Common definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/x2ap/X2AP-Constants.asn b/epan/dissectors/asn1/x2ap/X2AP-Constants.asn index a888c70de9..16917b1f45 100644 --- a/epan/dissectors/asn1/x2ap/X2AP-Constants.asn +++ b/epan/dissectors/asn1/x2ap/X2AP-Constants.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.423 V13.6.0 (2017-01) +-- 3GPP TS 36.423 V13.7.0 (2017-06) -- 9.3.7 Constant definitions -- ************************************************************** -- @@ -274,5 +274,6 @@ id-E-RABs-ToBeSetupRetrieve-Item ProtocolIE-ID ::= 174 id-NewEUTRANCellIdentifier ProtocolIE-ID ::= 175 id-OffsetOfNbiotChannelNumberToDL-EARFCN ProtocolIE-ID ::= 177 id-OffsetOfNbiotChannelNumberToUL-EARFCN ProtocolIE-ID ::= 178 +id-uL-GTPtunnelEndpoint ProtocolIE-ID ::= 185 END diff --git a/epan/dissectors/asn1/x2ap/X2AP-Containers.asn b/epan/dissectors/asn1/x2ap/X2AP-Containers.asn index 339b1089af..e8c847ab58 100644 --- a/epan/dissectors/asn1/x2ap/X2AP-Containers.asn +++ b/epan/dissectors/asn1/x2ap/X2AP-Containers.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.423 V13.6.0 (2017-01) +-- 3GPP TS 36.423 V13.7.0 (2017-06) -- 9.3.8 Container definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/x2ap/X2AP-IEs.asn b/epan/dissectors/asn1/x2ap/X2AP-IEs.asn index b3016b6752..ec1d58532a 100644 --- a/epan/dissectors/asn1/x2ap/X2AP-IEs.asn +++ b/epan/dissectors/asn1/x2ap/X2AP-IEs.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.423 V13.6.0 (2017-01) +-- 3GPP TS 36.423 V13.7.0 (2017-06) -- 9.3.5 Information Element definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn b/epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn index 69ea52c502..876c8aec76 100644 --- a/epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn +++ b/epan/dissectors/asn1/x2ap/X2AP-PDU-Contents.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.423 V13.6.0 (2017-01) +-- 3GPP TS 36.423 V13.7.0 (2017-06) -- 9.3.4 PDU Definitions -- ************************************************************** -- @@ -283,6 +283,7 @@ FROM X2AP-Containers id-UE-ContextInformationRetrieve, id-E-RABs-ToBeSetupRetrieve-Item, id-NewEUTRANCellIdentifier, + id-uL-GTPtunnelEndpoint, maxCellineNB, maxnoofBearers, @@ -2088,6 +2089,7 @@ E-RABs-ToBeSetupRetrieve-Item ::= SEQUENCE { } E-RABs-ToBeSetupRetrieve-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= { + { ID id-uL-GTPtunnelEndpoint CRITICALITY reject EXTENSION GTPtunnelEndpoint PRESENCE mandatory}, ... } diff --git a/epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn b/epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn index ce5c042f1a..1667064441 100644 --- a/epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn +++ b/epan/dissectors/asn1/x2ap/X2AP-PDU-Descriptions.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.423 V13.6.0 (2017-01) +-- 3GPP TS 36.423 V13.7.0 (2017-06) -- 9.3.3 Elementary Procedure Definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/x2ap/packet-x2ap-template.c b/epan/dissectors/asn1/x2ap/packet-x2ap-template.c index e740f400a1..6c44780236 100644 --- a/epan/dissectors/asn1/x2ap/packet-x2ap-template.c +++ b/epan/dissectors/asn1/x2ap/packet-x2ap-template.c @@ -24,7 +24,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * Ref: - * 3GPP TS 36.423 V13.6.0 (2017-01) + * 3GPP TS 36.423 V13.7.0 (2017-06) */ #include "config.h" diff --git a/epan/dissectors/asn1/x2ap/x2ap.cnf b/epan/dissectors/asn1/x2ap/x2ap.cnf index a6a93ac695..4d698a09a7 100644 --- a/epan/dissectors/asn1/x2ap/x2ap.cnf +++ b/epan/dissectors/asn1/x2ap/x2ap.cnf @@ -771,6 +771,7 @@ id-E-RABs-ToBeSetupRetrieve-Item ProtocolIE-ID id-NewEUTRANCellIdentifier ProtocolIE-ID id-OffsetOfNbiotChannelNumberToDL-EARFCN ProtocolIE-ID id-OffsetOfNbiotChannelNumberToUL-EARFCN ProtocolIE-ID +id-uL-GTPtunnelEndpoint ProtocolIE-ID #.REGISTER @@ -952,6 +953,7 @@ CellReportingIndicator N x2ap.extension id-CellReportingIndicator BearerType N x2ap.extension id-BearerType OffsetOfNbiotChannelNumberToEARFCN N x2ap.extension id-OffsetOfNbiotChannelNumberToDL-EARFCN OffsetOfNbiotChannelNumberToEARFCN N x2ap.extension id-OffsetOfNbiotChannelNumberToUL-EARFCN +GTPtunnelEndpoint N x2ap.extension id-uL-GTPtunnelEndpoint # X2AP-PDU-Descriptions.asn Interface Elementary Procedures #X2AP-ELEMENTARY-PROCEDURE diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c index 36b01ece1c..130196cbdc 100644 --- a/epan/dissectors/packet-x2ap.c +++ b/epan/dissectors/packet-x2ap.c @@ -32,7 +32,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * Ref: - * 3GPP TS 36.423 V13.6.0 (2017-01) + * 3GPP TS 36.423 V13.7.0 (2017-06) */ #include "config.h" @@ -306,7 +306,8 @@ typedef enum _ProtocolIE_ID_enum { id_E_RABs_ToBeSetupRetrieve_Item = 174, id_NewEUTRANCellIdentifier = 175, id_OffsetOfNbiotChannelNumberToDL_EARFCN = 177, - id_OffsetOfNbiotChannelNumberToUL_EARFCN = 178 + id_OffsetOfNbiotChannelNumberToUL_EARFCN = 178, + id_uL_GTPtunnelEndpoint = 185 } ProtocolIE_ID_enum; /*--- End of included file: packet-x2ap-val.h ---*/ @@ -399,6 +400,7 @@ static int hf_x2ap_ExpectedUEBehaviour_PDU = -1; /* ExpectedUEBehaviour */ static int hf_x2ap_ExtendedULInterferenceOverloadInfo_PDU = -1; /* ExtendedULInterferenceOverloadInfo */ static int hf_x2ap_FreqBandIndicatorPriority_PDU = -1; /* FreqBandIndicatorPriority */ static int hf_x2ap_GlobalENB_ID_PDU = -1; /* GlobalENB_ID */ +static int hf_x2ap_GTPtunnelEndpoint_PDU = -1; /* GTPtunnelEndpoint */ static int hf_x2ap_GUGroupIDList_PDU = -1; /* GUGroupIDList */ static int hf_x2ap_GUMMEI_PDU = -1; /* GUMMEI */ static int hf_x2ap_HandoverReportType_PDU = -1; /* HandoverReportType */ @@ -1620,6 +1622,7 @@ static const value_string x2ap_ProtocolIE_ID_vals[] = { { id_NewEUTRANCellIdentifier, "id-NewEUTRANCellIdentifier" }, { id_OffsetOfNbiotChannelNumberToDL_EARFCN, "id-OffsetOfNbiotChannelNumberToDL-EARFCN" }, { id_OffsetOfNbiotChannelNumberToUL_EARFCN, "id-OffsetOfNbiotChannelNumberToUL-EARFCN" }, + { id_uL_GTPtunnelEndpoint, "id-uL-GTPtunnelEndpoint" }, { 0, NULL } }; @@ -9209,6 +9212,14 @@ static int dissect_GlobalENB_ID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p offset += 7; offset >>= 3; return offset; } +static int dissect_GTPtunnelEndpoint_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_x2ap_GTPtunnelEndpoint(tvb, offset, &asn1_ctx, tree, hf_x2ap_GTPtunnelEndpoint_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_GUGroupIDList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -10964,6 +10975,10 @@ void proto_register_x2ap(void) { { "GlobalENB-ID", "x2ap.GlobalENB_ID_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_x2ap_GTPtunnelEndpoint_PDU, + { "GTPtunnelEndpoint", "x2ap.GTPtunnelEndpoint_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_x2ap_GUGroupIDList_PDU, { "GUGroupIDList", "x2ap.GUGroupIDList", FT_UINT32, BASE_DEC, NULL, 0, @@ -13668,6 +13683,7 @@ proto_reg_handoff_x2ap(void) dissector_add_uint("x2ap.extension", id_BearerType, create_dissector_handle(dissect_BearerType_PDU, proto_x2ap)); dissector_add_uint("x2ap.extension", id_OffsetOfNbiotChannelNumberToDL_EARFCN, create_dissector_handle(dissect_OffsetOfNbiotChannelNumberToEARFCN_PDU, proto_x2ap)); dissector_add_uint("x2ap.extension", id_OffsetOfNbiotChannelNumberToUL_EARFCN, create_dissector_handle(dissect_OffsetOfNbiotChannelNumberToEARFCN_PDU, proto_x2ap)); + dissector_add_uint("x2ap.extension", id_uL_GTPtunnelEndpoint, create_dissector_handle(dissect_GTPtunnelEndpoint_PDU, proto_x2ap)); dissector_add_uint("x2ap.proc.imsg", id_handoverPreparation, create_dissector_handle(dissect_HandoverRequest_PDU, proto_x2ap)); dissector_add_uint("x2ap.proc.sout", id_handoverPreparation, create_dissector_handle(dissect_HandoverRequestAcknowledge_PDU, proto_x2ap)); dissector_add_uint("x2ap.proc.uout", id_handoverPreparation, create_dissector_handle(dissect_HandoverPreparationFailure_PDU, proto_x2ap)); -- cgit v1.2.1