diff options
| -rw-r--r-- | debian/libwireshark0.symbols | 4 | ||||
| -rw-r--r-- | epan/conversation_table.h | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/debian/libwireshark0.symbols b/debian/libwireshark0.symbols index e4d79c904a..dde237931b 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 741936cae1..b71d1a03b4 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 } |