diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-05 23:20:45 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-07 14:11:01 +0000 |
| commit | 3aefd3b5b2a64f5da9670e28af4bb409fff3fcd1 (patch) | |
| tree | 819f6a9594023280d3593d61813a23d52bec2eaa /asn1/h225 | |
| parent | b56d323412306604b1d2a42943d170258476931a (diff) | |
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 <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'asn1/h225')
| -rw-r--r-- | asn1/h225/packet-h225-template.c | 7 |
1 files changed, 4 insertions, 3 deletions
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); } |