diff options
| -rw-r--r-- | AUTHORS | 4 | ||||
| -rw-r--r-- | doc/ethereal.pod.template | 1 | ||||
| -rw-r--r-- | llcsaps.h | 3 | ||||
| -rw-r--r-- | packet-bacnet.c | 5 | ||||
| -rw-r--r-- | packet-llc.c | 3 |
5 files changed, 13 insertions, 3 deletions
@@ -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 a6e2cab7a1..b3a728f855 100644 --- 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. @@ -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 ea9ff4c5b7..265a48a43c 100644 --- 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 e9e17f646d..0371f768a1 100644 --- 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()"? */ |