diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-02-07 17:05:17 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-03-06 11:41:54 +0000 |
| commit | 56aaa5b705fc87830a0f74f0ad34997ed76f7c92 (patch) | |
| tree | dd6ec6c8d7fee0aa341b5a3b4b2ff136089c36ba /epan/conversation_table.h | |
| parent | cfa50019b6366404f54da57700e50862aa87ebb0 (diff) | |
Switch conversations to use wmem_tree_t instead of (sorted) GSList.
Change-Id: Ifaf25ca5a7974f1d398ceebbb4c6733d4d3e001a
Reviewed-on: https://code.wireshark.org/review/20006
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/conversation_table.h')
| -rw-r--r-- | epan/conversation_table.h | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/epan/conversation_table.h b/epan/conversation_table.h index ba94029bd9..741936cae1 100644 --- a/epan/conversation_table.h +++ b/epan/conversation_table.h @@ -26,6 +26,7 @@ #include "conv_id.h" #include "tap.h" +#include "wmem/wmem.h" #ifdef __cplusplus extern "C" { @@ -205,26 +206,17 @@ WS_DLL_PUBLIC void conversation_table_set_gui_info(conv_gui_init_cb init_cb); */ WS_DLL_PUBLIC void hostlist_table_set_gui_info(host_gui_init_cb init_cb); -/** Interator to walk converation tables and execute func - * a GUI menu (only used in GTK) +/** Iterator to walk converation tables and execute func * * @param func action to be performed on all converation tables * @param user_data any data needed to help perform function */ -WS_DLL_PUBLIC void conversation_table_iterate_tables(GFunc func, gpointer user_data); +WS_DLL_PUBLIC void conversation_table_iterate_tables(wmem_foreach_func func, void* user_data); /** Total number of converation tables */ WS_DLL_PUBLIC guint conversation_table_get_num(void); -/** Get conversation table by its number - * Tables are ordered alphabetically by title. - * - * @param table_num Item to fetch. - * @return table pointer or NULL. - */ -WS_DLL_PUBLIC register_ct_t* get_conversation_table_by_num(guint table_num); - /** Remove all entries from the conversation table. * * @param ch the table to reset @@ -340,10 +332,6 @@ add_conversation_table_data_with_conv_id(conv_hash_t *ch, const address *src, co void add_hostlist_table_data(conv_hash_t *ch, const address *addr, guint32 port, gboolean sender, int num_frames, int num_bytes, hostlist_dissector_info_t *host_info, port_type port_type_val); -/** Cleanup internal structures - */ -void conversation_table_cleanup(void); - #ifdef __cplusplus } #endif /* __cplusplus */ |