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>

diff --git a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
index 034c5bed29622d5c578aaca387865db458e826d6..e55fc318c2d38a927d5a5af811d2a0edafa4b193 100644 (file)
--- 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=&lte_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=&lte_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=&lte_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=&lte_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=&lte_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=&lte_rrc_geran_q_RxLevMin_vals_ext
 

diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c
index bca29bb946eb87404c5234cda6832231a39f6e2c..a466fc59637495b71a36ae52325d90b0f04fba7a 100644 (file)
--- 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, &lte_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, &lte_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, &lte_rrc_geran_q_RxLevMin_vals_ext, 0,
         "INTEGER_0_45", HFILL }},
     { &hf_lte_rrc_p_MaxGERAN,