Wireshark · Ethereal-dev: [Ethereal-dev] Re: patches for arcnet support

[Peter Fales <psfales@xxxxxxxxxx>]

Guy,

Thanks for all your suggestions on cleaning up the code for arcnet
support.  I was able to build with the latest libpcap from CVS, so 
no libpcap changes were needed.  I've attached the patches to 
ethereal-0.9.7.  See what you think of this.

--
Peter Fales

diff -urN ethereal-0.9.7/Makefile.am ethereal-0.9.7+arcnet/Makefile.am
--- ethereal-0.9.7/Makefile.am	Sun Sep 29 14:10:05 2002
+++ ethereal-0.9.7+arcnet/Makefile.am	Thu Oct 17 22:56:20 2002
@@ -90,6 +90,7 @@
 	packet-ajp13.c		\
 	packet-aodv.c  \
 	packet-aodv6.c \
+	packet-arcnet.c \
 	packet-arp.c   \
 	packet-asap.c  \
 	packet-ascend.c\
diff -urN ethereal-0.9.7/packet-arcnet.c ethereal-0.9.7+arcnet/packet-arcnet.c
--- ethereal-0.9.7/packet-arcnet.c	Wed Dec 31 18:00:00 1969
+++ ethereal-0.9.7+arcnet/packet-arcnet.c	Thu Oct 17 22:56:50 2002
@@ -0,0 +1,189 @@
+/* packet-arcnet.c
+ * Routines for arcnet dissection
+ * Copyright 2001-2002, Peter Fales <ethereal@fales-lorenz.net>
+ *
+ * $Id: README.developer,v 1.36 2001/09/14 07:10:09 guy Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * 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 <string.h>
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+
+#include <glib.h>
+
+#ifdef NEED_SNPRINTF_H
+# include "snprintf.h"
+#endif
+
+#include "epan/packet.h"
+#include "packet-arcnet.h"
+#include "packet-ip.h"
+
+packet_counts *get_counts ();
+
+/* Initialize the protocol and registered fields */
+static int proto_arcnet = -1;
+static int hf_arcnet_src = -1;
+static int hf_arcnet_dst = -1;
+static int hf_arcnet_protID = -1;
+
+/* Initialize the subtree pointers */
+static gint ett_arcnet = -1;
+
+static dissector_table_t arcnet_dissector_table;
+static dissector_handle_t data_handle;
+static dissector_handle_t arcnet_handle;
+
+
+/* Code to actually dissect the packets */
+static void
+dissect_arcnet (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
+{
+  guint8 dst, src, protID;
+  tvbuff_t *next_tvb;
+
+/* Set up structures needed to add the protocol subtree and manage it */
+  proto_item *ti;
+  proto_tree *arcnet_tree;
+
+  src = tvb_get_guint8 (tvb, 0);
+  dst = tvb_get_guint8 (tvb, 1);
+  protID = tvb_get_guint8 (tvb, 4);
+
+/* Make entries in Protocol column and Info column on summary display */
+  if (check_col (pinfo->cinfo, COL_PROTOCOL))
+    col_set_str (pinfo->cinfo, COL_PROTOCOL, "arcnet");
+
+  if (check_col (pinfo->cinfo, COL_INFO))
+    col_set_str (pinfo->cinfo, COL_INFO, "ARCNET");
+
+/* In the interest of speed, if "tree" is NULL, don't do any work not
+   necessary to generate protocol tree items. */
+  if (tree)
+    {
+
+/* create display subtree for the protocol */
+      ti =
+	proto_tree_add_item (tree, proto_arcnet, tvb, 0, tvb_length (tvb),
+			     FALSE);
+
+      arcnet_tree = proto_item_add_subtree (ti, ett_arcnet);
+
+      proto_tree_add_uint (tree, hf_arcnet_src, tvb, 0, 1, src);
+      proto_tree_add_uint (tree, hf_arcnet_dst, tvb, 1, 1, dst);
+      proto_tree_add_uint (tree, hf_arcnet_protID, tvb, 4, 1, protID);
+    }
+
+/* If this protocol has a sub-dissector call it here, see section 1.8 */
+
+  next_tvb = tvb_new_subset (tvb, 8, -1, -1);
+
+  if (!dissector_try_port (arcnet_dissector_table, protID,
+			   next_tvb, pinfo, tree))
+    {
+      if (check_col (pinfo->cinfo, COL_PROTOCOL))
+	{
+	  col_add_fstr (pinfo->cinfo, COL_PROTOCOL, "0x%04x", protID);
+	}
+      call_dissector (data_handle, next_tvb, pinfo, tree);
+    }
+
+}
+
+
+/* Register the protocol with Ethereal */
+
+/* this format is require because a script is used to build the C function
+   that calls all the protocol registration.
+*/
+
+static const value_string arcnet_prot_id_vals[] = {
+  {ARCNET_PROTO_IP, "IP packet"},
+  {ARCNET_PROTO_ARP, "ARP packet"},
+  {ARCNET_PROTO_IPX, "IPX packet"},
+  {0, NULL}
+};
+
+void
+proto_register_arcnet (void)
+{
+
+/* Setup list of header fields  See Section 1.6.1 for details*/
+  static hf_register_info hf[] = {
+    {&hf_arcnet_src,
+     {"Source", "arcnet.src",
+      FT_UINT8, BASE_HEX, NULL, 0,
+      "Source ID", HFILL}
+     },
+    {&hf_arcnet_dst,
+     {"Dest", "arcnet.dst",
+      FT_UINT8, BASE_HEX, NULL, 0,
+      "Dest ID", HFILL}
+     },
+    {&hf_arcnet_protID,
+     {"Protocol ID", "arcnet.protID",
+      FT_UINT8, BASE_HEX, arcnet_prot_id_vals, 0,
+      "Proto type", HFILL}
+     },
+  };
+
+/* Setup protocol subtree array */
+  static gint *ett[] = {
+    &ett_arcnet,
+  };
+
+  arcnet_dissector_table = register_dissector_table ("arcnet.protocol_id",
+						     "ARCNET Protocol ID",
+						     FT_UINT8, BASE_HEX);
+
+/* Register the protocol name and description */
+  proto_arcnet = proto_register_protocol ("Arcnet", "Arcnet", "arcnet");
+
+/* Required function calls to register the header fields and subtrees used */
+  proto_register_field_array (proto_arcnet, hf, array_length (hf));
+  proto_register_subtree_array (ett, array_length (ett));
+
+  register_dissector ("arcnet", dissect_arcnet, proto_arcnet);
+}
+
+
+void
+proto_reg_handoff_arcnet (void)
+{
+
+  arcnet_handle = find_dissector ("arcnet");
+
+  dissector_add ("wtap_encap", WTAP_ENCAP_ARCNET, arcnet_handle);
+  data_handle = find_dissector ("data");
+
+}
diff -urN ethereal-0.9.7/packet-arcnet.h ethereal-0.9.7+arcnet/packet-arcnet.h
--- ethereal-0.9.7/packet-arcnet.h	Wed Dec 31 18:00:00 1969
+++ ethereal-0.9.7+arcnet/packet-arcnet.h	Thu Oct 17 22:56:50 2002
@@ -0,0 +1,28 @@
+/* packet-arcnet.h
+ * Routines for arcnet dissection
+ * Copyright 2001-2002, Peter Fales <ethereal@fales-lorenz.net>
+ *
+ * $Id: README.developer,v 1.36 2001/09/14 07:10:09 guy Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * 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.
+ */
+
+#define ARCNET_PROTO_IP		0xd4
+#define ARCNET_PROTO_ARP	0xd5
+#define ARCNET_PROTO_IPX	0xfa
diff -urN ethereal-0.9.7/packet-arp.c ethereal-0.9.7+arcnet/packet-arp.c
--- ethereal-0.9.7/packet-arp.c	Wed Aug 28 19:39:46 2002
+++ ethereal-0.9.7+arcnet/packet-arp.c	Thu Oct 17 22:56:50 2002
@@ -32,6 +32,7 @@
 #include <epan/strutil.h>
 #include <epan/resolv.h>
 #include "packet-arp.h"
+#include "packet-arcnet.h"
 #include "etypes.h"
 
 static int proto_arp = -1;
@@ -994,4 +995,6 @@
   arp_handle = create_dissector_handle(dissect_arp, proto_arp);
   dissector_add("ethertype", ETHERTYPE_ARP, arp_handle);
   dissector_add("ethertype", ETHERTYPE_REVARP, arp_handle);
+  dissector_add("arcnet.protocol_id", ARCNET_PROTO_ARP, arp_handle);
+
 }
