From Steve Karg:

BACnet Dissector latest enumerations for properties, states, error codes, and vendor ids.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6249

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

1 files changed, 352 insertions, 3 deletions

diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c
index 041cec54a1..594789cd9a 100644
--- a/epan/dissectors/packet-bacapp.c
+++ b/epan/dissectors/packet-bacapp.c
@@ -2480,6 +2480,10 @@ BACnetReliability [] = {
 	{7,"unreliable-other"},
 	{8,"process-error"},
 	{9,"multi-state-fault"},
+	{10,"configuration-error"},
+	/* enumeration value 11 is reserved for a future addendum */
+	{12,"communication-failure"},
+	{13,"member-fault"},
 	{0,NULL}
 };
 
@@ -2546,12 +2550,14 @@ BACnetObjectType [] = {
 	{28,"load-control"},
 	{29,"structured-view"},
 	{30,"access-door"},		/* 30-37 added with addanda 135-2008j */
+	/* value 31 is unassigned */
 	{32,"access-credential"},
 	{33,"access-point"},
 	{34,"access-rights"},
 	{35,"access-user"},
 	{36,"access-zone"},
 	{37,"credential-data-input"},
+	{38,"network-security"},
 	{39,"bitstring-value"},		/* 39-50 added with addenda 135-2008w */
 	{40,"characterstring-value"},
 	{41,"date-pattern-value"},
@@ -2561,7 +2567,7 @@ BACnetObjectType [] = {
 	{45,"integer-value"},
 	{46,"large-analog-value"},
 	{47,"octetstring-value"},
-	{48,"positive-Integer-value"},
+	{48,"positive-integer-value"},
 	{49,"time-pattern-value"},
 	{50,"time-value"},
 	{0, NULL}
@@ -2762,6 +2768,53 @@ BACnetEngineeringUnits [] = {
 	{187,"newton-seconds"},
 	{188,"newtons-per-meter"},
 	{189,"watts-per-meter-per-degree-Kelvin"},
+	{190,"micro-siemens"},
+	{191,"cubic-feet-per-hour"},
+	{192,"us-gallons-per-hour"},
+	{193,"kilometers"},
+	{194,"micrometers"},
+	{195,"grams"},
+	{196,"milligrams"},
+	{197,"milliliters"},
+	{198,"milliliters-per-second"},
+	{199,"decibels"},
+	{200,"decibels-millivolt"},
+	{201,"decibels-volt"},
+	{202,"millisiemens"},
+	{203,"watt-hours-reactive"},
+	{204,"kilowatt-hours-reactive"},
+	{205,"megawatt-hours-reactive"},
+	{206,"millimeters-of-water"},
+	{207,"per-mille"},
+	{208,"grams-per-gram"},
+	{209,"kilograms-per-kilogram"},
+	{210,"grams-per-kilogram"},
+	{211,"milligrams-per-gram"},
+	{212,"milligrams-per-kilogram"},
+	{213,"grams-per-milliliter"},
+	{214,"grams-per-liter"},
+	{215,"milligrams-per-liter"},
+	{216,"micrograms-per-liter"},
+	{217,"grams-per-cubic-meter"},
+	{218,"milligrams-per-cubic-meter"},
+	{219,"micrograms-per-cubic-meter"},
+	{220,"nanograms-per-cubic-meter"},
+	{221,"grams-per-cubic-centimeter"},
+	{222,"becquerels"},
+	{223,"kilobecquerels"},
+	{224,"megabecquerels"},
+	{225,"gray"},
+	{226,"milligray"},
+	{227,"microgray"},
+	{228,"sieverts"},
+	{229,"millisieverts"},
+	{230,"microsieverts"},
+	{231,"microsieverts-per-hour"},
+	{232,"decibels-a"},
+	{233,"nephelometric-turbidity-unit"},
+	{234,"pH"},
+	{235,"grams-per-square-meter"},
+	{236,"minutes-per-degree-kelvin"},
 	{0,NULL}
 /* Enumerated values 0-255 are reserved for definition by ASHRAE.
    Enumerated values 256-65535 may be used by others subject to
@@ -2823,6 +2876,68 @@ BACnetErrorCode [] = {
 	{50,"property-is-not-an-array"},
 	{73,"invalid-event-state"},
 	{74,"no-alarm-configured"},
+	{75,"log-buffer-full"},
+	{76,"logged-value-purged"},
+	{77,"no-property-specified"},
+	{78,"not-configured-for-triggered-logging"},
+	{79,"unknown-subscription"},
+	{80,"parameter-out-of-range"},
+	{81,"list-element-not-found"},
+	{82,"busy"},
+	{83,"communication-disabled"},
+	{84,"success"},
+	{85,"access-denied"},
+	{86,"bad-destination-address"},
+	{87,"bad-destination-device-id"},
+	{88,"bad-signature"},
+	{89,"bad-source-address"},
+	{90,"bad-timestamp"},
+	{91,"cannot-use-key"},
+	{92,"cannot-verify-message-id"},
+	{93,"correct-key-revision"},
+	{94,"destination-device-id-required"},
+	{95,"duplicate-message"},
+	{96,"encryption-not-configured"},
+	{97,"encryption-required"},
+	{98,"incorrect-key"},
+	{99,"invalid-key-data"},
+	{100,"key-update-in-progress"},
+	{101,"malformed-message"},
+	{102,"not-key-server"},
+	{103,"security-not-configured"},
+	{104,"source-security-required"},
+	{105,"too-many-keys"},
+	{106,"unknown-authentication-type"},
+	{107,"unknown-key"},
+	{108,"unknown-key-revision"},
+	{109,"unknown-source-message"},
+	{110,"not-router-to-dnet"},
+	{111,"router-busy"},
+	{112,"unknown-network-message"},
+	{113,"message-too-long"},
+	{114,"security-error"},
+	{115,"addressing-error"},
+	{116,"write-bdt-failed"},
+	{117,"read-bdt-failed"},
+	{118,"register-foreign-device-failed"},
+	{119,"read-fdt-failed"},
+	{120,"delete-fdt-entry-failed"},
+	{121,"distribute-broadcast-failed"},
+	{122,"unknown-file-size"},
+	{123,"abort-apdu-too-long"},
+	{124,"abort-application-exceeded-reply-time"},
+	{125,"abort-out-of-resources"},
+	{126,"abort-tsm-timeout"},
+	{127,"abort-window-size-out-of-range"},
+	{128,"file-full"},
+	{129,"inconsistent-configuration"},
+	{130,"inconsistent-object-type"},
+	{131,"internal-error"},
+	{132,"not-configured"},
+	{133,"out-of-memory"},
+	{134,"value-too-long"},
+	{135,"abort-insufficient-security"},
+	{136,"abort-security-error"},
 	{0, NULL}
 /* Enumerated values 0-255 are reserved for definition by ASHRAE.
    Enumerated values 256-65535 may be used by others subject to the
@@ -3054,6 +3169,7 @@ BACnetPropertyIdentifier [] = {
 	{220,"shed-level-descriptions"},
 	{221,"shed-levels"},
 	{222,"state-description"},
+	/* enumeration values 223-225 are unassigned */
 	{226,"door-alarm-state"},
 	{227,"door-extended-pulse-time"},
 	{228,"door-members"},
@@ -3064,6 +3180,7 @@ BACnetPropertyIdentifier [] = {
 	{233,"lock-status"},
 	{234,"masked-alarm-values"},
 	{235,"secured-status"},
+	/* enumeration values 236-243 are unassigned */
 	{244,"absentee-limit"},		/* added with addenda 135-2008j */
 	{245,"access-alarm-events"},
 	{246,"access-doors"},
@@ -3132,7 +3249,7 @@ BACnetPropertyIdentifier [] = {
 	{309,"transaction-notification-class"},
 	{310,"user-external-identifier"},
 	{311,"user-information-reference"},
-	/* enumeration values 312-316 reserved for future addenda */
+	/* enumeration values 312-316 are unassigned */
 	{317,"user-name"},
 	{318,"user-type"},
 	{319,"uses-remaining"},
@@ -3142,9 +3259,31 @@ BACnetPropertyIdentifier [] = {
 	{323,"global-identifier"},
 	/* enumeration values 324-325 reserved for future addenda */
 	{326,"verification-time"},
+	{327,"base-device-security-policy"},
+	{328,"distribution-key-revision"},
+	{329,"do-not-hide"},
+	{330,"key-sets"},
+	{331,"last-key-server"},
+	{332,"network-access-security-policies"},
+	{333,"packet-reorder-time"},
+	{334,"security-pdu-timeout"},
+	{335,"security-time-window"},
+	{336,"supported-security-algorithms"},
+	{337,"update-key-set-timeout"},
+	{338,"backup-and-restore-state"},
+	{339,"backup-preparation-time"},
+	{340,"restore-completion-time"},
+	{341,"restore-preparation-time"},
 	{342,"bit-mask"},		/* addenda 135-2008w */
 	{343,"bit-text"},
 	{344,"is-utc"},
+	{345,"group-members"},
+	{346,"group-member-names"},
+	{347,"member-status-flags"},
+	{348,"requested-update-interval"},
+	{349,"covu-period"},
+	{350,"covu-recipients"},
+	{351,"event-message-texts"},
 	{0, NULL}
 /* Enumerated values 0-511 are reserved for definition by ASHRAE.
    Enumerated values 512-4194303 may be used by others subject to
@@ -3372,6 +3511,7 @@ BACnetEventType [] = {
 	{15,"signed-out-of-range"},
 	{16,"unsigned-out-of-range"},
 	{17,"change-of-characterstring"},
+	{18,"change-of-status-flags"},
 	{0,NULL }
 /* Enumerated values 0-63 are reserved for definition by ASHRAE.
    Enumerated values 64-65535 may be used by others subject to
@@ -3480,7 +3620,28 @@ BACnetPropertyStates [] = {
 	{11,"unsigned-value"},
 	{12,"life-safety-mode"},
 	{13,"life-safety-state"},
-	{14,"door-alarm-state"},
+	{14,"restart-reason"},
+	{15,"door-alarm-state"},
+	{16,"action"},
+	{17,"door-secured-status"},
+	{18,"door-status"},
+	{19,"door-value"},
+	{20,"file-access-method"},
+	{21,"lock-status"},
+	{22,"life-safety-operation"},
+	{23,"maintenance"},
+	{24,"node-type"},
+	{25,"notify-type"},
+	{26,"security-level"},
+	{27,"shed-state"},
+	{28,"silenced-state"},
+	/* context tag 29 reserved for future addenda */
+	{30,"access-event"},
+	{31,"zone-occupancy-state"},
+	{32,"access-credential-disable-reason"},
+	{33,"access-credential-disable"},
+	{34,"authentication-status"},
+	{36,"backup-state"},
 	{0,NULL}
 /* Tag values 0-63 are reserved for definition by ASHRAE.
    Tag values of 64-254 may be used by others to accommodate
@@ -3916,6 +4077,194 @@ BACnetVendorIdentifiers [] = {
 	{ 342, "POWERPEG NSI Limited" },
 	{ 343, "BACnet Interoperability Testing Services, Inc." },
 	{ 344, "Teco a.s." },
+	{ 345, "Plexus Technology Limited"},
+	{ 346, "Energy Focus, Inc."},
+	{ 347, "Powersmiths International Corp."},
+	{ 348, "Nichibei Co., Ltd."},
+	{ 349, "HKC Technology Ltd."},
+	{ 350, "Ovation Networks, Inc."},
+	{ 351, "Setra Systems"},
+	{ 352, "AVG Automation"},
+	{ 353, "ZXC Ltd."},
+	{ 354, "Byte Sphere"},
+	{ 355, "Generiton Co., Ltd."},
+	{ 356, "Holter Regelarmaturen GmbH & Co. KG"},
+	{ 357, "Bedford Instruments, LLC"},
+	{ 358, "Standair Inc."},
+	{ 359, "WEG Automation - R&D"},
+	{ 360, "Prolon Control Systems ApS"},
+	{ 361, "Inneasoft"},
+	{ 362, "ConneXSoft GmbH"},
+	{ 363, "CEAG Notlichtsysteme GmbH"},
+	{ 364, "Distech Controls Inc."},
+	{ 365, "Industrial Technology Research Institute"},
+	{ 366, "ICONICS, Inc."},
+	{ 367, "IQ Controls s.c."},
+	{ 368, "OJ Electronics A/S"},
+	{ 369, "Rolbit Ltd."},
+	{ 370, "Synapsys Solutions Ltd."},
+	{ 371, "ACME Engineering Prod. Ltd."},
+	{ 372, "Zener Electric Pty, Ltd."},
+	{ 373, "Selectronix, Inc."},
+	{ 374, "Gorbet & Banerjee, LLC."},
+	{ 375, "IME"},
+	{ 376, "Stephen H. Dawson Computer Service"},
+	{ 377, "Accutrol, LLC"},
+	{ 378, "Schneider Elektronik GmbH"},
+	{ 379, "Alpha-Inno Tec GmbH"},
+	{ 380, "ADMMicro, Inc."},
+	{ 381, "Greystone Energy Systems, Inc."},
+	{ 382, "CAP Technologie"},
+	{ 383, "KeRo Systems"},
+	{ 384, "Domat Control System s.r.o."},
+	{ 385, "Efektronics Pty. Ltd."},
+	{ 386, "Hekatron Vertriebs GmbH"},
+	{ 387, "Securiton AG"},
+	{ 388, "Carlo Gavazzi Controls SpA"},
+	{ 389, "Chipkin Automation Systems"},
+	{ 390, "Savant Systems, LLC"},
+	{ 391, "Simmtronic Lighting Controls"},
+	{ 392, "Abelko Innovation AB"},
+	{ 393, "Seresco Technologies Inc."},
+	{ 394, "IT Watchdogs"},
+	{ 395, "Automation Assist Japan Corp."},
+	{ 396, "Thermokon Sensortechnik GmbH"},
+	{ 397, "EGauge Systems, LLC"},
+	{ 398, "Quantum Automation (ASIA) PTE, Ltd."},
+	{ 399, "Toshiba Lighting & Technology Corp."},
+	{ 400, "SPIN Engenharia de Automação Ltda."},
+	{ 401, "Logistics Systems & Software Services India PVT. Ltd."},
+	{ 402, "Delta Controls Integration Products"},
+	{ 403, "Focus Media"},
+	{ 404, "LUMEnergi Inc."},
+	{ 405, "Kara Systems"},
+	{ 406, "RF Code, Inc."},
+	{ 407, "Fatek Automation Corp."},
+	{ 408, "JANDA Software Company, LLC"},
+	{ 409, "Open System Solutions Limited"},
+	{ 410, "Intelec Systems PTY Ltd."},
+	{ 411, "Ecolodgix, LLC"},
+	{ 412, "Douglas Lighting Controls"},
+	{ 413, "iSAtech GmbH intelligente Sensoren Aktoren technologie"},
+	{ 414, "AREAL"},
+	{ 415, "Beckhoff Automation GmbH"},
+	{ 416, "IPAS GmbH"},
+	{ 417, "KE2 Therm Solutions"},
+	{ 418, "Base2Products"},
+	{ 419, "DTL Controls, LLC"},
+	{ 420, "INNCOM International, Inc."},
+	{ 421, "BTR Netcom GmbH"},
+	{ 422, "Greentrol Automation, Inc"},
+	{ 423, "BELIMO Automation AG"},
+	{ 424, "Samsung Heavy Industries Co, Ltd"},
+	{ 425, "Triacta Power Technologies, Inc."},
+	{ 426, "Globestar Systems"},
+	{ 427, "MLB Advanced Media, LP"},
+	{ 428, "SWG Stuckmann Wirtschaftliche Gebäudesysteme GmbH"},
+	{ 429, "SensorSwitch"},
+	{ 430, "Multitek Power Limited"},
+	{ 431, "Aquametro AG"},
+	{ 432, "LG Electronics Inc."},
+	{ 433, "Electronic Theatre Controls, Inc."},
+	{ 434, "Mitsubishi Electric Corporation Nagoya Works"},
+	{ 435, "Delta Electronics, Inc."},
+	{ 436, "Elma Kurtalj, Ltd."},
+	{ 437, "ADT Fire and Security Sp. A.o.o."},
+	{ 438, "Nedap Security Management"},
+	{ 439, "ESC Automation Inc."},
+	{ 440, "DSP4YOU Ltd."},
+	{ 441, "GE Sensing and Inspection Technologies"},
+	{ 442, "Embedded Systems SIA"},
+	{ 443, "BEFEGA GmbH"},
+	{ 444, "Baseline Inc."},
+	{ 445, "M2M Systems Integrators"},
+	{ 446, "OEMCtrl"},
+	{ 447, "Clarkson Controls Limited"},
+	{ 448, "Rogerwell Control System Limited"},
+	{ 449, "SCL Elements"},
+	{ 450, "Hitachi Ltd."},
+	{ 451, "Newron System SA"},
+	{ 452, "BEVECO Gebouwautomatisering BV"},
+	{ 453, "Streamside Solutions"},
+	{ 454, "Yellowstone Soft"},
+	{ 455, "Oztech Intelligent Systems Pty Ltd."},
+	{ 456, "Novelan GmbH"},
+	{ 457, "Flexim Americas Corporation"},
+	{ 458, "ICP DAS Co., Ltd."},
+	{ 459, "CARMA Industries Inc."},
+	{ 460, "Log-One Ltd."},
+	{ 461, "TECO Electric & Machinery Co., Ltd."},
+	{ 462, "ConnectEx, Inc."},
+	{ 463, "Turbo DDC Südwest"},
+	{ 464, "Quatrosense Environmental Ltd."},
+	{ 465, "Fifth Light Technology Ltd."},
+	{ 466, "Scientific Solutions, Ltd."},
+	{ 467, "Controller Area Network Solutions (M) Sdn Bhd"},
+	{ 468, "RESOL - Elektronische Regelungen GmbH"},
+	{ 469, "RPBUS LLC"},
+	{ 470, "BRS Sistemas Eletronicos"},
+	{ 471, "WindowMaster A/S"},
+	{ 472, "Sunlux Technologies Ltd."},
+	{ 473, "Measurlogic"},
+	{ 474, "Frimat GmbH"},
+	{ 475, "Spirax Sarco"},
+	{ 476, "Luxtron"},
+	{ 477, "Raypak Inc"},
+	{ 478, "Air Monitor Corporation"},
+	{ 479, "Regler Och Webbteknik Sverige (ROWS)"},
+	{ 480, "Intelligent Lighting Controls Inc."},
+	{ 481, "Sanyo Electric Industry Co., Ltd"},
+	{ 482, "E-Mon Energy Monitoring Products"},
+	{ 483, "Digital Control Systems"},
+	{ 484, "ATI Airtest Technologies, Inc."},
+	{ 485, "SCS SA"},
+	{ 486, "HMS Industrial Networks AB"},
+	{ 487, "Shenzhen Universal Intellisys Co Ltd"},
+	{ 488, "EK Intellisys Sdn Bhd"},
+	{ 489, "SysCom"},
+	{ 490, "Firecom, Inc."},
+	{ 491, "ESA Elektroschaltanlagen Grimma GmbH"},
+	{ 492, "Kumahira Co Ltd"},
+	{ 493, "Hotraco"},
+	{ 494, "SABO Elektronik GmbH"},
+	{ 495, "Equip'Trans"},
+	{ 496, "TCS Basys Controls"},
+	{ 497, "FlowCon International A/S"},
+	{ 498, "ThyssenKrupp Elevator Americas"},
+	{ 499, "Abatement Technologies"},
+	{ 500, "Continental Control Systems, LLC"},
+	{ 501, "WISAG Automatisierungstechnik GmbH & Co KG"},
+	{ 502, "EasyIO"},
+	{ 503, "EAP-Electric GmbH"},
+	{ 504, "Hardmeier"},
+	{ 505, "Mircom Group of Companies"},
+	{ 506, "Quest Controls"},
+	{ 507, "Mestek, Inc"},
+	{ 508, "Pulse Energy"},
+	{ 509, "Tachikawa Corporation"},
+	{ 510, "University of Nebraska-Lincoln"},
+	{ 511, "Redwood Systems"},
+	{ 512, "PASStec Industrie-Elektronik GmbH"},
+	{ 513, "NgEK, Inc."},
+	{ 514, "FAW Electronics Ltd"},
+	{ 515, "Jireh Energy Tech Co., Ltd."},
+	{ 516, "Enlighted Inc."},
+	{ 517, "El-Piast Sp. Z o.o"},
+	{ 518, "NetxAutomation Software GmbH"},
+	{ 519, "Invertek Drives"},
+	{ 520, "Deutschmann Automation GmbH & Co. KG"},
+	{ 521, "EMU Electronic AG"},
+	{ 522, "Phaedrus Limited"},
+	{ 523, "Sigmatek GmbH & Co KG"},
+	{ 524, "Marlin Controls"},
+	{ 525, "Circutor, SA"},
+	{ 526, "UTC Fire & Security"},
+	{ 527, "DENT Instruments, Inc."},
+	{ 528, "FHP Manufacturing Company - Bosch Group"},
+	{ 529, "GE Intelligent Platforms"},
+	{ 530, "Inner Range Pty Ltd"},
+	{ 531, "GLAS Energy Technology"},
+	{ 532, "MSR-Electronic-GmbH"},
 	{ 0, NULL }
 };