X.25 over TCP support, from Paul Ionescu.
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 17 Dec 2000 07:38:14 +0000 (07:38 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 17 Dec 2000 07:38:14 +0000 (07:38 +0000)
Also, update his e-mail address.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2765 f5534014-38df-0310-8fa8-9805f1628bb7

AUTHORS
Makefile.am
Makefile.nmake
packet-xot.c [new file with mode: 0644]

diff --git a/AUTHORS b/AUTHORS
index 7af88dece956f0b77e921569381f034bf11fcf88..7410f2e0fd3a12ba47ec69498f575e271f1bc2af 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -327,10 +327,11 @@ Yaniv Kaul <ykaul@netvision.net.il> {
        Enhancements to ISAKMP
 }
 
        Enhancements to ISAKMP
 }
 
-Paul Ionescu <ipaul@romsys.ro> {
+Paul Ionescu <paul@acorp.ro> {
        IPX over GRE support
        EIGRP support
        Cisco IGRP support
        IPX over GRE support
        EIGRP support
        Cisco IGRP support
+       X.25 over TCP support
 }
 
 Mark Burton <markb@ordern.com> {
 }
 
 Mark Burton <markb@ordern.com> {
index 6a2363e980b641e5032518c36be517f3248a3084..4206f77d3ff4508b7f1bc772418d4f11709f53a2 100644 (file)
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.258 2000/12/13 02:24:21 guy Exp $
+# $Id: Makefile.am,v 1.259 2000/12/17 07:38:14 guy Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@zing.org>
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@zing.org>
@@ -174,6 +174,7 @@ DISSECTOR_SOURCES = \
        packet-wtp.c \
        packet-x11.c   \
        packet-x25.c   \
        packet-wtp.c \
        packet-x11.c   \
        packet-x25.c   \
+       packet-xot.c   \
        packet-yhoo.c  \
        packet-ypbind.c \
        packet-ypserv.c \
        packet-yhoo.c  \
        packet-ypbind.c \
        packet-ypserv.c \
index 5afd5d91e527a2137a4c24655b64cc83937735db..c6a5fd9d259f9c6d94e8c266ff1b8cd34ef8089e 100644 (file)
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: nmake -f makefile.nmake
 #
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: nmake -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.67 2000/12/13 02:24:21 guy Exp $
+# $Id: Makefile.nmake,v 1.68 2000/12/17 07:38:14 guy Exp $
 
 include config.nmake
 
 
 include config.nmake
 
@@ -161,6 +161,7 @@ DISSECTOR_SOURCES = \
        packet-wtp.c \
        packet-x11.c    \
        packet-x25.c   \
        packet-wtp.c \
        packet-x11.c    \
        packet-x25.c   \
+       packet-xot.c   \
        packet-yhoo.c  \
        packet-ypbind.c \
        packet-ypserv.c \
        packet-yhoo.c  \
        packet-ypbind.c \
        packet-ypserv.c \
diff --git a/packet-xot.c b/packet-xot.c
new file mode 100644 (file)
index 0000000..4d41058
--- /dev/null
@@ -0,0 +1,98 @@
+/* packet-xot.c
+ * Routines for X25 over TCP dissection (RFC 1613)
+ *
+ * Copyright 2000, Paul Ionescu        <paul@acorp.ro>
+ *
+ * $Id: packet-xot.c,v 1.1 2000/12/17 07:38:14 guy Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.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
+ * 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>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include <string.h>
+#include <glib.h>
+#include "packet.h"
+#include "packet-x25.h"
+
+#define TCP_PORT_XOT 1998
+
+static gint proto_xot = -1;
+static gint ett_xot = -1;
+
+static void dissect_xot(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+  proto_item *ti;
+  proto_tree *xot_tree;
+  guint16 version,len;
+  tvbuff_t   *next_tvb; 
+    
+  CHECK_DISPLAY_AS_DATA(proto_xot, tvb, pinfo, tree);
+
+  pinfo->current_proto = "XOT";
+  if (check_col(pinfo->fd, COL_PROTOCOL)) 
+      col_set_str(pinfo->fd, COL_PROTOCOL, "XOT");
+
+  version = tvb_get_ntohs(tvb,0);
+  len     = tvb_get_ntohs(tvb,2);
+
+  if (check_col(pinfo->fd, COL_INFO)) 
+     col_add_fstr(pinfo->fd, COL_INFO, "XOT Version = %u, size = %u",version,len );
+
+  if (tree) {
+       
+      ti = proto_tree_add_protocol_format(tree, proto_xot, tvb, 0, 4, "X.25 over TCP");
+      xot_tree = proto_item_add_subtree(ti, ett_xot);
+      
+      ti = proto_tree_add_text(xot_tree, tvb, 0,2,"XOT Version : %u %s",version,(version==0?"":" - Unknown version")) ;
+      ti = proto_tree_add_text(xot_tree, tvb, 2,2,"XOT length : %u",len) ;
+  }
+  next_tvb =  tvb_new_subset(tvb,4, -1 , -1);
+  dissect_x25(next_tvb,pinfo,tree);
+}
+/* Register the protocol with Ethereal */
+void proto_register_xot(void)
+{                 
+
+
+  /* Setup protocol subtree array */
+  static gint *ett[] = {
+    &ett_xot,
+  };
+
+  /* Register the protocol name and description */
+  proto_xot = proto_register_protocol("X.25 over TCP", "xot");
+
+  /* Required function calls to register the header fields and subtrees used */
+  proto_register_subtree_array(ett, array_length(ett));
+};
+
+void
+proto_reg_handoff_xot(void)
+{
+  dissector_add("tcp.port", TCP_PORT_XOT, dissect_xot);
+}