#include "config.h"
-#include <glib.h>
-
#include <epan/packet.h>
#include <epan/to_str.h>
-#include <epan/wmem/wmem.h>
#include <epan/reassemble.h>
#include <epan/expert.h>
#include <epan/stats_tree.h>
/* formerly bacapp.h contains definitions and forward declarations */
-#ifndef FAULT
-#define FAULT proto_tree_add_text(subtree, tvb, offset, tvb_length(tvb) - offset, "something is going wrong here !!"); \
- offset = tvb_length(tvb);
-#endif
-
/* BACnet PDU Types */
#define BACAPP_TYPE_CONFIRMED_SERVICE_REQUEST 0
#define BACAPP_TYPE_UNCONFIRMED_SERVICE_REQUEST 1
* listOfReadAccessResults SEQUENCE OF ReadAccessResult
* }
* @param tvb the tv buffer of the current data
- * @parma pinfo
+ * @param pinfo the packet info of the current data
* @param tree the tree to append this item to
* @param offset the offset in the tvb
* @return offset modified
const gchar *label, const value_string *vs);
static const char *bacapp_unknown_service_str = "unknown service"; /* Usage: no format specifiers */
-static const char *ASHRAE_Reserved_Fmt = "(%d) Reserved for Use by ASHRAE";
-static const char *Vendor_Proprietary_Fmt = "(%d) Vendor Proprietary Value";
+static const char ASHRAE_Reserved_Fmt[] = "(%d) Reserved for Use by ASHRAE";
+static const char Vendor_Proprietary_Fmt[] = "(%d) Vendor Proprietary Value";
static const value_string
BACnetTypeName[] = {
{ 6, "alarm-value"},
{ 7, "alarm-values"},
{ 8, "all"},
- { 9, "all-write-successful"},
+ { 9, "all-writes-successful"},
{ 10, "apdu-segment-timeout"},
{ 11, "apdu-timeout"},
{ 12, "application-software-version"},
{ 44, "firmware-revision"},
{ 45, "high-limit"},
{ 46, "inactive-text"},
- { 47, "in-progress"},
+ { 47, "in-process"},
{ 48, "instance-of"},
{ 49, "integral-constant"},
{ 50, "integral-constant-units"},
{ 70, "RLE Technologies" },
{ 71, "Cardkey Systems" },
{ 72, "SECOM Co., Ltd." },
- { 73, "ABB Gebaudetechnik AG Bereich NetServ" },
+ { 73, "ABB Gebaeudetechnik AG Bereich NetServ" },
{ 74, "KNX Association cvba" },
{ 75, "Institute of Electrical Installation Engineers of Japan (IEIEJ)" },
{ 76, "Nohmi Bosai, Ltd." },
{ 77, "Carel S.p.A." },
- { 78, "AirSense Technology, Inc." },
+ { 78, "UTC Fire & Security Espana, S.L." },
{ 79, "Hochiki Corporation" },
{ 80, "Fr. Sauter AG" },
{ 81, "Matsushita Electric Works, Ltd." },
{ 106, "Meidensha Corporation" },
{ 107, "JCI Systems Integration Services" },
{ 108, "Freedom Corporation" },
- { 109, "Neuberger Gebaudeautomation GmbH" },
+ { 109, "Neuberger Gebaeudeautomation GmbH" },
{ 110, "Sitronix" },
{ 111, "Leviton Manufacturing" },
{ 112, "Fujitsu Limited" },
{ 153, "National Environmental Product" },
{ 154, "Unitec Corporation" },
{ 155, "Kanden Engineering Company" },
- { 156, "Messner Gebaudetechnik GmbH" },
+ { 156, "Messner Gebaeudetechnik GmbH" },
{ 157, "Integrated.CH" },
{ 158, "Price Industries" },
{ 159, "SE-Elektronic GmbH" },
{ 162, "ASI Controls" },
{ 163, "SysMik GmbH Dresden" },
{ 164, "HSC Regelungstechnik GmbH" },
- { 165, "Smart Temp Australia Pty. Ltd." },
+ { 165, "Smart Temp Australia Pty. Ltd." },
{ 166, "Cooper Controls" },
{ 167, "Duksan Mecasys Co., Ltd." },
{ 168, "Fuji IT Co., Ltd." },
{ 174, "Building Control Integrators" },
{ 175, "ITG Worldwide (M) Sdn Bhd" },
{ 176, "Lutron Electronics Co., Inc." },
+ { 177, "Cooper-Atkins Corporation" },
{ 178, "LOYTEC Electronics GmbH" },
{ 179, "ProLon" },
{ 180, "Mega Controls Limited" },
{ 185, "Hermos AG" },
{ 186, "CEZIM" },
{ 187, "Softing" },
- { 188, "Lynxspring" },
+ { 188, "Lynxspring, Inc." },
{ 189, "Schneider Toshiba Inverter Europe" },
{ 190, "Danfoss Drives A/S" },
{ 191, "Eaton Corporation" },
{ 194, "Noveo, Inc." },
{ 195, "AMEV" },
{ 196, "Yokogawa Electric Corporation" },
- { 197, "GFR Gesellschaft fur Regelungstechnik" },
+ { 197, "GFR Gesellschaft fuer Regelungstechnik" },
{ 198, "Exact Logic" },
{ 199, "Mass Electronics Pty Ltd dba Innotech Control Systems Australia" },
{ 200, "Kandenko Co., Ltd." },
{ 303, "Real Time Automation, Inc." },
{ 304, "ITEC Hankyu-Hanshin Co." },
{ 305, "Cyrus E&M Engineering Co., Ltd." },
- { 306, "Racine Federated, Inc." },
+ { 306, "Badger Meter" },
{ 307, "Cirrascale Corporation" },
{ 308, "Elesta GmbH Building Automation" },
{ 309, "Securiton" },
{ 397, "EGauge Systems, LLC" },
{ 398, "Quantum Automation (ASIA) PTE, Ltd." },
{ 399, "Toshiba Lighting & Technology Corp." },
- { 400, "SPIN Engenharia de Automaca Ltda." },
+ { 400, "SPIN Engenharia de Automacao Ltda." },
{ 401, "Logistics Systems & Software Services India PVT. Ltd." },
{ 402, "Delta Controls Integration Products" },
{ 403, "Focus Media" },
{ 425, "Triacta Power Technologies, Inc." },
{ 426, "Globestar Systems" },
{ 427, "MLB Advanced Media, LP" },
- { 428, "SWG Stuckmann Wirtschaftliche Gebaudesysteme GmbH" },
+ { 428, "SWG Stuckmann Wirtschaftliche Gebaeudesysteme GmbH" },
{ 429, "SensorSwitch" },
{ 430, "Multitek Power Limited" },
{ 431, "Aquametro AG" },
{ 460, "Log-One Ltd." },
{ 461, "TECO Electric & Machinery Co., Ltd." },
{ 462, "ConnectEx, Inc." },
- { 463, "Turbo DDC Sudwest" },
+ { 463, "Turbo DDC Suedwest" },
{ 464, "Quatrosense Environmental Ltd." },
{ 465, "Fifth Light Technology Ltd." },
{ 466, "Scientific Solutions, Ltd." },
{ 638, "Conditionaire International Pty. Limited" },
{ 639, "Quebec, Inc." },
{ 640, "Homerun Holdings" },
- { 641, "RFM, Inc." },
+ { 641, "Murata Americas" },
{ 642, "Comptek" },
{ 643, "Westco Systems, Inc." },
{ 644, "Advancis Software & Services GmbH" },
{ 680, "ISM EuroCenter S.A." },
{ 681, "TDIS" },
{ 682, "Trade FIDES" },
- { 683, "Knurr GmbH (Emerson Network Power)" },
+ { 683, "Knuerr GmbH (Emerson Network Power)" },
{ 684, "Resource Data Management" },
{ 685, "Abies Technology, Inc." },
{ 686, "Amalva" },
{ 692, "Ruskin Manufacturing" },
{ 693, "Calon Associates Limited" },
{ 694, "Contec Co., Ltd." },
- { 695, "iT GmbH"},
- { 696, "Autani Corporation"},
- { 697, "Christian Fortin"},
- { 698, "HDL"},
- { 699, "IPID Sp. Z.O.O Limited"},
- { 700, "Fuji Electric Co., Ltd"},
- { 701, "View, Inc."},
- { 702, "Samsung S1 Corporation"},
- { 703, "New Lift"},
- { 704, "VRT Systems"},
+ { 695, "iT GmbH" },
+ { 696, "Autani Corporation" },
+ { 697, "Christian Fortin" },
+ { 698, "HDL" },
+ { 699, "IPID Sp. Z.O.O Limited" },
+ { 700, "Fuji Electric Co., Ltd" },
+ { 701, "View, Inc." },
+ { 702, "Samsung S1 Corporation" },
+ { 703, "New Lift" },
+ { 704, "VRT Systems" },
+ { 705, "Motion Control Engineering, Inc." },
+ { 706, "Weiss Klimatechnik GmbH" },
+ { 707, "Elkon" },
+ { 708, "Eliwell Controls S.r.l." },
+ { 709, "Japan Computer Technos Corp" },
+ { 710, "Rational Network ehf" },
+ { 711, "Magnum Energy Solutions, LLC" },
+ { 712, "MelRok" },
+ { 713, "VAE Group" },
+ { 714, "LGCNS" },
+ { 715, "Berghof Automationstechnik GmbH" },
+ { 716, "Quark Communications, Inc." },
+ { 717, "Sontex" },
+ { 718, "mivune AG" },
+ { 719, "Panduit" },
+ { 720, "Smart Controls, LLC" },
+ { 721, "Compu-Aire, Inc." },
+ { 722, "Sierra" },
+ { 723, "ProtoSense Technologies" },
+ { 724, "Eltrac Technologies Pvt Ltd" },
+ { 725, "Bektas Invisible Controls GmbH" },
+ { 726, "Entelec" },
+ { 727, "Innexiv" },
+ { 728, "Covenant" },
+ { 729, "Davitor AB" },
+ { 730, "TongFang Technovator" },
+ { 731, "Building Robotics, Inc." },
+ { 732, "HSS-MSR UG" },
+ { 733, "FramTack LLC" },
+ { 734, "B. L. Acoustics, Ltd." },
+ { 735, "Traxxon Rock Drills, Ltd" },
+ { 736, "Franke" },
+ { 737, "Wurm GmbH & Co" },
+ { 738, "AddENERGIE" },
+ { 739, "Mirle Automation Corporation" },
+ { 740, "Ibis Networks" },
+ { 741, "ID-KARTA s.r.o." },
+ { 742, "Anaren, Inc." },
+ { 743, "Span, Incorporated" },
+ { 744, "Bosch Thermotechnology Corp" },
+ { 745, "DRC Technology S.A." },
+ { 746, "Shanghai Energy Building Technology Co, Ltd" },
+ { 747, "Fraport AG" },
+ { 748, "Flowgroup" },
+ { 749, "Skytron Energy, GmbH" },
+ { 750, "ALTEL Wicha, Golda Sp. J." },
+ { 751, "Drupal" },
+ { 752, "Axiomatic Technology, Ltd" },
+ { 753, "Bohnke + Partner" },
+ { 754, "Function 1" },
+ { 755, "Optergy Pty, Ltd" },
+ { 756, "LSI Virticus" },
+ { 757, "Konzeptpark GmbH" },
+ { 758, "Hubbell Building Automation, Inc." },
+ { 759, "eCurv, Inc." },
+ { 760, "Agnosys GmbH" },
+ { 761, "Shanghai Sunfull Automation Co., LTD" },
+ { 762, "Kurz Instruments, Inc." },
+ { 763, "Cias Elettronica S.r.l." },
+ { 764, "Multiaqua, Inc." },
+ { 765, "BlueBox" },
+ { 766, "Sensidyne" },
+ { 767, "Viessmann Elektronik GmbH" },
+ { 768, "ADFweb.com srl" },
+ { 769, "Gaylord Industries" },
+ { 770, "Majur Ltd." },
+ { 771, "Shanghai Huilin Technology Co., Ltd." },
+ { 772, "Exotronic" },
+ { 773, "Safecontrol spol s.r.o." },
+ { 774, "Amatis" },
+ { 775, "Universal Electric Corporation" },
+ { 776, "iBACnet" },
+ { 778, "Smartrise Engineering, Inc." },
+ { 779, "Miratron, Inc." },
+ { 780, "SmartEdge" },
+ { 781, "Mitsubishi Electric Australia Pty Ltd" },
+ { 782, "Triangle Research International Ptd Ltd" },
+ { 783, "Produal Oy" },
+ { 784, "Milestone Systems A/S" },
+ { 785, "Trustbridge" },
{ 0, NULL }
};
static value_string_ext BACnetVendorIdentifiers_ext = VALUE_STRING_EXT_INIT(BACnetVendorIdentifiers);
static int hf_BACnetNamedTag = -1;
static int hf_BACnetTagClass = -1;
static int hf_BACnetCharacterSet = -1;
+static int hf_BACnetCodePage = -1;
static int hf_bacapp_tag_lvt = -1;
static int hf_bacapp_tag_ProcessId = -1;
static int hf_bacapp_uservice = -1;
static gint ett_bacapp_value = -1;
static expert_field ei_bacapp_bad_length = EI_INIT;
+static expert_field ei_bacapp_bad_tag = EI_INIT;
static gint32 propertyIdentifier = -1;
static gint32 propertyArrayIndex = -1;
bacapp_stats_tree_instanceid, bacapp_instanceid_stats_tree_init, NULL);
}
-/* 'data' must be ep_ allocated */
+/* 'data' must be allocated with wmem packet scope */
static gint
updateBacnetInfoValue(gint whichval, const gchar *data)
{
}
#endif
+static const char*
+val_to_split_str(guint32 val, guint32 split_val, const value_string *vs,
+ const char *fmt, const char *split_fmt)
+ G_GNUC_PRINTF(4, 0)
+ G_GNUC_PRINTF(5, 0);
/* Used when there are ranges of reserved and proprietary enumerations */
static const char*
if (tree) {
proto_tree *subtree;
- if (tag_is_opening(tag))
- ti = proto_tree_add_text(tree, tvb, offset, tag_len, "{[%u]", *tag_no );
- else if (tag_is_closing(tag))
- ti = proto_tree_add_text(tree, tvb, offset, tag_len, "}[%u]", *tag_no );
- else if (tag_is_context_specific(tag)) {
- ti = proto_tree_add_text(tree, tvb, offset, tag_len,
- "Context Tag: %u, Length/Value/Type: %u",
- *tag_no, *lvt);
- } else
- ti = proto_tree_add_text(tree, tvb, offset, tag_len,
- "Application Tag: %s, Length/Value/Type: %u",
- val_to_str(*tag_no,
- BACnetApplicationTagNumber,
- ASHRAE_Reserved_Fmt),
- *lvt);
+ if (tag_is_opening(tag)) {
+ subtree = proto_tree_add_subtree_format(tree, tvb, offset, tag_len,
+ ett_bacapp_tag, &ti, "{[%u]", *tag_no );
+ } else if (tag_is_closing(tag)) {
+ subtree = proto_tree_add_subtree_format(tree, tvb, offset, tag_len,
+ ett_bacapp_tag, &ti, "}[%u]", *tag_no );
+ } else if (tag_is_context_specific(tag)) {
+ subtree = proto_tree_add_subtree_format(tree, tvb, offset, tag_len,
+ ett_bacapp_tag, &ti,
+ "Context Tag: %u, Length/Value/Type: %u", *tag_no, *lvt);
+ } else {
+ subtree = proto_tree_add_subtree_format(tree, tvb, offset, tag_len,
+ ett_bacapp_tag, &ti,
+ "Application Tag: %s, Length/Value/Type: %u",
+ val_to_str(*tag_no, BACnetApplicationTagNumber,
+ ASHRAE_Reserved_Fmt),
+ *lvt);
+ }
/* details if needed */
- subtree = proto_item_add_subtree(ti, ett_bacapp_tag);
proto_tree_add_item(subtree, hf_BACnetTagClass, tvb, offset, 1, ENC_BIG_ENDIAN);
if (tag_is_extended_tag_number(tag)) {
proto_tree_add_uint_format(subtree,
tvb, lvt_offset, lvt_len, *lvt);
} /* if (tree) */
- if (*lvt > tvb_length(tvb)) {
+ if (*lvt > tvb_reported_length(tvb)) {
expert_add_info_format(pinfo, ti, &ei_bacapp_bad_length,
"LVT length too long: %d > %d", *lvt,
- tvb_length(tvb));
+ tvb_reported_length(tvb));
*lvt = 1;
}
offset += fTagHeader(tvb, pinfo, offset, &tag_no, &tag_info, &lvt);
if (lvt > 0) {
- tmp = tvb_bytes_to_ep_str(tvb, offset, lvt);
+ tmp = tvb_bytes_to_str(wmem_packet_scope(), tvb, offset, lvt);
subtree = proto_tree_add_subtree_format(tree, tvb, offset, lvt,
ett_bacapp_tag, NULL, "%s %s", label, tmp);
offset += lvt;
offset += fTagHeader(tvb, pinfo, offset, &tag_no, &tag_info, &lvt);
- subtree = proto_tree_add_subtree(tree, tvb, offset, 6, ett_bacapp_tag, NULL, label); /* just add the label, with the tagHeader information in its subtree */
-
- if (lvt > 0) {
- if (lvt == 6) { /* we have 6 Byte IP Address with 4 Octets IPv4 and 2 Octets Port Information */
-
- proto_tree_add_item(tree, hf_bacapp_tag_IPV4, tvb, offset, 4, ENC_BIG_ENDIAN);
- proto_tree_add_item(tree, hf_bacapp_tag_PORT, tvb, offset+4, 2, ENC_BIG_ENDIAN);
-
- } else {
- if (lvt == 18) { /* we have 18 Byte IP Address with 16 Octets IPv6 and 2 Octets Port Information */
-
- proto_tree_add_item(tree, hf_bacapp_tag_IPV6, tvb, offset, 16, ENC_NA);
- proto_tree_add_item(tree, hf_bacapp_tag_PORT, tvb, offset+16, 2, ENC_BIG_ENDIAN);
-
- } else { /* we have 1 Byte MS/TP Address or anything else interpreted as an address */
- subtree = proto_tree_add_subtree(tree, tvb, offset, lvt,
- ett_bacapp_tag, NULL, tvb_bytes_to_ep_str(tvb, offset, lvt));
- }
- }
- offset += lvt;
+ /* just add the label, with the tagHeader information in its subtree */
+ subtree = proto_tree_add_subtree(tree, tvb, offset, 6, ett_bacapp_tag, NULL, label);
+
+ if (lvt == 6) { /* we have 6 Byte IP Address with 4 Octets IPv4 and 2 Octets Port Information */
+ proto_tree_add_item(tree, hf_bacapp_tag_IPV4, tvb, offset, 4, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_bacapp_tag_PORT, tvb, offset+4, 2, ENC_BIG_ENDIAN);
+ } else if (lvt == 18) { /* we have 18 Byte IP Address with 16 Octets IPv6 and 2 Octets Port Information */
+ proto_tree_add_item(tree, hf_bacapp_tag_IPV6, tvb, offset, 16, ENC_NA);
+ proto_tree_add_item(tree, hf_bacapp_tag_PORT, tvb, offset+16, 2, ENC_BIG_ENDIAN);
+ } else { /* we have 1 Byte MS/TP Address or anything else interpreted as an address */
+ subtree = proto_tree_add_subtree(tree, tvb, offset, lvt,
+ ett_bacapp_tag, NULL, tvb_bytes_to_str(wmem_packet_scope(), tvb, offset, lvt));
}
+ offset += lvt;
fTagHeaderTree(tvb, pinfo, subtree, start, &tag_no, &tag_info, &lvt);
{
guint8 tag_no, tag_info, character_set;
guint32 lvt, l;
- guint offs, extra = 1;
+ guint offs;
const char *coding;
guint8 *out;
proto_tree *subtree;
if (tvb_reported_length_remaining(tvb, offset) > 0) {
offs = fTagHeader(tvb, pinfo, offset, &tag_no, &tag_info, &lvt);
+ offset += offs;
+
+ character_set = tvb_get_guint8(tvb, offset);
+ offset++;
+ lvt--;
- character_set = tvb_get_guint8(tvb, offset+offs);
/* Account for code page if DBCS */
- if (character_set == 1) {
- extra = 3;
+ if (character_set == IBM_MS_DBCS) {
+ offset += 2;
+ lvt -= 2;
}
- offset += (offs+extra);
- lvt -= (extra);
do {
l = MIN(lvt, 256);
fTagHeaderTree(tvb, pinfo, subtree, start, &tag_no, &tag_info, &lvt);
proto_tree_add_item(subtree, hf_BACnetCharacterSet, tvb, start+offs, 1, ENC_BIG_ENDIAN);
- if (character_set == 1) {
- proto_tree_add_text(subtree, tvb, start+offs+1, 2, "Code Page: %d", tvb_get_ntohs(tvb, start+offs+1));
+ if (character_set == IBM_MS_DBCS) {
+ proto_tree_add_item(subtree, hf_BACnetCodePage, tvb, start+offs+1, 2, ENC_BIG_ENDIAN);
}
/* XXX - put the string value here */
}
offset += fTagHeaderTree(tvb, pinfo, tree, offset,
&tag_no, &tag_info, &lvt);
offset = fAbstractSyntaxNType(tvb, pinfo, tree, offset);
- if (tvb_length_remaining(tvb, offset) > 0) {
+ if (tvb_reported_length_remaining(tvb, offset) > 0) {
offset += fTagHeaderTree(tvb, pinfo, tree, offset,
&tag_no, &tag_info, &lvt);
}
} else {
- proto_tree_add_text(tree, tvb, offset, tvb_length(tvb) - offset,
+ proto_tree_add_text(tree, tvb, offset, tvb_reported_length(tvb) - offset,
"expected Opening Tag!");
- offset = tvb_length(tvb);
+ offset = tvb_reported_length(tvb);
}
return offset;
subtree = proto_tree_add_subtree(subtree, tvb, offset, 1, ett_bacapp_value, NULL, "monitoredPropertyIdentifier");
offset += fTagHeaderTree(tvb, pinfo, subtree, offset, &tag_no, &tag_info, &lvt);
offset = fBACnetPropertyReference(tvb, pinfo, subtree, offset, 1);
- break;
+ } else {
+ expert_add_info(pinfo, subtree, &ei_bacapp_bad_tag);
}
- FAULT;
break;
case 5: /* covIncrement */
offset = fRealTag(tvb, pinfo, tree, offset, "COV Increment: ");
tag_len = fTagHeader(tvb, pinfo, offset, &tag_no, &tag_info, &lvt);
if (fUnsigned32(tvb, offset + tag_len, lvt, &val))
- ti = proto_tree_add_text(tree, tvb, offset, lvt+tag_len,
- "%s: %s (%u)",
+ subtree = proto_tree_add_subtree_format(tree, tvb, offset, lvt+tag_len,
+ ett_bacapp_tag, &ti, "%s: %s (%u)",
label,
val_to_str_ext_const(val, &BACnetVendorIdentifiers_ext, "Unknown Vendor"),
val);
else
- ti = proto_tree_add_text(tree, tvb, offset, lvt+tag_len,
- "%s - %u octets (Unsigned)", label, lvt);
- subtree = proto_item_add_subtree(ti, ett_bacapp_tag);
+ subtree = proto_tree_add_subtree_format(tree, tvb, offset, lvt+tag_len,
+ ett_bacapp_tag, &ti, "%s - %u octets (Unsigned)", label, lvt);
fTagHeaderTree(tvb, pinfo, subtree, offset, &tag_no, &tag_info, &lvt);
if ((lvt < 1) || (lvt > 2)) { /* vendorIDs >= 1 and <= 2 are supported */
- proto_tree_add_expert_format(tree, pinfo, &ei_bacapp_bad_length, tvb, 0, lvt,
+ expert_add_info_format(pinfo, ti, &ei_bacapp_bad_length,
"Wrong length indicated. Expected 1 or 2, got %u", lvt);
return offset+tag_len+lvt;
}
tag_len = fTagHeader(tvb, pinfo, offset, &tag_no, &tag_info, &lvt);
if (fUnsigned32(tvb, offset + tag_len, lvt, &val))
- ti = proto_tree_add_text(tree, tvb, offset, lvt+tag_len,
- "%s: %s (%u)", label,
+ subtree = proto_tree_add_subtree_format(tree, tvb, offset, lvt+tag_len,
+ ett_bacapp_tag, &ti, "%s: %s (%u)", label,
val_to_str_const(val, BACnetRestartReason, "Unknown reason"), val);
else
- ti = proto_tree_add_text(tree, tvb, offset, lvt+tag_len,
- "%s - %u octets (Unsigned)", label, lvt);
- subtree = proto_item_add_subtree(ti, ett_bacapp_tag);
+ subtree = proto_tree_add_subtree_format(tree, tvb, offset, lvt+tag_len,
+ ett_bacapp_tag, &ti, "%s - %u octets (Unsigned)", label, lvt);
fTagHeaderTree(tvb, pinfo, subtree, offset, &tag_no, &tag_info, &lvt);
if (lvt != 1) {
- proto_tree_add_expert_format(tree, pinfo, &ei_bacapp_bad_length, tvb, 0, lvt,
+ expert_add_info_format(pinfo, ti, &ei_bacapp_bad_length,
"Wrong length indicated. Expected 1, got %u", lvt);
return offset+tag_len+lvt;
}
if (dissector_try_uint(bacapp_dissector_table,
vendor_identifier, next_tvb, pinfo, tree)) {
/* we parsed it so skip over length and we are done */
- offset += tvb_length(next_tvb);
+ offset += tvb_reported_length(next_tvb);
return offset;
}
ett_bacapp_value, NULL, "service Parameters");
propertyIdentifier = -1;
offset = fAbstractSyntaxNType(tvb, pinfo, subtree, offset);
- break;
+ } else {
+ expert_add_info(pinfo, subtree, &ei_bacapp_bad_tag);
}
- FAULT;
break;
default:
return offset;
}
break;
case 17: /* change-of-characterstring */
+ while (tvb_reported_length_remaining(tvb, offset) > 0) { /* exit loop if nothing happens inside */
+ lastoffset = offset;
+ switch (fTagNo(tvb, offset)) {
+ case 0:
+ /* changed-value (CharacterString) */
+ offset = fCharacterString(tvb, pinfo, subtree, offset, "changed-value: ");
+ break;
+ case 1:
+ offset = fBitStringTagVS(tvb, pinfo, subtree, offset,
+ "status-flags: ", BACnetStatusFlags);
+ break;
+ case 2:
+ /* alarm-value (CharacterString) */
+ offset = fCharacterString(tvb, pinfo, subtree, offset, "alarm-value: ");
+ lastoffset = offset;
+ break;
+ default:
+ break;
+ }
+ if (offset == lastoffset) break; /* nothing happened, exit loop */
+ }
break;
case 18: /* change-of-status-flags */
+ while (tvb_reported_length_remaining(tvb, offset) > 0) {
+ /* exit loop if nothing happens inside */
+ lastoffset = offset;
+ switch (fTagNo(tvb, offset)) {
+ case 0:
+ offset += fTagHeaderTree(tvb, pinfo, subtree, offset, &tag_no, &tag_info, &lvt);
+ offset = fApplicationTypesEnumerated(tvb, pinfo, subtree, offset,
+ "present-value: ", BACnetStatusFlags);
+ offset += fTagHeaderTree(tvb, pinfo, subtree, offset, &tag_no, &tag_info, &lvt);
+ break;
+ case 1:
+ offset = fBitStringTagVS(tvb, pinfo, subtree, offset,
+ "referenced-flags: ", BACnetStatusFlags);
+ lastoffset = offset;
+ break;
+ default:
+ break;
+ }
+ if (offset == lastoffset) break; /* nothing happened, exit loop */
+ }
break;
/* todo: add new parameters here ... */
default:
subtree = proto_tree_add_subtree(subtree, tvb, offset, 1, ett_bacapp_value, NULL, "list of Values");
offset += fTagHeaderTree(tvb, pinfo, subtree, offset, &tag_no, &tag_info, &lvt);
offset = fBACnetPropertyValue(tvb, pinfo, subtree, offset);
- break;
+ } else {
+ expert_add_info(pinfo, subtree, &ei_bacapp_bad_tag);
}
- FAULT;
break;
default:
return offset;
subtree = proto_tree_add_subtree(subtree, tvb, offset, 1, ett_bacapp_value, NULL, "listOfElements");
offset += fTagHeaderTree(tvb, pinfo, subtree, offset, &tag_no, &tag_info, &lvt);
offset = fAbstractSyntaxNType(tvb, pinfo, subtree, offset);
- break;
+ } else {
+ expert_add_info(pinfo, subtree, &ei_bacapp_bad_tag);
}
- FAULT;
break;
default:
return offset;
if (tag_is_opening(tag_info)) {
offset += fTagHeaderTree(tvb, pinfo, subtree, offset, &tag_no, &tag_info, &lvt);
offset = fBACnetPropertyValue(tvb, pinfo, subtree, offset);
- break;
+ } else {
+ expert_add_info(pinfo, subtree, &ei_bacapp_bad_tag);
}
- FAULT;
break;
default:
return offset;
{
guint8 tag_no, tag_info;
guint32 lvt;
- guint lastoffset = 0, len;
- gboolean closing_found = FALSE; /* tracks when we are done decoding the fSpecialEvent entries */
+ guint lastoffset = 0;
while (tvb_reported_length_remaining(tvb, offset) > 0) { /* exit loop if nothing happens inside */
lastoffset = offset;
- len = fTagHeader(tvb, pinfo, offset, &tag_no, &tag_info, &lvt);
- /* maybe a SEQUENCE of SpecialEvents if we spot a closing tag */
+ fTagHeader(tvb, pinfo, offset, &tag_no, &tag_info, &lvt);
+ /* quit loop if we spot an un-matched closing tag */
if (tag_is_closing(tag_info)) {
- /* if we find 2 closing tags in succession we need to exit without incrementing the offset again */
- /* This handles the special case where we have a special event entry in an RPM-ACK msg */
- if ( closing_found == TRUE )
- break;
- offset += len;
- closing_found = TRUE;
- continue;
+ break;
}
-
switch (tag_no) {
case 0: /* calendarEntry */
if (tag_is_opening(tag_info)) {
offset += fTagHeaderTree(tvb, pinfo, subtree, offset, &tag_no, &tag_info, &lvt);
offset = fTimeValue(tvb, pinfo, subtree, offset);
offset += fTagHeaderTree(tvb, pinfo, subtree, offset, &tag_no, &tag_info, &lvt);
- break;
+ } else {
+ expert_add_info(pinfo, subtree, &ei_bacapp_bad_tag);
}
- FAULT;
break;
case 3: /* eventPriority */
offset = fUnsignedTag(tvb, pinfo, subtree, offset, "event priority: ");
default:
return offset;
}
- closing_found = FALSE; /* reset our closing tag status, we processed another open tag */
if (offset == lastoffset) break; /* nothing happened, exit loop */
}
return offset;
offset += fTagHeaderTree(tvb, pinfo, subtree, offset, &tag_no, &tag_info, &lvt);
offset = fSelectionCriteria(tvb, pinfo, subtree, offset);
offset += fTagHeaderTree(tvb, pinfo, subtree, offset, &tag_no, &tag_info, &lvt);
- break;
+ } else {
+ expert_add_info(pinfo, subtree, &ei_bacapp_bad_tag);
}
- FAULT;
break;
default:
return offset;
if (tag_is_opening(tag_info)) {
subtree = proto_tree_add_subtree(tree, tvb, offset, 1, ett_bacapp_value, NULL, "listOfResults");
offset += fTagHeaderTree(tvb, pinfo, subtree, offset, &tag_no, &tag_info, &lvt);
- break;
+ } else {
+ expert_add_info(pinfo, subtree, &ei_bacapp_bad_tag);
}
- FAULT;
break;
case 2: /* propertyIdentifier */
offset = fPropertyIdentifierValue(tvb, pinfo, subtree, offset, 2);
offset += fTagHeaderTree(tvb, pinfo, subtree, offset, &tag_no, &tag_info, &lvt);
/* Error Code follows */
offset = fError(tvb, pinfo, subtree, offset);
- break;
+ } else {
+ expert_add_info(pinfo, subtree, &ei_bacapp_bad_tag);
}
- FAULT;
break;
default:
return offset;
case 1: /* propertyValue */
if (tag_is_opening(tag_info)) {
offset = fBACnetPropertyValue(tvb, pinfo, subtree, offset);
- break;
+ } else {
+ expert_add_info(pinfo, subtree, &ei_bacapp_bad_tag);
}
- FAULT;
break;
default:
break;
&addresses_reassembly_table_functions);
}
+static void
+bacapp_cleanup_routine(void)
+{
+ reassembly_table_destroy(&msg_reassembly_table);
+}
+
void
proto_register_bacapp(void)
{
FT_UINT8, BASE_DEC, VALS(BACnetCharacterSet), 0,
NULL, HFILL }
},
+ { &hf_BACnetCodePage,
+ { "Code Page",
+ "bacapp.code_page",
+ FT_UINT16, BASE_DEC, NULL, 0,
+ NULL, HFILL }
+ },
{ &hf_BACnetTagClass,
{ "Tag Class", "bacapp.tag_class",
FT_BOOLEAN, 8, TFS(&BACnetTagClass), 0x08, NULL, HFILL }
static ei_register_info ei[] = {
{ &ei_bacapp_bad_length, { "bacapp.bad_length", PI_MALFORMED, PI_ERROR, "Wrong length indicated", EXPFILL }},
+ { &ei_bacapp_bad_tag, { "bacapp.bad_tag", PI_MALFORMED, PI_ERROR, "Wrong tag found", EXPFILL }},
};
expert_module_t* expert_bacapp;
expert_register_field_array(expert_bacapp, ei, array_length(ei));
register_dissector("bacapp", dissect_bacapp, proto_bacapp);
register_init_routine(&bacapp_init_routine);
+ register_cleanup_routine(&bacapp_cleanup_routine);
bacapp_dissector_table = register_dissector_table("bacapp.vendor_identifier",
"BACapp Vendor Identifier",
git.samba.org / metze / wireshark / wip.git / blobdiff