osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

bluetooth: Update Assigned Numbers 

Update URLs for sources.

Change-Id: Ia70bc657210e867abea1eb25c5feab189c53a230
Reviewed-on: https://code.wireshark.org/review/26324
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
This commit is contained in:
Stig Bjørlykke 2018-03-07 08:22:55 +01:00
parent f789736521
commit 3a54fd1d7d
1 changed files with 100 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
epan/dissectors/packet-bluetooth.c
View File

@ -550,7 +550,17 @@ const value_string bluetooth_uuid_vals[] = {
{ 0x2AD8, "Supported Power Range" },
{ 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 */
/* 16-bit UUID for Members - https://www.bluetooth.com/specifications/assigned-numbers/16-bit-uuids-for-members */
{ 0xFDF0, "Google Inc." },
{ 0xFDF1, "LAMPLIGHT Co.,Ltd" },
{ 0xFDF2, "AMICCOM Electronics Corporation" },
{ 0xFDF3, "Amersports" },
{ 0xFDF4, "O. E. M. Controls, Inc." },
{ 0xFDF5, "Milwaukee Electric Tools" },
{ 0xFDF6, "AIAIAI ApS" },
{ 0xFDF7, "HP Inc." },
{ 0xFDF8, "Onvocal" },
{ 0xFDF9, "INIA" },
{ 0xFDFA, "Tandem Diabetes Care" },
{ 0xFDFB, "Tandem Diabetes Care" },
{ 0xFDFC, "Optrel AG" },
@ -822,7 +832,7 @@ const value_string bluetooth_uuid_vals[] = {
};
value_string_ext bluetooth_uuid_vals_ext = VALUE_STRING_EXT_INIT(bluetooth_uuid_vals);
/* Taken from https://www.bluetooth.org/technical/assignednumbers/identifiers.htm */
/* Taken from https://www.bluetooth.com/specifications/assigned-numbers/company-identifiers */
static const value_string bluetooth_company_id_vals[] = {
{0x0000, "Ericsson Technology Licensing"},
{0x0001, "Nokia Mobile Phones"},
@ -891,7 +901,7 @@ static const value_string bluetooth_company_id_vals[] = {
{0x0040, "Seiko Epson Corporation"},
{0x0041, "Integrated Silicon Solution Taiwan, Inc."},
{0x0042, "CONWISE Technology Corporation Ltd"},
{0x0043, "PARROT SA"},
{0x0043, "PARROT AUTOMOTIVE SAS"},
{0x0044, "Socket Mobile"},
{0x0045, "Atheros Communications, Inc."},
{0x0046, "MediaTek, Inc."},
@ -1060,7 +1070,7 @@ static const value_string bluetooth_company_id_vals[] = {
{0x00E9, "Vtrack Systems"},
{0x00EA, "Nielsen-Kellerman Company"},
{0x00EB, "Server Technology Inc."},
{0x00EC, "BioResarch Associates"},
{0x00EC, "BioResearch Associates"},
{0x00ED, "Jolly Logic, LLC"},
{0x00EE, "Above Average Outcomes, Inc."},
{0x00EF, "Bitsplitters GmbH"},
@ -1083,7 +1093,7 @@ static const value_string bluetooth_company_id_vals[] = {
{0x0100, "TomTom International BV"},
{0x0101, "Fugoo, Inc."},
{0x0102, "Keiser Corporation"},
{0x0103, "Bang & Olufsen S/A"},
{0x0103, "Bang & Olufsen A/S"},
{0x0104, "PLUS Location Systems Pty Ltd"},
{0x0105, "Ubiquitous Computing Technology Corporation"},
{0x0106, "Innovative Yachtter Solutions"},
@ -1107,11 +1117,11 @@ static const value_string bluetooth_company_id_vals[] = {
{0x0118, "Radius Networks, Inc."},
{0x0119, "Wize Technology Co., Ltd."},
{0x011A, "Qualcomm Labs, Inc."},
{0x011B, "Aruba Networks"},
{0x011B, "Hewlett Packard Enterprise"},
{0x011C, "Baidu"},
{0x011D, "Arendi AG"},
{0x011E, "Skoda Auto a.s."},
{0x011F, "Volkwagon AG"},
{0x011F, "Volkswagen AG"},
{0x0120, "Porsche AG"},
{0x0121, "Sino Wealth Electronic Ltd."},
{0x0122, "AirTurn, Inc."},
@ -1134,7 +1144,7 @@ static const value_string bluetooth_company_id_vals[] = {
{0x0133, "Blue Maestro Limited"},
{0x0134, "Resolution Products, Ltd."},
{0x0135, "Aireware LLC"},
{0x0136, "Seed Labs, Inc. (formerly ETC sp. z.o.o.)"},
{0x0136, "Silvair, Inc."},
{0x0137, "Prestigio Plaza Ltd."},
{0x0138, "NTEO Inc."},
{0x0139, "Focus Systems Corporation"},
@ -1183,7 +1193,7 @@ static const value_string bluetooth_company_id_vals[] = {
{0x0164, "Qingdao Yeelink Information Technology Co., Ltd."},
{0x0165, "Milwaukee Tool (Formally Milwaukee Electric Tools)"},
{0x0166, "MISHIK Pte Ltd"},
{0x0167, "Bayer HealthCare"},
{0x0167, "Ascensia Diabetes Care US Inc."},
{0x0168, "Spicebox LLC"},
{0x0169, "emberlight"},
{0x016A, "Cooper-Atkins Corporation"},
@ -1196,7 +1206,7 @@ static const value_string bluetooth_company_id_vals[] = {
{0x0171, "Amazon Fulfillment Service"},
{0x0172, "Connovate Technology Private Limited"},
{0x0173, "Kocomojo, LLC"},
{0x0174, "EveryKey LLC"},
{0x0174, "Everykey Inc."},
{0x0175, "Dynamic Controls"},
{0x0176, "SentriLock"},
{0x0177, "I-SYST inc."},
@ -1207,7 +1217,7 @@ static const value_string bluetooth_company_id_vals[] = {
{0x017C, "Daimler AG"},
{0x017D, "BatAndCat"},
{0x017E, "BluDotz Ltd"},
{0x017F, "XTel ApS"},
{0x017F, "XTel Wireless ApS"},
{0x0180, "Gigaset Communications GmbH"},
{0x0181, "Gecko Health Innovations, Inc."},
{0x0182, "HOP Ubiquitous"},
@ -1232,7 +1242,7 @@ static const value_string bluetooth_company_id_vals[] = {
{0x0195, "Zuli"},
{0x0196, "Paxton Access Ltd"},
{0x0197, "WiSilica Inc."},
{0x0198, "VENGIT Korltolt Felelssg Trsasg"},
{0x0198, "VENGIT Korlatolt Felelossegu Tarsasag"},
{0x0199, "SALTO SYSTEMS S.L."},
{0x019A, "TRON Forum (formerly T-Engine Forum)"},
{0x019B, "CUBETECH s.r.o."},
@ -1252,7 +1262,7 @@ static const value_string bluetooth_company_id_vals[] = {
{0x01A9, "Canon Inc."},
{0x01AA, "Geophysical Technology Inc."},
{0x01AB, "Facebook, Inc."},
{0x01AC, "Nipro Diagnostics, Inc."},
{0x01AC, "Trividia Health, Inc."},
{0x01AD, "FlightSafety International"},
{0x01AE, "Earlens Corporation"},
{0x01AF, "Sunrise Micro Devices, Inc."},
@ -1461,7 +1471,7 @@ static const value_string bluetooth_company_id_vals[] = {
{0x027A, "Ekomini inc."},
{0x027B, "DEFA AS"},
{0x027C, "Aseptika Ltd"},
{0x027D, "HUAWEI Technologies Co., Ltd."},
{0x027D, "HUAWEI Technologies Co., Ltd. ( )"},
{0x027E, "HabitAware, LLC"},
{0x027F, "ruwido austria gmbh"},
{0x0280, "ITEC corporation"},
@ -1501,7 +1511,7 @@ static const value_string bluetooth_company_id_vals[] = {
{0x02A2, "LockedUp"},
{0x02A3, "Itude"},
{0x02A4, "Pacific Lock Company"},
{0x02A5, "Tendyron Corporation"},
{0x02A5, "Tendyron Corporation ( )"},
{0x02A6, "Robert Bosch GmbH"},
{0x02A7, "Illuxtron international B.V."},
{0x02A8, "miSport Ltd."},
@ -1533,7 +1543,7 @@ static const value_string bluetooth_company_id_vals[] = {
{0x02C2, "Guillemot Corporation"},
{0x02C3, "Techtronic Power Tools Technology Limited"},
{0x02C4, "Wilson Sporting Goods"},
{0x02C5, "Lenovo (Singapore) Pte Ltd."},
{0x02C5, "Lenovo (Singapore) Pte Ltd. ( )"},
{0x02C6, "Ayatan Sensors"},
{0x02C7, "Electronics Tomorrow Limited"},
{0x02C8, "VASCO Data Security International, Inc."},
@ -1565,7 +1575,7 @@ static const value_string bluetooth_company_id_vals[] = {
{0x02E2, "NTT docomo"},
{0x02E3, "Carmanah Technologies Corp."},
{0x02E4, "Bytestorm Ltd."},
{0x02E5, "Espressif Incorporated"},
{0x02E5, "Espressif Incorporated ( () )"},
{0x02E6, "Unwire"},
{0x02E7, "Connected Yard, Inc."},
{0x02E8, "American Music Environments"},
@ -1596,7 +1606,7 @@ static const value_string bluetooth_company_id_vals[] = {
{0x0301, "Giatec Scientific Inc."},
{0x0302, "Loop Devices, Inc"},
{0x0303, "IACA electronique"},
{0x0304, "Martians Inc"},
{0x0304, "Proxy Technologies, Inc."},
{0x0305, "Swipp ApS"},
{0x0306, "Life Laboratory Inc."},
{0x0307, "FUJI INDUSTRIAL CO.,LTD."},
@ -1897,7 +1907,7 @@ static const value_string bluetooth_company_id_vals[] = {
{0x042E, "MemCachier Inc."},
{0x042F, "Danfoss A/S"},
{0x0430, "SnapStyk Inc."},
{0x0431, "Amyway Corporation"},
{0x0431, "Amway Corporation"},
{0x0432, "Silk Labs, Inc."},
{0x0433, "Pillsy Inc."},
{0x0434, "Hatch Baby, Inc."},
@ -2279,6 +2289,77 @@ static const value_string bluetooth_company_id_vals[] = {
{0x05AC, "GoerTek Dynaudio Co., Ltd."},
{0x05AD, "INIA"},
{0x05AE, "CARMATE MFG.CO.,LTD"},
{0x05AF, "ONvocal"},
{0x05B0, "NewTec GmbH"},
{0x05B1, "Medallion Instrumentation Systems"},
{0x05B2, "CAREL INDUSTRIES S.P.A."},
{0x05B3, "Parabit Systems, Inc."},
{0x05B4, "White Horse Scientific ltd"},
{0x05B5, "verisilicon"},
{0x05B6, "Elecs Industry Co.,Ltd."},
{0x05B7, "Beijing Pinecone Electronics Co.,Ltd."},
{0x05B8, "Ambystoma Labs Inc."},
{0x05B9, "Suzhou Pairlink Network Technology"},
{0x05BA, "igloohome"},
{0x05BB, "Oxford Metrics plc"},
{0x05BC, "Leviton Mfg. Co., Inc."},
{0x05BD, "ULC Robotics Inc."},
{0x05BE, "RFID Global by Softwork SrL"},
{0x05BF, "Real-World-Systems Corporation"},
{0x05C0, "Nalu Medical, Inc."},
{0x05C1, "P.I.Engineering"},
{0x05C2, "Grote Industries"},
{0x05C3, "Runtime, Inc."},
{0x05C4, "Codecoup sp. z o.o. sp. k."},
{0x05C5, "SELVE GmbH & Co. KG"},
{0x05C6, "Smart Animal Training Systems, LLC"},
{0x05C7, "Lippert Components, INC"},
{0x05C8, "SOMFY SAS"},
{0x05C9, "TBS Electronics B.V."},
{0x05CA, "MHL Custom Inc"},
{0x05CB, "LucentWear LLC"},
{0x05CC, "WATTS ELECTRONICS"},
{0x05CD, "RJ Brands LLC"},
{0x05CE, "V-ZUG Ltd"},
{0x05CF, "Biowatch SA"},
{0x05D0, "Anova Applied Electronics"},
{0x05D1, "Lindab AB"},
{0x05D2, "frogblue TECHNOLOGY GmbH"},
{0x05D3, "Acurable Limited"},
{0x05D4, "LAMPLIGHT Co., Ltd."},
{0x05D5, "TEGAM, Inc."},
{0x05D6, "Zhuhai Jieli technology Co.,Ltd"},
{0x05D7, "modum.io AG"},
{0x05D8, "Farm Jenny LLC"},
{0x05D9, "Toyo Electronics Corporation"},
{0x05DA, "Applied Neural Research Corp"},
{0x05DB, "Avid Identification Systems, Inc."},
{0x05DC, "Petronics Inc."},
{0x05DD, "essentim GmbH"},
{0x05DE, "QT Medical INC."},
{0x05DF, "VIRTUALCLINIC.DIRECT LIMITED"},
{0x05E0, "Viper Design LLC"},
{0x05E1, "Human, Incorporated"},
{0x05E2, "stAPPtronics GmbH"},
{0x05E3, "Elemental Machines, Inc."},
{0x05E4, "Taiyo Yuden Co., Ltd"},
{0x05E5, "INEO ENERGY& SYSTEMS"},
{0x05E6, "Motion Instruments Inc."},
{0x05E7, "PressurePro"},
{0x05E8, "COWBOY"},
{0x05E9, "iconmobile GmbH"},
{0x05EA, "ACS-Control-System GmbH"},
{0x05EB, "Bayerische Motoren Werke AG"},
{0x05EC, "Gycom Svenska AB"},
{0x05ED, "Fuji Xerox Co., Ltd"},
{0x05EE, "Glide Inc."},
{0x05EF, "SIKOM AS"},
{0x05F0, "beken"},
{0x05F1, "The Linux Foundation"},
{0x05F2, "Try and E CO.,LTD."},
{0x05F3, "SeeScan"},
{0x05F4, "Clearity, LLC"},
{0x05F5, "GS TAG"},
{0xFFFF, "For use in internal and interoperability tests."},
{0, NULL }
};