diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-24 13:13:18 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-25 19:21:14 +0000 |
| commit | 0cd1a8506425fa379c88df941e3039ce9a1164d4 (patch) | |
| tree | 9c2cb1edbaf7de9fa028e4b05fcc13f491a4230b /asn1/t124 | |
| parent | 992a7ee6e7603c2552971dc516ca4e6c45ae2d21 (diff) | |
Require BER dissector (OID) registration to be "new style".
Both old and new style API existed, just remove the "old" one.
Change-Id: If725e778a0ecad5a431d634ed5c4856b4a281013
Reviewed-on: https://code.wireshark.org/review/12107
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'asn1/t124')
| -rw-r--r-- | asn1/t124/packet-t124-template.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/asn1/t124/packet-t124-template.c b/asn1/t124/packet-t124-template.c index 6dab75f214..b0ad39a48a 100644 --- a/asn1/t124/packet-t124-template.c +++ b/asn1/t124/packet-t124-template.c @@ -117,7 +117,7 @@ int dissect_DomainMCSPDU_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree } static int -dissect_t124_new(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data _U_) +dissect_t124(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data _U_) { proto_item *item = NULL; proto_tree *tree = NULL; @@ -137,12 +137,6 @@ dissect_t124_new(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, voi return tvb_captured_length(tvb); } -static void -dissect_t124(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) -{ - dissect_t124_new(tvb, pinfo, parent_tree, NULL); -} - static gboolean dissect_t124_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data _U_) { @@ -168,7 +162,7 @@ dissect_t124_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, vo if (!failed && ((asn1_ctx.external.direct_reference != NULL) && (strcmp(asn1_ctx.external.direct_reference, "0.0.20.124.0.1") == 0))) { - dissect_t124(tvb, pinfo, parent_tree); + dissect_t124(tvb, pinfo, parent_tree, data); return TRUE; } @@ -212,14 +206,14 @@ void proto_register_t124(void) { t124_ns_dissector_table = register_dissector_table("t124.ns", "T.124 H.221 Non Standard Dissectors", FT_STRING, BASE_NONE, DISSECTOR_TABLE_ALLOW_DUPLICATE); t124_sd_dissector_table = register_dissector_table("t124.sd", "T.124 H.221 Send Data Dissectors", FT_UINT32, BASE_HEX, DISSECTOR_TABLE_ALLOW_DUPLICATE); - new_register_dissector("t124", dissect_t124_new, proto_t124); + new_register_dissector("t124", dissect_t124, proto_t124); } void proto_reg_handoff_t124(void) { - register_ber_oid_dissector("0.0.20.124.0.1", dissect_t124, proto_t124, "Generic Conference Control"); + new_register_ber_oid_dissector("0.0.20.124.0.1", dissect_t124, proto_t124, "Generic Conference Control"); heur_dissector_add("t125", dissect_t124_heur, "T.124 over T.125", "t124_t125", proto_t124, HEURISTIC_ENABLE); |