LTE RRC: register dissectors for UERadioAccessCapabilityInformation(-NB) and UERadioPagingInformation(-NB)

Change-Id: Idb3c3fe2cab4ce7aff2bfe108a6bd4fb07fe44b3
Reviewed-on: https://code.wireshark.org/review/25426
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>

1 files changed, 20 insertions, 16 deletions

diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c
index 06c0ad7fa1..0bd2f6c475 100644
--- a/epan/dissectors/packet-lte-rrc.c
+++ b/epan/dissectors/packet-lte-rrc.c
@@ -277,8 +277,8 @@ static int hf_lte_rrc_lte_rrc_HandoverCommand_PDU = -1;  /* HandoverCommand */
 static int hf_lte_rrc_lte_rrc_HandoverPreparationInformation_PDU = -1;  /* HandoverPreparationInformation */
 static int hf_lte_rrc_lte_rrc_SCG_ConfigInfo_r12_PDU = -1;  /* SCG_ConfigInfo_r12 */
 static int hf_lte_rrc_lte_rrc_UEPagingCoverageInformation_PDU = -1;  /* UEPagingCoverageInformation */
-static int hf_lte_rrc_lte_rrc_UERadioAccessCapabilityInformation_PDU = -1;  /* UERadioAccessCapabilityInformation */
-static int hf_lte_rrc_lte_rrc_UERadioPagingInformation_PDU = -1;  /* UERadioPagingInformation */
+static int hf_lte_rrc_UERadioAccessCapabilityInformation_PDU = -1;  /* UERadioAccessCapabilityInformation */
+static int hf_lte_rrc_UERadioPagingInformation_PDU = -1;  /* UERadioPagingInformation */
 static int hf_lte_rrc_BCCH_BCH_Message_PDU = -1;  /* BCCH_BCH_Message */
 static int hf_lte_rrc_BCCH_BCH_Message_MBMS_PDU = -1;  /* BCCH_BCH_Message_MBMS */
 static int hf_lte_rrc_BCCH_DL_SCH_Message_PDU = -1;  /* BCCH_DL_SCH_Message */
@@ -300,8 +300,8 @@ static int hf_lte_rrc_SBCCH_SL_BCH_Message_PDU = -1;  /* SBCCH_SL_BCH_Message */
 static int hf_lte_rrc_SBCCH_SL_BCH_Message_V2X_r14_PDU = -1;  /* SBCCH_SL_BCH_Message_V2X_r14 */
 static int hf_lte_rrc_lte_rrc_HandoverPreparationInformation_NB_PDU = -1;  /* HandoverPreparationInformation_NB */
 static int hf_lte_rrc_lte_rrc_UEPagingCoverageInformation_NB_PDU = -1;  /* UEPagingCoverageInformation_NB */
-static int hf_lte_rrc_lte_rrc_UERadioAccessCapabilityInformation_NB_PDU = -1;  /* UERadioAccessCapabilityInformation_NB */
-static int hf_lte_rrc_lte_rrc_UERadioPagingInformation_NB_PDU = -1;  /* UERadioPagingInformation_NB */
+static int hf_lte_rrc_UERadioAccessCapabilityInformation_NB_PDU = -1;  /* UERadioAccessCapabilityInformation_NB */
+static int hf_lte_rrc_UERadioPagingInformation_NB_PDU = -1;  /* UERadioPagingInformation_NB */
 static int hf_lte_rrc_BCCH_BCH_Message_NB_PDU = -1;  /* BCCH_BCH_Message_NB */
 static int hf_lte_rrc_BCCH_DL_SCH_Message_NB_PDU = -1;  /* BCCH_DL_SCH_Message_NB */
 static int hf_lte_rrc_PCCH_Message_NB_PDU = -1;   /* PCCH_Message_NB */
@@ -87273,19 +87273,19 @@ int dissect_lte_rrc_UEPagingCoverageInformation_PDU(tvbuff_t *tvb _U_, packet_in
   offset += 7; offset >>= 3;
   return offset;
 }
-int dissect_lte_rrc_UERadioAccessCapabilityInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+static int dissect_UERadioAccessCapabilityInformation_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_UERadioAccessCapabilityInformation(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_UERadioAccessCapabilityInformation_PDU);
+  offset = dissect_lte_rrc_UERadioAccessCapabilityInformation(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_UERadioAccessCapabilityInformation_PDU);
   offset += 7; offset >>= 3;
   return offset;
 }
-int dissect_lte_rrc_UERadioPagingInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+static int dissect_UERadioPagingInformation_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_UERadioPagingInformation(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_UERadioPagingInformation_PDU);
+  offset = dissect_lte_rrc_UERadioPagingInformation(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_UERadioPagingInformation_PDU);
   offset += 7; offset >>= 3;
   return offset;
 }
