Let's be consistent and display lte_rrc root for all LTE RRC messages

svn path=/trunk/; revision=45080

5 files changed, 105 insertions, 81 deletions

diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c
index 2dd9b5faa8..8b893f08c2 100644
--- a/epan/dissectors/packet-catapult-dct2000.c
+++ b/epan/dissectors/packet-catapult-dct2000.c
@@ -1012,14 +1012,14 @@ static void dissect_rrc_lte(tvbuff_t *tvb, gint offset,
                 protocol_handle = find_dissector("lte_rrc.dl_ccch");
                 break;
             case Channel_PCCH:
-                protocol_handle = find_dissector("lte-rrc.pcch");
+                protocol_handle = find_dissector("lte_rrc.pcch");
                 break;
             case Channel_BCCH:
                 if (bcch_transport == 1) {
-                    protocol_handle = find_dissector("lte-rrc.bcch.bch");
+                    protocol_handle = find_dissector("lte_rrc.bcch_bch");
                 }
                 else {
-                    protocol_handle = find_dissector("lte-rrc.bcch.dl.sch");
+                    protocol_handle = find_dissector("lte_rrc.bcch_dl_sch");
                 }
                 break;
 
diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c
index 8547b0ad80..d4b5c9cd9c 100644
--- a/epan/dissectors/packet-lte-rrc.c
+++ b/epan/dissectors/packet-lte-rrc.c
@@ -140,7 +140,7 @@ typedef enum _RAT_Type_enum {
 } RAT_Type_enum;
 
 /*--- End of included file: packet-lte-rrc-val.h ---*/
-#line 59 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 57 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
 
 /* Initialize the protocol and registered fields */
 static int proto_lte_rrc = -1;
@@ -1855,7 +1855,7 @@ static int hf_lte_rrc_CandidateCellInfoList_r10_item = -1;  /* CandidateCellInfo
 static int hf_lte_rrc_dummy_eag_field = -1; /* never registered */ 
 
 /*--- End of included file: packet-lte-rrc-hf.c ---*/
-#line 64 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 62 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
 
 static int hf_lte_rrc_eutra_cap_feat_group_ind_1 = -1;
 static int hf_lte_rrc_eutra_cap_feat_group_ind_2 = -1;
@@ -2835,7 +2835,7 @@ static gint ett_lte_rrc_CandidateCellInfoList_r10 = -1;
 static gint ett_lte_rrc_CandidateCellInfo_r10 = -1;
 
 /*--- End of included file: packet-lte-rrc-ett.c ---*/
-#line 166 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 164 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
 
 static gint ett_lte_rrc_featureGroupIndicators = -1;
 static gint ett_lte_rrc_featureGroupIndRel9Add = -1;
@@ -27860,103 +27860,135 @@ static int dissect_SystemInformationBlockType1_v890_IEs_PDU(tvbuff_t *tvb _U_, p
 
 
 /*--- End of included file: packet-lte-rrc-fn.c ---*/
-#line 1675 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 1673 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
 
 static void
 dissect_lte_rrc_DL_CCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-	proto_item *ti;
-	proto_tree *lte_rrc_tree;
+  proto_item *ti;
+  proto_tree *lte_rrc_tree;
 
-	col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC DL_CCCH");
-	col_clear(pinfo->cinfo, COL_INFO);
-	if (tree) {
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC DL_CCCH");
+  col_clear(pinfo->cinfo, COL_INFO);
 
-		ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
-		lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
-		dissect_DL_CCCH_Message_PDU(tvb, pinfo, lte_rrc_tree, NULL);
-	}
+  if (tree) {
+    ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
+    lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
+    dissect_DL_CCCH_Message_PDU(tvb, pinfo, lte_rrc_tree, NULL);
+  }
 }
 
 static void
 dissect_lte_rrc_DL_DCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-	proto_item *ti;
-	proto_tree *lte_rrc_tree;
-
-	col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC DL_DCCH");
-	col_clear(pinfo->cinfo, COL_INFO);
-	if (tree) {
-
-		ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
-		lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
-		dissect_DL_DCCH_Message_PDU(tvb, pinfo, lte_rrc_tree, NULL);
-	}
+  proto_item *ti;
+  proto_tree *lte_rrc_tree;
+
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC DL_DCCH");
+  col_clear(pinfo->cinfo, COL_INFO);
+  
+  if (tree) {
+    ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
+    lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
+    dissect_DL_DCCH_Message_PDU(tvb, pinfo, lte_rrc_tree, NULL);
+  }
 }
 
 
 static void
 dissect_lte_rrc_UL_CCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-	proto_item *ti;
-	proto_tree *lte_rrc_tree;
+  proto_item *ti;
+  proto_tree *lte_rrc_tree;
 
-	col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC UL_CCCH");
-	col_clear(pinfo->cinfo, COL_INFO);
-	if (tree) {
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC UL_CCCH");
+  col_clear(pinfo->cinfo, COL_INFO);
 
-		ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
-		lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
-		dissect_UL_CCCH_Message_PDU(tvb, pinfo, lte_rrc_tree, NULL);
-	}
+  if (tree) {
+    ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
+    lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
+    dissect_UL_CCCH_Message_PDU(tvb, pinfo, lte_rrc_tree, NULL);
+  }
 }
 
 static void
 dissect_lte_rrc_UL_DCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-	proto_item *ti;
-	proto_tree *lte_rrc_tree;
+  proto_item *ti;
+  proto_tree *lte_rrc_tree;
 
-	col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC UL_DCCH");
-	col_clear(pinfo->cinfo, COL_INFO);
-	if (tree) {
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC UL_DCCH");
+  col_clear(pinfo->cinfo, COL_INFO);
 
-		ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
-		lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
-		dissect_UL_DCCH_Message_PDU(tvb, pinfo, lte_rrc_tree, NULL);
-	}
+  if (tree) {
+    ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
+    lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
+    dissect_UL_DCCH_Message_PDU(tvb, pinfo, lte_rrc_tree, NULL);
+  }
 }
 
 static void
 dissect_lte_rrc_BCCH_BCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-	proto_item *ti;
-	proto_tree *lte_rrc_tree;
+  proto_item *ti;
+  proto_tree *lte_rrc_tree;
 
-	col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC BCCH_BCH");
-	col_clear(pinfo->cinfo, COL_INFO);
-	if (tree) {
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC BCCH_BCH");
+  col_clear(pinfo->cinfo, COL_INFO);
 
-		ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
-		lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
-		dissect_BCCH_BCH_Message_PDU(tvb, pinfo, lte_rrc_tree, NULL);
-	}
+  if (tree) {
+    ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
+    lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
+    dissect_BCCH_BCH_Message_PDU(tvb, pinfo, lte_rrc_tree, NULL);
+  }
 }
 
 static void
 dissect_lte_rrc_BCCH_DL_SCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-	proto_item *ti;
-	proto_tree *lte_rrc_tree;
+  proto_item *ti;
+  proto_tree *lte_rrc_tree;
 
-	col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC DL_SCH");
-	col_clear(pinfo->cinfo, COL_INFO);
-	if (tree) {
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC DL_SCH");
+  col_clear(pinfo->cinfo, COL_INFO);
 
-		ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
-		lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
-		dissect_BCCH_DL_SCH_Message_PDU(tvb, pinfo, lte_rrc_tree, NULL);
-	}
+  if (tree) {
+    ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
+    lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
+    dissect_BCCH_DL_SCH_Message_PDU(tvb, pinfo, lte_rrc_tree, NULL);
+  }
+}
+
+static void
+dissect_lte_rrc_PCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+  proto_item *ti;
+  proto_tree *lte_rrc_tree;
+
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC PCCH");
+  col_clear(pinfo->cinfo, COL_INFO);
+
+  if (tree) {
+    ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
+    lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
+    dissect_PCCH_Message_PDU(tvb, pinfo, lte_rrc_tree, NULL);
+  }
+}
+
+static void
+dissect_lte_rrc_MCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+  proto_item *ti;
+  proto_tree *lte_rrc_tree;
+
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC MCCH");
+  col_clear(pinfo->cinfo, COL_INFO);
+
+  if (tree) {
+    ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
+    lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
+    dissect_MCCH_Message_PDU(tvb, pinfo, lte_rrc_tree, NULL);
+  }
 }
 
 /*--- proto_register_rrc -------------------------------------------*/
@@ -34786,7 +34818,7 @@ void proto_register_lte_rrc(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-lte-rrc-hfarr.c ---*/
-#line 1780 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 1810 "../../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",
@@ -36055,7 +36087,7 @@ void proto_register_lte_rrc(void) {
     &ett_lte_rrc_CandidateCellInfo_r10,
 
 /*--- End of included file: packet-lte-rrc-ettarr.c ---*/
-#line 2171 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 2201 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
 
     &ett_lte_rrc_featureGroupIndicators,
     &ett_lte_rrc_featureGroupIndRel9Add,
@@ -36075,6 +36107,8 @@ void proto_register_lte_rrc(void) {
   register_dissector("lte_rrc.ul_dcch", dissect_lte_rrc_UL_DCCH, proto_lte_rrc);
   register_dissector("lte_rrc.bcch_bch", dissect_lte_rrc_BCCH_BCH, proto_lte_rrc);
   register_dissector("lte_rrc.bcch_dl_sch", dissect_lte_rrc_BCCH_DL_SCH, proto_lte_rrc);
+  register_dissector("lte_rrc.pcch", dissect_lte_rrc_PCCH, proto_lte_rrc);
+  register_dissector("lte_rrc.mcch", dissect_lte_rrc_MCCH, proto_lte_rrc);
 
   /* Register fields and subtrees */
   proto_register_field_array(proto_lte_rrc, hf, array_length(hf));
@@ -36097,7 +36131,7 @@ void proto_register_lte_rrc(void) {
 
 
 /*--- End of included file: packet-lte-rrc-dis-reg.c ---*/
-#line 2197 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
+#line 2229 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
 
 }
 
diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c
index 1b6244f8a3..de914919bf 100644
--- a/epan/dissectors/packet-mac-lte.c
+++ b/epan/dissectors/packet-mac-lte.c
@@ -1801,18 +1801,13 @@ static void dissect_pch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
         tvbuff_t *rrc_tvb = tvb_new_subset(tvb, offset, -1, tvb_length_remaining(tvb, offset));
 
         /* Get appropriate dissector handle */
-        dissector_handle_t protocol_handle = find_dissector("lte-rrc.pcch");
+        dissector_handle_t protocol_handle = find_dissector("lte_rrc.pcch");
 
         /* Hide raw view of bytes */
         PROTO_ITEM_SET_HIDDEN(ti);
 
         /* Call it (catch exceptions so that stats will be updated) */
-        TRY {
-            call_dissector_only(protocol_handle, rrc_tvb, pinfo, tree, NULL);
-        }
-        CATCH_ALL {
-        }
-        ENDTRY
+        call_with_catch_all(protocol_handle, rrc_tvb, pinfo, tree);
     }
 
     /* Check that this *is* downlink! */
@@ -1917,12 +1912,7 @@ static void call_rlc_dissector(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
     s_number_of_rlc_pdus_shown++;
 
     /* Call it (catch exceptions so that stats will be updated) */
-    TRY {
-        call_dissector_only(protocol_handle, srb_tvb, pinfo, tree, NULL);
-    }
-    CATCH_ALL {
-    }
-    ENDTRY
+    call_with_catch_all(protocol_handle, srb_tvb, pinfo, tree);
 
     /* Let columns be written to again */
     col_set_writable(pinfo->cinfo, TRUE);
diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c
index 41a1d854bf..6882a97bc2 100644
--- a/epan/dissectors/packet-pdcp-lte.c
+++ b/epan/dissectors/packet-pdcp-lte.c
@@ -780,7 +780,7 @@ static dissector_handle_t lookup_rrc_dissector_handle(struct pdcp_lte_info  *p_p
             }
             break;
         case Channel_PCCH:
-            rrc_handle = find_dissector("lte-rrc.pcch");
+            rrc_handle = find_dissector("lte_rrc.pcch");
             break;
         case Channel_BCCH:
             switch (p_pdcp_info->BCCHTransport) {
diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c
index 97130c7c2d..547507028f 100644
--- a/epan/dissectors/packet-rlc-lte.c
+++ b/epan/dissectors/packet-rlc-lte.c
@@ -1842,7 +1842,7 @@ static void dissect_rlc_lte_tm(tvbuff_t *tvb, packet_info *pinfo,
                 protocol_handle = find_dissector("lte_rrc.bcch_dl_sch");
                 break;
             case CHANNEL_TYPE_PCCH:
-                protocol_handle = find_dissector("lte-rrc.pcch");
+                protocol_handle = find_dissector("lte_rrc.pcch");
                 break;
 
             case CHANNEL_TYPE_SRB: