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-tcp.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-tcp.c')
| -rw-r--r-- | epan/dissectors/packet-tcp.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index e6c5aa5209..2e075cef1d 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -6445,20 +6445,12 @@ static void tcp_init(void) { tcp_stream_count = 0; - reassembly_table_init(&tcp_reassembly_table, - &addresses_ports_reassembly_table_functions); /* MPTCP init */ mptcp_stream_count = 0; mptcp_tokens = wmem_tree_new(wmem_file_scope()); } -static void -tcp_cleanup(void) -{ - reassembly_table_destroy(&tcp_reassembly_table); -} - void proto_register_tcp(void) { @@ -7458,7 +7450,8 @@ proto_register_tcp(void) &tcp_display_process_info); register_init_routine(tcp_init); - register_cleanup_routine(tcp_cleanup); + reassembly_table_register(&tcp_reassembly_table, + &addresses_ports_reassembly_table_functions); register_decode_as(&tcp_da); |