added minimalist MAPI dissector - only determines request/reply

svn path=/trunk/; revision=1017

diff --git a/Makefile.am b/Makefile.am
index b7760afb9d625a7921b9978b6a8648d4e6cc8e54..b7920d2ff45bfad97543bce0a2cd2062c73ba8ca 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.105 1999/11/11 21:21:59 nneul Exp $
+# $Id: Makefile.am,v 1.106 1999/11/11 23:13:42 nneul Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@zing.org>
@@ -73,6 +73,7 @@ DISSECTOR_SOURCES = \
        packet-lapd.c  \
        packet-llc.c   \
        packet-lpd.c   \
+       packet-mapi.c  \
        packet-mount.c \
        packet-mount.h \
        packet-nbipx.c \

diff --git a/packet-mapi.c b/packet-mapi.c
new file mode 100644 (file)
index 0000000..68a0966
--- /dev/null
+++ b/packet-mapi.c
@@ -0,0 +1,83 @@
+/* packet-mapi.c
+ * Routines for MSX mapi packet dissection
+ *
+ * $Id: packet-mapi.c,v 1.1 1999/11/11 23:13:42 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_mapi = -1;
+
+void
+dissect_mapi(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
+{
+       proto_tree      *mapi_tree, *ti;
+
+       if (check_col(fd, COL_PROTOCOL))
+       col_add_str(fd, COL_PROTOCOL, "MAPI");
+
+       if (check_col(fd, COL_INFO))
+       {
+               col_add_fstr(fd, COL_INFO, "%s", 
+                       (pi.match_port == pi.destport) ? "Request" : "Response");         
+       }
+
+       if (tree) 
+       {
+               ti = proto_tree_add_item(tree, proto_mapi, offset, END_OF_FRAME, NULL);
+               mapi_tree = proto_item_add_subtree(ti, ETT_MAPI);
+
+               if (pi.match_port == pi.destport)
+               {
+                       proto_tree_add_text(mapi_tree, offset, 
+                               END_OF_FRAME, "Request: <opaque data>" );
+               }
+               else
+               {
+                       proto_tree_add_text(mapi_tree, offset, 
+                               END_OF_FRAME, "Response: <opaque data>");
+               }
+       }
+}
+
+void
+proto_register_mapi(void)
+{
+       proto_mapi = proto_register_protocol("MAPI", "mapi");
+}

diff --git a/packet-tcp.c b/packet-tcp.c
index b4831fb2e1e346c5252e0efa6d8d4b68bc96a551..7fd79fd4137f7de47451409fd6651ee6e4cc22d0 100644 (file)
--- a/packet-tcp.c
+++ b/packet-tcp.c
@@ -1,7 +1,7 @@
 /* packet-tcp.c
  * Routines for TCP packet disassembly
  *
- * $Id: packet-tcp.c,v 1.41 1999/11/10 14:44:57 nneul Exp $
+ * $Id: packet-tcp.c,v 1.42 1999/11/11 23:13:43 nneul Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -96,6 +96,7 @@ static int hf_tcp_urgent_pointer = -1;
 #define TCP_PORT_PPTP     1723
 #define TCP_PORT_RTSP     554
 #define TCP_PORT_YHOO     5050
+#define TCP_PORT_MAPI     1065
 
 /* TCP structs and definitions */
 
@@ -509,6 +510,9 @@ dissect_tcp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
     else if (PORT_IS(TCP_PORT_BGP)) {
       pi.match_port = TCP_PORT_BGP;
       dissect_bgp(pd, offset, fd, tree);
+    } else if (PORT_IS(TCP_PORT_MAPI)) {
+      pi.match_port = TCP_PORT_MAPI;
+      dissect_mapi(pd, offset, fd, tree);
     } else {
         /* check existence of high level protocols */
 

diff --git a/packet.h b/packet.h
index 14710b6c0a7570cbcf8a99869511aa0981187136..c7f1ea97a39be207bbd4cd9895c99da2fcb1609e 100644 (file)
--- a/packet.h
+++ b/packet.h
@@ -1,7 +1,7 @@
 /* packet.h
  * Definitions for packet disassembly structures and routines
  *
- * $Id: packet.h,v 1.136 1999/11/11 21:22:00 nneul Exp $
+ * $Id: packet.h,v 1.137 1999/11/11 23:13:43 nneul Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -332,6 +332,7 @@ enum {
        ETT_ICMPv6FLAG,
        ETT_POP,
        ETT_IMAP,
+       ETT_MAPI,
        ETT_FTP,
        ETT_TELNET,
        ETT_TELNET_SUBOPT,
@@ -596,6 +597,7 @@ void dissect_ipv6(const u_char *, int, frame_data *, proto_tree *);
 void dissect_ipx(const u_char *, int, frame_data *, proto_tree *);
 void dissect_llc(const u_char *, int, frame_data *, proto_tree *);
 void dissect_lpd(const u_char *, int, frame_data *, proto_tree *);
+void dissect_mapi(const u_char *, int, frame_data *, proto_tree *);
 void dissect_nbdgm(const u_char *, int, frame_data *, proto_tree *);
 void dissect_netbios(const u_char *, int, frame_data *, proto_tree *);
 void dissect_nbipx(const u_char *, int, frame_data *, proto_tree *);