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 --- asn1/h225/packet-h225-template.c | 7 ++++--- asn1/ldap/packet-ldap-template.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'asn1') diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c index b2b6ec0a0c..4b7cab749f 100644 --- a/asn1/h225/packet-h225-template.c +++ b/asn1/h225/packet-h225-template.c @@ -940,7 +940,7 @@ void proto_reg_handoff_h225(void) { static gboolean h225_prefs_initialized = FALSE; - static dissector_handle_t h225ras_handle; + static dissector_handle_t h225ras_handle, q931_tpkt_handle; static guint saved_h225_tls_port; if (!h225_prefs_initialized) { @@ -953,12 +953,13 @@ proto_reg_handoff_h225(void) h4501_handle = find_dissector("h4501"); data_handle = find_dissector("data"); h225_prefs_initialized = TRUE; + q931_tpkt_handle = find_dissector("q931.tpkt"); } else { - ssl_dissector_delete(saved_h225_tls_port, "q931.tpkt", TRUE); + ssl_dissector_delete(saved_h225_tls_port, q931_tpkt_handle); } saved_h225_tls_port = h225_tls_port; - ssl_dissector_add(saved_h225_tls_port, "q931.tpkt", TRUE); + ssl_dissector_add(saved_h225_tls_port, q931_tpkt_handle); } diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c index 0dbe926b4c..736d6be206 100644 --- a/asn1/ldap/packet-ldap-template.c +++ b/asn1/ldap/packet-ldap-template.c @@ -2399,13 +2399,13 @@ prefs_register_ldap(void) if(ssl_port != global_ldaps_tcp_port) { if(ssl_port) - ssl_dissector_delete(ssl_port, "ldap", TRUE); + ssl_dissector_delete(ssl_port, ldap_handle); /* Set our port number for future use */ ssl_port = global_ldaps_tcp_port; if(ssl_port) - ssl_dissector_add(ssl_port, "ldap", TRUE); + ssl_dissector_add(ssl_port, ldap_handle); } } -- cgit v1.2.3