forked from osmocom/wireshark
From Pascal Quantin:
Upgrade LTE RRC dissector to v10.4.0 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6742 svn path=/trunk/; revision=40549
This commit is contained in:
Anders Broman
parent
5f2cf1a036
commit
3624284ef0
|
|
@ -8,8 +8,18 @@ PER
|
|||
UNALIGNED
|
||||
#.END
|
||||
|
||||
#.EXPORTS
|
||||
Ellipsoid-Point_PDU
|
||||
EllipsoidPointWithAltitude_PDU
|
||||
HorizontalVelocity_PDU
|
||||
#.END
|
||||
|
||||
#.PDU_NEW
|
||||
LPP-Message
|
||||
Ellipsoid-Point
|
||||
EllipsoidPointWithAltitude
|
||||
HorizontalVelocity
|
||||
#.END
|
||||
|
||||
#.FN_HDR LPP-Message
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V9.7.0 (2011-06)
|
||||
-- 3GPP TS 36.331 V10.4.0 (2011-12)
|
||||
-- $Id$
|
||||
--
|
||||
EUTRA-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
|
@ -12,10 +12,14 @@ IMPORTS
|
|||
DL-DCCH-Message,
|
||||
ARFCN-ValueEUTRA,
|
||||
MasterInformationBlock,
|
||||
maxFreq,
|
||||
MeasConfig,
|
||||
OtherConfig-r9,
|
||||
PhysCellId,
|
||||
RadioResourceConfigDedicated,
|
||||
RSRP-Range,
|
||||
RSRQ-Range,
|
||||
SCellToAddModList-r10,
|
||||
SecurityAlgorithmConfig,
|
||||
ShortMAC-I,
|
||||
SystemInformationBlockType1,
|
||||
|
|
@ -66,7 +70,7 @@ HandoverPreparationInformation-r8-IEs ::= SEQUENCE {
|
|||
|
||||
HandoverPreparationInformation-v920-IEs ::= SEQUENCE {
|
||||
ue-ConfigRelease-r9 ENUMERATED {
|
||||
rel9, spare7, spare6, spare5, spare4, spare3,
|
||||
rel9, rel10, spare6, spare5, spare4, spare3,
|
||||
spare2, spare1, ...} OPTIONAL, -- Cond HO2
|
||||
nonCriticalExtension SEQUENCE {} OPTIONAL
|
||||
}
|
||||
|
|
@ -106,8 +110,9 @@ AS-Config ::= SEQUENCE {
|
|||
[[ sourceSystemInformationBlockType1Ext OCTET STRING (CONTAINING
|
||||
SystemInformationBlockType1-v890-IEs) OPTIONAL,
|
||||
sourceOtherConfig-r9 OtherConfig-r9
|
||||
]],
|
||||
[[ sourceSCellConfigList-r10 SCellToAddModList-r10 OPTIONAL
|
||||
]]
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -145,6 +150,20 @@ RRM-Config ::= SEQUENCE {
|
|||
hr8, hr10, hr13, hr16, hr20, day1, day1hr12, day2,
|
||||
day2hr12, day3, day4, day5, day7, day10, day14, day19,
|
||||
day24, day30, dayMoreThan30} OPTIONAL,
|
||||
...,
|
||||
[[ candidateCellInfoList-r10 CandidateCellInfoList-r10 OPTIONAL
|
||||
]]
|
||||
}
|
||||
|
||||
CandidateCellInfoList-r10 ::= SEQUENCE (SIZE (1..maxFreq)) OF CandidateCellInfo-r10
|
||||
|
||||
CandidateCellInfo-r10 ::= SEQUENCE {
|
||||
-- cellIdentification
|
||||
physCellId-r10 PhysCellId,
|
||||
dl-CarrierFreq-r10 ARFCN-ValueEUTRA,
|
||||
-- available measurement results
|
||||
rsrpResult-r10 RSRP-Range OPTIONAL,
|
||||
rsrqResult-r10 RSRQ-Range OPTIONAL,
|
||||
...
|
||||
}
|
||||
|
||||
|
|
@ -154,5 +173,3 @@ maxReestabInfo INTEGER ::= 32 -- Maximum number of KeNB* and shortMAC-I forwa
|
|||
|
||||
|
||||
END
|
||||
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.331 V9.7.0 (2011-06)
|
||||
-- 3GPP TS 36.331 V10.4.0 (2011-12)
|
||||
-- $Id$
|
||||
--
|
||||
EUTRA-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
|
@ -6,10 +6,15 @@ EUTRA-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
|
|||
BEGIN
|
||||
|
||||
IMPORTS
|
||||
AbsoluteTimeInfo-r10,
|
||||
AreaConfiguration-r10,
|
||||
CarrierFreqGERAN,
|
||||
CellIdentity,
|
||||
SpeedStateScaleFactors,
|
||||
C-RNTI,
|
||||
LoggingDuration-r10,
|
||||
LoggingInterval-r10,
|
||||
LogMeasInfo-r10,
|
||||
MeasId,
|
||||
MeasIdToAddModList,
|
||||
MeasObjectToAddModList,
|
||||
|
|
@ -20,14 +25,37 @@ IMPORTS
|
|||
PhysCellIdGERAN,
|
||||
PhysCellIdUTRA-FDD,
|
||||
PhysCellIdUTRA-TDD,
|
||||
PLMN-Identity,
|
||||
QuantityConfig,
|
||||
ReportConfigToAddModList,
|
||||
RLF-Report-r9,
|
||||
RSRP-Range,
|
||||
-- TraceRecordingSessionRef-r10,
|
||||
TraceReference-r10,
|
||||
maxCellMeas,
|
||||
maxMeasId
|
||||
FROM EUTRA-RRC-Definitions;
|
||||
|
||||
|
||||
VarLogMeasConfig-r10 ::= SEQUENCE {
|
||||
areaConfiguration-r10 AreaConfiguration-r10 OPTIONAL,
|
||||
loggingDuration-r10 LoggingDuration-r10,
|
||||
loggingInterval-r10 LoggingInterval-r10
|
||||
}
|
||||
|
||||
|
||||
VarLogMeasReport-r10 ::= SEQUENCE {
|
||||
traceReference-r10 TraceReference-r10,
|
||||
traceRecordingSessionRef-r10 OCTET STRING (SIZE (2)),
|
||||
tce-Id-r10 OCTET STRING (SIZE (1)),
|
||||
plmn-Identity-r10 PLMN-Identity,
|
||||
absoluteTimeInfo-r10 AbsoluteTimeInfo-r10,
|
||||
logMeasInfoList-r10 VarLogMeasInfoList-r10
|
||||
}
|
||||
|
||||
VarLogMeasInfoList-r10 ::= SEQUENCE (SIZE (1..maxLogMeas-r10)) OF LogMeasInfo-r10
|
||||
|
||||
|
||||
VarMeasConfig ::= SEQUENCE {
|
||||
-- Measurement identities
|
||||
measIdList MeasIdToAddModList OPTIONAL,
|
||||
|
|
@ -37,7 +65,7 @@ VarMeasConfig ::= SEQUENCE {
|
|||
reportConfigList ReportConfigToAddModList OPTIONAL,
|
||||
-- Other parameters
|
||||
quantityConfig QuantityConfig OPTIONAL,
|
||||
s-Measure RSRP-Range OPTIONAL,
|
||||
s-Measure INTEGER (-140..-44) OPTIONAL,
|
||||
speedStatePars CHOICE {
|
||||
release NULL,
|
||||
setup SEQUENCE {
|
||||
|
|
@ -70,14 +98,20 @@ CellsTriggeredList ::= SEQUENCE (SIZE (1..maxCellMeas)) OF CHOICE {
|
|||
physCellIdCDMA2000 PhysCellIdCDMA2000
|
||||
}
|
||||
|
||||
VarRLF-Report-r10 ::= SEQUENCE {
|
||||
rlf-Report-r10 RLF-Report-r9,
|
||||
plmn-Identity-r10 PLMN-Identity
|
||||
}
|
||||
|
||||
|
||||
VarShortMAC-Input ::= SEQUENCE {
|
||||
cellIdentity CellIdentity,
|
||||
physCellId PhysCellId,
|
||||
c-RNTI C-RNTI
|
||||
}
|
||||
|
||||
maxLogMeas-r10 INTEGER ::= 4060-- Maximum number of logged measurement entries
|
||||
-- that can be stored by the UE
|
||||
|
||||
|
||||
END
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -8,9 +8,6 @@ PER
|
|||
UNALIGNED
|
||||
#.END
|
||||
|
||||
#.OMIT_ASSIGNMENT
|
||||
#.END
|
||||
|
||||
#.EXPORTS
|
||||
HandoverCommand
|
||||
HandoverCommand_PDU
|
||||
|
|
@ -21,6 +18,7 @@ UERadioAccessCapabilityInformation_PDU
|
|||
UE-EUTRA-Capability
|
||||
UE-EUTRA-Capability_PDU
|
||||
#UEInformationResponse
|
||||
#.END
|
||||
|
||||
#.PDU_NEW
|
||||
HandoverCommand
|
||||
|
|
@ -44,6 +42,11 @@ VarShortMAC-Input
|
|||
VarMeasConfig
|
||||
VarMeasReportList
|
||||
VarMeasReport
|
||||
CellsTriggeredList
|
||||
VarLogMeasConfig-r10
|
||||
VarLogMeasReport-r10
|
||||
VarLogMeasInfoList-r10
|
||||
VarRLF-Report-r10
|
||||
|
||||
#.FN_HDR UL-DCCH-Message
|
||||
actx->pinfo->link_dir = P2P_DIR_UL;
|
||||
|
|
@ -223,6 +226,80 @@ if(ue_eutra_cap_tvb){
|
|||
curr_bit_offset++;
|
||||
}
|
||||
|
||||
#.FN_BODY UE-EUTRA-Capability-v1020-IEs/featureGroupIndicators-v1020 VAL_PTR = &featureGroupIndicatorsV1020_tvb
|
||||
tvbuff_t *featureGroupIndicatorsV1020_tvb=NULL;
|
||||
%(DEFAULT_BODY)s
|
||||
if(featureGroupIndicatorsV1020_tvb){
|
||||
/* Dissect featureGroupIndicators-v1020 */
|
||||
proto_tree *subtree;
|
||||
gint curr_bit_offset = 0;
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_featureGroupIndicatorsV1020);
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_101, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_102, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_103, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_104, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_105, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_106, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_107, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_108, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_109, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_110, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_111, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_112, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_113, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_114, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_115, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_116, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_117, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_118, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_119, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_120, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_121, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_122, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_123, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_124, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_125, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_126, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_127, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_128, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_129, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_130, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_131, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
proto_tree_add_bits_item(subtree, hf_lte_rrc_eutra_cap_feat_group_ind_132, featureGroupIndicatorsV1020_tvb, curr_bit_offset, 1, FALSE);
|
||||
curr_bit_offset++;
|
||||
}
|
||||
|
||||
#.FN_BODY Handover
|
||||
lte_rrc_ho_target_rat_type_value = -1;
|
||||
%(DEFAULT_BODY)s
|
||||
|
|
@ -356,6 +433,49 @@ if(ue_eutra_cap_tvb){
|
|||
}
|
||||
}
|
||||
|
||||
#.FN_BODY LocationInfo-r10/locationCoordinates-r10/ellipsoid-Point-r10 VAL_PTR = &ellipsoid_point_tvb
|
||||
tvbuff_t *ellipsoid_point_tvb = NULL;
|
||||
%(DEFAULT_BODY)s
|
||||
if (ellipsoid_point_tvb) {
|
||||
dissect_lpp_Ellipsoid_Point_PDU(ellipsoid_point_tvb, actx->pinfo, tree);
|
||||
}
|
||||
|
||||
#.FN_BODY LocationInfo-r10/locationCoordinates-r10/ellipsoidPointWithAltitude-r10 VAL_PTR = &ellipsoid_point_with_alt_tvb
|
||||
tvbuff_t *ellipsoid_point_with_alt_tvb = NULL;
|
||||
%(DEFAULT_BODY)s
|
||||
if (ellipsoid_point_with_alt_tvb) {
|
||||
dissect_lpp_EllipsoidPointWithAltitude_PDU(ellipsoid_point_with_alt_tvb, actx->pinfo, tree);
|
||||
}
|
||||
|
||||
#.FN_BODY LocationInfo-r10/horizontalVelocity-r10 VAL_PTR = &horizontal_velocity_tvb
|
||||
tvbuff_t *horizontal_velocity_tvb = NULL;
|
||||
%(DEFAULT_BODY)s
|
||||
if (horizontal_velocity_tvb) {
|
||||
dissect_lpp_HorizontalVelocity_PDU(horizontal_velocity_tvb, actx->pinfo, tree);
|
||||
}
|
||||
|
||||
#.FN_BODY LocationInfo-r10/gnss-TOD-msec-r10 VAL_PTR = &gnss_tod_msec_tvb
|
||||
tvbuff_t *gnss_tod_msec_tvb = NULL;
|
||||
%(DEFAULT_BODY)s
|
||||
if (gnss_tod_msec_tvb) {
|
||||
asn1_ctx_t asn1_ctx;
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, actx->pinfo);
|
||||
dissect_per_constrained_integer(gnss_tod_msec_tvb, 0, &asn1_ctx, tree, hf_index, 0U, 3599999U, NULL, FALSE);
|
||||
}
|
||||
|
||||
#.FN_BODY AbsoluteTimeInfo-r10 VAL_PTR = &abs_time_info_tvb
|
||||
tvbuff_t *abs_time_info_tvb = NULL;
|
||||
%(DEFAULT_BODY)s
|
||||
#.FN_FTR AbsoluteTimeInfo-r10
|
||||
if (abs_time_info_tvb) {
|
||||
const gchar *str;
|
||||
proto_tree *subtree;
|
||||
subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_neighCellConfig);
|
||||
str = tvb_bcd_dig_to_ep_str(abs_time_info_tvb, 0, 6, NULL, FALSE);
|
||||
proto_tree_add_text(subtree, abs_time_info_tvb, 0, 6, "%c%c-%c%c-%c%c %c%c:%c%c:%c%c", str[0], str[1],
|
||||
str[2], str[3], str[4], str[5], str[6], str[7], str[8], str[9], str[10], str[11]);
|
||||
}
|
||||
|
||||
#.TYPE_ATTR
|
||||
SystemInformationBlockType9/hnb-Name TYPE=FT_STRING DISPLAY=BASE_NONE
|
||||
|
||||
|
|
@ -375,6 +495,10 @@ col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformationBlockType1 ");
|
|||
|
||||
col_append_str(actx->pinfo->cinfo, COL_INFO, "MBSFNAreaConfiguration-r9 ");
|
||||
|
||||
#.FN_HDR MBMSCountingRequest-r10
|
||||
|
||||
col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCountingRequest-r10 ");
|
||||
|
||||
#.FN_HDR Paging
|
||||
|
||||
col_append_str(actx->pinfo->cinfo, COL_INFO, "Paging ");
|
||||
|
|
@ -435,6 +559,14 @@ col_append_str(actx->pinfo->cinfo, COL_INFO, "CounterCheck ");
|
|||
|
||||
col_append_str(actx->pinfo->cinfo, COL_INFO, "UEInformationRequest-r9 ");
|
||||
|
||||
#.FN_HDR LoggedMeasurementConfiguration-r10
|
||||
|
||||
col_append_str(actx->pinfo->cinfo, COL_INFO, "LoggedMeasurementConfiguration-r10 ");
|
||||
|
||||
#.FN_HDR RNReconfiguration-r10
|
||||
|
||||
col_append_str(actx->pinfo->cinfo, COL_INFO, "RNReconfiguration-r10 ");
|
||||
|
||||
#.FN_HDR RRCConnectionReestablishmentRequest
|
||||
|
||||
col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReestablishmentRequest ");
|
||||
|
|
@ -495,3 +627,15 @@ col_append_str(actx->pinfo->cinfo, COL_INFO, "UEInformationResponse-r9 ");
|
|||
|
||||
col_append_str(actx->pinfo->cinfo, COL_INFO, "ProximityIndication-r9 ");
|
||||
|
||||
#.FN_HDR RNReconfigurationComplete-r10
|
||||
|
||||
col_append_str(actx->pinfo->cinfo, COL_INFO, "RNReconfigurationComplete-r10 ");
|
||||
|
||||
#.FN_HDR MBMSCountingResponse-r10
|
||||
|
||||
col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCountingResponse-r10 ");
|
||||
|
||||
#.FN_HDR InterFreqRSTDMeasurementIndication-r10
|
||||
|
||||
col_append_str(actx->pinfo->cinfo, COL_INFO, "InterFreqRSTDMeasurementIndication-r10 ");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-lte-rrc-template.c
|
||||
* Routines for Evolved Universal Terrestrial Radio Access (E-UTRA);
|
||||
* Radio Resource Control (RRC) protocol specification
|
||||
* (3GPP TS 36.331 V9.7.0 Release 9) packet dissection
|
||||
* (3GPP TS 36.331 V10.4.0 Release 10) packet dissection
|
||||
* Copyright 2008, Vincent Helfre
|
||||
*
|
||||
* $Id$
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
#include "packet-per.h"
|
||||
#include "packet-rrc.h"
|
||||
#include "packet-gsm_a_common.h"
|
||||
|
||||
#include "packet-lpp.h"
|
||||
|
||||
#define PNAME "LTE Radio Resource Control (RRC) protocol"
|
||||
#define PSNAME "LTE RRC"
|
||||
|
|
@ -94,6 +94,38 @@ static int hf_lte_rrc_eutra_cap_feat_group_ind_29 = -1;
|
|||
static int hf_lte_rrc_eutra_cap_feat_group_ind_30 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_31 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_32 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_101 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_102 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_103 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_104 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_105 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_106 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_107 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_108 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_109 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_110 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_111 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_112 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_113 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_114 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_115 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_116 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_117 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_118 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_119 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_120 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_121 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_122 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_123 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_124 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_125 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_126 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_127 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_128 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_129 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_130 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_131 = -1;
|
||||
static int hf_lte_rrc_eutra_cap_feat_group_ind_132 = -1;
|
||||
|
||||
/* Initialize the subtree pointers */
|
||||
static int ett_lte_rrc = -1;
|
||||
|
|
@ -101,7 +133,9 @@ static int ett_lte_rrc = -1;
|
|||
#include "packet-lte-rrc-ett.c"
|
||||
|
||||
static gint ett_lte_rrc_featureGroupIndicators = -1;
|
||||
static gint ett_lte_rrc_featureGroupIndicatorsV1020 = -1;
|
||||
static gint ett_lte_rrc_neighCellConfig = -1;
|
||||
static gint ett_lte_rrc_absTimeInfo = -1;
|
||||
|
||||
/* Forward declarations */
|
||||
static int dissect_DL_DCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_);
|
||||
|
|
@ -157,8 +191,8 @@ static const true_false_string lte_rrc_eutra_cap_feat_group_ind_12_val = {
|
|||
"EUTRA RRC_CONNECTED to CDMA2000 HRPD Active handover - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_13_val = {
|
||||
"Inter-frequency handover - Supported",
|
||||
"Inter-frequency handover - Not supported"
|
||||
"Inter-frequency handover (within FDD or TDD) - Supported",
|
||||
"Inter-frequency handover (within FDD or TDD) - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_14_val = {
|
||||
"Measurement reporting event: Event A4 - Neighbour > threshold; Measurement reporting event: Event A5 - Serving < threshold1 & Neighbour > threshold2 - Supported",
|
||||
|
|
@ -173,8 +207,8 @@ static const true_false_string lte_rrc_eutra_cap_feat_group_ind_16_val = {
|
|||
"non-ANR related periodical measurement reporting - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_17_val = {
|
||||
"Periodical measurement reporting for SON / ANR; ANR related intra-frequency measurement reporting events - Supported",
|
||||
"Periodical measurement reporting for SON / ANR; ANR related intra-frequency measurement reporting events - Not supported"
|
||||
"ANR related intra-frequency measurement reporting events - Supported",
|
||||
"ANR related intra-frequency measurement reporting events - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_18_val = {
|
||||
"ANR related inter-frequency measurement reporting events - Supported",
|
||||
|
|
@ -236,6 +270,134 @@ static const true_false_string lte_rrc_eutra_cap_feat_group_ind_32_val = {
|
|||
"Undefined - Supported",
|
||||
"Undefined - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_101_val = {
|
||||
"DMRS with OCC (orthogonal cover code) and SGH (sequence group hopping) disabling - Supported",
|
||||
"DMRS with OCC (orthogonal cover code) and SGH (sequence group hopping) disabling - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_102_val = {
|
||||
"Trigger type 1 SRS (aperiodic SRS) transmission (Up to X ports) - Supported",
|
||||
"Trigger type 1 SRS (aperiodic SRS) transmission (Up to X ports) - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_103_val = {
|
||||
"PDSCH TM9 when up to 4 CSI reference signal ports are configured - Supported",
|
||||
"PDSCH TM9 when up to 4 CSI reference signal ports are configured - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_104_val = {
|
||||
"PDSCH TM9 for TDD when 8 CSI reference signal ports are configured - Supported",
|
||||
"PDSCH TM9 for TDD when 8 CSI reference signal ports are configured - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_105_val = {
|
||||
"PUCCH RM2-0 when PDSCH TM9 is configured and RM2-1 when PDSCH TM9 and up to 4 CSI reference signal ports are configured - Supported",
|
||||
"PUCCH RM2-0 when PDSCH TM9 is configured and RM2-1 when PDSCH TM9 and up to 4 CSI reference signal ports are configured - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_106_val = {
|
||||
"PUCCH RM2-1 when PDSCH TM9 and 8 CSI reference signal ports are configured - Supported",
|
||||
"PUCCH RM2-1 when PDSCH TM9 and 8 CSI reference signal ports are configured - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_107_val = {
|
||||
"PUSCH RM2-0 when PDSCH TM9 is configured and RM2-2 when PDSCH TM9 and up to 4 CSI reference signal ports are configured - Supported",
|
||||
"PUSCH RM2-0 when PDSCH TM9 is configured and RM2-2 when PDSCH TM9 and up to 4 CSI reference signal ports are configured - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_108_val = {
|
||||
"PUSCH RM2-2 when PDSCH TM9 and 8 CSI reference signal ports are configured - Supported",
|
||||
"PUSCH RM2-2 when PDSCH TM9 and 8 CSI reference signal ports are configured - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_109_val = {
|
||||
"PUCCH RM1-1 submode 1 - Supported",
|
||||
"PUCCH RM1-1 submode 1 - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_110_val = {
|
||||
"PUCCH RM1-1 submode 2 - Supported",
|
||||
"PUCCH RM1-1 submode 2 - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_111_val = {
|
||||
"Measurement reporting trigger Event A6 - Supported",
|
||||
"Measurement reporting trigger Event A6 - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_112_val = {
|
||||
"SCell addition within the Handover to EUTRA procedure - Supported",
|
||||
"SCell addition within the Handover to EUTRA procedure - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_113_val = {
|
||||
"Trigger type 0 SRS (periodic SRS) transmission on X Serving Cells - Supported",
|
||||
"Trigger type 0 SRS (periodic SRS) transmission on X Serving Cells - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_114_val = {
|
||||
"Reporting of both UTRA CPICH RSCP and Ec/N0 in a Measurement Report - Supported",
|
||||
"Reporting of both UTRA CPICH RSCP and Ec/N0 in a Measurement Report - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_115_val = {
|
||||
"Time domain ICIC RLM/RRM / ICIC RRM / ICIC CSI measurement sf restriction for the serving cell / neighbour cells - Supported",
|
||||
"Time domain ICIC RLM/RRM / ICIC RRM / ICIC CSI measurement sf restriction for the serving cell / neighbour cells - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_116_val = {
|
||||
"Relative transmit phase continuity for spatial multiplexing in UL - Supported",
|
||||
"Relative transmit phase continuity for spatial multiplexing in UL - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_117_val = {
|
||||
"Undefined - Supported",
|
||||
"Undefined - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_118_val = {
|
||||
"Undefined - Supported",
|
||||
"Undefined - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_119_val = {
|
||||
"Undefined - Supported",
|
||||
"Undefined - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_120_val = {
|
||||
"Undefined - Supported",
|
||||
"Undefined - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_121_val = {
|
||||
"Undefined - Supported",
|
||||
"Undefined - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_122_val = {
|
||||
"Undefined - Supported",
|
||||
"Undefined - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_123_val = {
|
||||
"Undefined - Supported",
|
||||
"Undefined - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_124_val = {
|
||||
"Undefined - Supported",
|
||||
"Undefined - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_125_val = {
|
||||
"Undefined - Supported",
|
||||
"Undefined - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_126_val = {
|
||||
"Undefined - Supported",
|
||||
"Undefined - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_127_val = {
|
||||
"Undefined - Supported",
|
||||
"Undefined - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_128_val = {
|
||||
"Undefined - Supported",
|
||||
"Undefined - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_129_val = {
|
||||
"Undefined - Supported",
|
||||
"Undefined - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_130_val = {
|
||||
"Undefined - Supported",
|
||||
"Undefined - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_131_val = {
|
||||
"Undefined - Supported",
|
||||
"Undefined - Not supported"
|
||||
};
|
||||
static const true_false_string lte_rrc_eutra_cap_feat_group_ind_132_val = {
|
||||
"Undefined - Supported",
|
||||
"Undefined - Not supported"
|
||||
};
|
||||
#include "packet-lte-rrc-fn.c"
|
||||
|
||||
static void
|
||||
|
|
@ -471,6 +633,134 @@ void proto_register_lte_rrc(void) {
|
|||
{ "Indicator 32", "lte-rrc.eutra_cap_feat_group_ind_32",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_32_val), 0,
|
||||
"EUTRA Feature Group Indicator 32", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_101,
|
||||
{ "Indicator 101", "lte-rrc.eutra_cap_feat_group_ind_101",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_101_val), 0,
|
||||
"EUTRA Feature Group Indicator 101", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_102,
|
||||
{ "Indicator 102", "lte-rrc.eutra_cap_feat_group_ind_102",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_102_val), 0,
|
||||
"EUTRA Feature Group Indicator 102", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_103,
|
||||
{ "Indicator 103", "lte-rrc.eutra_cap_feat_group_ind_103",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_103_val), 0,
|
||||
"EUTRA Feature Group Indicator 103", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_104,
|
||||
{ "Indicator 104", "lte-rrc.eutra_cap_feat_group_ind_104",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_104_val), 0,
|
||||
"EUTRA Feature Group Indicator 104", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_105,
|
||||
{ "Indicator 105", "lte-rrc.eutra_cap_feat_group_ind_105",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_105_val), 0,
|
||||
"EUTRA Feature Group Indicator 105", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_106,
|
||||
{ "Indicator 106", "lte-rrc.eutra_cap_feat_group_ind_106",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_106_val), 0,
|
||||
"EUTRA Feature Group Indicator 106", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_107,
|
||||
{ "Indicator 107", "lte-rrc.eutra_cap_feat_group_ind_107",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_107_val), 0,
|
||||
"EUTRA Feature Group Indicator 107", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_108,
|
||||
{ "Indicator 108", "lte-rrc.eutra_cap_feat_group_ind_108",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_108_val), 0,
|
||||
"EUTRA Feature Group Indicator 108", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_109,
|
||||
{ "Indicator 109", "lte-rrc.eutra_cap_feat_group_ind_109",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_109_val), 0,
|
||||
"EUTRA Feature Group Indicator 109", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_110,
|
||||
{ "Indicator 110", "lte-rrc.eutra_cap_feat_group_ind_110",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_110_val), 0,
|
||||
"EUTRA Feature Group Indicator 110", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_111,
|
||||
{ "Indicator 111", "lte-rrc.eutra_cap_feat_group_ind_111",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_111_val), 0,
|
||||
"EUTRA Feature Group Indicator 111", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_112,
|
||||
{ "Indicator 112", "lte-rrc.eutra_cap_feat_group_ind_112",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_112_val), 0,
|
||||
"EUTRA Feature Group Indicator 112", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_113,
|
||||
{ "Indicator 113", "lte-rrc.eutra_cap_feat_group_ind_113",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_113_val), 0,
|
||||
"EUTRA Feature Group Indicator 113", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_114,
|
||||
{ "Indicator 114", "lte-rrc.eutra_cap_feat_group_ind_114",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_114_val), 0,
|
||||
"EUTRA Feature Group Indicator 114", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_115,
|
||||
{ "Indicator 115", "lte-rrc.eutra_cap_feat_group_ind_115",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_115_val), 0,
|
||||
"EUTRA Feature Group Indicator 115", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_116,
|
||||
{ "Indicator 116", "lte-rrc.eutra_cap_feat_group_ind_116",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_116_val), 0,
|
||||
"EUTRA Feature Group Indicator 116", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_117,
|
||||
{ "Indicator 117", "lte-rrc.eutra_cap_feat_group_ind_117",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_117_val), 0,
|
||||
"EUTRA Feature Group Indicator 117", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_118,
|
||||
{ "Indicator 118", "lte-rrc.eutra_cap_feat_group_ind_118",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_118_val), 0,
|
||||
"EUTRA Feature Group Indicator 118", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_119,
|
||||
{ "Indicator 119", "lte-rrc.eutra_cap_feat_group_ind_119",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_119_val), 0,
|
||||
"EUTRA Feature Group Indicator 119", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_120,
|
||||
{ "Indicator 120", "lte-rrc.eutra_cap_feat_group_ind_120",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_120_val), 0,
|
||||
"EUTRA Feature Group Indicator 120", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_121,
|
||||
{ "Indicator 121", "lte-rrc.eutra_cap_feat_group_ind_121",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_121_val), 0,
|
||||
"EUTRA Feature Group Indicator 121", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_122,
|
||||
{ "Indicator 122", "lte-rrc.eutra_cap_feat_group_ind_122",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_122_val), 0,
|
||||
"EUTRA Feature Group Indicator 122", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_123,
|
||||
{ "Indicator 123", "lte-rrc.eutra_cap_feat_group_ind_123",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_123_val), 0,
|
||||
"EUTRA Feature Group Indicator 123", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_124,
|
||||
{ "Indicator 124", "lte-rrc.eutra_cap_feat_group_ind_124",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_124_val), 0,
|
||||
"EUTRA Feature Group Indicator 124", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_125,
|
||||
{ "Indicator 125", "lte-rrc.eutra_cap_feat_group_ind_125",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_125_val), 0,
|
||||
"EUTRA Feature Group Indicator 125", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_126,
|
||||
{ "Indicator 126", "lte-rrc.eutra_cap_feat_group_ind_126",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_126_val), 0,
|
||||
"EUTRA Feature Group Indicator 126", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_127,
|
||||
{ "Indicator 127", "lte-rrc.eutra_cap_feat_group_ind_127",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_127_val), 0,
|
||||
"EUTRA Feature Group Indicator 127", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_128,
|
||||
{ "Indicator 128", "lte-rrc.eutra_cap_feat_group_ind_128",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_128_val), 0,
|
||||
"EUTRA Feature Group Indicator 128", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_129,
|
||||
{ "Indicator 129", "lte-rrc.eutra_cap_feat_group_ind_129",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_129_val), 0,
|
||||
"EUTRA Feature Group Indicator 129", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_130,
|
||||
{ "Indicator 130", "lte-rrc.eutra_cap_feat_group_ind_130",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_130_val), 0,
|
||||
"EUTRA Feature Group Indicator 130", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_131,
|
||||
{ "Indicator 131", "lte-rrc.eutra_cap_feat_group_ind_131",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_131_val), 0,
|
||||
"EUTRA Feature Group Indicator 131", HFILL }},
|
||||
{ &hf_lte_rrc_eutra_cap_feat_group_ind_132,
|
||||
{ "Indicator 132", "lte-rrc.eutra_cap_feat_group_ind_132",
|
||||
FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_eutra_cap_feat_group_ind_132_val), 0,
|
||||
"EUTRA Feature Group Indicator 132", HFILL }},
|
||||
};
|
||||
|
||||
/* List of subtrees */
|
||||
|
|
@ -479,7 +769,9 @@ void proto_register_lte_rrc(void) {
|
|||
#include "packet-lte-rrc-ettarr.c"
|
||||
|
||||
&ett_lte_rrc_featureGroupIndicators,
|
||||
&ett_lte_rrc_featureGroupIndicatorsV1020,
|
||||
&ett_lte_rrc_neighCellConfig,
|
||||
&ett_lte_rrc_absTimeInfo,
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -220,6 +220,7 @@ set(ASN1_DISSECTOR_SRC
|
|||
dissectors/packet-lcsap.c
|
||||
dissectors/packet-logotypecertextn.c
|
||||
dissectors/packet-lppa.c
|
||||
dissectors/packet-lte-rrc.c
|
||||
dissectors/packet-mms.c
|
||||
dissectors/packet-mpeg-audio.c
|
||||
dissectors/packet-mpeg-pes.c
|
||||
|
|
@ -268,7 +269,6 @@ set(DIRTY_ASN1_DISSECTOR_SRC
|
|||
dissectors/packet-gsm_map.c
|
||||
dissectors/packet-ldap.c
|
||||
dissectors/packet-lpp.c
|
||||
dissectors/packet-lte-rrc.c
|
||||
dissectors/packet-nbap.c
|
||||
dissectors/packet-p1.c
|
||||
dissectors/packet-pcap.c
|
||||
|
|
|
|||
|
|
@ -60,6 +60,9 @@ static int proto_lpp = -1;
|
|||
/*--- Included file: packet-lpp-hf.c ---*/
|
||||
#line 1 "../../asn1/lpp/packet-lpp-hf.c"
|
||||
static int hf_lpp_LPP_Message_PDU = -1; /* LPP_Message */
|
||||
static int hf_lpp_lpp_Ellipsoid_Point_PDU = -1; /* Ellipsoid_Point */
|
||||
static int hf_lpp_lpp_EllipsoidPointWithAltitude_PDU = -1; /* EllipsoidPointWithAltitude */
|
||||
static int hf_lpp_lpp_HorizontalVelocity_PDU = -1; /* HorizontalVelocity */
|
||||
static int hf_lpp_transactionID = -1; /* LPP_TransactionID */
|
||||
static int hf_lpp_endTransaction = -1; /* BOOLEAN */
|
||||
static int hf_lpp_sequenceNumber = -1; /* SequenceNumber */
|
||||
|
|
@ -1498,7 +1501,7 @@ static const per_sequence_t RequestCapabilities_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_lpp_RequestCapabilities(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 29 "../../asn1/lpp/lpp.cnf"
|
||||
#line 39 "../../asn1/lpp/lpp.cnf"
|
||||
|
||||
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Request Capabilities");
|
||||
|
||||
|
|
@ -2282,7 +2285,7 @@ static const per_sequence_t ProvideCapabilities_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_lpp_ProvideCapabilities(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 33 "../../asn1/lpp/lpp.cnf"
|
||||
#line 43 "../../asn1/lpp/lpp.cnf"
|
||||
|
||||
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Provide Capabilities");
|
||||
|
||||
|
|
@ -3043,7 +3046,7 @@ static const per_sequence_t RequestAssistanceData_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_lpp_RequestAssistanceData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 37 "../../asn1/lpp/lpp.cnf"
|
||||
#line 47 "../../asn1/lpp/lpp.cnf"
|
||||
|
||||
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Request Assistance Data");
|
||||
|
||||
|
|
@ -5955,7 +5958,7 @@ static const per_sequence_t ProvideAssistanceData_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_lpp_ProvideAssistanceData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 41 "../../asn1/lpp/lpp.cnf"
|
||||
#line 51 "../../asn1/lpp/lpp.cnf"
|
||||
|
||||
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Provide Assistance Data");
|
||||
|
||||
|
|
@ -6353,7 +6356,7 @@ static const per_sequence_t RequestLocationInformation_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_lpp_RequestLocationInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 45 "../../asn1/lpp/lpp.cnf"
|
||||
#line 55 "../../asn1/lpp/lpp.cnf"
|
||||
|
||||
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Request Location Information");
|
||||
|
||||
|
|
@ -7537,7 +7540,7 @@ static const per_sequence_t ProvideLocationInformation_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_lpp_ProvideLocationInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 49 "../../asn1/lpp/lpp.cnf"
|
||||
#line 59 "../../asn1/lpp/lpp.cnf"
|
||||
|
||||
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Provide Location Information");
|
||||
|
||||
|
|
@ -7664,7 +7667,7 @@ static const per_sequence_t Abort_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_lpp_Abort(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 53 "../../asn1/lpp/lpp.cnf"
|
||||
#line 63 "../../asn1/lpp/lpp.cnf"
|
||||
|
||||
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Abort");
|
||||
|
||||
|
|
@ -7751,7 +7754,7 @@ static const per_choice_t Error_choice[] = {
|
|||
|
||||
static int
|
||||
dissect_lpp_Error(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 57 "../../asn1/lpp/lpp.cnf"
|
||||
#line 67 "../../asn1/lpp/lpp.cnf"
|
||||
|
||||
col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Error");
|
||||
|
||||
|
|
@ -7860,7 +7863,7 @@ static const per_sequence_t LPP_Message_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_lpp_LPP_Message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 15 "../../asn1/lpp/lpp.cnf"
|
||||
#line 25 "../../asn1/lpp/lpp.cnf"
|
||||
|
||||
proto_tree_add_item(tree, proto_lpp, tvb, 0, -1, ENC_NA);
|
||||
|
||||
|
|
@ -7882,6 +7885,30 @@ static int dissect_LPP_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr
|
|||
offset += 7; offset >>= 3;
|
||||
return offset;
|
||||
}
|
||||
int dissect_lpp_Ellipsoid_Point_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, FALSE, pinfo);
|
||||
offset = dissect_lpp_Ellipsoid_Point(tvb, offset, &asn1_ctx, tree, hf_lpp_lpp_Ellipsoid_Point_PDU);
|
||||
offset += 7; offset >>= 3;
|
||||
return offset;
|
||||
}
|
||||
int dissect_lpp_EllipsoidPointWithAltitude_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, FALSE, pinfo);
|
||||
offset = dissect_lpp_EllipsoidPointWithAltitude(tvb, offset, &asn1_ctx, tree, hf_lpp_lpp_EllipsoidPointWithAltitude_PDU);
|
||||
offset += 7; offset >>= 3;
|
||||
return offset;
|
||||
}
|
||||
int dissect_lpp_HorizontalVelocity_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, FALSE, pinfo);
|
||||
offset = dissect_lpp_HorizontalVelocity(tvb, offset, &asn1_ctx, tree, hf_lpp_lpp_HorizontalVelocity_PDU);
|
||||
offset += 7; offset >>= 3;
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
/*--- End of included file: packet-lpp-fn.c ---*/
|
||||
|
|
@ -7901,6 +7928,18 @@ void proto_register_lpp(void) {
|
|||
{ "LPP-Message", "lpp.LPP_Message",
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_lpp_lpp_Ellipsoid_Point_PDU,
|
||||
{ "Ellipsoid-Point", "lpp.Ellipsoid_Point",
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_lpp_lpp_EllipsoidPointWithAltitude_PDU,
|
||||
{ "EllipsoidPointWithAltitude", "lpp.EllipsoidPointWithAltitude",
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_lpp_lpp_HorizontalVelocity_PDU,
|
||||
{ "HorizontalVelocity", "lpp.HorizontalVelocity",
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_lpp_transactionID,
|
||||
{ "transactionID", "lpp.transactionID",
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue