diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-08-22 19:55:25 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-08-22 19:55:25 +0000 |
| commit | 75f4fa5b4be443418a1128fe254dd3e3cbf850b1 (patch) | |
| tree | 6102d45f419401067bc8f55c5c57c892d4ce41d9 | |
| parent | 9e7ce8b817dc9b6a26ae3544628aad377d233ac5 (diff) | |
| download | wireshark-75f4fa5b4be443418a1128fe254dd3e3cbf850b1.tar.gz | |
Remove tree check when dissecting PCCH message so as to avoid filtering expert info on first pass
svn path=/trunk/; revision=51477
| -rw-r--r-- | asn1/lte-rrc/packet-lte-rrc-template.c | 8 | ||||
| -rw-r--r-- | epan/dissectors/packet-lte-rrc.c | 14 |
2 files changed, 9 insertions, 13 deletions
diff --git a/asn1/lte-rrc/packet-lte-rrc-template.c b/asn1/lte-rrc/packet-lte-rrc-template.c index d0c42258b2..1f7d1f22f8 100644 --- a/asn1/lte-rrc/packet-lte-rrc-template.c +++ b/asn1/lte-rrc/packet-lte-rrc-template.c @@ -2157,11 +2157,9 @@ dissect_lte_rrc_PCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *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); - } + 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 diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index 21849ed4db..93c858d1af 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -34582,11 +34582,9 @@ dissect_lte_rrc_PCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *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); - } + 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 @@ -43138,7 +43136,7 @@ void proto_register_lte_rrc(void) { NULL, HFILL }}, /*--- End of included file: packet-lte-rrc-hfarr.c ---*/ -#line 2204 "../../asn1/lte-rrc/packet-lte-rrc-template.c" +#line 2202 "../../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", @@ -44649,7 +44647,7 @@ void proto_register_lte_rrc(void) { &ett_lte_rrc_CandidateCellInfo_r10, /*--- End of included file: packet-lte-rrc-ettarr.c ---*/ -#line 2627 "../../asn1/lte-rrc/packet-lte-rrc-template.c" +#line 2625 "../../asn1/lte-rrc/packet-lte-rrc-template.c" &ett_lte_rrc_featureGroupIndicators, &ett_lte_rrc_featureGroupIndRel9Add, @@ -44716,7 +44714,7 @@ void proto_register_lte_rrc(void) { /*--- End of included file: packet-lte-rrc-dis-reg.c ---*/ -#line 2678 "../../asn1/lte-rrc/packet-lte-rrc-template.c" +#line 2676 "../../asn1/lte-rrc/packet-lte-rrc-template.c" register_init_routine(<e_rrc_init_protocol); } |