diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-09-11 21:21:44 +0200 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-09-11 19:27:18 +0000 |
commit | b11e9a6e188c5bfac1e22f7b1f34c21c7ea7fe44 (patch) | |
tree | 8bfdcb3f266181d174e03a9b755d00f723fc8b80 /asn1 | |
parent | 2931dc118b6c9090e03480811c38ca582f20f8f3 (diff) |
LTE RRC: remove tree tests before decoding top level messages
It prevents proper update of Info column, and various other things
Change-Id: I355c46e6f6b3f923250d6b5bf720ea052ef3b646
Reviewed-on: https://code.wireshark.org/review/10488
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/lte-rrc/packet-lte-rrc-template.c | 50 |
1 files changed, 18 insertions, 32 deletions
diff --git a/asn1/lte-rrc/packet-lte-rrc-template.c b/asn1/lte-rrc/packet-lte-rrc-template.c index 198e0bf7d6..0205a25d1d 100644 --- a/asn1/lte-rrc/packet-lte-rrc-template.c +++ b/asn1/lte-rrc/packet-lte-rrc-template.c @@ -2675,11 +2675,9 @@ dissect_lte_rrc_DL_CCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC DL_CCCH"); 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_CCCH_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_DL_CCCH_Message_PDU(tvb, pinfo, lte_rrc_tree, NULL); } static void @@ -2706,11 +2704,9 @@ dissect_lte_rrc_UL_CCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC UL_CCCH"); 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_UL_CCCH_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_UL_CCCH_Message_PDU(tvb, pinfo, lte_rrc_tree, NULL); } static void @@ -2722,11 +2718,9 @@ dissect_lte_rrc_UL_DCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC UL_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_UL_DCCH_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_UL_DCCH_Message_PDU(tvb, pinfo, lte_rrc_tree, NULL); } static void @@ -2738,11 +2732,9 @@ dissect_lte_rrc_BCCH_BCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC BCCH_BCH"); 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_BCCH_BCH_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_BCCH_BCH_Message_PDU(tvb, pinfo, lte_rrc_tree, NULL); } static void @@ -2754,8 +2746,6 @@ dissect_lte_rrc_BCCH_DL_SCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC DL_SCH"); col_clear(pinfo->cinfo, COL_INFO); - /* Dissect regardless of whether tree is set, so that we can track whether - systemInfoValue has changed */ 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); @@ -2784,11 +2774,9 @@ dissect_lte_rrc_MCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *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); - } + 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); } static void @@ -2805,11 +2793,9 @@ dissect_lte_rrc_Handover_Preparation_Info(tvbuff_t *tvb, packet_info *pinfo, pro col_set_str(pinfo->cinfo, COL_INFO, "HandoverPreparationInformation"); col_set_writable(pinfo->cinfo, FALSE); - 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_lte_rrc_HandoverPreparationInformation_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_lte_rrc_HandoverPreparationInformation_PDU(tvb, pinfo, lte_rrc_tree, NULL); col_set_writable(pinfo->cinfo, TRUE); } |