aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregor Jasny <gjasny@googlemail.com>2017-10-03 11:15:47 +0200
committerMichael Mann <mmann78@netscape.net>2017-10-03 11:21:21 +0000
commitc09c6531ba7b434c4b0a7f1f9ee13ffc3ad4dc8d (patch)
tree027d77e90e5763db54b691e391b8eb5dd1f7b9a4
parent27c7aa38aa6d96aa9b3bfb889330cba107836c1f (diff)
conversation_table: Export all functions for external plugin use
Change-Id: I5e42ceb5013a9ec629845953051cdeaf8b94112d Reviewed-on: https://code.wireshark.org/review/23821 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--debian/libwireshark0.symbols4
-rw-r--r--epan/conversation_table.h14
2 files changed, 11 insertions, 7 deletions
diff --git a/debian/libwireshark0.symbols b/debian/libwireshark0.symbols
index e4d79c9..dde2379 100644
--- a/debian/libwireshark0.symbols
+++ b/debian/libwireshark0.symbols
@@ -20,6 +20,9 @@ libwireshark.so.0 libwireshark0 #MINVER#
_try_val_to_str_ext_init@Base 1.9.1
abs_time_secs_to_str@Base 1.99.0
abs_time_to_str@Base 1.99.0
+ add_conversation_table_data@Base 2.5.0
+ add_conversation_table_data_with_conv_id@Base 2.5.0
+ add_hostlist_table_data@Base 2.5.0
add_hosts_file@Base 1.9.1
add_ip_name_from_string@Base 1.9.1
add_ipv4_name@Base 1.9.1
@@ -1273,6 +1276,7 @@ libwireshark.so.0 libwireshark0 #MINVER#
register_capture_dissector_table@Base 2.1.0
register_cleanup_routine@Base 1.99.8
register_conversation_filter@Base 2.0.0
+ register_conversation_table@Base 2.5.0
register_count@Base 1.9.1
register_custom_dissector_table@Base 1.99.8
register_custom_dissector_table@Base 1.99.8
diff --git a/epan/conversation_table.h b/epan/conversation_table.h
index 741936c..b71d1a0 100644
--- a/epan/conversation_table.h
+++ b/epan/conversation_table.h
@@ -153,7 +153,7 @@ typedef struct _hostlist_talker_t {
* @param conv_packet_func the registered conversation tap name
* @param hostlist_func the registered hostlist tap name
*/
-extern void register_conversation_table(const int proto_id, gboolean hide_ports, tap_packet_cb conv_packet_func, tap_packet_cb hostlist_func);
+WS_DLL_PUBLIC void register_conversation_table(const int proto_id, gboolean hide_ports, tap_packet_cb conv_packet_func, tap_packet_cb hostlist_func);
/** Should port columns be hidden?
*
@@ -292,9 +292,9 @@ WS_DLL_PUBLIC char *get_hostlist_filter(hostlist_talker_t *host);
* @param ct_info callback handlers from the dissector
* @param ptype the port type (e.g. PT_TCP)
*/
-extern void add_conversation_table_data(conv_hash_t *ch, const address *src, const address *dst,
- guint32 src_port, guint32 dst_port, int num_frames, int num_bytes, nstime_t *ts, nstime_t *abs_ts,
- ct_dissector_info_t *ct_info, port_type ptype);
+WS_DLL_PUBLIC void add_conversation_table_data(conv_hash_t *ch, const address *src, const address *dst,
+ guint32 src_port, guint32 dst_port, int num_frames, int num_bytes, nstime_t *ts, nstime_t *abs_ts,
+ ct_dissector_info_t *ct_info, port_type ptype);
/** Add some data to the conversation table, passing a value to be used in
* addition to the address and port quadruple to uniquely identify the
@@ -313,7 +313,7 @@ extern void add_conversation_table_data(conv_hash_t *ch, const address *src, con
* @param ptype the port type (e.g. PT_TCP)
* @param conv_id a value to help differentiate the conversation in case the address and port quadruple is not sufficiently unique
*/
-extern void
+WS_DLL_PUBLIC void
add_conversation_table_data_with_conv_id(conv_hash_t *ch, const address *src, const address *dst, guint32 src_port,
guint32 dst_port, conv_id_t conv_id, int num_frames, int num_bytes,
nstime_t *ts, nstime_t *abs_ts, ct_dissector_info_t *ct_info, port_type ptype);
@@ -329,8 +329,8 @@ add_conversation_table_data_with_conv_id(conv_hash_t *ch, const address *src, co
* @param host_info conversation information provided by dissector
* @param port_type_val the port type (e.g. PT_TCP)
*/
-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);
+WS_DLL_PUBLIC 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);
#ifdef __cplusplus
}