diff options
| author | Pavel Strnad <pavel_strnad@hotmail.com> | 2017-06-08 15:23:53 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2017-06-08 14:33:23 +0000 |
| commit | bd5991819134fb0568d7b37c886ac79a7ad8366d (patch) | |
| tree | 437f07e0e5a24c546207980bb1339d683f2b50a2 | |
| parent | a24bcc5b359399adff73d0c856e17e566f2c9f01 (diff) | |
| download | wireshark-bd5991819134fb0568d7b37c886ac79a7ad8366d.tar.gz | |
LTE RRC: fix filtering of q-RxLevMin parameter
Ensure that filter as a different abbreviation depending on the
technology used.
Bug: 13481
Change-Id: I14782dffcf70bdb015fd705d2184ae8c42f232c5
Reviewed-on: https://code.wireshark.org/review/22039
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 3453a0b888a0e188c03012023a4e93d03764602c)
Reviewed-on: https://code.wireshark.org/review/22041
| -rw-r--r-- | epan/dissectors/asn1/lte-rrc/lte-rrc.cnf | 15 | ||||
| -rw-r--r-- | epan/dissectors/packet-lte-rrc.c | 6 |
2 files changed, 18 insertions, 3 deletions
diff --git a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf index 034c5bed29..e55fc318c2 100644 --- a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf +++ b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf @@ -950,15 +950,27 @@ BLER-Range-r12 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_BLER_Range_r12_ #.TYPE_ATTR TimeSinceFailure-r11 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +#.FIELD_ATTR +CarrierFreqUTRA-FDD/q-RxLevMin ABBREV=utra_q_RxLevMin + #.TYPE_ATTR CarrierFreqUTRA-FDD/q-RxLevMin DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_utra_q_RxLevMin_vals_ext +#.FIELD_ATTR +CarrierFreqUTRA-FDD-Ext-r12/q-RxLevMin-r12 ABBREV=utra_q_RxLevMin_r12 + #.TYPE_ATTR CarrierFreqUTRA-FDD-Ext-r12/q-RxLevMin-r12 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_utra_q_RxLevMin_vals_ext +#.FIELD_ATTR +CarrierFreqUTRA-TDD/q-RxLevMin ABBREV=utra_q_RxLevMin + #.TYPE_ATTR CarrierFreqUTRA-TDD/q-RxLevMin DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_utra_q_RxLevMin_vals_ext +#.FIELD_ATTR +CarrierFreqUTRA-TDD-r12/q-RxLevMin-r12 ABBREV=utra_q_RxLevMin_r12 + #.TYPE_ATTR CarrierFreqUTRA-TDD-r12/q-RxLevMin-r12 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_utra_q_RxLevMin_vals_ext @@ -980,6 +992,9 @@ CarrierFreqUTRA-FDD/q-QualMin DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_d #.TYPE_ATTR CarrierFreqUTRA-FDD-Ext-r12/q-QualMin-r12 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels +#.FIELD_ATTR +CarrierFreqsInfoGERAN/commonInfo/q-RxLevMin ABBREV=geran_q_RxLevMin + #.TYPE_ATTR CarrierFreqsInfoGERAN/commonInfo/q-RxLevMin DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_geran_q_RxLevMin_vals_ext diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index bca29bb946..a466fc5963 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -75864,7 +75864,7 @@ void proto_register_lte_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_lte_rrc_q_RxLevMin_01, - { "q-RxLevMin", "lte-rrc.q_RxLevMin", + { "q-RxLevMin", "lte-rrc.utra_q_RxLevMin", FT_INT32, BASE_DEC|BASE_EXT_STRING, <e_rrc_utra_q_RxLevMin_vals_ext, 0, "INTEGER_M60_M13", HFILL }}, { &hf_lte_rrc_p_MaxUTRA, @@ -75896,7 +75896,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "ARFCN_ValueUTRA", HFILL }}, { &hf_lte_rrc_q_RxLevMin_r12_01, - { "q-RxLevMin-r12", "lte-rrc.q_RxLevMin_r12", + { "q-RxLevMin-r12", "lte-rrc.utra_q_RxLevMin_r12", FT_INT32, BASE_DEC|BASE_EXT_STRING, <e_rrc_utra_q_RxLevMin_vals_ext, 0, "INTEGER_M60_M13", HFILL }}, { &hf_lte_rrc_p_MaxUTRA_r12, @@ -75960,7 +75960,7 @@ void proto_register_lte_rrc(void) { FT_BYTES, BASE_NONE, NULL, 0, "BIT_STRING_SIZE_8", HFILL }}, { &hf_lte_rrc_q_RxLevMin_02, - { "q-RxLevMin", "lte-rrc.q_RxLevMin", + { "q-RxLevMin", "lte-rrc.geran_q_RxLevMin", FT_UINT32, BASE_DEC|BASE_EXT_STRING, <e_rrc_geran_q_RxLevMin_vals_ext, 0, "INTEGER_0_45", HFILL }}, { &hf_lte_rrc_p_MaxGERAN, |