diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-01-28 19:53:36 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-01-29 13:29:04 +0000 |
| commit | af54b292e60fcdd8d03ec583e2b46c9c51f259a5 (patch) | |
| tree | 67a4b61fd3e71ada67f2c27092a6849424759263 /epan/dissectors/packet-rtse.c | |
| parent | ed8ac81497c890bc82f161be727c0bb5285dcf12 (diff) | |
Register reassembly tables
Register all reassembly tables with a central unit, allowing the
central unit to have the callback that initializes and destroys
the reassembly tables, rather than have dissectors do it individually.
Change-Id: Ic92619c06fb5ba6f1c3012f613cae14982e101d4
Reviewed-on: https://code.wireshark.org/review/19834
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-rtse.c')
| -rw-r--r-- | epan/dissectors/packet-rtse.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index 11b7cc84a2..a9f5051cb3 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -854,17 +854,6 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d return tvb_captured_length(tvb); } -static void rtse_reassemble_init (void) -{ - reassembly_table_init (&rtse_reassembly_table, - &addresses_reassembly_table_functions); -} - -static void rtse_reassemble_cleanup(void) -{ - reassembly_table_destroy(&rtse_reassembly_table); -} - /*--- proto_register_rtse -------------------------------------------*/ void proto_register_rtse(void) { @@ -1009,7 +998,7 @@ void proto_register_rtse(void) { NULL, HFILL }}, /*--- End of included file: packet-rtse-hfarr.c ---*/ -#line 364 "./asn1/rtse/packet-rtse-template.c" +#line 353 "./asn1/rtse/packet-rtse-template.c" }; /* List of subtrees */ @@ -1031,7 +1020,7 @@ void proto_register_rtse(void) { &ett_rtse_CallingSSuserReference, /*--- End of included file: packet-rtse-ettarr.c ---*/ -#line 373 "./asn1/rtse/packet-rtse-template.c" +#line 362 "./asn1/rtse/packet-rtse-template.c" }; static ei_register_info ei[] = { @@ -1051,8 +1040,10 @@ void proto_register_rtse(void) { proto_register_subtree_array(ett, array_length(ett)); expert_rtse = expert_register_protocol(proto_rtse); expert_register_field_array(expert_rtse, ei, array_length(ei)); - register_init_routine (&rtse_reassemble_init); - register_cleanup_routine (&rtse_reassemble_cleanup); + + reassembly_table_register (&rtse_reassembly_table, + &addresses_reassembly_table_functions); + rtse_module = prefs_register_protocol_subtree("OSI", proto_rtse, NULL); prefs_register_bool_preference(rtse_module, "reassemble", |