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

bluetooth: Update bluetooth_uuid_vals 

Change-Id: Idd3767f0b7fbd8cec606f7e3be138f310c6113eb
Reviewed-on: https://code.wireshark.org/review/23328
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
This commit is contained in:
Stig Bjørlykke 2017-08-31 15:39:05 +02:00
parent 74deaf895a
commit 05ad9c79b8
1 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,6 +220,9 @@ const value_string bluetooth_uuid_vals[] = {
{ 0x1823, "HTTP Proxy" },
{ 0x1824, "Transport Discovery" },
{ 0x1825, "Object Transfer" },
{ 0x1826, "Fitness Machine" },
{ 0x1827, "Mesh Provisioning Service" },
{ 0x1828, "Mesh Proxy Service" },
/* Units - https://developer.bluetooth.org/gatt/units/Pages/default.aspx */
{ 0x2700, "unitless" },
{ 0x2701, "length (metre)" },
@ -332,6 +335,15 @@ const value_string bluetooth_uuid_vals[] = {
{ 0x27B6, "irradiance (watt per square metre)" },
{ 0x27B7, "milliliter (per kilogram per minute)" },
{ 0x27B8, "mass (pound)" },
{ 0x27B9, "metabolic equivalent" },
{ 0x27BA, "step (per minute)" },
{ 0x27BC, "stroke (per minute)" },
{ 0x27BD, "pace (kilometre per minute)" },
{ 0x27BE, "luminous efficacy (lumen per watt)" },
{ 0x27BF, "luminous energy (lumen hour)" },
{ 0x27C0, "luminous exposure (lux hour)" },
{ 0x27C1, "mass flow (gram per second)" },
{ 0x27C2, "volume flow (litre per second)" },
/* Declarations - https://developer.bluetooth.org/gatt/declarations/Pages/DeclarationsHome.aspx */
{ 0x2800, "GATT Primary Service Declaration" },
{ 0x2801, "GATT Secondary Service Declaration" },
@ -535,7 +547,55 @@ const value_string bluetooth_uuid_vals[] = {
{ 0x2AC7, "Object List Filter" },
{ 0x2AC8, "Object Changed" },
{ 0x2AC9, "Resolvable Private Address Only" },
{ 0x2ACC, "Fitness Machine Feature" },
{ 0x2ACD, "Treadmill Data" },
{ 0x2ACE, "Cross Trainer Data" },
{ 0x2ACF, "Step Climber Data" },
{ 0x2AD0, "Stair Climber Data" },
{ 0x2AD1, "Rower Data" },
{ 0x2AD2, "Indoor Bike Data" },
{ 0x2AD3, "Training Status" },
{ 0x2AD4, "Supported Speed Range" },
{ 0x2AD5, "Supported Inclination Range" },
{ 0x2AD6, "Supported Resistance Level Range" },
{ 0x2AD7, "Supported Heart Rate Range" },
{ 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 */
{ 0xFE0E, "Setec Pty Ltd" },
{ 0xFE0F, "Philips Lighting B.V." },
{ 0xFE10, "Lapis Semiconductor Co., Ltd." },
{ 0xFE11, "GMC-I Messtechnik GmbH" },
{ 0xFE12, "M-Way Solutions GmbH" },
{ 0xFE13, "Apple Inc." },
{ 0xFE14, "Flextronics International USA Inc." },
{ 0xFE15, "Amazon Fulfillment Services, Inc." },
{ 0xFE16, "Footmarks, Inc." },
{ 0xFE17, "Telit Wireless Solutions GmbH" },
{ 0xFE18, "Runtime, Inc." },
{ 0xFE19, "Google Inc." },
{ 0xFE1A, "Tyto Life LLC" },
{ 0xFE1B, "Tyto Life LLC" },
{ 0xFE1C, "NetMedia, Inc." },
{ 0xFE1D, "Illuminati Instrument Corporation" },
{ 0xFE1E, "Smart Innovations Co., Ltd" },
{ 0xFE1F, "Garmin International, Inc." },
{ 0xFE20, "Emerson" },
{ 0xFE21, "Bose Corporation" },
{ 0xFE22, "Zoll Medical Corporation" },
{ 0xFE23, "Zoll Medical Corporation" },
{ 0xFE24, "August Home Inc" },
{ 0xFE25, "Apple, Inc." },
{ 0xFE26, "Google Inc." },
{ 0xFE27, "Google Inc." },
{ 0xFE28, "Ayla Networks" },
{ 0xFE29, "Gibson Innovations" },
{ 0xFE2A, "DaisyWorks, Inc." },
{ 0xFE2B, "ITT Industries" },
{ 0xFE2C, "Google Inc." },
{ 0xFE2D, "SMART INNOVATION Co.,Ltd" },
{ 0xFE2E, "ERi,Inc." },
{ 0xFE2F, "CRESCO Wireless, Inc" },
{ 0xFE30, "Volkswagen AG" },
{ 0xFE31, "Volkswagen AG" },
@ -747,6 +807,7 @@ const value_string bluetooth_uuid_vals[] = {
{ 0xFEFF, "GN Netcom" },
/* SDO Uuids - https://www.bluetooth.org/en-us/specification/assigned-numbers/sdo-16-bit-uuids */
{ 0xFFFC, "AirFuel Alliance - Wireless Power Transfer (WPT) Service" },
{ 0xFFFD, "Fast IDentity Online Alliance - Universal Second Factor Authenticator Service" },
{ 0xFFFE, "Alliance for Wireless Power - Wireless Power Transfer Service" },
{ 0, NULL }