diff options
author | Michał Łabędzki <michal.labedzki@wireshark.org> | 2018-03-24 17:10:55 +0100 |
---|---|---|
committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2018-03-25 09:52:09 +0000 |
commit | a344e8fc92bb2ddad24db5a1805ff7da2bdacd2b (patch) | |
tree | 2fcfe6dbe811216cb28f1648daa01c867732193c | |
parent | b577bff1ae1187471e0df2e4477b75ff548f1510 (diff) |
Bluetooth: ATT: Appearance: Add new items
Items:
Personal Mobility Device
Continuous Glucose Monitor
Insulin Pump
Medication Delivery
Change-Id: If0e706506164883b34550a6c6865095c4dd1e816
Reviewed-on: https://code.wireshark.org/review/26626
Petri-Dish: Michal Labedzki <michal.labedzki@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-rw-r--r-- | epan/dissectors/packet-btatt.c | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c index b8242d59b9..8d64db44f0 100644 --- a/epan/dissectors/packet-btatt.c +++ b/epan/dissectors/packet-btatt.c @@ -142,6 +142,8 @@ static int hf_btatt_appearance_subcategory_hid = -1; static int hf_btatt_appearance_subcategory_running_walking_sensor = -1; static int hf_btatt_appearance_subcategory_cycling = -1; static int hf_btatt_appearance_subcategory_pulse_oximeter = -1; +static int hf_btatt_appearance_subcategory_personal_mobility_device = -1; +static int hf_btatt_appearance_subcategory_insulin_pump = -1; static int hf_btatt_appearance_subcategory_outdoor_sports_activity = -1; static int hf_btatt_peripheral_privacy_flag = -1; static int hf_btatt_minimum_connection_interval = -1; @@ -1176,6 +1178,18 @@ static const int *hfx_btatt_appearance_pulse_oximeter[] = { NULL }; +static const int *hfx_btatt_appearance_personal_mobility_device[] = { + &hf_btatt_appearance_category, + &hf_btatt_appearance_subcategory_personal_mobility_device, + NULL +}; + +static const int *hfx_btatt_appearance_insulin_pump[] = { + &hf_btatt_appearance_category, + &hf_btatt_appearance_subcategory_insulin_pump, + NULL +}; + static const int *hfx_btatt_appearance_outdoor_sports_activity[] = { &hf_btatt_appearance_category, &hf_btatt_appearance_subcategory_outdoor_sports_activity, @@ -2608,6 +2622,10 @@ static const value_string appearance_category_vals[] = { {0x12, "Cycling"}, {0x31, "Pulse Oximeter"}, {0x32, "Weight Scale"}, + {0x33, "Personal Mobility Device"}, + {0x34, "Continuous Glucose Monitor"}, + {0x35, "Insulin Pump"}, + {0x36, "Medication Delivery"}, {0x51, "Outdoor Sports Activity"}, {0x0, NULL} }; @@ -2680,6 +2698,21 @@ static const value_string appearance_subcategory_pulse_oximeter_vals[] = { {0x0, NULL} }; +static const value_string appearance_subcategory_personal_mobility_device_vals[] = { + {0x00, "Generic"}, + {0x01, "Powered Wheelchair"}, + {0x02, "Mobility Scooter"}, + {0x0, NULL} +}; + +static const value_string appearance_subcategory_insulin_pump_vals[] = { + {0x00, "Generic"}, + {0x01, "Insulin Pump / Durable Pump"}, + {0x04, "Insulin Pump / Patch Pump"}, + {0x08, "Insulin Pen"}, + {0x0, NULL} +}; + static const value_string appearance_subcategory_outdoor_sports_activity_vals[] = { {0x00, "Generic"}, {0x01, "Location Display Device"}, @@ -4818,6 +4851,14 @@ dissect_attribute_value(proto_tree *tree, proto_item *patron_item, packet_info * hfs = hfx_btatt_appearance_pulse_oximeter; break; + case 0x033: /* Personal Mobility Device */ + hfs = hfx_btatt_appearance_personal_mobility_device; + break; + + case 0x035: /* Insulin Pump */ + hfs = hfx_btatt_appearance_insulin_pump; + break; + case 0x051: /* Outdoor Sports Activity */ hfs = hfx_btatt_appearance_outdoor_sports_activity; break; @@ -11339,6 +11380,16 @@ proto_register_btatt(void) FT_UINT16, BASE_DEC_HEX, VALS(appearance_subcategory_pulse_oximeter_vals), 0x003F, NULL, HFILL} }, + {&hf_btatt_appearance_subcategory_personal_mobility_device, + {"Personal Mobility Device", "btatt.appearance.subcategory.personal_mobility_device", + FT_UINT16, BASE_DEC_HEX, VALS(appearance_subcategory_personal_mobility_device_vals), 0x003F, + NULL, HFILL} + }, + {&hf_btatt_appearance_subcategory_insulin_pump, + {"Insulin Pump", "btatt.appearance.subcategory.insulin_pump", + FT_UINT16, BASE_DEC_HEX, VALS(appearance_subcategory_insulin_pump_vals), 0x003F, + NULL, HFILL} + }, {&hf_btatt_appearance_subcategory_outdoor_sports_activity, {"Subcategory", "btatt.appearance.subcategory.outdoor_sports_activity", FT_UINT16, BASE_DEC_HEX, VALS(appearance_subcategory_outdoor_sports_activity_vals), 0x003F, |