@@ -87457,19 +87457,19 @@ int dissect_lte_rrc_UEPagingCoverageInformation_NB_PDU(tvbuff_t *tvb _U_, packet
   offset += 7; offset >>= 3;
   return offset;
 }
-int dissect_lte_rrc_UERadioAccessCapabilityInformation_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+static int dissect_UERadioAccessCapabilityInformation_NB_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_UERadioAccessCapabilityInformation_NB(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_UERadioAccessCapabilityInformation_NB_PDU);
+  offset = dissect_lte_rrc_UERadioAccessCapabilityInformation_NB(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_UERadioAccessCapabilityInformation_NB_PDU);
   offset += 7; offset >>= 3;
   return offset;
 }
-int dissect_lte_rrc_UERadioPagingInformation_NB_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+static int dissect_UERadioPagingInformation_NB_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_UERadioPagingInformation_NB(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_UERadioPagingInformation_NB_PDU);
+  offset = dissect_lte_rrc_UERadioPagingInformation_NB(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_UERadioPagingInformation_NB_PDU);
   offset += 7; offset >>= 3;
   return offset;
 }
@@ -88119,11 +88119,11 @@ void proto_register_lte_rrc(void) {
       { "UEPagingCoverageInformation", "lte-rrc.UEPagingCoverageInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_lte_rrc_lte_rrc_UERadioAccessCapabilityInformation_PDU,
+    { &hf_lte_rrc_UERadioAccessCapabilityInformation_PDU,
       { "UERadioAccessCapabilityInformation", "lte-rrc.UERadioAccessCapabilityInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_lte_rrc_lte_rrc_UERadioPagingInformation_PDU,
+    { &hf_lte_rrc_UERadioPagingInformation_PDU,
       { "UERadioPagingInformation", "lte-rrc.UERadioPagingInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
@@ -88211,11 +88211,11 @@ void proto_register_lte_rrc(void) {
       { "UEPagingCoverageInformation-NB", "lte-rrc.UEPagingCoverageInformation_NB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_lte_rrc_lte_rrc_UERadioAccessCapabilityInformation_NB_PDU,
+    { &hf_lte_rrc_UERadioAccessCapabilityInformation_NB_PDU,
       { "UERadioAccessCapabilityInformation-NB", "lte-rrc.UERadioAccessCapabilityInformation_NB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_lte_rrc_lte_rrc_UERadioPagingInformation_NB_PDU,
+    { &hf_lte_rrc_UERadioPagingInformation_NB_PDU,
       { "UERadioPagingInformation-NB", "lte-rrc.UERadioPagingInformation_NB_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
@@ -114395,6 +114395,8 @@ void proto_register_lte_rrc(void) {
 
 /*--- Included file: packet-lte-rrc-dis-reg.c ---*/
 #line 1 "./asn1/lte-rrc/packet-lte-rrc-dis-reg.c"
+  register_dissector("lte-rrc.ue_radio_access_cap_info", dissect_UERadioAccessCapabilityInformation_PDU, proto_lte_rrc);
+  register_dissector("lte-rrc.ue_radio_paging_info", dissect_UERadioPagingInformation_PDU, proto_lte_rrc);
   register_dissector("lte-rrc.bcch.bch", dissect_BCCH_BCH_Message_PDU, proto_lte_rrc);
   register_dissector("lte-rrc.bcch.bch.mbms", dissect_BCCH_BCH_Message_MBMS_PDU, proto_lte_rrc);
   register_dissector("lte-rrc.bcch.dl.sch", dissect_BCCH_DL_SCH_Message_PDU, proto_lte_rrc);
@@ -114411,6 +114413,8 @@ void proto_register_lte_rrc(void) {
   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);
+  register_dissector("lte-rrc.ue_radio_access_cap_info.nb", dissect_UERadioAccessCapabilityInformation_NB_PDU, proto_lte_rrc);
+  register_dissector("lte-rrc.ue_radio_paging_info.nb", dissect_UERadioPagingInformation_NB_PDU, proto_lte_rrc);
   register_dissector("lte-rrc.bcch.bch.nb", dissect_BCCH_BCH_Message_NB_PDU, proto_lte_rrc);
   register_dissector("lte-rrc.bcch.dl.sch.nb", dissect_BCCH_DL_SCH_Message_NB_PDU, proto_lte_rrc);
   register_dissector("lte-rrc.pcch.nb", dissect_PCCH_Message_NB_PDU, proto_lte_rrc);