aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-smtp.c
diff options
context:
space:
mode:
authorstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2010-01-10 19:39:35 +0000
committerstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2010-01-10 19:39:35 +0000
commit8e4bf57149a4c167f1c0f229077a79c4da3768ed (patch)
tree527a74fbd28c581aca3c2a6216e0394c44065437 /epan/dissectors/packet-smtp.c
parentbd75dd73334f99197683dafbec8e0efaab17f1ec (diff)
From rmkml via wireshark-dev:
Redirect secure SMTP traffic on non-standard port 465 to the ssl dissector. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31482 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-smtp.c')
-rw-r--r--epan/dissectors/packet-smtp.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c
index 5ec783148f..a13c7cdf48 100644
--- a/epan/dissectors/packet-smtp.c
+++ b/epan/dissectors/packet-smtp.c
@@ -41,9 +41,11 @@
#include <epan/strutil.h>
#include <epan/emem.h>
#include <epan/reassemble.h>
+#include <epan/dissectors/packet-ssl.h>
/* RFC 2821 */
#define TCP_PORT_SMTP 25
+#define TCP_PORT_SSL_SMTP 465
/* RFC 4409 */
#define TCP_PORT_SUBMISSION 587
@@ -946,6 +948,7 @@ proto_reg_handoff_smtp(void)
smtp_handle = find_dissector("smtp");
dissector_add("tcp.port", TCP_PORT_SMTP, smtp_handle);
+ ssl_dissector_add(TCP_PORT_SSL_SMTP, "smtp", TRUE);
dissector_add("tcp.port", TCP_PORT_SUBMISSION, smtp_handle);
/* find the IMF dissector */