From Dave Richards: support BACNET over 802.2.

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

diff --git a/AUTHORS b/AUTHORS
index 761840665478b5aaa6f3094ff9722406c6d3141c..9a8119f8e901cac0f21c34121b0ebd684c73f3bd 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1506,6 +1506,10 @@ Brian Ginsbach <ginsbach [AT] cray.com> {
        Support for additional snoop file encapsulations in UNICOS/mp
 }
 
+Dave Richards <d_m_richards [AT] attbi.com> {
+       BACNET over 802.2
+}
+
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
 give his permission to use his version of snprintf.c.
 

diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index a6e2cab7a1e6e00005ab3cca77730261f59930cf..b3a728f85543311486ade615df24065ce35ca9ef 100644 (file)
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -1597,6 +1597,7 @@ B<http://www.ethereal.com>.
   Andreas Trauer           <andreas.trauer [AT] siemens.com>
   Ronald Henderson         <Ronald.Henderson [AT] CognicaseUSA.com>
   Brian Ginsbach           <ginsbach [AT] cray.com>
+  Dave Richards            <d_m_richards [AT] attbi.com>
 
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his
 permission to use his version of snprintf.c.

diff --git a/llcsaps.h b/llcsaps.h
index c52ab93eed0bbc5e6be5ca0852f31df6851e2f35..82e94e15cc8a649ec0d8243c1f9c1f51853864c5 100644 (file)
--- a/llcsaps.h
+++ b/llcsaps.h
@@ -1,7 +1,7 @@
 /* llcsaps.h
  * Defines LLC SAP values.
  *
- * $Id: llcsaps.h,v 1.3 2002/08/28 21:00:06 jmayer Exp $
+ * $Id: llcsaps.h,v 1.4 2002/11/16 08:55:11 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -38,6 +38,7 @@
 #define        SAP_RS511               0x4E
 #define        SAP_X25                 0x7E
 #define        SAP_XNS                 0x80
+#define        SAP_BACNET              0x82
 #define        SAP_NESTAR              0x86
 #define        SAP_PROWAY_ASLM         0x8E
 #define        SAP_ARP                 0x98

diff --git a/packet-bacnet.c b/packet-bacnet.c
index ea9ff4c5b74b0c7755314fb7fe1e4522181f68e2..265a48a43cbb8acf7f24d63aae299e1e83fa0e50 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.14 2002/08/28 21:00:07 jmayer Exp $
+ * $Id: packet-bacnet.c,v 1.15 2002/11/16 08:55:11 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -37,6 +37,8 @@
 
 #include <epan/packet.h>
 
+#include "llcsaps.h"
+
 static dissector_handle_t bacapp_handle;
 static dissector_handle_t data_handle;
 
@@ -593,6 +595,7 @@ proto_reg_handoff_bacnet(void)
        dissector_add("bvlc.function", 0x09, bacnet_handle);
        dissector_add("bvlc.function", 0x0a, bacnet_handle);
        dissector_add("bvlc.function", 0x0b, bacnet_handle);
+       dissector_add("llc.dsap", SAP_BACNET, bacnet_handle);
        bacapp_handle = find_dissector("bacapp");
        data_handle = find_dissector("data");
 }

diff --git a/packet-llc.c b/packet-llc.c
index e9e17f646dc03d7675b9955fec6398cb4b324fc6..0371f768a1fdebe7112cebe3b83067e7ae3eb575 100644 (file)
--- a/packet-llc.c
+++ b/packet-llc.c
@@ -2,7 +2,7 @@
  * Routines for IEEE 802.2 LLC layer
  * Gilbert Ramirez <gram@alumni.rice.edu>
  *
- * $Id: packet-llc.c,v 1.101 2002/11/05 22:50:42 guy Exp $
+ * $Id: packet-llc.c,v 1.102 2002/11/16 08:55:11 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -120,6 +120,7 @@ const value_string sap_vals[] = {
         */
        { 0x7F,               "ISO 802.2" },
        { SAP_XNS,            "XNS" },
+       { SAP_BACNET,         "BACnet" },
        { SAP_NESTAR,         "Nestar" },
        { SAP_PROWAY_ASLM,    "PROWAY (IEC955) Active Station List Maintenance" },
        { SAP_ARP,            "ARP" },  /* XXX - hand to "dissect_arp()"? */