diff options
Diffstat (limited to 'epan/dissectors/packet-http.c')
| -rw-r--r-- | epan/dissectors/packet-http.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 4b80bf5c92..c61488ba44 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -141,7 +141,7 @@ static expert_field ei_http_bad_header_name = EI_INIT; static dissector_handle_t http_handle; static dissector_handle_t http_tcp_handle; -static dissector_handle_t http_ssl_handle; +static dissector_handle_t http_tls_handle; static dissector_handle_t http_sctp_handle; static dissector_handle_t media_handle; @@ -3634,12 +3634,12 @@ dissect_ssdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ static void range_delete_http_ssl_callback(guint32 port, gpointer ptr _U_) { - ssl_dissector_delete(port, http_ssl_handle); + ssl_dissector_delete(port, http_tls_handle); } static void range_add_http_ssl_callback(guint32 port, gpointer ptr _U_) { - ssl_dissector_add(port, http_ssl_handle); + ssl_dissector_add(port, http_tls_handle); } static void reinit_http(void) { @@ -3974,7 +3974,7 @@ proto_register_http(void) http_handle = register_dissector("http", dissect_http, proto_http); http_tcp_handle = register_dissector("http-over-tcp", dissect_http_tcp, proto_http); - http_ssl_handle = register_dissector("http-over-tls", dissect_http_ssl, proto_http); /* RFC 2818 */ + http_tls_handle = register_dissector("http-over-tls", dissect_http_ssl, proto_http); /* RFC 2818 */ http_sctp_handle = register_dissector("http-over-sctp", dissect_http_sctp, proto_http); http_module = prefs_register_protocol(proto_http, reinit_http); @@ -4014,7 +4014,7 @@ proto_register_http(void) &global_http_sctp_range, 65535); range_convert_str(wmem_epan_scope(), &global_http_ssl_range, SSL_DEFAULT_RANGE, 65535); - prefs_register_range_preference(http_module, "ssl.port", "SSL/TLS Ports", + prefs_register_range_preference(http_module, "tls.port", "SSL/TLS Ports", "SSL/TLS Ports range", &global_http_ssl_range, 65535); /* UAT */ @@ -4148,7 +4148,7 @@ proto_reg_handoff_http(void) * SSL/TLS Application-Layer Protocol Negotiation (ALPN) protocol * ID. */ - dissector_add_string("ssl.handshake.extensions_alpn_str", "http/1.1", http_ssl_handle); + dissector_add_string("tls.handshake.extensions_alpn_str", "http/1.1", http_tls_handle); ntlmssp_handle = find_dissector_add_dependency("ntlmssp", proto_http); gssapi_handle = find_dissector_add_dependency("gssapi", proto_http); |