Bluetooth: Update Member UUIDs and CompanyIDs

Update member UUIDs and CompanyIDs from Bluetooth Assign Numbers.

Change-Id: I5deb5b8e930d2df0296f17a3fe3b46989a28a86d
Reviewed-on: https://code.wireshark.org/review/15453
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

1 files changed, 200 insertions, 10 deletions

diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c
index 5535985dd5..ccc6e50514 100644
--- a/epan/dissectors/packet-bluetooth.c
+++ b/epan/dissectors/packet-bluetooth.c
@@ -535,6 +535,39 @@ const value_string bluetooth_uuid_vals[] = {
     { 0x2AC7,   "Object List Filter" },
     { 0x2AC8,   "Object Changed" },
     /*  16-bit UUID for Members - https://www.bluetooth.org/en-us/Pages/LoginRestrictedAll/16-bit-UUIDs-member.aspx */
+    { 0xFE5C,   "million hunters GmbH" },
+    { 0xFE5D,   "Grundfos A/S" },
+    { 0xFE5E,   "Plastc Corporation" },
+    { 0xFE5F,   "Eyefi, Inc." },
+    { 0xFE60,   "Lierda Science & Technology Group Co., Ltd." },
+    { 0xFE61,   "Logitech International SA" },
+    { 0xFE62,   "Indagem Tech LLC" },
+    { 0xFE63,   "Connected Yard, Inc." },
+    { 0xFE64,   "Siemens AG" },
+    { 0xFE65,   "CHIPOLO d.o.o." },
+    { 0xFE66,   "Intel Corporation" },
+    { 0xFE67,   "Lab Sensor Solutions" },
+    { 0xFE68,   "Qualcomm Life Inc" },
+    { 0xFE69,   "Qualcomm Life Inc" },
+    { 0xFE6A,   "Kontakt Micro-Location Sp. z o.o." },
+    { 0xFE6B,   "TASER International, Inc." },
+    { 0xFE6C,   "TASER International, Inc." },
+    { 0xFE6D,   "The University of Tokyo" },
+    { 0xFE6E,   "The University of Tokyo" },
+    { 0xFE6F,   "LINE Corporation" },
+    { 0xFE70,   "Beijing Jingdong Century Trading Co., Ltd." },
+    { 0xFE71,   "Plume Design Inc" },
+    { 0xFE72,   "St. Jude Medical, Inc." },
+    { 0xFE73,   "St. Jude Medical, Inc." },
+    { 0xFE74,   "unwire" },
+    { 0xFE75,   "TangoMe" },
+    { 0xFE76,   "TangoMe" },
+    { 0xFE77,   "Hewlett-Packard Company" },
+    { 0xFE78,   "Hewlett-Packard Company" },
+    { 0xFE79,   "Zebra Technologies" },
+    { 0xFE7A,   "Bragi GmbH" },
+    { 0xFE7B,   "Orion Labs, Inc." },
+    { 0xFE7C,   "Telit Wireless Solutions (Formerly Stollmann E+V GmbH)" },
     { 0xFE7D,   "Aterica Health Inc." },
     { 0xFE7E,   "Awear Solutions Ltd" },
     { 0xFE7F,   "Doppler Lab" },
@@ -559,12 +592,12 @@ const value_string bluetooth_uuid_vals[] = {
     { 0xFE92,   "Jarden Safety & Security" },
     { 0xFE93,   "OttoQ Inc." },
     { 0xFE94,   "OttoQ Inc." },
-    { 0xFE95,   " Xiaomi Inc." },
+    { 0xFE95,   "Xiaomi Inc." },
     { 0xFE96,   "Tesla Motor Inc." },
     { 0xFE97,   "Tesla Motor Inc." },
     { 0xFE98,   "Currant, Inc." },
     { 0xFE99,   "Currant, Inc." },
-    { 0xFE9A,   " Estimote" },
+    { 0xFE9A,   "Estimote" },
     { 0xFE9B,   "Samsara Networks, Inc" },
     { 0xFE9C,   "GSI Laboratories, Inc." },
     { 0xFE9D,   "Mobiquity Networks Inc" },
@@ -661,12 +694,13 @@ const value_string bluetooth_uuid_vals[] = {
     { 0xFEF8,   "Aplix Corporation" },
     { 0xFEF9,   "PayPal, Inc." },
     { 0xFEFA,   "PayPal, Inc." },
-    { 0xFEFB,   "Stollmann E+V GmbH" },
+    { 0xFEFB,   "Telit Wireless Solutions (Formerly Stollmann E+V GmbH)" },
     { 0xFEFC,   "Gimbal, Inc." },
     { 0xFEFD,   "Gimbal, Inc." },
     { 0xFEFE,   "GN ReSound A/S" },
     { 0xFEFF,   "GN Netcom" },
 
+
     /* SDO Uuids - https://www.bluetooth.org/en-us/specification/assigned-numbers/sdo-16-bit-uuids */
     { 0xFFFD,   "Fast IDentity Online Alliance - Universal Second Factor Authenticator Service" },
     { 0xFFFE,   "Alliance for Wireless Power - Wireless Power Transfer Service" },
@@ -819,7 +853,7 @@ static const value_string bluetooth_company_id_vals[] = {
     {0x008C, "Gimbal Inc. (formerly Qualcomm Labs, Inc. and Qualcomm Retail Solutions, Inc.)"},
     {0x008D, "Zscan Software"},
     {0x008E, "Quintic Corp."},
-    {0x008F, "Stollman E+V GmbH"},
+    {0x008F, "Telit Wireless Solutions GmbH (Formerly Stollman E+V GmbH)"},
     {0x0090, "Funai Electric Co., Ltd."},
     {0x0091, "Advanced PANMOBIL Systems GmbH & Co. KG"},
     {0x0092, "ThinkOptics, Inc."},
@@ -1043,7 +1077,7 @@ static const value_string bluetooth_company_id_vals[] = {
     {0x016D, "LifeScan Inc"},
     {0x016E, "Volantic AB"},
     {0x016F, "Podo Labs, Inc"},
-    {0x0170, "Roche Diabetes Care AG"},
+    {0x0170, "F. Hoffmann-La Roche AG"},
     {0x0171, "Amazon Fulfillment Service"},
     {0x0172, "Connovate Technology Private Limited"},
     {0x0173, "Kocomojo, LLC"},
@@ -1115,7 +1149,7 @@ static const value_string bluetooth_company_id_vals[] = {
     {0x01B5, "Nest Labs Inc."},
     {0x01B6, "LM Technologies Ltd"},
     {0x01B7, "General Electric Company"},
-    {0x01B8, "iD3 S.L."},
+    {0x01B8, "i+D3 S.L."},
     {0x01B9, "HANA Micron"},
     {0x01BA, "Stages Cycling LLC"},
     {0x01BB, "Cochlear Bone Anchored Solutions AB"},
@@ -1224,7 +1258,7 @@ static const value_string bluetooth_company_id_vals[] = {
     {0x0222, "Praxis Dynamics"},
     {0x0223, "Philip Morris Products S.A."},
     {0x0224, "Comarch SA"},
-    {0x0225, "Nestl Nespresso S.A."},
+    {0x0225, "Nestle Nespresso S.A."},
     {0x0226, "Merlinia A/S"},
     {0x0227, "LifeBEAM Technologies"},
     {0x0228, "Twocanoes Labs, LLC"},
@@ -1256,7 +1290,7 @@ static const value_string bluetooth_company_id_vals[] = {
     {0x0242, "16Lab Inc"},
     {0x0243, "Masimo Corp"},
     {0x0244, "Iotera Inc."},
-    {0x0245, "EndressHauser"},
+    {0x0245, "Endress+Hauser"},
     {0x0246, "ACKme Networks, Inc."},
     {0x0247, "FiftyThree Inc."},
     {0x0248, "Parker Hannifin Corp"},
@@ -1266,7 +1300,7 @@ static const value_string bluetooth_company_id_vals[] = {
     {0x024C, "Blue Clover Devices"},
     {0x024D, "M-Way Solutions GmbH"},
     {0x024E, "Microtronics Engineering GmbH"},
-    {0x024F, "Schneider Schreibgerte GmbH"},
+    {0x024F, "Schneider Schreibgerate GmbH"},
     {0x0250, "Sapphire Circuits LLC"},
     {0x0251, "Lumo Bodytech Inc."},
     {0x0252, "UKC Technosolution"},
@@ -1305,7 +1339,7 @@ static const value_string bluetooth_company_id_vals[] = {
     {0x0273, "OCEASOFT"},
     {0x0274, "Motsai Research"},
     {0x0275, "Geotab"},
-    {0x0276, "E.G.O. Elektro-Gertebau GmbH"},
+    {0x0276, "E.G.O. Elektro-Geratebau GmbH"},
     {0x0277, "bewhere inc"},
     {0x0278, "Johnson Outdoors Inc"},
     {0x0279, "steute Schaltgerate GmbH & Co. KG"},
@@ -1398,6 +1432,162 @@ static const value_string bluetooth_company_id_vals[] = {
     {0x02D0, "3M"},
     {0x02D1, "Empatica Srl"},
     {0x02D2, "Afero, Inc."},
+    {0x02D3, "Powercast Corporation"},
+    {0x02D4, "Secuyou ApS"},
+    {0x02D5, "OMRON Corporation"},
+    {0x02D6, "Send Solutions"},
+    {0x02D7, "NIPPON SYSTEMWARE CO.,LTD."},
+    {0x02D8, "Neosfar"},
+    {0x02D9, "Fliegl Agrartechnik GmbH"},
+    {0x02DA, "Gilvader"},
+    {0x02DB, "Digi International Inc (R)"},
+    {0x02DC, "DeWalch Technologies, Inc."},
+    {0x02DD, "Flint Rehabilitation Devices, LLC"},
+    {0x02DE, "Samsung SDS Co., Ltd."},
+    {0x02DF, "Blur Product Development"},
+    {0x02E0, "University of Michigan"},
+    {0x02E1, "Victron Energy BV"},
+    {0x02E2, "NTT docomo"},
+    {0x02E3, "Carmanah Technologies Corp."},
+    {0x02E4, "Bytestorm Ltd."},
+    {0x02E5, "Espressif Incorporated"},
+    {0x02E6, "Unwire"},
+    {0x02E7, "Connected Yard, Inc."},
+    {0x02E8, "American Music Environments"},
+    {0x02E9, "Sensogram Technologies, Inc."},
+    {0x02EA, "Fujitsu Limited"},
+    {0x02EB, "Ardic Technology"},
+    {0x02EC, "Delta Systems, Inc"},
+    {0x02ED, "HTC Corporation"},
+    {0x02EE, "Citizen Holdings Co., Ltd."},
+    {0x02EF, "SMART-INNOVATION.inc"},
+    {0x02F0, "Blackrat Software"},
+    {0x02F1, "The Idea Cave, LLC"},
+    {0x02F2, "GoPro, Inc."},
+    {0x02F3, "AuthAir, Inc"},
+    {0x02F4, "Vensi, Inc."},
+    {0x02F5, "Indagem Tech LLC"},
+    {0x02F6, "Intemo Technologies"},
+    {0x02F7, "DreamVisions co., Ltd."},
+    {0x02F8, "Runteq Oy Ltd"},
+    {0x02F9, "IMAGINATION TECHNOLOGIES LTD"},
+    {0x02FA, "CoSTAR Technologies"},
+    {0x02FB, "Clarius Mobile Health Corp."},
+    {0x02FC, "Shanghai Frequen Microelectronics Co., Ltd."},
+    {0x02FD, "Uwanna, Inc."},
+    {0x02FE, "Lierda Science & Technology Group Co., Ltd."},
+    {0x02FF, "Silicon Laboratories"},
+    {0x0300, "World Moto Inc."},
+    {0x0301, "Giatec Scientific Inc."},
+    {0x0302, "Loop Devices, Inc"},
+    {0x0303, "IACA electronique"},
+    {0x0304, "Martians Inc"},
+    {0x0305, "Swipp ApS"},
+    {0x0306, "Life Laboratory Inc."},
+    {0x0307, "FUJI INDUSTRIAL CO.,LTD."},
+    {0x0308, "Surefire, LLC"},
+    {0x0309, "Dolby Labs"},
+    {0x030A, "Ellisys"},
+    {0x030B, "Magnitude Lighting Converters"},
+    {0x030C, "Hilti AG"},
+    {0x030D, "Devdata S.r.l."},
+    {0x030E, "Deviceworx"},
+    {0x030F, "Shortcut Labs"},
+    {0x0310, "SGL Italia S.r.l."},
+    {0x0311, "PEEQ DATA"},
+    {0x0312, "Ducere Technologies Pvt Ltd"},
+    {0x0313, "DiveNav, Inc."},
+    {0x0314, "RIIG AI Sp. z o.o."},
+    {0x0315, "Thermo Fisher Scientific"},
+    {0x0316, "AG Measurematics Pvt. Ltd."},
+    {0x0317, "CHUO Electronics CO., LTD."},
+    {0x0318, "Aspenta International"},
+    {0x0319, "Eugster Frismag AG"},
+    {0x031A, "Amber wireless GmbH"},
+    {0x031B, "HQ Inc"},
+    {0x031C, "Lab Sensor Solutions"},
+    {0x031D, "Enterlab ApS"},
+    {0x031E, "Eyefi, Inc."},
+    {0x031F, "MetaSystem S.p.A"},
+    {0x0320, "SONO ELECTRONICS. CO., LTD"},
+    {0x0321, "Jewelbots"},
+    {0x0322, "Compumedics Limited"},
+    {0x0323, "Rotor Bike Components"},
+    {0x0324, "Astro, Inc."},
+    {0x0325, "Amotus Solutions"},
+    {0x0326, "Healthwear Technologies (Changzhou)Ltd"},
+    {0x0327, "Essex Electronics"},
+    {0x0328, "Grundfos A/S"},
+    {0x0329, "Eargo, Inc."},
+    {0x032A, "Electronic Design Lab"},
+    {0x032B, "ESYLUX"},
+    {0x032C, "NIPPON SMT.CO.,Ltd"},
+    {0x032D, "BM innovations GmbH"},
+    {0x032E, "indoormap"},
+    {0x032F, "OttoQ Inc"},
+    {0x0330, "North Pole Engineering"},
+    {0x0331, "3flares Technologies Inc."},
+    {0x0332, "Electrocompaniet A.S."},
+    {0x0333, "Mul-T-Lock"},
+    {0x0334, "Corentium AS"},
+    {0x0335, "Enlighted Inc"},
+    {0x0336, "GISTIC"},
+    {0x0337, "AJP2 Holdings, LLC"},
+    {0x0338, "COBI GmbH"},
+    {0x0339, "Blue Sky Scientific, LLC"},
+    {0x033A, "Appception, Inc."},
+    {0x033B, "Courtney Thorne Limited"},
+    {0x033C, "Virtuosys"},
+    {0x033D, "TPV Technology Limited"},
+    {0x033E, "Monitra SA"},
+    {0x033F, "Automation Components, Inc."},
+    {0x0340, "Letsense s.r.l."},
+    {0x0341, "Etesian Technologies LLC"},
+    {0x0342, "GERTEC BRASIL LTDA."},
+    {0x0343, "Drekker Development Pty. Ltd."},
+    {0x0344, "Whirl Inc"},
+    {0x0345, "Locus Positioning"},
+    {0x0346, "Acuity Brands Lighting, Inc"},
+    {0x0347, "Prevent Biometrics"},
+    {0x0348, "Arioneo"},
+    {0x0349, "VersaMe"},
+    {0x034A, "Vaddio"},
+    {0x034B, "Libratone A/S"},
+    {0x034C, "HM Electronics, Inc."},
+    {0x034D, "TASER International, Inc."},
+    {0x034E, "Safe Trust Inc."},
+    {0x034F, "Heartland Payment Systems"},
+    {0x0350, "Bitstrata Systems Inc."},
+    {0x0351, "Pieps GmbH"},
+    {0x0352, "iRiding(Xiamen)Technology Co.,Ltd."},
+    {0x0353, "Alpha Audiotronics, Inc."},
+    {0x0354, "TOPPAN FORMS CO.,LTD."},
+    {0x0355, "Sigma Designs, Inc."},
+    {0x0356, "Spectrum Brands, Inc."},
+    {0x0357, "Polymap Wireless"},
+    {0x0358, "MagniWare Ltd."},
+    {0x0359, "Novotec Medical GmbH"},
+    {0x035A, "Medicom Innovation Partner a/s"},
+    {0x035B, "Matrix Inc."},
+    {0x035C, "Eaton Corporation"},
+    {0x035D, "KYS"},
+    {0x035E, "Naya Health, Inc."},
+    {0x035F, "Acromag"},
+    {0x0360, "Insulet Corporation"},
+    {0x0361, "Wellinks Inc."},
+    {0x0362, "ON Semiconductor"},
+    {0x0363, "FREELAP SA"},
+    {0x0364, "Favero Electronics Srl"},
+    {0x0365, "BioMech Sensor LLC"},
+    {0x0366, "BOLTT Sports technologies Private limited"},
+    {0x0367, "Saphe International"},
+    {0x0368, "Metormote AB"},
+    {0x0369, "littleBits"},
+    {0x036A, "SetPoint Medical"},
+    {0x036B, "BRControls Products BV"},
+    {0x036C, "Zipcar"},
+    {0x036D, "AirBolt Pty Ltd"},
+    {0x036E, "KeepTruckin Inc"},
     {0xFFFF, "For use in internal and interoperability tests."},
     {0, NULL }
 };