aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2017-12-28 23:09:46 +0100
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2017-12-29 06:13:03 +0000
commitc693522e3312d4b7c4e4f68409e39f1000644631 (patch)
tree6cfb21327449ce946d00f7237d89ee7ccbfbffa8 /epan
parentc791549a778aa34d83154b27fc9cd272e0d14881 (diff)
bluetooth: Update Assigned Numbers
Change-Id: I1565d8fa8983c36a6efe6ffbdb97b1e874632891 Reviewed-on: https://code.wireshark.org/review/25049 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-bluetooth.c127
1 files changed, 127 insertions, 0 deletions
diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c
index 65f3ed171b..d2c7871dcc 100644
--- a/epan/dissectors/packet-bluetooth.c
+++ b/epan/dissectors/packet-bluetooth.c
@@ -563,6 +563,26 @@ const value_string bluetooth_uuid_vals[] = {
{ 0x2AD9, "Fitness Machine Control Point" },
{ 0x2ADA, "Fitness Machine Status" },
/* 16-bit UUID for Members - https://www.bluetooth.org/en-us/Pages/LoginRestrictedAll/16-bit-UUIDs-member.aspx */
+ { 0xFDFA, "Tandem Diabetes Care" },
+ { 0xFDFB, "Tandem Diabetes Care" },
+ { 0xFDFC, "Optrel AG" },
+ { 0xFDFD, "RecursiveSoft Inc." },
+ { 0xFDFE, "ADHERIUM(NZ) LIMITED" },
+ { 0xFDFF, "OSRAM GmbH" },
+ { 0xFE00, "Amazon Fulfillment Services Inc." },
+ { 0xFE01, "Duracell U.S. Operations Inc." },
+ { 0xFE02, "Robert Bosch GmbH" },
+ { 0xFE03, "Amazon Fulfillment Services, Inc" },
+ { 0xFE04, "OpenPath Security Inc" },
+ { 0xFE05, "CORE Transport Technologies NZ Limited" },
+ { 0xFE06, "Qualcomm Technologies, Inc." },
+ { 0xFE07, "Sonos Inc." },
+ { 0xFE08, "Microsoft" },
+ { 0xFE09, "Pillsy, Inc." },
+ { 0xFE0A, "ruwido austria gmbh" },
+ { 0xFE0B, "ruwido austria gmbh" },
+ { 0xFE0C, "Procter & Gamble" },
+ { 0xFE0D, "Procter & Gamble" },
{ 0xFE0E, "Setec Pty Ltd" },
{ 0xFE0F, "Philips Lighting B.V." },
{ 0xFE10, "Lapis Semiconductor Co., Ltd." },
@@ -2164,6 +2184,113 @@ static const value_string bluetooth_company_id_vals[] = {
{0x0541, "Sharknet srl"},
{0x0542, "Mist Systems, Inc."},
{0x0543, "MIWA LOCK CO.,Ltd"},
+ {0x0544, "OrthoSensor, Inc."},
+ {0x0545, "Candy Hoover Group s.r.l"},
+ {0x0546, "Apexar Technologies S.A."},
+ {0x0547, "LOGICDATA d.o.o."},
+ {0x0548, "Knick Elektronische Messgeraete GmbH & Co. KG"},
+ {0x0549, "Smart Technologies and Investment Limited"},
+ {0x054A, "Linough Inc."},
+ {0x054B, "Advanced Electronic Designs, Inc."},
+ {0x054C, "Carefree Scott Fetzer Co Inc"},
+ {0x054D, "Sensome"},
+ {0x054E, "FORTRONIK storitve d.o.o."},
+ {0x054F, "Sinnoz"},
+ {0x0550, "Versa Networks, Inc."},
+ {0x0551, "Sylero"},
+ {0x0552, "Avempace SARL"},
+ {0x0553, "Nintendo Co., Ltd."},
+ {0x0554, "National Instruments"},
+ {0x0555, "KROHNE Messtechnik GmbH"},
+ {0x0556, "Otodynamics Ltd"},
+ {0x0557, "Arwin Technology Limited"},
+ {0x0558, "benegear, inc."},
+ {0x0559, "Newcon Optik"},
+ {0x055A, "CANDY HOUSE, Inc."},
+ {0x055B, "FRANKLIN TECHNOLOGY INC"},
+ {0x055C, "Lely"},
+ {0x055D, "Valve Corporation"},
+ {0x055E, "Hekatron Vertriebs GmbH"},
+ {0x055F, "PROTECH S.A.S. DI GIRARDI ANDREA & C."},
+ {0x0560, "Sarita CareTech IVS"},
+ {0x0561, "Finder S.p.A."},
+ {0x0562, "Thalmic Labs Inc."},
+ {0x0563, "Steinel Vertrieb GmbH"},
+ {0x0564, "Beghelli Spa"},
+ {0x0565, "Beijing Smartspace Technologies Inc."},
+ {0x0566, "CORE TRANSPORT TECHNOLOGIES NZ LIMITED"},
+ {0x0567, "Xiamen Everesports Goods Co., Ltd"},
+ {0x0568, "Bodyport Inc."},
+ {0x0569, "Audionics System, INC."},
+ {0x056A, "Flipnavi Co.,Ltd."},
+ {0x056B, "Rion Co., Ltd."},
+ {0x056C, "Long Range Systems, LLC"},
+ {0x056D, "Redmond Industrial Group LLC"},
+ {0x056E, "VIZPIN INC."},
+ {0x056F, "BikeFinder AS"},
+ {0x0570, "Consumer Sleep Solutions LLC"},
+ {0x0571, "PSIKICK, INC."},
+ {0x0572, "AntTail.com"},
+ {0x0573, "Lighting Science Group Corp."},
+ {0x0574, "AFFORDABLE ELECTRONICS INC"},
+ {0x0575, "Integral Memroy Plc"},
+ {0x0576, "Globalstar, Inc."},
+ {0x0577, "True Wearables, Inc."},
+ {0x0578, "Wellington Drive Technologies Ltd"},
+ {0x0579, "Ensemble Tech Private Limited"},
+ {0x057A, "OMNI Remotes"},
+ {0x057B, "Duracell U.S. Operations Inc."},
+ {0x057C, "Toor Technologies LLC"},
+ {0x057D, "Instinct Performance"},
+ {0x057E, "Beco, Inc"},
+ {0x057F, "Scuf Gaming International, LLC"},
+ {0x0580, "ARANZ Medical Limited"},
+ {0x0581, "LYS TECHNOLOGIES LTD"},
+ {0x0582, "Breakwall Analytics, LLC"},
+ {0x0583, "Code Blue Communications"},
+ {0x0584, "Gira Giersiepen GmbH & Co. KG"},
+ {0x0585, "Hearing Lab Technology"},
+ {0x0586, "LEGRAND"},
+ {0x0587, "Derichs GmbH"},
+ {0x0588, "ALT-TEKNIK LLC"},
+ {0x0589, "Star Technologies"},
+ {0x058A, "START TODAY CO.,LTD."},
+ {0x058B, "Maxim Integrated Products"},
+ {0x058C, "MERCK Kommanditgesellschaft auf Aktien"},
+ {0x058D, "Jungheinrich Aktiengesellschaft"},
+ {0x058E, "Oculus VR, LLC"},
+ {0x058F, "HENDON SEMICONDUCTORS PTY LTD"},
+ {0x0590, "Pur3 Ltd"},
+ {0x0591, "Viasat Group S.p.A."},
+ {0x0592, "IZITHERM"},
+ {0x0593, "Spaulding Clinical Research"},
+ {0x0594, "Kohler Company"},
+ {0x0595, "Inor Process AB"},
+ {0x0596, "My Smart Blinds"},
+ {0x0597, "RadioPulse Inc"},
+ {0x0598, "rapitag GmbH"},
+ {0x0599, "Lazlo326, LLC."},
+ {0x059A, "Teledyne Lecroy, Inc."},
+ {0x059B, "Dataflow Systems Limited"},
+ {0x059C, "Macrogiga Electronics"},
+ {0x059D, "Tandem Diabetes Care"},
+ {0x059E, "Polycom, Inc."},
+ {0x059F, "Fisher & Paykel Healthcare"},
+ {0x05A0, "RCP Software Oy"},
+ {0x05A1, "Shanghai Xiaoyi Technology Co.,Ltd."},
+ {0x05A2, "ADHERIUM(NZ) LIMITED"},
+ {0x05A3, "Axiomware Systems Incorporated"},
+ {0x05A4, "O. E. M. Controls, Inc."},
+ {0x05A5, "Kiiroo BV"},
+ {0x05A6, "Telecon Mobile Limited"},
+ {0x05A7, "Sonos Inc"},
+ {0x05A8, "Tom Allebrandi Consulting"},
+ {0x05A9, "Monidor"},
+ {0x05AA, "Tramex Limited"},
+ {0x05AB, "Nofence AS"},
+ {0x05AC, "GoerTek Dynaudio Co., Ltd."},
+ {0x05AD, "INIA"},
+ {0x05AE, "CARMATE MFG.CO.,LTD"},
{0xFFFF, "For use in internal and interoperability tests."},
{0, NULL }
};