Bluetooth: Update Assign numbers (5th December 2015)

Add TDS and OTS/OTP UUID, OTS PSM (I cannot find it, but
it seems to be linear), update CompanyIds and add three
EIR/AD codes: URI, Indoor Positioning and Transport Discovery Data.

Implementation of new "numbers" will be done later.

Change-Id: I8ad4d9c1d55c1824d87e88303c28e67dd445ec98
Reviewed-on: https://code.wireshark.org/review/13386
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 66 insertions, 0 deletions

diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c
index 3014ac9a09..1d095874de 100644
--- a/epan/dissectors/packet-bluetooth.c
+++ b/epan/dissectors/packet-bluetooth.c
@@ -209,6 +209,8 @@ const value_string bluetooth_uuid_vals[] = {
     { 0x1821,   "Indoor Positioning" },
     { 0x1822,   "Pulse Oximeter" },
     { 0x1823,   "HTTP Proxy" },
+    { 0x1824,   "Transport Discovery" },
+    { 0x1825,   "Object Transfer" },
     /* Units - https://developer.bluetooth.org/gatt/units/Pages/default.aspx */
     { 0x2700,   "unitless" },
     { 0x2701,   "length (metre)" },
@@ -507,7 +509,26 @@ const value_string bluetooth_uuid_vals[] = {
     { 0x2AB9,   "HTTP Entity Body" },
     { 0x2ABA,   "HTTP Control Point" },
     { 0x2ABB,   "HTTPS Security" },
+    { 0x2ABC,   "TDS Control Point" },
+    { 0x2ABD,   "OTS Feature" },
+    { 0x2ABE,   "Object Name" },
+    { 0x2ABF,   "Object Type" },
+    { 0x2AC0,   "Object Size" },
+    { 0x2AC1,   "Object First-Created" },
+    { 0x2AC2,   "Object Last-Modified" },
+    { 0x2AC3,   "Object ID" },
+    { 0x2AC4,   "Object Properties" },
+    { 0x2AC5,   "Object Action Control Point" },
+    { 0x2AC6,   "Object List Control Point" },
+    { 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 */
+    { 0xFE7D,   "Aterica Health Inc." },
+    { 0xFE7E,   "Awear Solutions Ltd" },
+    { 0xFE7F,   "Doppler Lab" },
+    { 0xFE80,   "Doppler Lab" },
+    { 0xFE81,   "Medtronic Inc." },
+    { 0xFE82,   "Medtronic Inc." },
     { 0xFE83,   "Blue Bite" },
     { 0xFE84,   "RF Digital Corp" },
     { 0xFE85,   "RF Digital Corp" },
@@ -1320,6 +1341,51 @@ static const value_string bluetooth_company_id_vals[] = {
     {0x02A3, "Itude"},
     {0x02A4, "Pacific Lock Company"},
     {0x02A5, "Tendyron Corporation"},
+    {0x02A6, "Robert Bosch GmbH"},
+    {0x02A7, "Illuxtron international B.V."},
+    {0x02A8, "miSport Ltd."},
+    {0x02A9, "Chargelib"},
+    {0x02AA, "Doppler Lab"},
+    {0x02AB, "BBPOS Limited"},
+    {0x02AC, "RTB Elektronik GmbH & Co. KG"},
+    {0x02AD, "Rx Networks, Inc."},
+    {0x02AE, "WeatherFlow, Inc."},
+    {0x02AF, "Technicolor USA Inc."},
+    {0x02B0, "Bestechnic(Shanghai),Ltd"},
+    {0x02B1, "Raden Inc"},
+    {0x02B2, "JouZen Oy"},
+    {0x02B3, "CLABER S.P.A."},
+    {0x02B4, "Hyginex, Inc."},
+    {0x02B5, "HANSHIN ELECTRIC RAILWAY CO.,LTD."},
+    {0x02B6, "Schneider Electric"},
+    {0x02B7, "Oort Technologies LLC"},
+    {0x02B8, "Chrono Therapeutics"},
+    {0x02B9, "Rinnai Corporation"},
+    {0x02BA, "Swissprime Technologies AG"},
+    {0x02BB, "Koha.,Co.Ltd"},
+    {0x02BC, "Genevac Ltd"},
+    {0x02BD, "Chemtronics"},
+    {0x02BE, "Seguro Technology Sp. z o.o."},
+    {0x02BF, "Redbird Flight Simulations"},
+    {0x02C0, "Dash Robotics"},
+    {0x02C1, "LINE Corporation"},
+    {0x02C2, "Guillemot Corporation"},
+    {0x02C3, "Techtronic Power Tools Technology Limited"},
+    {0x02C4, "Wilson Sporting Goods"},
+    {0x02C5, "Lenovo (Singapore) Pte Ltd."},
+    {0x02C6, "Ayatan Sensors"},
+    {0x02C7, "Electronics Tomorrow Limited"},
+    {0x02C8, "VASCO Data Security International, Inc."},
+    {0x02C9, "PayRange Inc."},
+    {0x02CA, "ABOV Semiconductor"},
+    {0x02CB, "AINA-Wireless Inc."},
+    {0x02CC, "Eijkelkamp Soil & Water"},
+    {0x02CD, "BMA ergonomics b.v."},
+    {0x02CE, "Teva Branded Pharmaceutical Products R&D, Inc."},
+    {0x02CF, "Anima"},
+    {0x02D0, "3M"},
+    {0x02D1, "Empatica Srl"},
+    {0x02D2, "Afero, Inc."},
     {0xFFFF, "For use in internal and interoperability tests."},
     {0, NULL }
 };