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-scsi.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-scsi.c')
| -rw-r--r-- | epan/dissectors/packet-scsi.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index 1a790efad7..58033f9056 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -795,19 +795,6 @@ const int *cdb_control_fields[6] = { NULL }; -static void -scsi_defragment_init(void) -{ - reassembly_table_init(&scsi_reassembly_table, - &addresses_reassembly_table_functions); -} - -static void -scsi_defragment_cleanup(void) -{ - reassembly_table_destroy(&scsi_reassembly_table); -} - static const fragment_items scsi_frag_items = { &ett_scsi_fragment, &ett_scsi_fragments, @@ -7769,8 +7756,8 @@ proto_register_scsi(void) "Reassemble fragmented SCSI DATA IN/OUT transfers", "Whether fragmented SCSI DATA IN/OUT transfers should be reassembled", &scsi_defragment); - register_init_routine(scsi_defragment_init); - register_cleanup_routine(scsi_defragment_cleanup); + reassembly_table_register(&scsi_reassembly_table, + &addresses_reassembly_table_functions); register_srt_table(proto_scsi, NULL, 1, scsistat_packet, scsistat_init, scsistat_param); |