osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Bluetooth: Update Assign Numbers 

+18 ATT attributes to be implemented (IPS 1.0 - 19 May 2015, etc.)

Change-Id: Ib30ea20fe9b32a4be842f01ad5b8e8ee081a14ff
Reviewed-on: https://code.wireshark.org/review/10095
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Michal Labedzki 2015-06-06 19:37:20 +02:00 committed by Anders Broman
parent a50a49e527
commit db5b786e55
2 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,6 +192,7 @@ const value_string bluetooth_uuid_vals[] = {
{ 0x1812, "Human Interface Device" },
{ 0x1813, "Scan Parameters" },
{ 0x1814, "Running Speed and Cadence" },
{ 0x1815, "Automation IO" }, /* Not adopted, 0.9 now (6th June 2015) */
{ 0x1816, "Cycling Speed and Cadence" },
{ 0x1818, "Cycling Power" },
{ 0x1819, "Location and Navigation" },
@ -202,6 +203,8 @@ const value_string bluetooth_uuid_vals[] = {
{ 0x181E, "Bond Management" },
{ 0x181F, "Continuous Glucose Monitoring" },
{ 0x1820, "Internet Protocol Support" },
{ 0x1821, "Indoor Positioning" },
{ 0x1822, "Pulse Oximeter" },
/* Units - https://developer.bluetooth.org/gatt/units/Pages/default.aspx */
{ 0x2700, "unitless" },
{ 0x2701, "length (metre)" },
@ -329,9 +332,12 @@ const value_string bluetooth_uuid_vals[] = {
{ 0x2906, "Valid Range" },
{ 0x2907, "External Report Reference" },
{ 0x2908, "Report Reference" },
{ 0x2909, "Number of Digitals" }, /* Not adopted, 0.9 now (18th July 2015) */
{ 0x290A, "Value Trigger Setting" },
{ 0x290B, "Environmental Sensing Configuration" },
{ 0x290C, "Environmental Sensing Measurement" },
{ 0x290D, "Environmental Sensing Trigger Setting" },
{ 0x290E, "Time Trigger Setting" }, /* Not adopted, 0.9 now (18th July 2015) */
/* Characteristics - https://developer.bluetooth.org/gatt/characteristics/Pages/CharacteristicsHome.aspx */
{ 0x2A00, "Device Name" },
{ 0x2A01, "Appearance" },
@ -403,6 +409,9 @@ const value_string bluetooth_uuid_vals[] = {
{ 0x2A53, "RSC Measurement" },
{ 0x2A54, "RSC Feature" },
{ 0x2A55, "SC Control Point" },
{ 0x2A56, "Digital" }, /* Not adopted, 0.9 now (6th June 2015) */
{ 0x2A58, "Analog" }, /* Not adopted, 0.9 now (6th June 2015) */
{ 0x2A5A, "Aggregate" }, /* Not adopted, 0.9 now (6th June 2015) */
{ 0x2A5B, "CSC Measurement" },
{ 0x2A5C, "CSC Feature" },
{ 0x2A5D, "Sensor Location" },
@ -479,6 +488,15 @@ const value_string bluetooth_uuid_vals[] = {
{ 0x2AAA, "CGM Session Start Time" },
{ 0x2AAB, "CGM Session Run Time" },
{ 0x2AAC, "CGM Specific Ops Control Point" },
{ 0x2AAD, "Indoor Positioning Configuration" },
{ 0x2AAE, "Latitude" },
{ 0x2AAF, "Longitude" },
{ 0x2AB0, "Local North Coordinate" },
{ 0x2AB1, "Local East Coordinate" },
{ 0x2AB2, "Floor Number" },
{ 0x2AB3, "Altitude" },
{ 0x2AB4, "Uncertainty" },
{ 0x2AB5, "Location Name" },
/* 16-bit UUID for Members - https://www.bluetooth.org/en-us/Pages/LoginRestrictedAll/16-bit-UUIDs-member.aspx */
{ 0XFEB6, "Vencer Co, Ltd" },
{ 0XFEB7, "Facebook, Inc." },
@ -486,14 +504,14 @@ const value_string bluetooth_uuid_vals[] = {
{ 0XFEB9, "LG Electronics" },
{ 0XFEBA, "Tencent Holdings Limited" },
{ 0XFEBB, "adafruit industries" },
{ 0XFEBC, "Dexcom, Inc. " },
{ 0XFEBD, "Clover Network, Inc. " },
{ 0XFEBC, "Dexcom, Inc." },
{ 0XFEBD, "Clover Network, Inc." },
{ 0XFEBE, "Bose Corporation" },
{ 0XFEBF, "Nod, Inc. " },
{ 0XFEBF, "Nod, Inc." },
{ 0XFEC0, "KDDI Corporation" },
{ 0XFEC1, "KDDI Corporation" },
{ 0XFEC2, "Blue Spark Technologies, Inc. " },
{ 0XFEC3, "360fly, Inc. " },
{ 0XFEC2, "Blue Spark Technologies, Inc." },
{ 0XFEC3, "360fly, Inc." },
{ 0XFEC4, "PLUS Location Systems" },
{ 0XFEC5, "Realtek Semiconductor Corp." },
{ 0XFEC6, "Kocomojo, LLC" },
@ -522,7 +540,7 @@ const value_string bluetooth_uuid_vals[] = {
{ 0XFEDD, "Jawbone" },
{ 0XFEDE, "Coin, Inc." },
{ 0XFEDF, "Design SHIFT" },
{ 0XFEE0, "Anhui Huami Information Technology Co. " },
{ 0XFEE0, "Anhui Huami Information Technology Co." },
{ 0XFEE1, "Anhui Huami Information Technology Co." },
{ 0XFEE2, "Anki, Inc." },
{ 0XFEE3, "Anki, Inc." },
@ -534,7 +552,7 @@ const value_string bluetooth_uuid_vals[] = {
{ 0XFEE9, "Quintic Corp." },
{ 0xFEEA, "Swirl Networks, Inc." },
{ 0xFEEB, "Swirl Networks, Inc." },
{ 0xFEEC, "Tile, Inc. " },
{ 0xFEEC, "Tile, Inc." },
{ 0xFEED, "Tile, Inc." },
{ 0xFEEE, "Polar Electro Oy" },
{ 0xFEEF, "Polar Electro Oy" },

17
epan/dissectors/packet-btatt.c
View File

@ -3674,8 +3674,16 @@ dissect_attribute_value(proto_tree *tree, proto_item *patron_item, packet_info *
offset += 1;
break;
case 0x2909: /* Number of Digitals - Not adopted, 0.9 now (18th July 2015) */
case 0x290E: /* Time Trigger Setting - Not adopted, 0.9 now (18th July 2015) */
/* TODO: Implement, low priority because they are not adopted yet */
case 0x290A: /* Value Trigger Setting */
case 0x2A53: /* RSC Measurement */
case 0x2A55: /* SC Control Point */
case 0x2A56: /* Digital */
case 0x2A58: /* Analog */
case 0x2A5A: /* Aggregate */
case 0x2A5B: /* CSC Measurement */
case 0x2A63: /* Cycling Power Measurement */
case 0x2A64: /* Cycling Power Vector */
@ -3693,6 +3701,15 @@ dissect_attribute_value(proto_tree *tree, proto_item *patron_item, packet_info *
case 0x2AAA: /* CGM Session Start Time */
case 0x2AAB: /* CGM Session Run Time */
case 0x2AAC: /* CGM Specific Ops Control Point */
case 0x2AAD: /* Indoor Positioning Configuration */
case 0x2AAE: /* Latitude */
case 0x2AAF: /* Longitude */
case 0x2AB0: /* Local North Coordinate */
case 0x2AB1: /* Local East Coordinate */
case 0x2AB2: /* Floor Number */
case 0x2AB3: /* Altitude */
case 0x2AB4: /* Uncertainty */
case 0x2AB5: /* Location Name */
/* TODO: Implement (easy) */
case 0x2906: /* Valid Range */
case 0x2A2A: /* IEEE 11073-20601 Regulatory Certification Data List */