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-idmp.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-idmp.c')
| -rw-r--r-- | epan/dissectors/packet-idmp.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/epan/dissectors/packet-idmp.c b/epan/dissectors/packet-idmp.c index bf0816559b..87ff313ae2 100644 --- a/epan/dissectors/packet-idmp.c +++ b/epan/dissectors/packet-idmp.c @@ -731,15 +731,8 @@ static int dissect_idmp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *paren return tvb_captured_length(tvb); } -static void idmp_reassemble_init (void) -{ - reassembly_table_init (&idmp_reassembly_table, - &addresses_reassembly_table_functions); -} - static void idmp_reassemble_cleanup(void) { - reassembly_table_destroy(&idmp_reassembly_table); saved_protocolID = NULL; } @@ -934,7 +927,7 @@ void proto_register_idmp(void) NULL, HFILL }}, /*--- End of included file: packet-idmp-hfarr.c ---*/ -#line 319 "./asn1/idmp/packet-idmp-template.c" +#line 312 "./asn1/idmp/packet-idmp-template.c" }; /* List of subtrees */ @@ -957,7 +950,7 @@ void proto_register_idmp(void) &ett_idmp_InvokeId, /*--- End of included file: packet-idmp-ettarr.c ---*/ -#line 327 "./asn1/idmp/packet-idmp-template.c" +#line 320 "./asn1/idmp/packet-idmp-template.c" }; module_t *idmp_module; @@ -970,8 +963,10 @@ void proto_register_idmp(void) idmp_handle = register_dissector("idmp", dissect_idmp_tcp, proto_idmp); - register_init_routine (&idmp_reassemble_init); register_cleanup_routine (&idmp_reassemble_cleanup); + reassembly_table_register (&idmp_reassembly_table, + &addresses_reassembly_table_functions); + /* Register our configuration options for IDMP, particularly our port */ |