diff options
Diffstat (limited to 'epan/dissectors/packet-t124.c')
| -rw-r--r-- | epan/dissectors/packet-t124.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/epan/dissectors/packet-t124.c b/epan/dissectors/packet-t124.c index d9a9fd2790..f2a52ddff2 100644 --- a/epan/dissectors/packet-t124.c +++ b/epan/dissectors/packet-t124.c @@ -2927,7 +2927,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; @@ -2947,12 +2947,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_) { @@ -2978,7 +2972,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; } @@ -3896,7 +3890,7 @@ void proto_register_t124(void) { NULL, HFILL }}, /*--- End of included file: packet-t124-hfarr.c ---*/ -#line 197 "../../asn1/t124/packet-t124-template.c" +#line 191 "../../asn1/t124/packet-t124-template.c" }; /* List of subtrees */ @@ -4009,7 +4003,7 @@ void proto_register_t124(void) { &ett_t124_DomainMCSPDU, /*--- End of included file: packet-t124-ettarr.c ---*/ -#line 204 "../../asn1/t124/packet-t124-template.c" +#line 198 "../../asn1/t124/packet-t124-template.c" }; /* Register protocol */ @@ -4021,14 +4015,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); |