osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Added imap dissector, pretty much a simple translation of the pop 

dissector.

svn path=/trunk/; revision=995
This commit is contained in:
Nathan Neulinger 1999-11-10 14:44:58 +00:00
parent ac4026f37a
commit 2d81454829
4 changed files with 127 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal
#
# $Id: Makefile.am,v 1.100 1999/10/29 01:04:16 guy Exp $
# $Id: Makefile.am,v 1.101 1999/11/10 14:44:57 nneul Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
@ -57,6 +57,7 @@ DISSECTOR_SOURCES = \
packet-icmpv6.c\
packet-icp.c \
packet-icq.c \
packet-imap.c \
packet-ip.c \
packet-ip.h \
packet-ipp.c \

118
packet-imap.c Normal file
View File

@ -0,0 +1,118 @@
/* packet-imap.c
* Routines for imap packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
* $Id: packet-imap.c,v 1.1 1999/11/10 14:44:57 nneul Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net>
* Copyright 1998 Gerald Combs
*
* Copied from packet-tftp.c
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <stdio.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
#include <string.h>
#include <glib.h>
#include "packet.h"
static int proto_imap = -1;
void
dissect_imap(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
proto_tree *imap_tree, *ti;
gchar rr[50], rd[1500];
int i1 = (u_char *)strchr(pd + offset, ' ') - (pd + offset); /* Where is that space */
int i2;
int max_data = pi.captured_len - offset;
memset(rr, '\0', sizeof(rr));
memset(rd, '\0', sizeof(rd));
if ((i1 > max_data) || (i1 <= 0)) {
i1 = max_data;
strncpy(rr, pd + offset, MIN(max_data - 2, sizeof(rr) - 1));
}
else {
strncpy(rr, pd + offset, MIN(i1, sizeof(rr) - 1));
i2 = ((u_char *)strchr(pd + offset + i1 + 1, '\r') - (pd + offset)) - i1 - 1;
if (i2 > max_data - i1 - 1 || i2 <= 0) {
i2 = ((u_char *)strchr(pd + offset + i1 + 1, '\n') - (pd + offset)) - i1 - 1;
if (i2 > max_data - i1 - 1 || i2 <= 0)
i2 = max_data - i1 - 1;
}
strncpy(rd, pd + offset + i1 + 1, MIN(i2, sizeof(rd) - 1));
}
if (check_col(fd, COL_PROTOCOL))
col_add_str(fd, COL_PROTOCOL, "IMAP");
if (check_col(fd, COL_INFO)) {
col_add_fstr(fd, COL_INFO, "%s: %s %s", (pi.match_port == pi.destport)? "Request" : "Response", rr, rd);
}
if (tree) {
ti = proto_tree_add_item(tree, proto_imap, offset, END_OF_FRAME, NULL);
imap_tree = proto_item_add_subtree(ti, ETT_IMAP);
if (pi.match_port == pi.destport) { /* Request */
proto_tree_add_text(imap_tree, offset, i1, "Request Tag: %s", rr);
proto_tree_add_text(imap_tree, offset + i1 + 1, END_OF_FRAME, "Request: %s", rd);
}
else {
proto_tree_add_text(imap_tree, offset, i1, "Response Tag: %s", rr);
proto_tree_add_text(imap_tree, offset + i1 + 1, END_OF_FRAME, "Response: %s", rd);
}
}
}
void
proto_register_imap(void)
{
/* static hf_register_info hf[] = {
{ &variable,
{ "Name", "imap.abbreviation", TYPE, VALS_POINTER }},
};*/
proto_imap = proto_register_protocol("IMAP", "imap");
/* proto_register_field_array(proto_imap, hf, array_length(hf));*/
}

6
packet-tcp.c
View File

@ -1,7 +1,7 @@
/* packet-tcp.c
* Routines for TCP packet disassembly
*
* $Id: packet-tcp.c,v 1.40 1999/11/02 07:04:46 guy Exp $
* $Id: packet-tcp.c,v 1.41 1999/11/10 14:44:57 nneul Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -89,6 +89,7 @@ static int hf_tcp_urgent_pointer = -1;
#define TCP_PORT_NNTP 119
#define TCP_PORT_NTP 123
#define TCP_PORT_NBSS 139
#define TCP_PORT_IMAP 143
#define TCP_PORT_BGP 179
#define TCP_PORT_PRINTER 515
#define TCP_ALT_PORT_HTTP 8080
@ -485,6 +486,9 @@ dissect_tcp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
} else if (PORT_IS(TCP_PORT_POP)) {
pi.match_port = TCP_PORT_POP;
dissect_pop(pd, offset, fd, tree);
} else if (PORT_IS(TCP_PORT_IMAP)) {
pi.match_port = TCP_PORT_IMAP;
dissect_imap(pd, offset, fd, tree);
} else if (PORT_IS(TCP_PORT_NNTP)) {
pi.match_port = TCP_PORT_NNTP;
dissect_nntp(pd, offset, fd, tree);

3
packet.h
View File

@ -1,7 +1,7 @@
/* packet.h
* Definitions for packet disassembly structures and routines
*
* $Id: packet.h,v 1.128 1999/11/06 06:26:57 guy Exp $
* $Id: packet.h,v 1.129 1999/11/10 14:44:58 nneul Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -326,6 +326,7 @@ enum {
ETT_ICMPv6OPT,
ETT_ICMPv6FLAG,
ETT_POP,
ETT_IMAP,
ETT_FTP,
ETT_TELNET,
ETT_TELNET_SUBOPT,