Support BACNET over ARCNET, under the assumption that no fragmentation

is done.

Support "Novell EC" over ARCNET, under the assumption that it's just
another way of sending IPX over ARCNET.

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

diff --git a/arcnet_pids.h b/arcnet_pids.h
index 95e36fbe04485069dbd237f5343b03c8b6037c87..fc77f70584322e96b565b1156a3984ce43cdd9cd 100644 (file)
--- a/arcnet_pids.h
+++ b/arcnet_pids.h
@@ -2,7 +2,7 @@
  * ARCNET protocol ID values
  * Copyright 2001-2002, Peter Fales <ethereal@fales-lorenz.net>
  *
- * $Id: arcnet_pids.h,v 1.3 2003/01/23 07:28:59 guy Exp $
+ * $Id: arcnet_pids.h,v 1.4 2003/01/23 09:54:54 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -53,3 +53,5 @@
 #define ARCNET_PROTO_BANYAN    247     /* Banyan VINES */
 
 #define ARCNET_PROTO_DIAGNOSE  128     /* as per ANSI/ATA 878.1 */
+
+#define ARCNET_PROTO_BACNET    205

diff --git a/packet-arcnet.c b/packet-arcnet.c
index 6b623c603f59f88d0f3cd524b2af83bf24494d23..71c10089b60662d475e5f301ce2ce65ddf91799d 100644 (file)
--- a/packet-arcnet.c
+++ b/packet-arcnet.c
@@ -2,7 +2,7 @@
  * Routines for arcnet dissection
  * Copyright 2001-2002, Peter Fales <ethereal@fales-lorenz.net>
  *
- * $Id: packet-arcnet.c,v 1.7 2003/01/23 09:04:54 guy Exp $
+ * $Id: packet-arcnet.c,v 1.8 2003/01/23 09:54:54 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -182,6 +182,7 @@ dissect_arcnet_common (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
   case ARCNET_PROTO_IP_1051:
   case ARCNET_PROTO_ARP_1051:
   case ARCNET_PROTO_DIAGNOSE:
+  case ARCNET_PROTO_BACNET:    /* XXX - no fragmentation? */
     /* No fragmentation stuff in the header */
     break;
 

diff --git a/packet-bacnet.c b/packet-bacnet.c
index 265a48a43cbb8acf7f24d63aae299e1e83fa0e50..44903224be40e728a3851659d029d7a92dd04ed8 100644 (file)
--- a/packet-bacnet.c
+++ b/packet-bacnet.c
@@ -2,7 +2,7 @@
  * Routines for BACnet (NPDU) dissection
  * Copyright 2001, Hartmut Mueller <hartmut@abmlinux.org>, FH Dortmund
  *
- * $Id: packet-bacnet.c,v 1.15 2002/11/16 08:55:11 guy Exp $
+ * $Id: packet-bacnet.c,v 1.16 2003/01/23 09:54:54 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -38,6 +38,7 @@
 #include <epan/packet.h>
 
 #include "llcsaps.h"
+#include "arcnet_pids.h"
 
 static dissector_handle_t bacapp_handle;
 static dissector_handle_t data_handle;
@@ -596,6 +597,7 @@ proto_reg_handoff_bacnet(void)
        dissector_add("bvlc.function", 0x0a, bacnet_handle);
        dissector_add("bvlc.function", 0x0b, bacnet_handle);
        dissector_add("llc.dsap", SAP_BACNET, bacnet_handle);
+       dissector_add("arcnet.protocol_id", ARCNET_PROTO_BACNET, bacnet_handle);
        bacapp_handle = find_dissector("bacapp");
        data_handle = find_dissector("data");
 }

diff --git a/packet-ipx.c b/packet-ipx.c
index e24bc9f7b16acf7676c64e7fef09bf78505b76dd..d36f104004aa3657fb13c79d2b3dbba3c57da73e 100644 (file)
--- a/packet-ipx.c
+++ b/packet-ipx.c
@@ -2,7 +2,7 @@
  * Routines for NetWare's IPX
  * Gilbert Ramirez <gram@alumni.rice.edu>
  *
- * $Id: packet-ipx.c,v 1.117 2002/12/02 23:43:26 guy Exp $
+ * $Id: packet-ipx.c,v 1.118 2003/01/23 09:54:54 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1082,6 +1082,7 @@ proto_reg_handoff_ipx(void)
        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);
+        dissector_add("arcnet.protocol_id", ARCNET_PROTO_NOVELL_EC, ipx_handle);
 
        spx_handle = create_dissector_handle(dissect_spx, proto_spx);
        dissector_add("ipx.packet_type", IPX_PACKET_TYPE_SPX, spx_handle);