diff -urN ethereal-0.9.7/packet-ip.c ethereal-0.9.7+arcnet/packet-ip.c
--- ethereal-0.9.7/packet-ip.c	Wed Aug 28 19:39:53 2002
+++ ethereal-0.9.7+arcnet/packet-ip.c	Thu Oct 17 22:56:50 2002
@@ -46,6 +46,7 @@
 #include "aftypes.h"
 #include "packet-ip.h"
 #include "packet-ipsec.h"
+#include "packet-arcnet.h"
 #include "in_cksum.h"
 #include "nlpid.h"
 
@@ -1753,6 +1754,8 @@
 	dissector_add("chdlctype", ETHERTYPE_IP, ip_handle);
 	dissector_add("fr.ietf", NLPID_IP, ip_handle);
 	dissector_add("x.25.spi", NLPID_IP, ip_handle);
+        dissector_add("arcnet.protocol_id", 0xd4, ip_handle);
+
 }
 
 void
diff -urN ethereal-0.9.7/packet-ipx.c ethereal-0.9.7+arcnet/packet-ipx.c
--- ethereal-0.9.7/packet-ipx.c	Tue Sep 24 20:52:57 2002
+++ ethereal-0.9.7+arcnet/packet-ipx.c	Thu Oct 17 22:56:50 2002
@@ -32,6 +32,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-ipx.h"
+#include "packet-arcnet.h"
 #include <epan/resolv.h>
 #include "etypes.h"
 #include "ppptypes.h"
@@ -1039,6 +1040,8 @@
 	dissector_add("llc.dsap", SAP_NETWARE, ipx_handle);
 	dissector_add("null.type", BSD_AF_IPX, ipx_handle);
 	dissector_add("gre.proto", ETHERTYPE_IPX, ipx_handle);
+        dissector_add("arcnet.protocol_id", ARCNET_PROTO_IPX, ipx_handle);
+
 	spx_handle = create_dissector_handle(dissect_spx, proto_spx);
 	dissector_add("ipx.packet_type", IPX_PACKET_TYPE_SPX, spx_handle);
 	ipxsap_handle = find_dissector("ipxsap");