osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Move the registration for SSL sockets to the protocol dissectors themselves. 

svn path=/trunk/; revision=25721
This commit is contained in:
Jaap Keuter 2008-07-12 14:42:14 +00:00
parent a092f9857d
commit 445e2212b7
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/dissectors/packet-imap.c
View File

@ -35,6 +35,7 @@
#include <glib.h>
#include <epan/packet.h>
#include <epan/strutil.h>
#include "packet-ssl.h"
static int proto_imap = -1;
static int hf_imap_response = -1;
@ -44,6 +45,7 @@ static gint ett_imap = -1;
static gint ett_imap_reqresp = -1;
#define TCP_PORT_IMAP 143
#define TCP_PORT_SSL_IMAP 993
static void
dissect_imap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
@ -192,4 +194,5 @@ proto_reg_handoff_imap(void)
imap_handle = create_dissector_handle(dissect_imap, proto_imap);
dissector_add("tcp.port", TCP_PORT_IMAP, imap_handle);
ssl_dissector_add(TCP_PORT_SSL_IMAP, "imap", TRUE);
}

3
epan/dissectors/packet-pop.c
View File

@ -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 */

12
epan/dissectors/packet-ssl-utils.h
View File

@ -1,9 +1,12 @@
/* packet-ssl-utils.h
* ssl manipulation functions
* By Paolo Abeni <paolo.abeni@email.com>
*
* $Id$
*
* ssl manipulation functions
* By Paolo Abeni <paolo.abeni@email.com>
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -56,11 +59,6 @@
#define SSL_PRIVATE_KEY void
#endif /* HAVE_LIBGNUTLS */
/* The TCP port to associate with by default */
#define TCP_PORT_SSL 443
#define TCP_PORT_SSL_LDAP 636
#define TCP_PORT_SSL_IMAP 993
#define TCP_PORT_SSL_POP 995
/* version state tables */
#define SSL_VER_UNKNOWN 0

4
epan/dissectors/packet-ssl.c
View File

@ -4381,10 +4381,6 @@ proto_reg_handoff_ssl(void)
/* parse key list */
ssl_parse();
/* add ssl dissection to defaults ports */
ssl_dissector_add(TCP_PORT_SSL_IMAP, "imap", TRUE);
ssl_dissector_add(TCP_PORT_SSL_POP, "pop", TRUE);
}
void

2
epan/dissectors/packet-ssl.h
View File

@ -4,7 +4,7 @@
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998
* Copyright 1998 Gerald Combs
*
*
* This program is free software; you can redistribute it and/or