diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-07-08 17:06:21 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-07-08 15:17:17 +0000 |
| commit | ac52c06038d919b94e77c7d0c5bdb1e3e659815c (patch) | |
| tree | df71c97ba991b1d6599b0dd3e44911b14e052ba2 /epan/dissectors/packet-rrc.c | |
| parent | 32ae5735e3fa4a650fd679cfad6b70ac89872ecd (diff) | |
RRC: fix ASN.1 description by manually adding CR5591
Without it, dual-band DF-3C feature does not work
Change-Id: I95d4a7320b77c6093f5d51efdbb2b21af0deab11
Reviewed-on: https://code.wireshark.org/review/2942
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-rrc.c')
| -rw-r--r-- | epan/dissectors/packet-rrc.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index dace418fce..ec4954da95 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -30,7 +30,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Ref: 3GPP TS 25.331 V11.8.0 (2013-12) + * Ref: 3GPP TS 25.331 V11.8.0 (2013-12) + CR5591 */ /** @@ -3397,9 +3397,9 @@ static int hf_rrc_uRNTI_Group = -1; /* U_RNTI_Group */ static int hf_rrc_gsm900 = -1; /* BOOLEAN */ static int hf_rrc_dcs1800 = -1; /* BOOLEAN */ static int hf_rrc_gsm1900 = -1; /* BOOLEAN */ -static int hf_rrc_numberOfCellsBandA = -1; /* INTEGER_2_6 */ +static int hf_rrc_numberOfCellsBandA = -1; /* INTEGER_1_6 */ static int hf_rrc_numberOfFrequenciesBandA = -1; /* INTEGER_1_3 */ -static int hf_rrc_numberOfCellsBandB = -1; /* INTEGER_2_6 */ +static int hf_rrc_numberOfCellsBandB = -1; /* INTEGER_1_6 */ static int hf_rrc_numberOfFrequenciesBandB = -1; /* INTEGER_1_3 */ static int hf_rrc_MultiflowCapabBandCombList_item = -1; /* MultiflowCapabBandCombination */ static int hf_rrc_mimoInDifferentBands = -1; /* MultiflowMIMOCapability */ @@ -120984,20 +120984,10 @@ dissect_rrc_GANSS_Mode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, } - -static int -dissect_rrc_INTEGER_2_6(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 2U, 6U, NULL, FALSE); - - return offset; -} - - static const per_sequence_t MultiflowCapabBandCombination_sequence[] = { - { &hf_rrc_numberOfCellsBandA, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_INTEGER_2_6 }, + { &hf_rrc_numberOfCellsBandA, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_INTEGER_1_6 }, { &hf_rrc_numberOfFrequenciesBandA, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_INTEGER_1_3 }, - { &hf_rrc_numberOfCellsBandB, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_INTEGER_2_6 }, + { &hf_rrc_numberOfCellsBandB, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_INTEGER_1_6 }, { &hf_rrc_numberOfFrequenciesBandB, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_INTEGER_1_3 }, { NULL, 0, 0, NULL } }; @@ -156306,7 +156296,7 @@ void proto_register_rrc(void) { { &hf_rrc_numberOfCellsBandA, { "numberOfCellsBandA", "rrc.numberOfCellsBandA", FT_UINT32, BASE_DEC, NULL, 0, - "INTEGER_2_6", HFILL }}, + "INTEGER_1_6", HFILL }}, { &hf_rrc_numberOfFrequenciesBandA, { "numberOfFrequenciesBandA", "rrc.numberOfFrequenciesBandA", FT_UINT32, BASE_DEC, NULL, 0, @@ -156314,7 +156304,7 @@ void proto_register_rrc(void) { { &hf_rrc_numberOfCellsBandB, { "numberOfCellsBandB", "rrc.numberOfCellsBandB", FT_UINT32, BASE_DEC, NULL, 0, - "INTEGER_2_6", HFILL }}, + "INTEGER_1_6", HFILL }}, { &hf_rrc_numberOfFrequenciesBandB, { "numberOfFrequenciesBandB", "rrc.numberOfFrequenciesBandB", FT_UINT32, BASE_DEC, NULL, 0, |