diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2018-04-06 12:26:31 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2018-04-06 11:29:02 +0000 |
commit | 64d6a7b846d4e4803382f786cde9bc4168942ca0 (patch) | |
tree | d8d9ffd1a457c13e79fb9823849250804b4f016c /epan/dissectors/packet-lte-rrc.c | |
parent | 485cec5bdfc90d968b0970e657cf24435e22fe25 (diff) |
NR RRC: upgrade dissector to v15.1.0
Change-Id: If34d8627e8dee0e9dd7c1dc72701aec57df68853
Reviewed-on: https://code.wireshark.org/review/26774
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-lte-rrc.c')
-rw-r--r-- | epan/dissectors/packet-lte-rrc.c | 52 |
1 files changed, 36 insertions, 16 deletions
diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index e830cab0cf..76fbb7d458 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -294,7 +294,7 @@ static int hf_lte_rrc_DL_DCCH_Message_PDU = -1; /* DL_DCCH_Message */ static int hf_lte_rrc_UL_CCCH_Message_PDU = -1; /* UL_CCCH_Message */ static int hf_lte_rrc_UL_DCCH_Message_PDU = -1; /* UL_DCCH_Message */ static int hf_lte_rrc_SC_MCCH_Message_r13_PDU = -1; /* SC_MCCH_Message_r13 */ -static int hf_lte_rrc_lte_rrc_UECapabilityInformation_PDU = -1; /* UECapabilityInformation */ +static int hf_lte_rrc_UECapabilityInformation_PDU = -1; /* UECapabilityInformation */ static int hf_lte_rrc_lte_rrc_RLF_Report_r9_PDU = -1; /* RLF_Report_r9 */ static int hf_lte_rrc_lte_rrc_RLF_Report_v9e0_PDU = -1; /* RLF_Report_v9e0 */ static int hf_lte_rrc_lte_rrc_UE_EUTRA_Capability_PDU = -1; /* UE_EUTRA_Capability */ @@ -1492,7 +1492,7 @@ static int hf_lte_rrc_requestReducedIntNonContComb_r13 = -1; /* T_requestReduce static int hf_lte_rrc_nonCriticalExtension_162 = -1; /* UECapabilityEnquiry_v1430_IEs */ static int hf_lte_rrc_requestDiffFallbackCombList_r14 = -1; /* BandCombinationList_r14 */ static int hf_lte_rrc_nonCriticalExtension_163 = -1; /* UECapabilityEnquiry_v1510_IEs */ -static int hf_lte_rrc_requestedFreqBandsNR_MRDC_r15 = -1; /* OCTET_STRING */ +static int hf_lte_rrc_requestedFreqBandsNR_MRDC_r15 = -1; /* T_requestedFreqBandsNR_MRDC_r15 */ static int hf_lte_rrc_nonCriticalExtension_164 = -1; /* T_nonCriticalExtension_55 */ static int hf_lte_rrc_UE_CapabilityRequest_item = -1; /* RAT_Type */ static int hf_lte_rrc_criticalExtensions_46 = -1; /* T_criticalExtensions_46 */ @@ -8951,6 +8951,7 @@ static gint ett_lte_rrc_sourceRB_ConfigNR_r15 = -1; static gint ett_lte_rrc_sourceRB_ConfigSN_NR_r15 = -1; static gint ett_lte_rrc_sourceOtherConfigSN_NR_r15 = -1; static gint ett_lte_rrc_sourceContextENDC_r15 = -1; +static gint ett_lte_rrc_requestedFreqBandsNR_MRDC_r15 = -1; static expert_field ei_lte_rrc_number_pages_le15 = EI_INIT; static expert_field ei_lte_rrc_si_info_value_changed = EI_INIT; @@ -9005,6 +9006,7 @@ static const fragment_items lte_rrc_sib12_frag_items = { /* Forward declarations */ static int dissect_DL_DCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); +static int dissect_UECapabilityInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); static const true_false_string lte_rrc_eutra_cap_feat_group_ind_1_val = { "Intra-subframe freq hopping for PUSCH scheduled by UL grant; DCI format 3a; Aperiodic CQI/PMI/RI report on PUSCH: Mode 2-0 & 2-2 - Supported", @@ -39681,7 +39683,7 @@ dissect_lte_rrc_T_sourceContextENDC_r15(tvbuff_t *tvb _U_, int offset _U_, asn1_ if (scg_config_info_tvb) { proto_tree *subtree; subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_sourceContextENDC_r15); - dissect_nr_rrc_SCG_ConfigInfo_PDU(scg_config_info_tvb, actx->pinfo, subtree, NULL); + dissect_nr_rrc_ConfigRestrictInfoSCG_PDU(scg_config_info_tvb, actx->pinfo, subtree, NULL); } @@ -43883,7 +43885,7 @@ dissect_lte_rrc_PowerCoordinationInfo_r12(tvbuff_t *tvb _U_, int offset _U_, asn static int dissect_lte_rrc_T_eutra_CapabilityInfo_r12(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_octet_string_containing_pdu_new(tvb, offset, actx, tree, hf_index, - NO_BOUND, NO_BOUND, FALSE, dissect_lte_rrc_UECapabilityInformation_PDU); + NO_BOUND, NO_BOUND, FALSE, dissect_UECapabilityInformation_PDU); return offset; } @@ -44554,7 +44556,7 @@ dissect_lte_rrc_UEPagingCoverageInformation(tvbuff_t *tvb _U_, int offset _U_, a static int dissect_lte_rrc_T_ue_RadioAccessCapabilityInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_octet_string_containing_pdu_new(tvb, offset, actx, tree, hf_index, - NO_BOUND, NO_BOUND, FALSE, dissect_lte_rrc_UECapabilityInformation_PDU); + NO_BOUND, NO_BOUND, FALSE, dissect_UECapabilityInformation_PDU); return offset; } @@ -55639,6 +55641,23 @@ dissect_lte_rrc_BandCombinationList_r14(tvbuff_t *tvb _U_, int offset _U_, asn1_ } + +static int +dissect_lte_rrc_T_requestedFreqBandsNR_MRDC_r15(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + tvbuff_t *freq_band_list_tvb = NULL; + offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, + NO_BOUND, NO_BOUND, FALSE, &freq_band_list_tvb); + + if (freq_band_list_tvb) { + proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_requestedFreqBandsNR_MRDC_r15); + dissect_nr_rrc_FreqBandList_PDU(freq_band_list_tvb, actx->pinfo, subtree, NULL); + } + + + return offset; +} + + static const per_sequence_t T_nonCriticalExtension_55_sequence[] = { { NULL, 0, 0, NULL } }; @@ -55653,7 +55672,7 @@ dissect_lte_rrc_T_nonCriticalExtension_55(tvbuff_t *tvb _U_, int offset _U_, asn static const per_sequence_t UECapabilityEnquiry_v1510_IEs_sequence[] = { - { &hf_lte_rrc_requestedFreqBandsNR_MRDC_r15, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_OCTET_STRING }, + { &hf_lte_rrc_requestedFreqBandsNR_MRDC_r15, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_T_requestedFreqBandsNR_MRDC_r15 }, { &hf_lte_rrc_nonCriticalExtension_164, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_lte_rrc_T_nonCriticalExtension_55 }, { NULL, 0, 0, NULL } }; @@ -88167,11 +88186,11 @@ static int dissect_SC_MCCH_Message_r13_PDU(tvbuff_t *tvb _U_, packet_info *pinfo offset += 7; offset >>= 3; return offset; } -int dissect_lte_rrc_UECapabilityInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { +static int dissect_UECapabilityInformation_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, FALSE, pinfo); - offset = dissect_lte_rrc_UECapabilityInformation(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_UECapabilityInformation_PDU); + offset = dissect_lte_rrc_UECapabilityInformation(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_UECapabilityInformation_PDU); offset += 7; offset >>= 3; return offset; } @@ -88522,7 +88541,7 @@ static int dissect_UE_RadioPagingInfo_NB_r13_PDU(tvbuff_t *tvb _U_, packet_info /*--- End of included file: packet-lte-rrc-fn.c ---*/ -#line 3082 "./asn1/lte-rrc/packet-lte-rrc-template.c" +#line 3084 "./asn1/lte-rrc/packet-lte-rrc-template.c" static int dissect_lte_rrc_DL_CCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) @@ -88957,7 +88976,7 @@ void proto_register_lte_rrc(void) { { "SC-MCCH-Message-r13", "lte-rrc.SC_MCCH_Message_r13_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_lte_rrc_lte_rrc_UECapabilityInformation_PDU, + { &hf_lte_rrc_UECapabilityInformation_PDU, { "UECapabilityInformation", "lte-rrc.UECapabilityInformation_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -93752,7 +93771,7 @@ void proto_register_lte_rrc(void) { { &hf_lte_rrc_requestedFreqBandsNR_MRDC_r15, { "requestedFreqBandsNR-MRDC-r15", "lte-rrc.requestedFreqBandsNR_MRDC_r15", FT_BYTES, BASE_NONE, NULL, 0, - "OCTET_STRING", HFILL }}, + NULL, HFILL }}, { &hf_lte_rrc_nonCriticalExtension_164, { "nonCriticalExtension", "lte-rrc.nonCriticalExtension_element", FT_NONE, BASE_NONE, NULL, 0, @@ -111939,7 +111958,7 @@ void proto_register_lte_rrc(void) { "CarrierFreq_NB_r13", HFILL }}, /*--- End of included file: packet-lte-rrc-hfarr.c ---*/ -#line 3442 "./asn1/lte-rrc/packet-lte-rrc-template.c" +#line 3444 "./asn1/lte-rrc/packet-lte-rrc-template.c" { &hf_lte_rrc_eutra_cap_feat_group_ind_1, { "Indicator 1", "lte-rrc.eutra_cap_feat_group_ind_1", @@ -115353,7 +115372,7 @@ void proto_register_lte_rrc(void) { &ett_lte_rrc_PCI_ARFCN_NB_r14, /*--- End of included file: packet-lte-rrc-ettarr.c ---*/ -#line 4169 "./asn1/lte-rrc/packet-lte-rrc-template.c" +#line 4171 "./asn1/lte-rrc/packet-lte-rrc-template.c" &ett_lte_rrc_featureGroupIndicators, &ett_lte_rrc_featureGroupIndRel9Add, @@ -115388,7 +115407,8 @@ void proto_register_lte_rrc(void) { &ett_lte_rrc_sourceRB_ConfigNR_r15, &ett_lte_rrc_sourceRB_ConfigSN_NR_r15, &ett_lte_rrc_sourceOtherConfigSN_NR_r15, - &ett_lte_rrc_sourceContextENDC_r15 + &ett_lte_rrc_sourceContextENDC_r15, + &ett_lte_rrc_requestedFreqBandsNR_MRDC_r15 }; static ei_register_info ei[] = { @@ -115458,7 +115478,7 @@ void proto_register_lte_rrc(void) { register_dissector("lte-rrc.ul.ccch", dissect_UL_CCCH_Message_PDU, proto_lte_rrc); register_dissector("lte-rrc.ul.dcch", dissect_UL_DCCH_Message_PDU, proto_lte_rrc); register_dissector("lte-rrc.sc.mcch", dissect_SC_MCCH_Message_r13_PDU, proto_lte_rrc); - register_dissector("lte-rrc.ue_cap_info", dissect_lte_rrc_UECapabilityInformation_PDU, proto_lte_rrc); + register_dissector("lte-rrc.ue_cap_info", dissect_UECapabilityInformation_PDU, proto_lte_rrc); register_dissector("lte-rrc.ue_eutra_cap", dissect_lte_rrc_UE_EUTRA_Capability_PDU, proto_lte_rrc); register_dissector("lte-rrc.sbcch.sl.bch", dissect_SBCCH_SL_BCH_Message_PDU, proto_lte_rrc); register_dissector("lte-rrc.sbcch.sl.bch.v2x", dissect_SBCCH_SL_BCH_Message_V2X_r14_PDU, proto_lte_rrc); @@ -115475,7 +115495,7 @@ void proto_register_lte_rrc(void) { /*--- End of included file: packet-lte-rrc-dis-reg.c ---*/ -#line 4257 "./asn1/lte-rrc/packet-lte-rrc-template.c" +#line 4260 "./asn1/lte-rrc/packet-lte-rrc-template.c" lte_rrc_etws_cmas_dcs_hash = wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(), g_direct_hash, g_direct_equal); lte_rrc_system_info_value_changed_hash = wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(), g_direct_hash, g_direct_equal); |