aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-tpkt.c
diff options
context:
space:
mode:
authorÉmilio Gonzalez <egg997@gmail.com>2019-06-08 12:57:10 -0700
committerAnders Broman <a.broman58@gmail.com>2019-06-09 23:19:10 +0000
commit004d26dfaf17e3599ed518a546d9ca2684f9ff22 (patch)
treecb24cb2d485b8e97bb445dafef0c05d9039191eb /epan/dissectors/packet-tpkt.c
parent13fc8302e09d1b9885d4d853aeb40b27c549b33c (diff)
TPKT: Add the dissector to the list of TLS subdissectors
Also make the RDP port (3389) to default to TPKT when decrypting TLS. Change-Id: I951531080b36905b2c3ac9039e66243c67b6efe6 Reviewed-on: https://code.wireshark.org/review/33521 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-tpkt.c')
-rw-r--r--epan/dissectors/packet-tpkt.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c
index b133461a52..36e56fa240 100644
--- a/epan/dissectors/packet-tpkt.c
+++ b/epan/dissectors/packet-tpkt.c
@@ -21,6 +21,7 @@
#include <epan/prefs.h>
#include <epan/show_exception.h>
+#include "packet-tls.h"
#include "packet-tpkt.h"
void proto_register_tpkt(void);
@@ -669,6 +670,8 @@ proto_reg_handoff_tpkt(void)
port_range = range_copy(wmem_epan_scope(), tpkt_tcp_port_range);
dissector_add_uint_range("tcp.port", port_range, tpkt_handle);
+ ssl_dissector_add(3389, tpkt_handle);
+
/*
tpkt_ascii_handle = create_dissector_handle(dissect_ascii_tpkt, proto_tpkt);
dissector_add_uint("tcp.port", TCP_PORT_TPKT, tpkt_ascii_handle);