aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-bluetooth.c
diff options
context:
space:
mode:
authorMichal Labedzki <michal.labedzki@tieto.com>2016-10-28 15:47:01 +0200
committerMichael Mann <mmann78@netscape.net>2016-12-05 12:46:37 +0000
commit5a0bc5f27bcb918fd78fd690cbd8073b254f15b2 (patch)
tree231836f95c3bed05d1c54afb8841180969d1a2e7 /epan/dissectors/packet-bluetooth.c
parenta7d404a972bc24020bbfe2d64b99e299f2507bdc (diff)
Bluetooth: Assigned Numbers: Update Member UUIDs
Update manually from time to time based on: https://www.bluetooth.com/specifications/assigned-numbers Change-Id: I506e58c16322862c9fe517b71ab12806818331b5 Reviewed-on: https://code.wireshark.org/review/19086 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-bluetooth.c')
-rw-r--r--epan/dissectors/packet-bluetooth.c27
1 files changed, 26 insertions, 1 deletions
diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c
index 8dfc70be37..5731472a66 100644
--- a/epan/dissectors/packet-bluetooth.c
+++ b/epan/dissectors/packet-bluetooth.c
@@ -535,6 +535,32 @@ 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 */
+ { 0xFE42, "Nets A/S" },
+ { 0xFE43, "Andreas Stihl AG & Co. KG" },
+ { 0xFE44, "SK Telecom" },
+ { 0xFE45, "Snapchat Inc" },
+ { 0xFE46, "B&O Play A/S" },
+ { 0xFE47, "General Motors" },
+ { 0xFE48, "General Motors" },
+ { 0xFE49, "SenionLab AB" },
+ { 0xFE4A, "OMRON HEALTHCARE Co., Ltd." },
+ { 0xFE4B, "Koninklijke Philips N.V." },
+ { 0xFE4C, "Volkswagen AG" },
+ { 0xFE4D, "Casambi Technologies Oy" },
+ { 0xFE4E, "NTT docomo" },
+ { 0xFE4F, "Molekule, Inc." },
+ { 0xFE50, "Google Inc." },
+ { 0xFE51, "SRAM" },
+ { 0xFE52, "SetPoint Medical" },
+ { 0xFE53, "3M" },
+ { 0xFE54, "Motiv, Inc." },
+ { 0xFE55, "Google Inc." },
+ { 0xFE56, "Google Inc." },
+ { 0xFE57, "Dotted Labs" },
+ { 0xFE58, "Nordic Semiconductor ASA" },
+ { 0xFE59, "Nordic Semiconductor ASA" },
+ { 0xFE5A, "Chronologics Corporation" },
+ { 0xFE5B, "GT-tronics HK Ltd" },
{ 0xFE5C, "million hunters GmbH" },
{ 0xFE5D, "Grundfos A/S" },
{ 0xFE5E, "Plastc Corporation" },
@@ -700,7 +726,6 @@ const value_string bluetooth_uuid_vals[] = {
{ 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" },