diff options
author | Anders Broman <anders.broman@ericsson.com> | 2010-05-15 09:04:28 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2010-05-15 09:04:28 +0000 |
commit | ef9129b5e6cf9e3bb16e6525af08074a85f71ebf (patch) | |
tree | 50ca3dca9b193fb22c38b78bff0aaebea4ca653e | |
parent | 874a518ed6d707450f0096ab88d10043f5cc72da (diff) |
Update to V9.1.0 (2010-03).
svn path=/trunk/; revision=32818
-rw-r--r-- | asn1/pcap/PCAP-CommonDataTypes.asn | 2 | ||||
-rw-r--r-- | asn1/pcap/PCAP-Constants.asn | 6 | ||||
-rw-r--r-- | asn1/pcap/PCAP-Containers.asn | 2 | ||||
-rw-r--r-- | asn1/pcap/PCAP-IEs.asn | 49 | ||||
-rw-r--r-- | asn1/pcap/PCAP-PDU-Contents.asn | 15 | ||||
-rw-r--r-- | asn1/pcap/PCAP-PDU-Descriptions.asn | 2 | ||||
-rw-r--r-- | asn1/pcap/pcap.cnf | 5 | ||||
-rw-r--r-- | epan/dissectors/packet-pcap.c | 123 |
8 files changed, 189 insertions, 15 deletions
diff --git a/asn1/pcap/PCAP-CommonDataTypes.asn b/asn1/pcap/PCAP-CommonDataTypes.asn index 50a68f4203..689ae83d2a 100644 --- a/asn1/pcap/PCAP-CommonDataTypes.asn +++ b/asn1/pcap/PCAP-CommonDataTypes.asn @@ -1,6 +1,6 @@ -- $Id$ -- --- 3GPP TS 25.453 V9.0.0 (2009-12) +-- 3GPP TS 25.453 V9.1.0 (2010-03) -- --9.3.5 Common Definitions -- ************************************************************** diff --git a/asn1/pcap/PCAP-Constants.asn b/asn1/pcap/PCAP-Constants.asn index 9c0ff7af99..4e91e9ac0c 100644 --- a/asn1/pcap/PCAP-Constants.asn +++ b/asn1/pcap/PCAP-Constants.asn @@ -1,6 +1,6 @@ -- $Id$ -- --- 3GPP TS 25.453 V9.0.0 (2009-12) +-- 3GPP TS 25.453 V9.1.0 (2010-03) -- -- 9.3.6 Constant Definitions -- ************************************************************** @@ -197,7 +197,9 @@ id-GANSS-alm-keplerianGLONASS ProtocolIE-ID ::= 112 id-GANSS-alm-ecefSBASAlmanac ProtocolIE-ID ::= 113 id-UTRAN-GANSSReferenceTimeResult ProtocolIE-ID ::= 114 id-GANSS-Reference-Time-Only ProtocolIE-ID ::= 115 -id-GANSS-AddADchoices ProtocolIE-ID ::= 116 +id-GANSS-AddADchoices ProtocolIE-ID ::= 116 +id-OTDOA-ReferenceCellInfo ProtocolIE-ID ::= 117 +id-DGNSS-ValidityPeriod ProtocolIE-ID ::= 118 END diff --git a/asn1/pcap/PCAP-Containers.asn b/asn1/pcap/PCAP-Containers.asn index d107ed349f..1f62655d77 100644 --- a/asn1/pcap/PCAP-Containers.asn +++ b/asn1/pcap/PCAP-Containers.asn @@ -1,6 +1,6 @@ -- $Id$ -- --- 3GPP TS 25.453 V9.0.0 (2009-12) +-- 3GPP TS 25.453 V9.1.0 (2010-03) -- -- 9.3.7 Container Definitions -- ************************************************************** diff --git a/asn1/pcap/PCAP-IEs.asn b/asn1/pcap/PCAP-IEs.asn index 7f93105738..b03aa42eba 100644 --- a/asn1/pcap/PCAP-IEs.asn +++ b/asn1/pcap/PCAP-IEs.asn @@ -1,6 +1,6 @@ -- $Id$ -- --- 3GPP TS 25.453 V9.0.0 (2009-12) +-- 3GPP TS 25.453 V9.1.0 (2010-03) -- -- 9.3.4 Information Element Definitions -- ************************************************************** @@ -108,7 +108,8 @@ IMPORTS id-ganssAddNavigationModel-req, id-ganssAddUTCModel-req, id-ganssAuxInfo-req, - id-GANSS-AlmanacModelChoice + id-GANSS-AlmanacModelChoice, + id-DGNSS-ValidityPeriod @@ -596,6 +597,18 @@ DGPS-CorrectionSatInfo ::= SEQUENCE { } DGPS-CorrectionSatInfo-ExtIEs PCAP-PROTOCOL-EXTENSION ::= { + {ID id-DGNSS-ValidityPeriod CRITICALITY ignore EXTENSION DGNSS-ValidityPeriod PRESENCE optional}, + ... +} + +DGNSS-ValidityPeriod ::= SEQUENCE { + udreGrowthRate UDREGrowthRate, + udreValidityTime UDREValidityTime, + iE-Extensions ProtocolExtensionContainer { { DGNSS-ValidityPeriod-ExtIEs } } OPTIONAL, + ... +} + +DGNSS-ValidityPeriod-ExtIEs PCAP-PROTOCOL-EXTENSION ::= { ... } @@ -605,6 +618,26 @@ UDRE ::= ENUMERATED { between4-and-8, over8 } +UDREGrowthRate ::= ENUMERATED { + growth-1-point-5, + growth-2, + growth-4, + growth-6, + growth-8, + growth-10, + growth-12, + growth-16 } + +UDREValidityTime ::= ENUMERATED { + val-20sec, + val-40sec, + val-80sec, + val-160sec, + val-320sec, + val-640sec, + val-1280sec, + val-2560sec } + PRC ::= INTEGER (-2047..2047) RRC ::= INTEGER (-127..127) @@ -1014,7 +1047,7 @@ DGANSS-SignalInformationItem ::= SEQUENCE { ... } -DGANSS-SignalInformationItem-ExtIEs PCAP-PROTOCOL-EXTENSION ::= { +DGANSS-SignalInformationItem-ExtIEs PCAP-PROTOCOL-EXTENSION ::= { {ID id-DGNSS-ValidityPeriod CRITICALITY ignore EXTENSION DGNSS-ValidityPeriod PRESENCE OPTIONAL}, ... } @@ -2942,6 +2975,16 @@ OTDOA-ReferenceCellInfo-ExtIEs PCAP-PROTOCOL-EXTENSION ::= { ... } +OTDOA-ReferenceCellInfoSAS-centric ::= SEQUENCE { + uC-ID UC-ID, + iE-Extensions ProtocolExtensionContainer { { OTDOA-ReferenceCellInfoSAS-centric-ExtIEs } } OPTIONAL, + ... +} + +OTDOA-ReferenceCellInfoSAS-centric-ExtIEs PCAP-PROTOCOL-EXTENSION ::= { + ... +} + OTDOA-NeighbourCellInfoList ::= SEQUENCE (SIZE (1..maxNrOfMeasNCell)) OF OTDOA-NeighbourCellInfo diff --git a/asn1/pcap/PCAP-PDU-Contents.asn b/asn1/pcap/PCAP-PDU-Contents.asn index 9a9300af99..ce0bec522e 100644 --- a/asn1/pcap/PCAP-PDU-Contents.asn +++ b/asn1/pcap/PCAP-PDU-Contents.asn @@ -1,6 +1,6 @@ -- $Id$ -- --- 3GPP TS 25.453 V9.0.0 (2009-12) +-- 3GPP TS 25.453 V9.1.0 (2010-03) -- --9.3.3 PDU Definitions -- ************************************************************** @@ -68,7 +68,8 @@ IMPORTS GANSSPositioning, GANSS-UTRAN-TRU, AdditionalGPSAssistDataRequired, - AdditionalGanssAssistDataRequired + AdditionalGanssAssistDataRequired, + OTDOA-ReferenceCellInfoSAS-centric FROM PCAP-IEs @@ -136,7 +137,8 @@ FROM PCAP-Containers id-GANSSPositioning, id-GANSS-UTRAN-TRU, id-AdditionalGPSAssistDataRequired, - id-AdditionalGanssAssistDataRequired + id-AdditionalGanssAssistDataRequired, + id-OTDOA-ReferenceCellInfo FROM PCAP-Constants; @@ -480,7 +482,8 @@ PositionActivationResponseExtensions PCAP-PROTOCOL-EXTENSION ::= { { ID id-MeasInstructionsUsed CRITICALITY ignore EXTENSION MeasInstructionsUsed PRESENCE optional} | { ID id-GANSS-MeasuredResultsList CRITICALITY reject EXTENSION GANSS-MeasuredResultsList PRESENCE optional } | { ID id-AdditionalGPSAssistDataRequired CRITICALITY ignore EXTENSION AdditionalGPSAssistDataRequired PRESENCE optional } | - { ID id-AdditionalGanssAssistDataRequired CRITICALITY ignore EXTENSION AdditionalGanssAssistDataRequired PRESENCE optional }, + { ID id-AdditionalGanssAssistDataRequired CRITICALITY ignore EXTENSION AdditionalGanssAssistDataRequired PRESENCE optional } | + { ID id-OTDOA-ReferenceCellInfo CRITICALITY reject EXTENSION OTDOA-ReferenceCellInfoSAS-centric PRESENCE optional }, ... } @@ -700,7 +703,8 @@ PositionPeriodicReport-IEs PCAP-PROTOCOL-IES ::= { PositionPeriodicReport-Extensions PCAP-PROTOCOL-EXTENSION ::= { { ID id-GANSS-MeasuredResultsList CRITICALITY ignore EXTENSION GANSS-MeasuredResultsList PRESENCE optional } | { ID id-AdditionalGPSAssistDataRequired CRITICALITY ignore EXTENSION AdditionalGPSAssistDataRequired PRESENCE optional } | - { ID id-AdditionalGanssAssistDataRequired CRITICALITY ignore EXTENSION AdditionalGanssAssistDataRequired PRESENCE optional }, + { ID id-AdditionalGanssAssistDataRequired CRITICALITY ignore EXTENSION AdditionalGanssAssistDataRequired PRESENCE optional } | + { ID id-OTDOA-ReferenceCellInfo CRITICALITY reject EXTENSION OTDOA-ReferenceCellInfoSAS-centric PRESENCE optional }, ... } @@ -750,4 +754,3 @@ PositionPeriodicTermination-Extensions PCAP-PROTOCOL-EXTENSION ::= { ... } END - diff --git a/asn1/pcap/PCAP-PDU-Descriptions.asn b/asn1/pcap/PCAP-PDU-Descriptions.asn index d66f509df3..4d48cb1c05 100644 --- a/asn1/pcap/PCAP-PDU-Descriptions.asn +++ b/asn1/pcap/PCAP-PDU-Descriptions.asn @@ -1,6 +1,6 @@ -- $Id$ -- --- 3GPP TS 25.453 V9.0.0 (2009-12) +-- 3GPP TS 25.453 V9.1.0 (2010-03) -- -- 9.3.2 Elementary Procedure Definitions -- ************************************************************** diff --git a/asn1/pcap/pcap.cnf b/asn1/pcap/pcap.cnf index b436907e74..d11c6d1ccb 100644 --- a/asn1/pcap/pcap.cnf +++ b/asn1/pcap/pcap.cnf @@ -253,6 +253,8 @@ id-ganssAddNavigationModel-req ProtocolIE-ID id-ganssAddUTCModel-req ProtocolIE-ID id-ganssAuxInfo-req ProtocolIE-ID id-GANSS-AlmanacModelChoice ProtocolIE-ID +id-OTDOA-ReferenceCellInfo ProtocolIE-ID +id-DGNSS-ValidityPeriod ProtocolIE-ID #.END #.REGISTER_NEW @@ -356,6 +358,9 @@ GANSS-AddNavigationModel-Req N pcap.extension id-ganssAddNavigationModel-req GANSS-AddUTCModel-Req N pcap.extension id-ganssAddUTCModel-req GANSS-AuxInfo-req N pcap.extension id-ganssAuxInfo-req #N pcap.extension id-GANSS-AlmanacModelChoice Not used? +OTDOA-ReferenceCellInfoSAS-centric N pcap.extension id-OTDOA-ReferenceCellInfo +DGNSS-ValidityPeriod N pcap.extension id-DGNSS-ValidityPeriod + #PCAP-ELEMENTARY-PROCEDURE PositionCalculationRequest N pcap.proc.imsg id-PositionCalculation diff --git a/epan/dissectors/packet-pcap.c b/epan/dissectors/packet-pcap.c index 6256bedbd8..b0204b3c3f 100644 --- a/epan/dissectors/packet-pcap.c +++ b/epan/dissectors/packet-pcap.c @@ -232,7 +232,9 @@ typedef enum _ProtocolIE_ID_enum { id_GANSS_alm_ecefSBASAlmanac = 113, id_UTRAN_GANSSReferenceTimeResult = 114, id_GANSS_Reference_Time_Only = 115, - id_GANSS_AddADchoices = 116 + id_GANSS_AddADchoices = 116, + id_OTDOA_ReferenceCellInfo = 117, + id_DGNSS_ValidityPeriod = 118 } ProtocolIE_ID_enum; /*--- End of included file: packet-pcap-val.h ---*/ @@ -258,6 +260,7 @@ static int hf_pcap_AngleOfArrivalLCR_PDU = -1; /* AngleOfArrivalLCR */ static int hf_pcap_CellIDPositioning_PDU = -1; /* CellIDPositioning */ static int hf_pcap_ClientType_PDU = -1; /* ClientType */ static int hf_pcap_CriticalityDiagnostics_PDU = -1; /* CriticalityDiagnostics */ +static int hf_pcap_DGNSS_ValidityPeriod_PDU = -1; /* DGNSS_ValidityPeriod */ static int hf_pcap_UE_PositionEstimate_PDU = -1; /* UE_PositionEstimate */ static int hf_pcap_UE_PositionEstimateInfo_PDU = -1; /* UE_PositionEstimateInfo */ static int hf_pcap_GANSS_Reference_Time_Only_PDU = -1; /* GANSS_Reference_Time_Only */ @@ -302,6 +305,7 @@ static int hf_pcap_GANSS_EarthOrientParaReq_PDU = -1; /* GANSS_EarthOrientParaR static int hf_pcap_GANSS_SBAS_ID_PDU = -1; /* GANSS_SBAS_ID */ static int hf_pcap_MeasInstructionsUsed_PDU = -1; /* MeasInstructionsUsed */ static int hf_pcap_OTDOA_MeasurementGroup_PDU = -1; /* OTDOA_MeasurementGroup */ +static int hf_pcap_OTDOA_ReferenceCellInfoSAS_centric_PDU = -1; /* OTDOA_ReferenceCellInfoSAS_centric */ static int hf_pcap_OTDOA_MeasuredResultsSets_PDU = -1; /* OTDOA_MeasuredResultsSets */ static int hf_pcap_OTDOA_AddMeasuredResultsInfo_PDU = -1; /* OTDOA_AddMeasuredResultsInfo */ static int hf_pcap_UC_ID_PDU = -1; /* UC_ID */ @@ -451,6 +455,8 @@ static int hf_pcap_iode = -1; /* INTEGER_0_255 */ static int hf_pcap_udre = -1; /* UDRE */ static int hf_pcap_prc = -1; /* PRC */ static int hf_pcap_rrc = -1; /* RRC */ +static int hf_pcap_udreGrowthRate = -1; /* UDREGrowthRate */ +static int hf_pcap_udreValidityTime = -1; /* UDREValidityTime */ static int hf_pcap_point = -1; /* GA_Point */ static int hf_pcap_pointWithUnCertainty = -1; /* GA_PointWithUnCertainty */ static int hf_pcap_polygon = -1; /* GA_Polygon */ @@ -1400,6 +1406,7 @@ static gint ett_pcap_CriticalityDiagnostics_IE_List_item = -1; static gint ett_pcap_DGPSCorrections = -1; static gint ett_pcap_DGPS_CorrectionSatInfoList = -1; static gint ett_pcap_DGPS_CorrectionSatInfo = -1; +static gint ett_pcap_DGNSS_ValidityPeriod = -1; static gint ett_pcap_UE_PositionEstimate = -1; static gint ett_pcap_GeographicalCoordinates = -1; static gint ett_pcap_GA_AltitudeAndDirection = -1; @@ -1587,6 +1594,7 @@ static gint ett_pcap_MeasInstructionsUsed = -1; static gint ett_pcap_MeasurementValidity = -1; static gint ett_pcap_OTDOA_MeasurementGroup = -1; static gint ett_pcap_OTDOA_ReferenceCellInfo = -1; +static gint ett_pcap_OTDOA_ReferenceCellInfoSAS_centric = -1; static gint ett_pcap_OTDOA_NeighbourCellInfoList = -1; static gint ett_pcap_OTDOA_NeighbourCellInfo = -1; static gint ett_pcap_OTDOA_MeasuredResultsSets = -1; @@ -1979,6 +1987,8 @@ static const value_string pcap_ProtocolIE_ID_vals[] = { { id_UTRAN_GANSSReferenceTimeResult, "id-UTRAN-GANSSReferenceTimeResult" }, { id_GANSS_Reference_Time_Only, "id-GANSS-Reference-Time-Only" }, { id_GANSS_AddADchoices, "id-GANSS-AddADchoices" }, + { id_OTDOA_ReferenceCellInfo, "id-OTDOA-ReferenceCellInfo" }, + { id_DGNSS_ValidityPeriod, "id-DGNSS-ValidityPeriod" }, { 0, NULL } }; @@ -3597,6 +3607,66 @@ dissect_pcap_DGPSCorrections(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx } +static const value_string pcap_UDREGrowthRate_vals[] = { + { 0, "growth-1-point-5" }, + { 1, "growth-2" }, + { 2, "growth-4" }, + { 3, "growth-6" }, + { 4, "growth-8" }, + { 5, "growth-10" }, + { 6, "growth-12" }, + { 7, "growth-16" }, + { 0, NULL } +}; + + +static int +dissect_pcap_UDREGrowthRate(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, + 8, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string pcap_UDREValidityTime_vals[] = { + { 0, "val-20sec" }, + { 1, "val-40sec" }, + { 2, "val-80sec" }, + { 3, "val-160sec" }, + { 4, "val-320sec" }, + { 5, "val-640sec" }, + { 6, "val-1280sec" }, + { 7, "val-2560sec" }, + { 0, NULL } +}; + + +static int +dissect_pcap_UDREValidityTime(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, + 8, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const per_sequence_t DGNSS_ValidityPeriod_sequence[] = { + { &hf_pcap_udreGrowthRate , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_pcap_UDREGrowthRate }, + { &hf_pcap_udreValidityTime, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_pcap_UDREValidityTime }, + { &hf_pcap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_pcap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_pcap_DGNSS_ValidityPeriod(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_pcap_DGNSS_ValidityPeriod, DGNSS_ValidityPeriod_sequence); + + return offset; +} + + static int dissect_pcap_T_ue_GPSTimingOfCell(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -8252,6 +8322,21 @@ dissect_pcap_OTDOA_MeasurementGroup(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ } +static const per_sequence_t OTDOA_ReferenceCellInfoSAS_centric_sequence[] = { + { &hf_pcap_uC_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_pcap_UC_ID }, + { &hf_pcap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_pcap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_pcap_OTDOA_ReferenceCellInfoSAS_centric(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_pcap_OTDOA_ReferenceCellInfoSAS_centric, OTDOA_ReferenceCellInfoSAS_centric_sequence); + + return offset; +} + + static int dissect_pcap_PrimaryScramblingCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -12190,6 +12275,14 @@ static int dissect_CriticalityDiagnostics_PDU(tvbuff_t *tvb _U_, packet_info *pi offset += 7; offset >>= 3; return offset; } +static int dissect_DGNSS_ValidityPeriod_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_pcap_DGNSS_ValidityPeriod(tvb, offset, &asn1_ctx, tree, hf_pcap_DGNSS_ValidityPeriod_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_UE_PositionEstimate_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -12542,6 +12635,14 @@ static int dissect_OTDOA_MeasurementGroup_PDU(tvbuff_t *tvb _U_, packet_info *pi offset += 7; offset >>= 3; return offset; } +static int dissect_OTDOA_ReferenceCellInfoSAS_centric_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_pcap_OTDOA_ReferenceCellInfoSAS_centric(tvb, offset, &asn1_ctx, tree, hf_pcap_OTDOA_ReferenceCellInfoSAS_centric_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_OTDOA_MeasuredResultsSets_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -13213,6 +13314,8 @@ proto_reg_handoff_pcap(void) dissector_add("pcap.extension", id_ganssAddNavigationModel_req, new_create_dissector_handle(dissect_GANSS_AddNavigationModel_Req_PDU, proto_pcap)); dissector_add("pcap.extension", id_ganssAddUTCModel_req, new_create_dissector_handle(dissect_GANSS_AddUTCModel_Req_PDU, proto_pcap)); dissector_add("pcap.extension", id_ganssAuxInfo_req, new_create_dissector_handle(dissect_GANSS_AuxInfo_req_PDU, proto_pcap)); + dissector_add("pcap.extension", id_OTDOA_ReferenceCellInfo, new_create_dissector_handle(dissect_OTDOA_ReferenceCellInfoSAS_centric_PDU, proto_pcap)); + dissector_add("pcap.extension", id_DGNSS_ValidityPeriod, new_create_dissector_handle(dissect_DGNSS_ValidityPeriod_PDU, proto_pcap)); dissector_add("pcap.proc.imsg", id_PositionCalculation, new_create_dissector_handle(dissect_PositionCalculationRequest_PDU, proto_pcap)); dissector_add("pcap.proc.sout", id_PositionCalculation, new_create_dissector_handle(dissect_PositionCalculationResponse_PDU, proto_pcap)); dissector_add("pcap.proc.uout", id_PositionCalculation, new_create_dissector_handle(dissect_PositionCalculationFailure_PDU, proto_pcap)); @@ -13305,6 +13408,10 @@ void proto_register_pcap(void) { { "CriticalityDiagnostics", "pcap.CriticalityDiagnostics", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_pcap_DGNSS_ValidityPeriod_PDU, + { "DGNSS-ValidityPeriod", "pcap.DGNSS_ValidityPeriod", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_pcap_UE_PositionEstimate_PDU, { "UE-PositionEstimate", "pcap.UE_PositionEstimate", FT_UINT32, BASE_DEC, VALS(pcap_UE_PositionEstimate_vals), 0, @@ -13481,6 +13588,10 @@ void proto_register_pcap(void) { { "OTDOA-MeasurementGroup", "pcap.OTDOA_MeasurementGroup", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_pcap_OTDOA_ReferenceCellInfoSAS_centric_PDU, + { "OTDOA-ReferenceCellInfoSAS-centric", "pcap.OTDOA_ReferenceCellInfoSAS_centric", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_pcap_OTDOA_MeasuredResultsSets_PDU, { "OTDOA-MeasuredResultsSets", "pcap.OTDOA_MeasuredResultsSets", FT_UINT32, BASE_DEC, NULL, 0, @@ -14077,6 +14188,14 @@ void proto_register_pcap(void) { { "rrc", "pcap.rrc", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_pcap_udreGrowthRate, + { "udreGrowthRate", "pcap.udreGrowthRate", + FT_UINT32, BASE_DEC, VALS(pcap_UDREGrowthRate_vals), 0, + NULL, HFILL }}, + { &hf_pcap_udreValidityTime, + { "udreValidityTime", "pcap.udreValidityTime", + FT_UINT32, BASE_DEC, VALS(pcap_UDREValidityTime_vals), 0, + NULL, HFILL }}, { &hf_pcap_point, { "point", "pcap.point", FT_NONE, BASE_NONE, NULL, 0, @@ -17741,6 +17860,7 @@ void proto_register_pcap(void) { &ett_pcap_DGPSCorrections, &ett_pcap_DGPS_CorrectionSatInfoList, &ett_pcap_DGPS_CorrectionSatInfo, + &ett_pcap_DGNSS_ValidityPeriod, &ett_pcap_UE_PositionEstimate, &ett_pcap_GeographicalCoordinates, &ett_pcap_GA_AltitudeAndDirection, @@ -17928,6 +18048,7 @@ void proto_register_pcap(void) { &ett_pcap_MeasurementValidity, &ett_pcap_OTDOA_MeasurementGroup, &ett_pcap_OTDOA_ReferenceCellInfo, + &ett_pcap_OTDOA_ReferenceCellInfoSAS_centric, &ett_pcap_OTDOA_NeighbourCellInfoList, &ett_pcap_OTDOA_NeighbourCellInfo, &ett_pcap_OTDOA_MeasuredResultsSets, |