diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2019-12-13 15:25:08 +0100 |
|---|---|---|
| committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2019-12-15 12:27:57 +0000 |
| commit | 5e266102d3c65c87dee39c154e308a49aebf153a (patch) | |
| tree | 0a7c3c6bdefe60cd45e22e1e841f5f9d67d21cc3 | |
| parent | 2f39d1e4a27d055784c4e22fbff3cedffd8f8060 (diff) | |
| download | wireshark-5e266102d3c65c87dee39c154e308a49aebf153a.tar.gz wireshark-5e266102d3c65c87dee39c154e308a49aebf153a.tar.bz2 wireshark-5e266102d3c65c87dee39c154e308a49aebf153a.zip | |
m3ap: Info column lost at filtering.
Remove if (tree)
Change-Id: I1bb38fd8cdea85e026837ea1dc9bcd72b7432f1e
Reviewed-on: https://code.wireshark.org/review/35430
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 8b8bf626000291c0187715196ee907c1b5265a99)
Reviewed-on: https://code.wireshark.org/review/35456
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
| -rw-r--r-- | epan/dissectors/asn1/m3ap/packet-m3ap-template.c | 8 | ||||
| -rw-r--r-- | epan/dissectors/packet-m3ap.c | 14 |
2 files changed, 9 insertions, 13 deletions
diff --git a/epan/dissectors/asn1/m3ap/packet-m3ap-template.c b/epan/dissectors/asn1/m3ap/packet-m3ap-template.c index dd460d7d5d..e3c0db1af7 100644 --- a/epan/dissectors/asn1/m3ap/packet-m3ap-template.c +++ b/epan/dissectors/asn1/m3ap/packet-m3ap-template.c @@ -119,12 +119,10 @@ dissect_m3ap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ col_clear(pinfo->cinfo, COL_INFO); /* create the m3ap protocol tree */ - if (tree) { - m3ap_item = proto_tree_add_item(tree, proto_m3ap, tvb, 0, -1, ENC_NA); - m3ap_tree = proto_item_add_subtree(m3ap_item, ett_m3ap); + m3ap_item = proto_tree_add_item(tree, proto_m3ap, tvb, 0, -1, ENC_NA); + m3ap_tree = proto_item_add_subtree(m3ap_item, ett_m3ap); - dissect_M3AP_PDU_PDU(tvb, pinfo, m3ap_tree, NULL); - } + dissect_M3AP_PDU_PDU(tvb, pinfo, m3ap_tree, NULL); return tvb_captured_length(tvb); } /*--- proto_register_m3ap -------------------------------------------*/ diff --git a/epan/dissectors/packet-m3ap.c b/epan/dissectors/packet-m3ap.c index 3afb0fe1de..47d8466bc1 100644 --- a/epan/dissectors/packet-m3ap.c +++ b/epan/dissectors/packet-m3ap.c @@ -2121,12 +2121,10 @@ dissect_m3ap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ col_clear(pinfo->cinfo, COL_INFO); /* create the m3ap protocol tree */ - if (tree) { - m3ap_item = proto_tree_add_item(tree, proto_m3ap, tvb, 0, -1, ENC_NA); - m3ap_tree = proto_item_add_subtree(m3ap_item, ett_m3ap); + m3ap_item = proto_tree_add_item(tree, proto_m3ap, tvb, 0, -1, ENC_NA); + m3ap_tree = proto_item_add_subtree(m3ap_item, ett_m3ap); - dissect_M3AP_PDU_PDU(tvb, pinfo, m3ap_tree, NULL); - } + dissect_M3AP_PDU_PDU(tvb, pinfo, m3ap_tree, NULL); return tvb_captured_length(tvb); } /*--- proto_register_m3ap -------------------------------------------*/ @@ -2551,7 +2549,7 @@ void proto_register_m3ap(void) { "UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-m3ap-hfarr.c ---*/ -#line 152 "./asn1/m3ap/packet-m3ap-template.c" +#line 150 "./asn1/m3ap/packet-m3ap-template.c" }; /* List of subtrees */ @@ -2609,7 +2607,7 @@ void proto_register_m3ap(void) { &ett_m3ap_UnsuccessfulOutcome, /*--- End of included file: packet-m3ap-ettarr.c ---*/ -#line 159 "./asn1/m3ap/packet-m3ap-template.c" +#line 157 "./asn1/m3ap/packet-m3ap-template.c" }; expert_module_t* expert_m3ap; @@ -2695,7 +2693,7 @@ proto_reg_handoff_m3ap(void) /*--- End of included file: packet-m3ap-dis-tab.c ---*/ -#line 197 "./asn1/m3ap/packet-m3ap-template.c" +#line 195 "./asn1/m3ap/packet-m3ap-template.c" dissector_add_uint("m3ap.extension", 17, create_dissector_handle(dissect_AllocationAndRetentionPriority_PDU, proto_m3ap)); } else { |