From 3aefd3b5b2a64f5da9670e28af4bb409fff3fcd1 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Thu, 5 Nov 2015 23:20:45 -0500 Subject: Create real dissector tables for SSL and DTLS to use. Since ssl_dissector_[add|delete] only take TCP dissectors, remove the parameter and just use it within the "internal" ssl_association_add call. Change-Id: I0fdf941389934c20cbacf910250e17520614e706 Reviewed-on: https://code.wireshark.org/review/11591 Petri-Dish: Michael Mann Reviewed-by: Michael Mann --- epan/dissectors/packet-ssl.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'epan/dissectors/packet-ssl.h') diff --git a/epan/dissectors/packet-ssl.h b/epan/dissectors/packet-ssl.h index 499ba8d22e..ba800bddba 100644 --- a/epan/dissectors/packet-ssl.h +++ b/epan/dissectors/packet-ssl.h @@ -24,14 +24,15 @@ #define __PACKET_SSL_H__ #include "ws_symbol_export.h" +#include /** Maps Session-ID to pre-master secrets. */ WS_DLL_PUBLIC GHashTable *ssl_session_hash; /** Maps Client Random to pre-master secrets. */ WS_DLL_PUBLIC GHashTable *ssl_crandom_hash; -WS_DLL_PUBLIC void ssl_dissector_add(guint port, const gchar *protocol, gboolean tcp); -WS_DLL_PUBLIC void ssl_dissector_delete(guint port, const gchar *protocol, gboolean tcp); +WS_DLL_PUBLIC void ssl_dissector_add(guint port, dissector_handle_t handle); +WS_DLL_PUBLIC void ssl_dissector_delete(guint port, dissector_handle_t handle); WS_DLL_PUBLIC void ssl_set_master_secret(guint32 frame_num, address *addr_srv, address *addr_cli, port_type ptype, guint32 port_srv, guint32 port_cli, @@ -41,6 +42,4 @@ WS_DLL_PUBLIC void ssl_set_master_secret(guint32 frame_num, address *addr_srv, a extern gboolean ssl_ignore_mac_failed; -gchar* ssl_association_info(void); - #endif /* __PACKET_SSL_H__ */ -- cgit v1.2.3