aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-bluetooth.c
diff options
context:
space:
mode:
authorMichal Labedzki <michal.labedzki@tieto.com>2016-10-18 22:33:59 +0200
committerMichal Labedzki <michal.labedzki@tieto.com>2016-11-04 09:20:38 +0000
commitc9262ac6701e8b7541b792593e49b2a62d39eda5 (patch)
tree5adc2a2fee45c9f4cdbb16a19dff18a406fbb86d /epan/dissectors/packet-bluetooth.c
parent604fa3e2ea78968666c69be4db147e8b6edc09d8 (diff)
Bluetooth: Update Assigned Numbers: CompanyIDs
It comes from: https://www.bluetooth.com/specifications/assigned-numbers/Company-Identifiers To meet Wireshark requirements make them ASCII in case of some vendors. Change-Id: I66b8ce5a1bc6af03fae6efa18e594d83b586be38 Reviewed-on: https://code.wireshark.org/review/18664 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Diffstat (limited to 'epan/dissectors/packet-bluetooth.c')
-rw-r--r--epan/dissectors/packet-bluetooth.c169
1 files changed, 164 insertions, 5 deletions
diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c
index 23e1514180..8dfc70be37 100644
--- a/epan/dissectors/packet-bluetooth.c
+++ b/epan/dissectors/packet-bluetooth.c
@@ -759,7 +759,7 @@ static const value_string bluetooth_company_id_vals[] = {
{0x002E, "Norwood Systems"},
{0x002F, "MewTel Technology Inc."},
{0x0030, "ST Microelectronics"},
- {0x0031, "Synopsis"},
+ {0x0031, "Synopsys, Inc."},
{0x0032, "Red-M (Communications) Ltd"},
{0x0033, "Commil Ltd"},
{0x0034, "Computer Access Technology Corporation (CATC)"},
@@ -849,7 +849,7 @@ static const value_string bluetooth_company_id_vals[] = {
{0x0088, "Ecotest"},
{0x0089, "GN ReSound A/S"},
{0x008A, "Jawbone"},
- {0x008B, "Topcorn Positioning Systems, LLC"},
+ {0x008B, "Topcon Positioning Systems, LLC"},
{0x008C, "Gimbal Inc. (formerly Qualcomm Labs, Inc. and Qualcomm Retail Solutions, Inc.)"},
{0x008D, "Zscan Software"},
{0x008E, "Quintic Corp."},
@@ -997,7 +997,7 @@ static const value_string bluetooth_company_id_vals[] = {
{0x011C, "Baidu"},
{0x011D, "Arendi AG"},
{0x011E, "Skoda Auto a.s."},
- {0x011F, "Volkswagon AG"},
+ {0x011F, "Volkswagen AG"},
{0x0120, "Porsche AG"},
{0x0121, "Sino Wealth Electronic Ltd."},
{0x0122, "AirTurn, Inc."},
@@ -1117,7 +1117,7 @@ static const value_string bluetooth_company_id_vals[] = {
{0x0195, "Zuli"},
{0x0196, "Paxton Access Ltd"},
{0x0197, "WiSilica Inc"},
- {0x0198, "Vengit Limited"},
+ {0x0198, "VENGIT Korlatolt Felelossegu Tarsasag"},
{0x0199, "SALTO SYSTEMS S.L."},
{0x019A, "TRON Forum (formerly T-Engine Forum)"},
{0x019B, "CUBETECH s.r.o."},
@@ -1231,7 +1231,7 @@ static const value_string bluetooth_company_id_vals[] = {
{0x0207, "STEMP Inc."},
{0x0208, "LumiGeek LLC"},
{0x0209, "InvisionHeart Inc."},
- {0x020A, "Macnica Inc. "},
+ {0x020A, "Macnica Inc."},
{0x020B, "Jaguar Land Rover Limited"},
{0x020C, "CoroWare Technologies, Inc"},
{0x020D, "Simplo Technology Co., LTD"},
@@ -1588,6 +1588,165 @@ static const value_string bluetooth_company_id_vals[] = {
{0x036C, "Zipcar"},
{0x036D, "AirBolt Pty Ltd"},
{0x036E, "KeepTruckin Inc"},
+ {0x036F, "Motiv, Inc."},
+ {0x0370, "Wazombi Labs OU"},
+ {0x0371, "ORBCOMM"},
+ {0x0372, "Nixie Labs, Inc."},
+ {0x0373, "AppNearMe Ltd"},
+ {0x0374, "Holman Industries"},
+ {0x0375, "Expain AS"},
+ {0x0376, "Electronic Temperature Instruments Ltd"},
+ {0x0377, "Plejd AB"},
+ {0x0378, "Propeller Health"},
+ {0x0379, "Shenzhen iMCO Electronic Technology Co.,Ltd"},
+ {0x037A, "Algoria"},
+ {0x037B, "Apption Labs Inc."},
+ {0x037C, "Cronologics Corporation"},
+ {0x037D, "MICRODIA Ltd."},
+ {0x037E, "lulabytes S.L."},
+ {0x037F, "Nestec S.A."},
+ {0x0380, "LLC \"MEGA-F service\""},
+ {0x0381, "Sharp Corporation"},
+ {0x0382, "Precision Outcomes Ltd"},
+ {0x0383, "Kronos Incorporated"},
+ {0x0384, "OCOSMOS Co., Ltd."},
+ {0x0385, "Embedded Electronic Solutions Ltd. dba e2Solutions"},
+ {0x0386, "Aterica Inc."},
+ {0x0387, "BluStor PMC, Inc."},
+ {0x0388, "Kapsch TrafficCom AB"},
+ {0x0389, "ActiveBlu Corporation"},
+ {0x038A, "Kohler Mira Limited"},
+ {0x038B, "Noke"},
+ {0x038C, "Appion Inc."},
+ {0x038D, "Resmed Ltd"},
+ {0x038E, "Crownstone B.V."},
+ {0x038F, "Xiaomi Inc."},
+ {0x0390, "INFOTECH s.r.o."},
+ {0x0391, "Thingsquare AB"},
+ {0x0392, "T&D"},
+ {0x0393, "LAVAZZA S.p.A."},
+ {0x0394, "Netclearance Systems, Inc."},
+ {0x0395, "SDATAWAY"},
+ {0x0396, "BLOKS GmbH"},
+ {0x0397, "LEGO System A/S"},
+ {0x0398, "Thetatronics Ltd"},
+ {0x0399, "Nikon Corporation"},
+ {0x039A, "NeST"},
+ {0x039B, "South Silicon Valley Microelectronics"},
+ {0x039C, "ALE International"},
+ {0x039D, "CareView Communications, Inc."},
+ {0x039E, "SchoolBoard Limited"},
+ {0x039F, "Molex Corporation"},
+ {0x03A0, "IVT Wireless Limited"},
+ {0x03A1, "Alpine Labs LLC"},
+ {0x03A2, "Candura Instruments"},
+ {0x03A3, "SmartMovt Technology Co., Ltd"},
+ {0x03A4, "Token Zero Ltd"},
+ {0x03A5, "ACE CAD Enterprise Co., Ltd. (ACECAD)"},
+ {0x03A6, "Medela, Inc"},
+ {0x03A7, "AeroScout"},
+ {0x03A8, "Esrille Inc."},
+ {0x03A9, "THINKERLY SRL"},
+ {0x03AA, "Exon Sp. z o.o."},
+ {0x03AB, "Meizu Technology Co., Ltd."},
+ {0x03AC, "Smablo LTD"},
+ {0x03AD, "XiQ"},
+ {0x03AE, "Allswell Inc."},
+ {0x03AF, "Comm-N-Sense Corp DBA Verigo"},
+ {0x03B0, "VIBRADORM GmbH"},
+ {0x03B1, "Otodata Wireless Network Inc."},
+ {0x03B2, "Propagation Systems Limited"},
+ {0x03B3, "Midwest Instruments & Controls"},
+ {0x03B4, "Alpha Nodus, inc."},
+ {0x03B5, "petPOMM, Inc"},
+ {0x03B6, "Mattel"},
+ {0x03B7, "Airbly Inc."},
+ {0x03B8, "A-Safe Limited"},
+ {0x03B9, "FREDERIQUE CONSTANT SA"},
+ {0x03BA, "Maxscend Microelectronics Company Limited"},
+ {0x03BB, "Abbott Diabetes Care"},
+ {0x03BC, "ASB Bank Ltd"},
+ {0x03BD, "amadas"},
+ {0x03BE, "Applied Science, Inc."},
+ {0x03BF, "iLumi Solutions Inc."},
+ {0x03C0, "Arch Systems Inc."},
+ {0x03C1, "Ember Technologies, Inc."},
+ {0x03C2, "Snapchat Inc"},
+ {0x03C3, "Casambi Technologies Oy"},
+ {0x03C4, "Pico Technology Inc."},
+ {0x03C5, "St. Jude Medical, Inc."},
+ {0x03C6, "Intricon"},
+ {0x03C7, "Structural Health Systems, Inc."},
+ {0x03C8, "Avvel International"},
+ {0x03C9, "Gallagher Group"},
+ {0x03CA, "In2things Automation Pvt. Ltd."},
+ {0x03CB, "SYSDEV Srl"},
+ {0x03CC, "Vonkil Technologies Ltd"},
+ {0x03CD, "Wynd Technologies, Inc."},
+ {0x03CE, "CONTRINEX S.A."},
+ {0x03CF, "MIRA, Inc."},
+ {0x03D0, "Watteam Ltd"},
+ {0x03D1, "Density Inc."},
+ {0x03D2, "IOT Pot India Private Limited"},
+ {0x03D3, "Sigma Connectivity AB"},
+ {0x03D4, "PEG PEREGO SPA"},
+ {0x03D5, "Wyzelink Systems Inc."},
+ {0x03D6, "Yota Devices LTD"},
+ {0x03D7, "FINSECUR"},
+ {0x03D8, "Zen-Me Labs Ltd"},
+ {0x03D9, "3IWare Co., Ltd."},
+ {0x03DA, "EnOcean GmbH"},
+ {0x03DB, "Instabeat, Inc"},
+ {0x03DC, "Nima Labs"},
+ {0x03DD, "Andreas Stihl AG & Co. KG"},
+ {0x03DE, "Nathan Rhoades LLC"},
+ {0x03DF, "Grob Technologies, LLC"},
+ {0x03E0, "Actions (Zhuhai) Technology Co., Limited"},
+ {0x03E1, "SPD Development Company Ltd"},
+ {0x03E2, "Sensoan Oy"},
+ {0x03E3, "Qualcomm Life Inc"},
+ {0x03E4, "Chip-ing AG"},
+ {0x03E5, "ffly4u"},
+ {0x03E6, "IoT Instruments Oy"},
+ {0x03E7, "TRUE Fitness Technology"},
+ {0x03E8, "Reiner Kartengeraete GmbH & Co. KG."},
+ {0x03E9, "SHENZHEN LEMONJOY TECHNOLOGY CO., LTD."},
+ {0x03EA, "Hello Inc."},
+ {0x03EB, "Evollve Inc."},
+ {0x03EC, "Jigowatts Inc."},
+ {0x03ED, "BASIC MICRO.COM,INC."},
+ {0x03EE, "CUBE TECHNOLOGIES"},
+ {0x03EF, "foolography GmbH"},
+ {0x03F0, "CLINK"},
+ {0x03F1, "Hestan Smart Cooking Inc."},
+ {0x03F2, "WindowMaster A/S"},
+ {0x03F3, "Flowscape AB"},
+ {0x03F4, "PAL Technologies Ltd"},
+ {0x03F5, "WHERE, Inc."},
+ {0x03F6, "Iton Technology Corp."},
+ {0x03F7, "Owl Labs Inc."},
+ {0x03F8, "Rockford Corp."},
+ {0x03F9, "Becon Technologies Co.,Ltd."},
+ {0x03FA, "Vyassoft Technologies Inc"},
+ {0x03FB, "Nox Medical"},
+ {0x03FC, "Kimberly-Clark"},
+ {0x03FD, "Trimble Navigation Ltd."},
+ {0x03FE, "Littelfuse"},
+ {0x03FF, "Withings"},
+ {0x0400, "i-developer IT Beratung UG"},
+ {0x0401, "Relations Co., Ltd."},
+ {0x0402, "Sears Holdings Corporation"},
+ {0x0403, "Gantner Electronic GmbH"},
+ {0x0404, "Authomate Inc"},
+ {0x0405, "Vertex International, Inc."},
+ {0x0406, "Airtago"},
+ {0x0407, "Swiss Audio SA"},
+ {0x0408, "ToGetHome Inc."},
+ {0x0409, "AXIS"},
+ {0x040A, "Openmatics"},
+ {0x040B, "Jana Care Inc."},
+ {0x040C, "Senix Corporation"},
+ {0x040D, "NorthStar Battery Company, LLC"},
{0xFFFF, "For use in internal and interoperability tests."},
{0, NULL }
};