aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-bacapp.c
diff options
context:
space:
mode:
authorBACdaBASpert <BACdaBASpert@optigo.net>2016-09-16 16:57:50 -0700
committerAnders Broman <a.broman58@gmail.com>2016-09-18 08:15:07 +0000
commita978ad7ce3022fb7930ede81f4dd72a69bc6018a (patch)
tree62c6ba6f544c7e307a7addf85caf4c8949f327cb /epan/dissectors/packet-bacapp.c
parent9941cc5f7dbd49b31020d61de3ccd93855122552 (diff)
update bacapp vendor id to name mapping from BACnet
Change-Id: Ibd09e3d8ec167a9270545e37365a2370ac6c2c28 Reviewed-on: https://code.wireshark.org/review/17753 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-bacapp.c')
-rw-r--r--epan/dissectors/packet-bacapp.c161
1 files changed, 154 insertions, 7 deletions
diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c
index 99ee969bae..6a4f7db2f1 100644
--- a/epan/dissectors/packet-bacapp.c
+++ b/epan/dissectors/packet-bacapp.c
@@ -4064,7 +4064,7 @@ BACnetVendorIdentifiers [] = {
{ 39, "Kieback & Peter GmbH & Co KG" },
{ 40, "Anacon Systems, Inc." },
{ 41, "Systems Controls & Instruments, LLC" },
- { 42, "Lithonia Lighting" },
+ { 42, "Acuity Brands Lighting, Inc." },
{ 43, "Micropower Manufacturing" },
{ 44, "Matrix Controls" },
{ 45, "METALAIRE" },
@@ -4106,7 +4106,7 @@ BACnetVendorIdentifiers [] = {
{ 81, "Matsushita Electric Works, Ltd." },
{ 82, "Mitsubishi Electric Corporation, Inazawa Works" },
{ 83, "Mitsubishi Heavy Industries, Ltd." },
- { 84, "ITT Bell & Gossett" },
+ { 84, "Xylem, Inc." },
{ 85, "Yamatake Building Systems Co., Ltd." },
{ 86, "The Watt Stopper, Inc." },
{ 87, "Aichi Tokei Denki Co., Ltd." },
@@ -4132,7 +4132,7 @@ BACnetVendorIdentifiers [] = {
{ 107, "JCI Systems Integration Services" },
{ 108, "Freedom Corporation" },
{ 109, "Neuberger Gebaeudeautomation GmbH" },
- { 110, "Sitronix" },
+ { 110, "eZi Controls" },
{ 111, "Leviton Manufacturing" },
{ 112, "Fujitsu Limited" },
{ 113, "Emerson Network Power" },
@@ -4304,7 +4304,7 @@ BACnetVendorIdentifiers [] = {
{ 279, "M-System Co., Ltd." },
{ 280, "Yokota Co., Ltd." },
{ 281, "Hitranse Technology Co., LTD" },
- { 282, "Federspiel Controls" },
+ { 282, "Vigilent Corporation" },
{ 283, "Kele, Inc." },
{ 284, "Opera Electronics, Inc." },
{ 285, "Gentec" },
@@ -4335,7 +4335,7 @@ BACnetVendorIdentifiers [] = {
{ 310, "OSlsoft, Inc." },
{ 311, "Hanazeder Electronic GmbH" },
{ 312, "Honeywell Security Deutschland, Novar GmbH" },
- { 313, "Siemens Energy & Automation, Inc." },
+ { 313, "Siemens Industry, Inc." },
{ 314, "ETM Professional Control GmbH" },
{ 315, "Meitav-tec, Ltd." },
{ 316, "Janitza Electronics GmbH" },
@@ -4536,7 +4536,7 @@ BACnetVendorIdentifiers [] = {
{ 511, "Redwood Systems" },
{ 512, "PASStec Industrie-Elektronik GmbH" },
{ 513, "NgEK, Inc." },
- { 514, "FAW Electronics Ltd" },
+ { 514, "t-mac Technologies" },
{ 515, "Jireh Energy Tech Co., Ltd." },
{ 516, "Enlighted Inc." },
{ 517, "El-Piast Sp. Z o.o" },
@@ -4747,7 +4747,7 @@ BACnetVendorIdentifiers [] = {
{ 724, "Eltrac Technologies Pvt Ltd" },
{ 725, "Bektas Invisible Controls GmbH" },
{ 726, "Entelec" },
- { 727, "Innexiv" },
+ { 727, "INNEXIV" },
{ 728, "Covenant" },
{ 729, "Davitor AB" },
{ 730, "TongFang Technovator" },
@@ -4805,6 +4805,153 @@ BACnetVendorIdentifiers [] = {
{ 783, "Produal Oy" },
{ 784, "Milestone Systems A/S" },
{ 785, "Trustbridge" },
+ { 786, "Feedback Solutions" },
+ { 787, "IES" },
+ { 788, "GE Critical Power" },
+ { 789, "Riptide IO" },
+ { 790, "Messerschmitt Systems AG" },
+ { 791, "Dezem Energy Controlling" },
+ { 792, "MechoSystems" },
+ { 793, "evon GmbH" },
+ { 794, "CS Lab GmbH" },
+ { 795, "8760 Enterprises, Inc." },
+ { 796, "Touche Controls" },
+ { 797, "Ontrol Teknik Malzeme San. ve Tic. A.S." },
+ { 798, "Uni Control System Sp. Z o.o." },
+ { 799, "Weihai Ploumeter Co., Ltd" },
+ { 800, "Elcom International Pvt. Ltd" },
+ { 801, "Philips Lighting" },
+ { 802, "AutomationDirect" },
+ { 803, "Paragon Robotics" },
+ { 804, "SMT System & Modules Technology AG" },
+ { 805, "OS Technology Service and Trading Co., LTD" },
+ { 806, "CMR Controls Ltd" },
+ { 807, "Innovari, Inc." },
+ { 808, "ABB Control Products" },
+ { 809, "Gesellschaft fur Gebaeudeautomation mbH" },
+ { 810, "RODI Systems Corp." },
+ { 811, "Nextek Power Systems" },
+ { 812, "Creative Lighting" },
+ { 813, "WaterFurnace International" },
+ { 814, "Mercury Security" },
+ { 815, "Hisense (Shandong) Air-Conditioning Co., Ltd." },
+ { 816, "Layered Solutions, Inc." },
+ { 817, "Leegood Automatic System, Inc." },
+ { 818, "Shanghai Restar Technology Co., Ltd." },
+ { 819, "Reimann Ingenieurbuero" },
+ { 820, "LynTec" },
+ { 821, "HTP" },
+ { 822, "Elkor Technologies, Inc." },
+ { 823, "Bentrol Pty Ltd" },
+ { 824, "Team-Control Oy" },
+ { 825, "NextDevice, LLC" },
+ { 826, "GLOBAL CONTROL 5 Sp. z o.o." },
+ { 827, "King I Electronics Co., Ltd" },
+ { 828, "SAMDAV" },
+ { 829, "Next Gen Industries Pvt. Ltd." },
+ { 830, "Entic LLC" },
+ { 831, "ETAP" },
+ { 832, "Moralle Electronics Limited" },
+ { 833, "Leicom AG" },
+ { 834, "Watts Regulator Company" },
+ { 835, "S.C. Orbtronics S.R.L." },
+ { 836, "Gaussan Technologies" },
+ { 837, "WEBfactory GmbH" },
+ { 838, "Ocean Controls" },
+ { 839, "Messana Air-Ray Conditioning s.r.l." },
+ { 840, "Hangzhou BATOWN Technology Co. Ltd." },
+ { 841, "Reasonable Controls" },
+ { 842, "Servisys, Inc." },
+ { 843, "halstrup-walcher GmbH" },
+ { 844, "SWG Automation Fuzhou Limited" },
+ { 845, "KSB Aktiengesellschaft" },
+ { 846, "Hybryd Sp. z o.o." },
+ { 847, "Helvatron AG" },
+ { 848, "Oderon Sp. Z.O.O." },
+ { 849, "miko" },
+ { 850, "Exodraft" },
+ { 851, "Hochhuth GmbH" },
+ { 852, "Integrated System Technologies Ltd." },
+ { 853, "Shanghai Cellcons Controls Co., Ltd" },
+ { 854, "Emme Controls, LLC" },
+ { 855, "Field Diagnostic Services, Inc." },
+ { 856, "Ges Teknik A.S." },
+ { 857, "Global Power Products, Inc." },
+ { 858, "Option NV" },
+ { 859, "BV-Control AG" },
+ { 860, "Sigren Engineering AG" },
+ { 861, "Shanghai Jaltone Technology Co., Ltd." },
+ { 862, "MaxLine Solutions Ltd" },
+ { 863, "Kron Instrumentos Eletricos Ltda" },
+ { 864, "Thermo Matrix" },
+ { 865, "Infinite Automation Systems, Inc." },
+ { 866, "Vantage" },
+ { 867, "Elecon Measurements Pvt Ltd" },
+ { 868, "TBA" },
+ { 869, "Carnes Company" },
+ { 870, "Harman Professional" },
+ { 871, "Nenutec Asia Pacific Pte Ltd" },
+ { 872, "Gia NV" },
+ { 873, "Kepware Tehnologies" },
+ { 874, "Temperature Electronics Ltd" },
+ { 875, "Packet Power" },
+ { 876, "Project Haystack Corporation" },
+ { 877, "DEOS Controls Americas Inc." },
+ { 878, "Senseware Inc" },
+ { 879, "MST Systemtechnik AG" },
+ { 880, "Lonix Ltd" },
+ { 881, "GMC-I Messtechnik GmbH" },
+ { 882, "Aviosys International Inc." },
+ { 883, "Efficient Building Automation Corp." },
+ { 884, "Accutron Instruments Inc." },
+ { 885, "Vermont Energy Control Systems LLC" },
+ { 886, "DCC Dynamics" },
+ { 887, "Brueck Electronic GmbH" },
+ { 889, "NGBS Hungary Ltd." },
+ { 890, "ILLUM Technology, LLC" },
+ { 891, "Delta Controls Germany Limited" },
+ { 892, "S+T Service & Technique S.A." },
+ { 893, "SimpleSoft" },
+ { 894, "Candi Controls, Inc." },
+ { 895, "EZEN Solution Inc." },
+ { 896, "Fujitec Co. Ltd." },
+ { 897, "Terralux" },
+ { 898, "Annicom" },
+ { 899, "Bihl+Wiedemann GmbH" },
+ { 900, "Daper, Inc." },
+ { 901, "Schueco International KG" },
+ { 902, "Otis Elevator Company" },
+ { 903, "Fidelix Oy" },
+ { 904, "RAM GmbH Mess- und Regeltechnik" },
+ { 905, "WEMS" },
+ { 906, "Ravel Electronics Pvt Ltd" },
+ { 907, "OmniMagni" },
+ { 908, "Echelon" },
+ { 909, "Intellimeter Canada, Inc." },
+ { 910, "Bithouse Oy" },
+ { 912, "BuildPulse" },
+ { 913, "Shenzhen 1000 Building Automation Co. Ltd" },
+ { 914, "AED Engineering GmbH" },
+ { 915, "Guentner GmbH & Co. KG" },
+ { 916, "KNXlogic" },
+ { 917, "CIM Environmental Group" },
+ { 918, "Flow Control" },
+ { 919, "Lumen Cache, Inc." },
+ { 920, "Ecosystem" },
+ { 921, "Potter Electric Signal Company, LLC" },
+ { 922, "Tyco Fire & Security S.p.A." },
+ { 923, "Watanabe Electric Industry Co., Ltd." },
+ { 924, "Causam Energy" },
+ { 925, "W-tec AG" },
+ { 926, "IMI Hydronic Engineering International SA" },
+ { 927, "ARIGO Software" },
+ { 928, "MSA Safety" },
+ { 929, "Smart Solucoes Ltda - MERCATO" },
+ { 930, "PIATRA Engineering" },
+ { 931, "ODIN Automation Systems, LLC" },
+ { 932, "Belparts NV" },
+ { 933, "UAB, SALDA" },
+ { 934, "Alre-IT Regeltechnik GmbH" },
{ 0, NULL }
};
static value_string_ext BACnetVendorIdentifiers_ext = VALUE_STRING_EXT_INIT(BACnetVendorIdentifiers);