Re: [PATCH] bluez-hcidump fix SDP universal attributes

[Iain Hibbert <plunky@rya-online.net>]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 1177 bytes --]

On Tue, 16 Feb 2010, Marcel Holtmann wrote:

> > > > hcidump shows SDP universal attribute 0x000d as IconURL but in fact it is
> > > > defined as "Additional Protocol Descriptor Lists". IconURL is 0x000c and I
> > > > don't know what Icon_10 was, perhaps an older name?
> > > >
> > > > Eg, from an SDP probe of a mouse:
> > > >
> > > >       aid 0x000d (IconURL)
> > > >          < < < uuid-16 0x0100 (L2CAP) uint 0x13 > < uuid-16 0x0011 (HIDP) > > >
> > >
> > > Reposting because there was no response to this, patch is attached..
> > >
> > > See "5.1.6 AdditionalProtocolDescriptorList attribute" and "5.1.14 IconURL
> > > Attribute" sections in the core specification for reference..
> > >
> > > (they sometimes call it AdditionalProtocolDescriptorLists and that is more
> > > accurate as more than one protocol descriptor list may be included)
> >
> > posting this simple (and easily verified) patch for hcidump for the third
> > time..
>
> sorry for having missed it. For some reason it got sorted away. Can you
> create a proper patch with git format-patch. That makes it way easier
> for me to apply them.

I am not a git user but perhaps this is correct?

regards,
iain

[-- Attachment #2: git format-patch --]
[-- Type: TEXT/PLAIN, Size: 2087 bytes --]

From 5615f136fb57a97da15a29c8b27cef1a707efaa3 Mon Sep 17 00:00:00 2001
From: Iain Hibbert <plunky@galant.(none)>
Date: Tue, 16 Feb 2010 22:47:19 +0000
Subject: [PATCH] correct SDP Universal Attribute name printing

    0x000c = IconURL
    0x000d = AttributeProtocolDescriptorLists
---
 parser/sdp.c |    2 +-
 parser/sdp.h |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/parser/sdp.c b/parser/sdp.c
index 5f2c1c6..b9f990e 100644
--- a/parser/sdp.c
+++ b/parser/sdp.c
@@ -194,8 +194,8 @@ static sdp_attr_id_nam_lookup_table_t sdp_attr_id_nam_lookup_table[] = {
 	{ SDP_ATTR_ID_BLUETOOTH_PROFILE_DESCRIPTOR_LIST, "BTProfileDescList"  },
 	{ SDP_ATTR_ID_DOCUMENTATION_URL,                 "DocURL"             },
 	{ SDP_ATTR_ID_CLIENT_EXECUTABLE_URL,             "ClientExeURL"       },
-	{ SDP_ATTR_ID_ICON_10,                           "Icon10"             },
 	{ SDP_ATTR_ID_ICON_URL,                          "IconURL"            },
+	{ SDP_ATTR_ID_ADDITIONAL_PROTOCOL_DESC_LISTS,    "AdditionalProtocolDescLists" },
 	{ SDP_ATTR_ID_SERVICE_NAME,                      "SrvName"            },
 	{ SDP_ATTR_ID_SERVICE_DESCRIPTION,               "SrvDesc"            },
 	{ SDP_ATTR_ID_PROVIDER_NAME,                     "ProviderName"       },
diff --git a/parser/sdp.h b/parser/sdp.h
index 09e4432..4769fd0 100644
--- a/parser/sdp.h
+++ b/parser/sdp.h
@@ -129,8 +129,8 @@
 #define SDP_ATTR_ID_BLUETOOTH_PROFILE_DESCRIPTOR_LIST  0x0009
 #define SDP_ATTR_ID_DOCUMENTATION_URL                  0x000A
 #define SDP_ATTR_ID_CLIENT_EXECUTABLE_URL              0x000B
-#define SDP_ATTR_ID_ICON_10                            0x000C
-#define SDP_ATTR_ID_ICON_URL                           0x000D
+#define SDP_ATTR_ID_ICON_URL                           0x000C
+#define SDP_ATTR_ID_ADDITIONAL_PROTOCOL_DESC_LISTS     0x000D
 #define SDP_ATTR_ID_SERVICE_NAME                       0x0100
 #define SDP_ATTR_ID_SERVICE_DESCRIPTION                0x0101
 #define SDP_ATTR_ID_PROVIDER_NAME                      0x0102
-- 
1.6.6