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-smb.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-smb.c')
| -rw-r--r-- | epan/dissectors/packet-smb.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index d6e9dd55d6..09cc57ab9b 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -1585,20 +1585,6 @@ gboolean smb_dcerpc_reassembly = TRUE; static reassembly_table smb_trans_reassembly_table; -static void -smb_trans_reassembly_init(void) -{ - /* - * XXX - addresses_ports_reassembly_table_functions? - * Probably correct for SMB-over-NBT and SMB-over-TCP, - * as stuff from two different connections should - * probably not be combined, but what about other - * transports for SMB, e.g. NBF or Netware? - */ - reassembly_table_init(&smb_trans_reassembly_table, - &addresses_reassembly_table_functions); -} - static fragment_head * smb_trans_defragment(proto_tree *tree _U_, packet_info *pinfo, tvbuff_t *tvb, int offset, guint count, guint pos, guint totlen, smb_info_t *si) @@ -21037,7 +21023,16 @@ proto_register_smb(void) "Whether the export object functionality will take the full path file name as file identifier", &eosmb_take_name_as_fid); - register_init_routine(smb_trans_reassembly_init); + /* + * XXX - addresses_ports_reassembly_table_functions? + * Probably correct for SMB-over-NBT and SMB-over-TCP, + * as stuff from two different connections should + * probably not be combined, but what about other + * transports for SMB, e.g. NBF or Netware? + */ + reassembly_table_register(&smb_trans_reassembly_table, + &addresses_reassembly_table_functions); + smb_tap = register_tap("smb"); smb_handle = register_dissector("smb", dissect_smb, proto_smb); |