aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-pop.c
diff options
context:
space:
mode:
authorjake <jake@f5534014-38df-0310-8fa8-9805f1628bb7>2008-07-12 14:42:14 +0000
committerjake <jake@f5534014-38df-0310-8fa8-9805f1628bb7>2008-07-12 14:42:14 +0000
commit60cf244b64ff6a1dd4975727ee7cccfa4ab7cc82 (patch)
tree7c736bcc8102322809156a8c60fcdd36eb7b2968 /epan/dissectors/packet-pop.c
parent9b8272238b528bc487cf462b6e05d554d74774b5 (diff)
Move the registration for SSL sockets to the protocol dissectors themselves.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25721 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-pop.c')
-rw-r--r--epan/dissectors/packet-pop.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/epan/dissectors/packet-pop.c b/epan/dissectors/packet-pop.c
index 37bc3d4e0d..06d0a3122f 100644
--- a/epan/dissectors/packet-pop.c
+++ b/epan/dissectors/packet-pop.c
@@ -39,6 +39,7 @@
#include <epan/conversation.h>
#include <epan/prefs.h>
#include <epan/reassemble.h>
+#include "packet-ssl.h"
static int proto_pop = -1;
@@ -71,6 +72,7 @@ static dissector_handle_t data_handle;
static dissector_handle_t imf_handle = NULL;
#define TCP_PORT_POP 110
+#define TCP_PORT_SSL_POP 995
/* desegmentation of POP command and response lines */
static gboolean pop_data_desegment = TRUE;
@@ -468,6 +470,7 @@ proto_reg_handoff_pop(void)
pop_handle = create_dissector_handle(dissect_pop, proto_pop);
dissector_add("tcp.port", TCP_PORT_POP, pop_handle);
+ ssl_dissector_add(TCP_PORT_SSL_POP, "pop", TRUE);
data_handle = find_dissector("data");
/* find the IMF dissector */