diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-02-01 23:13:42 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-02-02 13:46:03 +0000 |
| commit | 577d21e35c1ca19e245014ea2b65d09709c9cca3 (patch) | |
| tree | 91d63807f33f05a4970b9fe769dbec7040b904e0 /epan/dissectors/packet-fc.c | |
| parent | 36892d8a4ca2f6019dc00b0f2540097499da2e11 (diff) | |
GHashtable -> wmem_map conversions
Many of the register_init_routine/register_cleanup_routine functions
are for initializing and cleaning up a GHashtable.
wmem_map_new_autoreset can do that automatically, so convert many
of the simple cases.
Change-Id: I93e1f435845fd5a5e5286487e9f0092fae052f3e
Reviewed-on: https://code.wireshark.org/review/19912
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-fc.c')
| -rw-r--r-- | epan/dissectors/packet-fc.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index f11fc5475b..04725916bc 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -166,7 +166,7 @@ typedef struct _fcseq_conv_data { guint32 seq_cnt; } fcseq_conv_data_t; -static GHashTable *fcseq_req_hash = NULL; +static wmem_map_t *fcseq_req_hash = NULL; /* * Hash Functions @@ -191,18 +191,6 @@ fcseq_hash (gconstpointer v) return val; } -static void -fc_exchange_init_protocol(void) -{ - fcseq_req_hash = g_hash_table_new(fcseq_hash, fcseq_equal); -} - -static void -fc_exchange_cleanup_protocol(void) -{ - g_hash_table_destroy(fcseq_req_hash); -} - static const char* fc_conv_get_filter_type(conv_item_t* conv, conv_filter_type_e filter) { if ((filter == CONV_FT_SRC_ADDRESS) && (conv->src_address.type == AT_FC)) @@ -1073,7 +1061,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean */ ckey.conv_idx = conversation->conv_index; - cdata = (fcseq_conv_data_t *)g_hash_table_lookup (fcseq_req_hash, + cdata = (fcseq_conv_data_t *)wmem_map_lookup (fcseq_req_hash, &ckey); if (is_1frame_inseq) { @@ -1091,7 +1079,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean cdata = wmem_new(wmem_file_scope(), fcseq_conv_data_t); cdata->seq_cnt = fchdr->seqcnt; - g_hash_table_insert (fcseq_req_hash, req_key, cdata); + wmem_map_insert (fcseq_req_hash, req_key, cdata); } real_seqcnt = 0; } @@ -1572,8 +1560,8 @@ proto_register_fc(void) "multi-frame sequence", 10, &fc_max_frame_size); - register_init_routine (fc_exchange_init_protocol); - register_cleanup_routine (fc_exchange_cleanup_protocol); + fcseq_req_hash = wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(), fcseq_hash, fcseq_equal); + reassembly_table_register(&fc_reassembly_table, &addresses_reassembly_table_functions); |