* [PATCH -v2 1/2] Bluetooth: Merge L2CAP and SCO modules into bluetooth.ko
From: Gustavo F. Padovan @ 2011-02-09 17:17 UTC (permalink / raw)
To: linux-bluetooth
Actually doesn't make sense have these modules built separately.
The L2CAP layer is needed by almost all Bluetooth protocols and profiles.
There isn't any real use case without having L2CAP loaded.
SCO is only essential for Audio transfers, but it is so small that we can
have it loaded always in bluetooth.ko without problems.
If you really doesn't want it you can disable SCO in the kernel config.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
---
include/net/bluetooth/bluetooth.h | 28 ++++++++++++++++++++++++++++
net/bluetooth/Kconfig | 10 ++--------
net/bluetooth/Makefile | 5 ++---
net/bluetooth/af_bluetooth.c | 32 ++++++++++++++++++++++++++++++--
net/bluetooth/l2cap_core.c | 16 ++--------------
net/bluetooth/sco.c | 16 ++--------------
6 files changed, 66 insertions(+), 41 deletions(-)
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index ed7d775..4375043 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -205,4 +205,32 @@ extern void bt_sysfs_cleanup(void);
extern struct dentry *bt_debugfs;
+#ifdef CONFIG_BT_L2CAP
+int l2cap_init(void);
+void l2cap_exit(void);
+#else
+static inline int l2cap_init(void)
+{
+ return 0;
+}
+
+static inline void l2cap_exit(void)
+{
+}
+#endif
+
+#ifdef CONFIG_BT_SCO
+int sco_init(void);
+void sco_exit(void);
+#else
+static inline int sco_init(void)
+{
+ return 0;
+}
+
+static inline void sco_exit(void)
+{
+}
+#endif
+
#endif /* __BLUETOOTH_H */
diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
index e45eae6..c6f9c2f 100644
--- a/net/bluetooth/Kconfig
+++ b/net/bluetooth/Kconfig
@@ -32,7 +32,7 @@ menuconfig BT
more information, see <http://www.bluez.org/>.
config BT_L2CAP
- tristate "L2CAP protocol support"
+ bool "L2CAP protocol support"
depends on BT
select CRC16
help
@@ -40,19 +40,13 @@ config BT_L2CAP
connection oriented and connection-less data transport. L2CAP
support is required for most Bluetooth applications.
- Say Y here to compile L2CAP support into the kernel or say M to
- compile it as module (l2cap).
-
config BT_SCO
- tristate "SCO links support"
+ bool "SCO links support"
depends on BT
help
SCO link provides voice transport over Bluetooth. SCO support is
required for voice applications like Headset and Audio.
- Say Y here to compile SCO support into the kernel or say M to
- compile it as module (sco).
-
source "net/bluetooth/rfcomm/Kconfig"
source "net/bluetooth/bnep/Kconfig"
diff --git a/net/bluetooth/Makefile b/net/bluetooth/Makefile
index 339b429..f04fe9a 100644
--- a/net/bluetooth/Makefile
+++ b/net/bluetooth/Makefile
@@ -3,12 +3,11 @@
#
obj-$(CONFIG_BT) += bluetooth.o
-obj-$(CONFIG_BT_L2CAP) += l2cap.o
-obj-$(CONFIG_BT_SCO) += sco.o
obj-$(CONFIG_BT_RFCOMM) += rfcomm/
obj-$(CONFIG_BT_BNEP) += bnep/
obj-$(CONFIG_BT_CMTP) += cmtp/
obj-$(CONFIG_BT_HIDP) += hidp/
bluetooth-y := af_bluetooth.o hci_core.o hci_conn.o hci_event.o mgmt.o hci_sock.o hci_sysfs.o lib.o
-l2cap-y := l2cap_core.o l2cap_sock.o
+bluetooth-$(CONFIG_BT_L2CAP) += l2cap_core.o l2cap_sock.o
+bluetooth-$(CONFIG_BT_SCO) += sco.o
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 2abfe2f..c258027 100644
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -40,7 +40,7 @@
#include <net/bluetooth/bluetooth.h>
-#define VERSION "2.15"
+#define VERSION "2.16"
/* Bluetooth sockets */
#define BT_MAX_PROTO 8
@@ -545,13 +545,41 @@ static int __init bt_init(void)
BT_INFO("HCI device and connection manager initialized");
- hci_sock_init();
+ err = hci_sock_init();
+ if (err < 0)
+ goto error;
+
+ err = l2cap_init();
+ if (err < 0) {
+ hci_sock_cleanup();
+ goto sock_err;
+ }
+
+ err = sco_init();
+ if (err < 0) {
+ l2cap_exit();
+ goto sock_err;
+ }
return 0;
+
+sock_err:
+ hci_sock_cleanup();
+
+error:
+ sock_unregister(PF_BLUETOOTH);
+ bt_sysfs_cleanup();
+
+ return err;
}
static void __exit bt_exit(void)
{
+
+ sco_exit();
+
+ l2cap_exit();
+
hci_sock_cleanup();
sock_unregister(PF_BLUETOOTH);
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index ba7f9da..6f054d9 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -55,8 +55,6 @@
#include <net/bluetooth/hci_core.h>
#include <net/bluetooth/l2cap.h>
-#define VERSION "2.15"
-
int disable_ertm;
static u32 l2cap_feat_mask = L2CAP_FEAT_FIXED_CHAN;
@@ -3806,7 +3804,7 @@ static struct hci_proto l2cap_hci_proto = {
.recv_acldata = l2cap_recv_acldata
};
-static int __init l2cap_init(void)
+int __init l2cap_init(void)
{
int err;
@@ -3834,7 +3832,6 @@ static int __init l2cap_init(void)
BT_ERR("Failed to create L2CAP debug file");
}
- BT_INFO("L2CAP ver %s", VERSION);
BT_INFO("L2CAP socket layer initialized");
return 0;
@@ -3845,7 +3842,7 @@ error:
return err;
}
-static void __exit l2cap_exit(void)
+void l2cap_exit(void)
{
debugfs_remove(l2cap_debugfs);
@@ -3866,14 +3863,5 @@ void l2cap_load(void)
}
EXPORT_SYMBOL(l2cap_load);
-module_init(l2cap_init);
-module_exit(l2cap_exit);
-
module_param(disable_ertm, bool, 0644);
MODULE_PARM_DESC(disable_ertm, "Disable enhanced retransmission mode");
-
-MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
-MODULE_DESCRIPTION("Bluetooth L2CAP ver " VERSION);
-MODULE_VERSION(VERSION);
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("bt-proto-0");
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 960c6d1..b517183 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -50,8 +50,6 @@
#include <net/bluetooth/hci_core.h>
#include <net/bluetooth/sco.h>
-#define VERSION "0.6"
-
static int disable_esco;
static const struct proto_ops sco_sock_ops;
@@ -1023,7 +1021,7 @@ static struct hci_proto sco_hci_proto = {
.recv_scodata = sco_recv_scodata
};
-static int __init sco_init(void)
+int __init sco_init(void)
{
int err;
@@ -1051,7 +1049,6 @@ static int __init sco_init(void)
BT_ERR("Failed to create SCO debug file");
}
- BT_INFO("SCO (Voice Link) ver %s", VERSION);
BT_INFO("SCO socket layer initialized");
return 0;
@@ -1061,7 +1058,7 @@ error:
return err;
}
-static void __exit sco_exit(void)
+void __exit sco_exit(void)
{
debugfs_remove(sco_debugfs);
@@ -1074,14 +1071,5 @@ static void __exit sco_exit(void)
proto_unregister(&sco_proto);
}
-module_init(sco_init);
-module_exit(sco_exit);
-
module_param(disable_esco, bool, 0644);
MODULE_PARM_DESC(disable_esco, "Disable eSCO connection creation");
-
-MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
-MODULE_DESCRIPTION("Bluetooth SCO ver " VERSION);
-MODULE_VERSION(VERSION);
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("bt-proto-2");
--
1.7.4
^ permalink raw reply related
* Re: Kernal/User space change for LE Random Addresses
From: Johan Hedberg @ 2011-02-09 15:38 UTC (permalink / raw)
To: Claudio Takahasi; +Cc: Brian Gix, BlueZ development
In-Reply-To: <AANLkTimiJ2sP8yrpnk3=Hjo6XrVoEuRbmYE2H=UsKAA7@mail.gmail.com>
Hi Claudio,
On Wed, Feb 09, 2011, Claudio Takahasi wrote:
> An address/advertising cache will be added in the kernel, if the given
> address is found in the cache the two most significant bits will be
> checked to infer the address type,
For the public vs random address detection you need to use the address
type info in the advertising report. Only when you've determined that
the address is random will the two bits make sense. So far the only use
I can think of for these bits is to determine whether it's useful to try
to perform a lookup in our IRK list (e.g. for a non-resolvable private
key that wouldn't make sense). Are there any other uses?
> otherwise the fallback will be BR/EDR. For BR/EDR L2CAP SOCK_SEQPACKET
> sockets PSM is always provided, we can also use this information to
> distinguish BR/EDR from LE address if an advertising has not been
> detected previously.
I think we could still keep the current CID based decision on the kernel
side. If the CID implies LE but we don't have a match for the address in
the cache we just return an error to user space.
Johan
^ permalink raw reply
* [PATCH v2] Fix blutoothd exit on badly formated AT+VTS
From: Dmitriy Paliy @ 2011-02-09 14:55 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Dmitriy Paliy
This fixes bluetoothd exit when AT+VTS command is badly formatted,
e.g. as AT+VTS\xfe\xfe[...]=1
Verification it done for the numeric value to be larger than 0x23,
that corresponds to the hash '#', and to be lower than 0x44, that
corresponds to 'D', such that the tone is in {0-9, *, #, A, B, C, D}.
---
audio/headset.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/audio/headset.c b/audio/headset.c
index 0270e2c..bdaa8da 100644
--- a/audio/headset.c
+++ b/audio/headset.c
@@ -1015,12 +1015,18 @@ int telephony_transmit_dtmf_rsp(void *telephony_device, cme_error_t err)
static int dtmf_tone(struct audio_device *device, const char *buf)
{
+ char tone;
+
if (strlen(buf) < 8) {
error("Too short string for DTMF tone");
return -EINVAL;
}
- telephony_transmit_dtmf_req(device, buf[7]);
+ tone = buf[7];
+ if (tone >= '#' && tone <= 'D')
+ telephony_transmit_dtmf_req(device, tone);
+ else
+ return -EINVAL;
return 0;
}
--
1.7.1
^ permalink raw reply related
* Re: [PATCH 6/7] Add ATT dump for read req/resp
From: André Dieb @ 2011-02-09 14:28 UTC (permalink / raw)
To: Gustavo F. Padovan; +Cc: linux-bluetooth
In-Reply-To: <20110209142118.GD1995@joana>
Besides its opcode (which was already parsed), read response contains
only the attribute value octets.
To further parse it, I think we'd need to store the handle of the read
request, match it against a UUID table and maybe parse the read
response format, if any. Maybe too much work?
I must note I liked raw_dump() for this because it also prints out
chars, which make attribs. like device name have a nice dump.
On Wed, Feb 9, 2011 at 12:21 PM, Gustavo F. Padovan
<padovan@profusion.mobi> wrote:
> Hi Andre,
>
> * Andre Dieb Martins <andre.dieb@signove.com> [2011-02-09 11:01:49 -0300]:
>
>> ---
>> parser/att.c | 14 ++++++++++++++
>> 1 files changed, 14 insertions(+), 0 deletions(-)
>>
>> diff --git a/parser/att.c b/parser/att.c
>> index b172f95..2a9da30 100644
>> --- a/parser/att.c
>> +++ b/parser/att.c
>> @@ -331,6 +331,14 @@ static void att_find_info_resp_dump(int level, struct frame *frm)
>> }
>> }
>>
>> +static void att_read_req_dump(int level, struct frame *frm)
>> +{
>> + uint16_t handle = btohs(htons(get_u16(frm)));
>> +
>> + p_indent(level, frm);
>> + printf("handle 0x%2.2x\n", handle);
>> +}
>> +
>> static void att_handle_notify_dump(int level, struct frame *frm)
>> {
>> uint16_t handle = btohs(htons(get_u16(frm)));
>> @@ -371,6 +379,12 @@ void att_dump(int level, struct frame *frm)
>> case ATT_OP_FIND_INFO_RESP:
>> att_find_info_resp_dump(level + 1, frm);
>> break;
>> + case ATT_OP_READ_REQ:
>> + att_read_req_dump(level + 1, frm);
>> + break;
>> + case ATT_OP_READ_RESP:
>> + raw_dump(level + 1, frm);
>
> raw_dump?
>
> --
> Gustavo F. Padovan
> http://profusion.mobi
>
^ permalink raw reply
* Re: [PATCH 1/6] Add dump for ATT MTU req/resp and notify value
From: Gustavo F. Padovan @ 2011-02-09 14:24 UTC (permalink / raw)
To: Andre Dieb Martins; +Cc: linux-bluetooth
In-Reply-To: <1297259619-10325-1-git-send-email-andre.dieb@signove.com>
Hi Andre,
* Andre Dieb Martins <andre.dieb@signove.com> [2011-02-09 10:53:34 -0300]:
> ---
> parser/att.c | 31 ++++++++++++++++++++++++++++++-
> 1 files changed, 30 insertions(+), 1 deletions(-)
>
> diff --git a/parser/att.c b/parser/att.c
> index b670694..05f9c23 100644
> --- a/parser/att.c
> +++ b/parser/att.c
> @@ -132,12 +132,35 @@ static const char *attop2str(uint8_t op)
> }
> }
>
> +static void att_mtu_req_dump(int level, struct frame *frm)
> +{
> + uint16_t client_rx_mtu = btohs(htons(get_u16(frm)));
> +
> + p_indent(level, frm);
> + printf("client rx mtu %d\n", client_rx_mtu);
> +}
> +
> +static void att_mtu_resp_dump(int level, struct frame *frm)
> +{
> + uint16_t server_rx_mtu = btohs(htons(get_u16(frm)));
> +
> + p_indent(level, frm);
> + printf("server rx mtu %d\n", server_rx_mtu);
> +}
> +
> static void att_handle_notify_dump(int level, struct frame *frm)
> {
> uint16_t handle = btohs(htons(get_u16(frm)));
>
> p_indent(level, frm);
> printf("handle 0x%2.2x\n", handle);
> +
> + p_indent(level, frm);
> + printf("value ");
> + while (frm->len > 0) {
> + printf("0x%.2x ", get_u8(frm));
> + }
> + printf("\n");
> }
>
> void att_dump(int level, struct frame *frm)
> @@ -147,9 +170,15 @@ void att_dump(int level, struct frame *frm)
> op = get_u8(frm);
>
> p_indent(level, frm);
> - printf("Opcode: %d (%s)\n", op, attop2str(op));
> + printf("Opcode %d (%s)\n", op, attop2str(op));
-v2 delivered a blank email to me for this one, so replying here.
Please move this change to the patch that introduced it.
--
Gustavo F. Padovan
http://profusion.mobi
^ permalink raw reply
* Re: [PATCH 6/7] Add ATT dump for read req/resp
From: Gustavo F. Padovan @ 2011-02-09 14:21 UTC (permalink / raw)
To: Andre Dieb Martins; +Cc: linux-bluetooth
In-Reply-To: <1297260110-10515-6-git-send-email-andre.dieb@signove.com>
Hi Andre,
* Andre Dieb Martins <andre.dieb@signove.com> [2011-02-09 11:01:49 -0300]:
> ---
> parser/att.c | 14 ++++++++++++++
> 1 files changed, 14 insertions(+), 0 deletions(-)
>
> diff --git a/parser/att.c b/parser/att.c
> index b172f95..2a9da30 100644
> --- a/parser/att.c
> +++ b/parser/att.c
> @@ -331,6 +331,14 @@ static void att_find_info_resp_dump(int level, struct frame *frm)
> }
> }
>
> +static void att_read_req_dump(int level, struct frame *frm)
> +{
> + uint16_t handle = btohs(htons(get_u16(frm)));
> +
> + p_indent(level, frm);
> + printf("handle 0x%2.2x\n", handle);
> +}
> +
> static void att_handle_notify_dump(int level, struct frame *frm)
> {
> uint16_t handle = btohs(htons(get_u16(frm)));
> @@ -371,6 +379,12 @@ void att_dump(int level, struct frame *frm)
> case ATT_OP_FIND_INFO_RESP:
> att_find_info_resp_dump(level + 1, frm);
> break;
> + case ATT_OP_READ_REQ:
> + att_read_req_dump(level + 1, frm);
> + break;
> + case ATT_OP_READ_RESP:
> + raw_dump(level + 1, frm);
raw_dump?
--
Gustavo F. Padovan
http://profusion.mobi
^ permalink raw reply
* Re: [PATCH 5/7] Better ATT dump format
From: Gustavo F. Padovan @ 2011-02-09 14:18 UTC (permalink / raw)
To: Andre Dieb Martins; +Cc: linux-bluetooth
In-Reply-To: <1297260110-10515-5-git-send-email-andre.dieb@signove.com>
Hi Andre,
* Andre Dieb Martins <andre.dieb@signove.com> [2011-02-09 11:01:48 -0300]:
> ---
> parser/att.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
This patch should not exist, make these changes in the patch the actually
introduced this code for the first time. 'git rebase -i' is your friend. ;)
--
Gustavo F. Padovan
http://profusion.mobi
^ permalink raw reply
* Re: [PATCH 4/7] Add ATT find info req/resp dump
From: Gustavo F. Padovan @ 2011-02-09 14:15 UTC (permalink / raw)
To: Andre Dieb Martins; +Cc: linux-bluetooth
In-Reply-To: <1297260110-10515-4-git-send-email-andre.dieb@signove.com>
* Andre Dieb Martins <andre.dieb@signove.com> [2011-02-09 11:01:47 -0300]:
> ---
> parser/att.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
> 1 files changed, 112 insertions(+), 1 deletions(-)
>
> diff --git a/parser/att.c b/parser/att.c
> index 526b7bf..79a74b5 100644
> --- a/parser/att.c
> +++ b/parser/att.c
> @@ -36,6 +36,27 @@
>
> #include "parser.h"
>
> +#define GATT_PRIM_SVC_UUID 0x2800
> +#define GATT_SND_SVC_UUID 0x2801
> +#define GATT_INCLUDE_UUID 0x2802
> +#define GATT_CHARAC_UUID 0x2803
> +
> +#define GATT_CHARAC_DEVICE_NAME 0x2A00
> +#define GATT_CHARAC_APPEARANCE 0x2A01
> +#define GATT_CHARAC_PERIPHERAL_PRIV_FLAG 0x2A02
> +#define GATT_CHARAC_RECONNECTION_ADDRESS 0x2A03
> +#define GATT_CHARAC_PERIPHERAL_PREF_CONN 0x2A04
> +#define GATT_CHARAC_SERVICE_CHANGED 0x2A05
> +
> +#define GATT_CHARAC_EXT_PROPER_UUID 0x2900
> +#define GATT_CHARAC_USER_DESC_UUID 0x2901
> +#define GATT_CLIENT_CHARAC_CFG_UUID 0x2902
> +#define GATT_SERVER_CHARAC_CFG_UUID 0x2903
> +#define GATT_CHARAC_FMT_UUID 0x2904
> +#define GATT_CHARAC_AGREG_FMT_UUID 0x2905
> +
> +
> +
> /* Attribute Protocol Opcodes */
> #define ATT_OP_ERROR 0x01
> #define ATT_OP_MTU_REQ 0x02
> @@ -196,6 +217,47 @@ static const char * atterror2str(uint8_t err)
> }
> }
>
> +static const char *uuid2str(uint16_t uuid)
> +{
> + switch (uuid) {
> + case GATT_PRIM_SVC_UUID:
> + return "GATT Primary Service";
> + case GATT_SND_SVC_UUID:
> + return "GATT Secondary Service";
> + case GATT_INCLUDE_UUID:
> + return "GATT Include";
> + case GATT_CHARAC_UUID:
> + return "GATT Characteristic";
> + case GATT_CHARAC_DEVICE_NAME:
> + return "GATT(type) Device Name";
> + case GATT_CHARAC_APPEARANCE:
> + return "GATT(type) Appearance";
> + case GATT_CHARAC_PERIPHERAL_PRIV_FLAG:
> + return "GATT(type) Peripheral Privacy Flag";
> + case GATT_CHARAC_RECONNECTION_ADDRESS:
> + return "GATT(type) Characteristic Reconnection Address";
> + case GATT_CHARAC_PERIPHERAL_PREF_CONN:
> + return "GATT(type) Characteristic Preferred Connection Parameters";
> + case GATT_CHARAC_SERVICE_CHANGED:
> + return "GATT(type) Characteristic Service Changed";
> + case GATT_CHARAC_EXT_PROPER_UUID:
> + return "GATT(desc) Characteristic Extended Properties";
> + case GATT_CHARAC_USER_DESC_UUID:
> + return "GATT(desc) User Description";
> + case GATT_CLIENT_CHARAC_CFG_UUID:
> + return "GATT(desc) Client Characteristic Configuration";
> + case GATT_SERVER_CHARAC_CFG_UUID:
> + return "GATT(desc) Server Characteristic Configuration";
> + case GATT_CHARAC_FMT_UUID:
> + return "GATT(desc) Format";
> + case GATT_CHARAC_AGREG_FMT_UUID:
> + return "GATT(desc) Aggregate Format";
> + default:
> + return "Unknown";
> + }
> +}
> +
> +
And a extra blank line here. ;)
--
Gustavo F. Padovan
http://profusion.mobi
^ permalink raw reply
* Re: [PATCH 4/7] Add ATT find info req/resp dump
From: Gustavo F. Padovan @ 2011-02-09 14:13 UTC (permalink / raw)
To: Andre Dieb Martins; +Cc: linux-bluetooth
In-Reply-To: <1297260110-10515-4-git-send-email-andre.dieb@signove.com>
Hi André,
* Andre Dieb Martins <andre.dieb@signove.com> [2011-02-09 11:01:47 -0300]:
> ---
> parser/att.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
> 1 files changed, 112 insertions(+), 1 deletions(-)
>
> diff --git a/parser/att.c b/parser/att.c
> index 526b7bf..79a74b5 100644
> --- a/parser/att.c
> +++ b/parser/att.c
> @@ -36,6 +36,27 @@
>
> #include "parser.h"
>
> +#define GATT_PRIM_SVC_UUID 0x2800
> +#define GATT_SND_SVC_UUID 0x2801
> +#define GATT_INCLUDE_UUID 0x2802
> +#define GATT_CHARAC_UUID 0x2803
> +
> +#define GATT_CHARAC_DEVICE_NAME 0x2A00
> +#define GATT_CHARAC_APPEARANCE 0x2A01
> +#define GATT_CHARAC_PERIPHERAL_PRIV_FLAG 0x2A02
> +#define GATT_CHARAC_RECONNECTION_ADDRESS 0x2A03
> +#define GATT_CHARAC_PERIPHERAL_PREF_CONN 0x2A04
> +#define GATT_CHARAC_SERVICE_CHANGED 0x2A05
> +
> +#define GATT_CHARAC_EXT_PROPER_UUID 0x2900
> +#define GATT_CHARAC_USER_DESC_UUID 0x2901
> +#define GATT_CLIENT_CHARAC_CFG_UUID 0x2902
> +#define GATT_SERVER_CHARAC_CFG_UUID 0x2903
> +#define GATT_CHARAC_FMT_UUID 0x2904
> +#define GATT_CHARAC_AGREG_FMT_UUID 0x2905
> +
> +
> +
> /* Attribute Protocol Opcodes */
> #define ATT_OP_ERROR 0x01
> #define ATT_OP_MTU_REQ 0x02
> @@ -196,6 +217,47 @@ static const char * atterror2str(uint8_t err)
> }
> }
>
> +static const char *uuid2str(uint16_t uuid)
> +{
> + switch (uuid) {
> + case GATT_PRIM_SVC_UUID:
> + return "GATT Primary Service";
> + case GATT_SND_SVC_UUID:
> + return "GATT Secondary Service";
> + case GATT_INCLUDE_UUID:
> + return "GATT Include";
> + case GATT_CHARAC_UUID:
> + return "GATT Characteristic";
> + case GATT_CHARAC_DEVICE_NAME:
> + return "GATT(type) Device Name";
> + case GATT_CHARAC_APPEARANCE:
> + return "GATT(type) Appearance";
> + case GATT_CHARAC_PERIPHERAL_PRIV_FLAG:
> + return "GATT(type) Peripheral Privacy Flag";
> + case GATT_CHARAC_RECONNECTION_ADDRESS:
> + return "GATT(type) Characteristic Reconnection Address";
> + case GATT_CHARAC_PERIPHERAL_PREF_CONN:
> + return "GATT(type) Characteristic Preferred Connection Parameters";
> + case GATT_CHARAC_SERVICE_CHANGED:
> + return "GATT(type) Characteristic Service Changed";
> + case GATT_CHARAC_EXT_PROPER_UUID:
> + return "GATT(desc) Characteristic Extended Properties";
> + case GATT_CHARAC_USER_DESC_UUID:
> + return "GATT(desc) User Description";
> + case GATT_CLIENT_CHARAC_CFG_UUID:
> + return "GATT(desc) Client Characteristic Configuration";
> + case GATT_SERVER_CHARAC_CFG_UUID:
> + return "GATT(desc) Server Characteristic Configuration";
> + case GATT_CHARAC_FMT_UUID:
> + return "GATT(desc) Format";
> + case GATT_CHARAC_AGREG_FMT_UUID:
> + return "GATT(desc) Aggregate Format";
> + default:
> + return "Unknown";
> + }
> +}
> +
> +
> static void att_error_dump(int level, struct frame *frm)
> {
> uint8_t op = get_u8(frm);
> @@ -225,6 +287,50 @@ static void att_mtu_resp_dump(int level, struct frame *frm)
> printf("server rx mtu %d\n", server_rx_mtu);
> }
>
> +static void att_find_info_req_dump(int level, struct frame *frm)
> +{
> + uint16_t start = btohs(htons(get_u16(frm)));
> + uint16_t end = btohs(htons(get_u16(frm)));
> +
> + p_indent(level, frm);
> + printf("start 0x%2.2x, end 0x%2.2x\n", start, end);
> +}
> +
> +static void att_find_info_resp_dump(int level, struct frame *frm)
> +{
> + uint8_t fmt = get_u8(frm);
> +
> + p_indent(level, frm);
> +
> + if (fmt == 0x01) {
> + printf("format: uuid-16\n");
> +
> + while (frm->len > 0) {
> + uint16_t handle = btohs(htons(get_u16(frm)));
> + uint16_t uuid = btohs(htons(get_u16(frm)));
> + p_indent(level + 1, frm);
> + printf("handle 0x%2.2x, uuid 0x%2.2x (%s)\n", handle, uuid,
> + uuid2str(uuid));
> + }
> + } else {
> + printf("format: uuid-128\n");
> +
> + while (frm->len > 0) {
> + uint16_t handle = btohs(htons(get_u16(frm)));
> + int i;
> +
> + p_indent(level + 1, frm);
> + printf("handle 0x%2.2x, uuid ", handle);
> + for (i = 0; i < 16; i++) {
> + printf("%02x", get_u8(frm));
> + if (i == 3 || i == 5 || i == 7 || i == 9)
> + printf("-");
> + }
> + printf("\n");
> + }
> + }
> +}
> +
> static void att_handle_notify_dump(int level, struct frame *frm)
> {
> uint16_t handle = btohs(htons(get_u16(frm)));
> @@ -259,10 +365,15 @@ void att_dump(int level, struct frame *frm)
> case ATT_OP_MTU_RESP:
> att_mtu_resp_dump(level + 1, frm);
> break;
> + case ATT_OP_FIND_INFO_REQ:
> + att_find_info_req_dump(level + 1, frm);
> + break;
> + case ATT_OP_FIND_INFO_RESP:
> + att_find_info_resp_dump(level + 1, frm);
> + break;
> case ATT_OP_HANDLE_NOTIFY:
> att_handle_notify_dump(level + 1, frm);
> break;
> -
Extra change in your patch. Otherwise look all good.
--
Gustavo F. Padovan
http://profusion.mobi
^ permalink raw reply
* [PATCH 7/7] Add ATT read by type req/resp dump
From: Andre Dieb Martins @ 2011-02-09 14:01 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Andre Dieb Martins
In-Reply-To: <1297260110-10515-1-git-send-email-andre.dieb@signove.com>
---
parser/att.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/parser/att.c b/parser/att.c
index 2a9da30..3c57d23 100644
--- a/parser/att.c
+++ b/parser/att.c
@@ -331,6 +331,54 @@ static void att_find_info_resp_dump(int level, struct frame *frm)
}
}
+static void att_read_by_type_req_dump(int level, struct frame *frm)
+{
+ uint16_t start = btohs(htons(get_u16(frm)));
+ uint16_t end = btohs(htons(get_u16(frm)));
+ int i;
+
+ p_indent(level, frm);
+ printf("start 0x%2.2x, end 0x%2.2x\n", start, end);
+
+ p_indent(level, frm);
+ if (frm->len == 2) {
+ printf("type-uuid 0x%2.2x\n", btohs(htons(get_u16(frm))));
+ } else if (frm->len == 16) {
+ printf("type-uuid ");
+ for (i = 0; i < 16; i++) {
+ printf("%02x", get_u8(frm));
+ if (i == 3 || i == 5 || i == 7 || i == 9)
+ printf("-");
+ }
+ printf("\n");
+ } else {
+ printf("malformed uuid (expected 2 or 16 octets)\n");
+ p_indent(level, frm);
+ raw_dump(level, frm);
+ }
+}
+
+static void att_read_by_type_resp_dump(int level, struct frame *frm)
+{
+ uint8_t length = get_u8(frm);
+
+ p_indent(level, frm);
+ printf("length: %d\n", length);
+
+ while (frm->len > 0) {
+ uint16_t handle = btohs(htons(get_u16(frm)));
+ int val_len = length - 2;
+ int i;
+
+ p_indent(level + 1, frm);
+ printf("handle 0x%2.2x, value ", handle);
+ for (i = 0; i < val_len; i++) {
+ printf("0x%.2x ", get_u8(frm));
+ }
+ printf("\n");
+ }
+}
+
static void att_read_req_dump(int level, struct frame *frm)
{
uint16_t handle = btohs(htons(get_u16(frm)));
@@ -379,6 +427,12 @@ void att_dump(int level, struct frame *frm)
case ATT_OP_FIND_INFO_RESP:
att_find_info_resp_dump(level + 1, frm);
break;
+ case ATT_OP_READ_BY_TYPE_REQ:
+ att_read_by_type_req_dump(level + 1, frm);
+ break;
+ case ATT_OP_READ_BY_TYPE_RESP:
+ att_read_by_type_resp_dump(level + 1, frm);
+ break;
case ATT_OP_READ_REQ:
att_read_req_dump(level + 1, frm);
break;
--
1.7.1
^ permalink raw reply related
* [PATCH 6/7] Add ATT dump for read req/resp
From: Andre Dieb Martins @ 2011-02-09 14:01 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Andre Dieb Martins
In-Reply-To: <1297260110-10515-1-git-send-email-andre.dieb@signove.com>
---
parser/att.c | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/parser/att.c b/parser/att.c
index b172f95..2a9da30 100644
--- a/parser/att.c
+++ b/parser/att.c
@@ -331,6 +331,14 @@ static void att_find_info_resp_dump(int level, struct frame *frm)
}
}
+static void att_read_req_dump(int level, struct frame *frm)
+{
+ uint16_t handle = btohs(htons(get_u16(frm)));
+
+ p_indent(level, frm);
+ printf("handle 0x%2.2x\n", handle);
+}
+
static void att_handle_notify_dump(int level, struct frame *frm)
{
uint16_t handle = btohs(htons(get_u16(frm)));
@@ -371,6 +379,12 @@ void att_dump(int level, struct frame *frm)
case ATT_OP_FIND_INFO_RESP:
att_find_info_resp_dump(level + 1, frm);
break;
+ case ATT_OP_READ_REQ:
+ att_read_req_dump(level + 1, frm);
+ break;
+ case ATT_OP_READ_RESP:
+ raw_dump(level + 1, frm);
+ break;
case ATT_OP_HANDLE_NOTIFY:
att_handle_notify_dump(level + 1, frm);
break;
--
1.7.1
^ permalink raw reply related
* [PATCH 5/7] Better ATT dump format
From: Andre Dieb Martins @ 2011-02-09 14:01 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Andre Dieb Martins
In-Reply-To: <1297260110-10515-1-git-send-email-andre.dieb@signove.com>
---
parser/att.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/parser/att.c b/parser/att.c
index 79a74b5..b172f95 100644
--- a/parser/att.c
+++ b/parser/att.c
@@ -265,10 +265,10 @@ static void att_error_dump(int level, struct frame *frm)
uint8_t err = get_u8(frm);
p_indent(level, frm);
- printf("Error: %s 0x%.2x\n", atterror2str(err), err);
+ printf("Error: %s (%d)\n", atterror2str(err), err);
p_indent(level, frm);
- printf("opcode %d (%s) on handle 0x%2.2x\n", op, attop2str(op), handle);
+ printf("%s (0x%.2x) on handle 0x%2.2x\n", attop2str(op), op, handle);
}
static void att_mtu_req_dump(int level, struct frame *frm)
@@ -353,7 +353,7 @@ void att_dump(int level, struct frame *frm)
op = get_u8(frm);
p_indent(level, frm);
- printf("Opcode %d (%s)\n", op, attop2str(op));
+ printf("ATT: %s (0x%.2x)\n", attop2str(op), op);
switch (op) {
case ATT_OP_ERROR:
--
1.7.1
^ permalink raw reply related
* [PATCH 4/7] Add ATT find info req/resp dump
From: Andre Dieb Martins @ 2011-02-09 14:01 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Andre Dieb Martins
In-Reply-To: <1297260110-10515-1-git-send-email-andre.dieb@signove.com>
---
parser/att.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 112 insertions(+), 1 deletions(-)
diff --git a/parser/att.c b/parser/att.c
index 526b7bf..79a74b5 100644
--- a/parser/att.c
+++ b/parser/att.c
@@ -36,6 +36,27 @@
#include "parser.h"
+#define GATT_PRIM_SVC_UUID 0x2800
+#define GATT_SND_SVC_UUID 0x2801
+#define GATT_INCLUDE_UUID 0x2802
+#define GATT_CHARAC_UUID 0x2803
+
+#define GATT_CHARAC_DEVICE_NAME 0x2A00
+#define GATT_CHARAC_APPEARANCE 0x2A01
+#define GATT_CHARAC_PERIPHERAL_PRIV_FLAG 0x2A02
+#define GATT_CHARAC_RECONNECTION_ADDRESS 0x2A03
+#define GATT_CHARAC_PERIPHERAL_PREF_CONN 0x2A04
+#define GATT_CHARAC_SERVICE_CHANGED 0x2A05
+
+#define GATT_CHARAC_EXT_PROPER_UUID 0x2900
+#define GATT_CHARAC_USER_DESC_UUID 0x2901
+#define GATT_CLIENT_CHARAC_CFG_UUID 0x2902
+#define GATT_SERVER_CHARAC_CFG_UUID 0x2903
+#define GATT_CHARAC_FMT_UUID 0x2904
+#define GATT_CHARAC_AGREG_FMT_UUID 0x2905
+
+
+
/* Attribute Protocol Opcodes */
#define ATT_OP_ERROR 0x01
#define ATT_OP_MTU_REQ 0x02
@@ -196,6 +217,47 @@ static const char * atterror2str(uint8_t err)
}
}
+static const char *uuid2str(uint16_t uuid)
+{
+ switch (uuid) {
+ case GATT_PRIM_SVC_UUID:
+ return "GATT Primary Service";
+ case GATT_SND_SVC_UUID:
+ return "GATT Secondary Service";
+ case GATT_INCLUDE_UUID:
+ return "GATT Include";
+ case GATT_CHARAC_UUID:
+ return "GATT Characteristic";
+ case GATT_CHARAC_DEVICE_NAME:
+ return "GATT(type) Device Name";
+ case GATT_CHARAC_APPEARANCE:
+ return "GATT(type) Appearance";
+ case GATT_CHARAC_PERIPHERAL_PRIV_FLAG:
+ return "GATT(type) Peripheral Privacy Flag";
+ case GATT_CHARAC_RECONNECTION_ADDRESS:
+ return "GATT(type) Characteristic Reconnection Address";
+ case GATT_CHARAC_PERIPHERAL_PREF_CONN:
+ return "GATT(type) Characteristic Preferred Connection Parameters";
+ case GATT_CHARAC_SERVICE_CHANGED:
+ return "GATT(type) Characteristic Service Changed";
+ case GATT_CHARAC_EXT_PROPER_UUID:
+ return "GATT(desc) Characteristic Extended Properties";
+ case GATT_CHARAC_USER_DESC_UUID:
+ return "GATT(desc) User Description";
+ case GATT_CLIENT_CHARAC_CFG_UUID:
+ return "GATT(desc) Client Characteristic Configuration";
+ case GATT_SERVER_CHARAC_CFG_UUID:
+ return "GATT(desc) Server Characteristic Configuration";
+ case GATT_CHARAC_FMT_UUID:
+ return "GATT(desc) Format";
+ case GATT_CHARAC_AGREG_FMT_UUID:
+ return "GATT(desc) Aggregate Format";
+ default:
+ return "Unknown";
+ }
+}
+
+
static void att_error_dump(int level, struct frame *frm)
{
uint8_t op = get_u8(frm);
@@ -225,6 +287,50 @@ static void att_mtu_resp_dump(int level, struct frame *frm)
printf("server rx mtu %d\n", server_rx_mtu);
}
+static void att_find_info_req_dump(int level, struct frame *frm)
+{
+ uint16_t start = btohs(htons(get_u16(frm)));
+ uint16_t end = btohs(htons(get_u16(frm)));
+
+ p_indent(level, frm);
+ printf("start 0x%2.2x, end 0x%2.2x\n", start, end);
+}
+
+static void att_find_info_resp_dump(int level, struct frame *frm)
+{
+ uint8_t fmt = get_u8(frm);
+
+ p_indent(level, frm);
+
+ if (fmt == 0x01) {
+ printf("format: uuid-16\n");
+
+ while (frm->len > 0) {
+ uint16_t handle = btohs(htons(get_u16(frm)));
+ uint16_t uuid = btohs(htons(get_u16(frm)));
+ p_indent(level + 1, frm);
+ printf("handle 0x%2.2x, uuid 0x%2.2x (%s)\n", handle, uuid,
+ uuid2str(uuid));
+ }
+ } else {
+ printf("format: uuid-128\n");
+
+ while (frm->len > 0) {
+ uint16_t handle = btohs(htons(get_u16(frm)));
+ int i;
+
+ p_indent(level + 1, frm);
+ printf("handle 0x%2.2x, uuid ", handle);
+ for (i = 0; i < 16; i++) {
+ printf("%02x", get_u8(frm));
+ if (i == 3 || i == 5 || i == 7 || i == 9)
+ printf("-");
+ }
+ printf("\n");
+ }
+ }
+}
+
static void att_handle_notify_dump(int level, struct frame *frm)
{
uint16_t handle = btohs(htons(get_u16(frm)));
@@ -259,10 +365,15 @@ void att_dump(int level, struct frame *frm)
case ATT_OP_MTU_RESP:
att_mtu_resp_dump(level + 1, frm);
break;
+ case ATT_OP_FIND_INFO_REQ:
+ att_find_info_req_dump(level + 1, frm);
+ break;
+ case ATT_OP_FIND_INFO_RESP:
+ att_find_info_resp_dump(level + 1, frm);
+ break;
case ATT_OP_HANDLE_NOTIFY:
att_handle_notify_dump(level + 1, frm);
break;
-
default:
raw_dump(level, frm);
break;
--
1.7.1
^ permalink raw reply related
* [PATCH 3/7] Add ATT error pdu dump
From: Andre Dieb Martins @ 2011-02-09 14:01 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Andre Dieb Martins
In-Reply-To: <1297260110-10515-1-git-send-email-andre.dieb@signove.com>
---
parser/att.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 80 insertions(+), 0 deletions(-)
diff --git a/parser/att.c b/parser/att.c
index 05f9c23..526b7bf 100644
--- a/parser/att.c
+++ b/parser/att.c
@@ -66,6 +66,26 @@
#define ATT_OP_HANDLE_CNF 0x1E
#define ATT_OP_SIGNED_WRITE_CMD 0xD2
+/* Error codes for Error response PDU */
+#define ATT_ECODE_INVALID_HANDLE 0x01
+#define ATT_ECODE_READ_NOT_PERM 0x02
+#define ATT_ECODE_WRITE_NOT_PERM 0x03
+#define ATT_ECODE_INVALID_PDU 0x04
+#define ATT_ECODE_INSUFF_AUTHEN 0x05
+#define ATT_ECODE_REQ_NOT_SUPP 0x06
+#define ATT_ECODE_INVALID_OFFSET 0x07
+#define ATT_ECODE_INSUFF_AUTHO 0x08
+#define ATT_ECODE_PREP_QUEUE_FULL 0x09
+#define ATT_ECODE_ATTR_NOT_FOUND 0x0A
+#define ATT_ECODE_ATTR_NOT_LONG 0x0B
+#define ATT_ECODE_INSUFF_ENCR_KEY_SIZE 0x0C
+#define ATT_ECODE_INVAL_ATTR_VALUE_LEN 0x0D
+#define ATT_ECODE_UNLIKELY 0x0E
+#define ATT_ECODE_INSUFF_ENC 0x0F
+#define ATT_ECODE_UNSUPP_GRP_TYPE 0x10
+#define ATT_ECODE_INSUFF_RESOURCES 0x11
+#define ATT_ECODE_IO 0xFF
+
/* Attribute Protocol Opcodes */
static const char *attop2str(uint8_t op)
@@ -132,6 +152,63 @@ static const char *attop2str(uint8_t op)
}
}
+static const char * atterror2str(uint8_t err)
+{
+ switch (err) {
+ case ATT_ECODE_INVALID_HANDLE:
+ return "Invalid handle";
+ case ATT_ECODE_READ_NOT_PERM:
+ return "Read not permitted";
+ case ATT_ECODE_WRITE_NOT_PERM:
+ return "Write not permitted";
+ case ATT_ECODE_INVALID_PDU:
+ return "Invalid PDU";
+ case ATT_ECODE_INSUFF_AUTHEN:
+ return "Insufficient authentication";
+ case ATT_ECODE_REQ_NOT_SUPP:
+ return "Request not supported";
+ case ATT_ECODE_INVALID_OFFSET:
+ return "Invalid offset";
+ case ATT_ECODE_INSUFF_AUTHO:
+ return "Insufficient authorization";
+ case ATT_ECODE_PREP_QUEUE_FULL:
+ return "Prepare queue full";
+ case ATT_ECODE_ATTR_NOT_FOUND:
+ return "Attribute not found";
+ case ATT_ECODE_ATTR_NOT_LONG:
+ return "Attribute not long";
+ case ATT_ECODE_INSUFF_ENCR_KEY_SIZE:
+ return "Insufficient encryption key size";
+ case ATT_ECODE_INVAL_ATTR_VALUE_LEN:
+ return "Invalid attribute value length";
+ case ATT_ECODE_UNLIKELY:
+ return "Unlikely error";
+ case ATT_ECODE_INSUFF_ENC:
+ return "Insufficient encryption";
+ case ATT_ECODE_UNSUPP_GRP_TYPE:
+ return "Unsupported group type";
+ case ATT_ECODE_INSUFF_RESOURCES:
+ return "Insufficient resources";
+ case ATT_ECODE_IO:
+ return "Application Error";
+ default:
+ return "Reserved";
+ }
+}
+
+static void att_error_dump(int level, struct frame *frm)
+{
+ uint8_t op = get_u8(frm);
+ uint16_t handle = btohs(htons(get_u16(frm)));
+ uint8_t err = get_u8(frm);
+
+ p_indent(level, frm);
+ printf("Error: %s 0x%.2x\n", atterror2str(err), err);
+
+ p_indent(level, frm);
+ printf("opcode %d (%s) on handle 0x%2.2x\n", op, attop2str(op), handle);
+}
+
static void att_mtu_req_dump(int level, struct frame *frm)
{
uint16_t client_rx_mtu = btohs(htons(get_u16(frm)));
@@ -173,6 +250,9 @@ void att_dump(int level, struct frame *frm)
printf("Opcode %d (%s)\n", op, attop2str(op));
switch (op) {
+ case ATT_OP_ERROR:
+ att_error_dump(level + 1, frm);
+ break;
case ATT_OP_MTU_REQ:
att_mtu_req_dump(level + 1, frm);
break;
--
1.7.1
^ permalink raw reply related
* [PATCH 2/7] Add dump for ATT MTU req/resp and notify value
From: Andre Dieb Martins @ 2011-02-09 14:01 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Andre Dieb Martins
In-Reply-To: <1297260110-10515-1-git-send-email-andre.dieb@signove.com>
---
parser/att.c | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/parser/att.c b/parser/att.c
index b670694..05f9c23 100644
--- a/parser/att.c
+++ b/parser/att.c
@@ -132,12 +132,35 @@ static const char *attop2str(uint8_t op)
}
}
+static void att_mtu_req_dump(int level, struct frame *frm)
+{
+ uint16_t client_rx_mtu = btohs(htons(get_u16(frm)));
+
+ p_indent(level, frm);
+ printf("client rx mtu %d\n", client_rx_mtu);
+}
+
+static void att_mtu_resp_dump(int level, struct frame *frm)
+{
+ uint16_t server_rx_mtu = btohs(htons(get_u16(frm)));
+
+ p_indent(level, frm);
+ printf("server rx mtu %d\n", server_rx_mtu);
+}
+
static void att_handle_notify_dump(int level, struct frame *frm)
{
uint16_t handle = btohs(htons(get_u16(frm)));
p_indent(level, frm);
printf("handle 0x%2.2x\n", handle);
+
+ p_indent(level, frm);
+ printf("value ");
+ while (frm->len > 0) {
+ printf("0x%.2x ", get_u8(frm));
+ }
+ printf("\n");
}
void att_dump(int level, struct frame *frm)
@@ -147,9 +170,15 @@ void att_dump(int level, struct frame *frm)
op = get_u8(frm);
p_indent(level, frm);
- printf("Opcode: %d (%s)\n", op, attop2str(op));
+ printf("Opcode %d (%s)\n", op, attop2str(op));
switch (op) {
+ case ATT_OP_MTU_REQ:
+ att_mtu_req_dump(level + 1, frm);
+ break;
+ case ATT_OP_MTU_RESP:
+ att_mtu_resp_dump(level + 1, frm);
+ break;
case ATT_OP_HANDLE_NOTIFY:
att_handle_notify_dump(level + 1, frm);
break;
--
1.7.1
^ permalink raw reply related
* [PATCH 1/7] Partial dump of ATT PDUs
From: Andre Dieb Martins @ 2011-02-09 14:01 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Andre Dieb Martins
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 6616 bytes --]
Starts implementing dumping for ATT/GATT pdus.
---
Makefile.am | 1 +
parser/att.c | 161 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
parser/l2cap.c | 7 +++
parser/parser.h | 2 +
src/hcidump.c | 1 +
5 files changed, 172 insertions(+), 0 deletions(-)
create mode 100644 parser/att.c
diff --git a/Makefile.am b/Makefile.am
index e39ae1e..99dd422 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,7 @@ parser_sources = parser/parser.h parser/parser.c \
parser/lmp.c \
parser/hci.c \
parser/l2cap.c \
+ parser/att.c \
parser/sdp.h parser/sdp.c \
parser/rfcomm.h parser/rfcomm.c \
parser/bnep.c \
diff --git a/parser/att.c b/parser/att.c
new file mode 100644
index 0000000..b670694
--- /dev/null
+++ b/parser/att.c
@@ -0,0 +1,161 @@
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2011 André Dieb Martins <andre.dieb@gmail.com>
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <sys/types.h>
+#include <netinet/in.h>
+
+#include "parser.h"
+
+/* Attribute Protocol Opcodes */
+#define ATT_OP_ERROR 0x01
+#define ATT_OP_MTU_REQ 0x02
+#define ATT_OP_MTU_RESP 0x03
+#define ATT_OP_FIND_INFO_REQ 0x04
+#define ATT_OP_FIND_INFO_RESP 0x05
+#define ATT_OP_FIND_BY_TYPE_REQ 0x06
+#define ATT_OP_FIND_BY_TYPE_RESP 0x07
+#define ATT_OP_READ_BY_TYPE_REQ 0x08
+#define ATT_OP_READ_BY_TYPE_RESP 0x09
+#define ATT_OP_READ_REQ 0x0A
+#define ATT_OP_READ_RESP 0x0B
+#define ATT_OP_READ_BLOB_REQ 0x0C
+#define ATT_OP_READ_BLOB_RESP 0x0D
+#define ATT_OP_READ_MULTI_REQ 0x0E
+#define ATT_OP_READ_MULTI_RESP 0x0F
+#define ATT_OP_READ_BY_GROUP_REQ 0x10
+#define ATT_OP_READ_BY_GROUP_RESP 0x11
+#define ATT_OP_WRITE_REQ 0x12
+#define ATT_OP_WRITE_RESP 0x13
+#define ATT_OP_WRITE_CMD 0x52
+#define ATT_OP_PREP_WRITE_REQ 0x16
+#define ATT_OP_PREP_WRITE_RESP 0x17
+#define ATT_OP_EXEC_WRITE_REQ 0x18
+#define ATT_OP_EXEC_WRITE_RESP 0x19
+#define ATT_OP_HANDLE_NOTIFY 0x1B
+#define ATT_OP_HANDLE_IND 0x1D
+#define ATT_OP_HANDLE_CNF 0x1E
+#define ATT_OP_SIGNED_WRITE_CMD 0xD2
+
+
+/* Attribute Protocol Opcodes */
+static const char *attop2str(uint8_t op)
+{
+ switch (op) {
+ case ATT_OP_ERROR:
+ return "Error";
+ case ATT_OP_MTU_REQ:
+ return "MTU req";
+ case ATT_OP_MTU_RESP:
+ return "MTU resp";
+ case ATT_OP_FIND_INFO_REQ:
+ return "Find Information req";
+ case ATT_OP_FIND_INFO_RESP:
+ return "Find Information resp";
+ case ATT_OP_FIND_BY_TYPE_REQ:
+ return "Find By Type req";
+ case ATT_OP_FIND_BY_TYPE_RESP:
+ return "Find By Type resp";
+ case ATT_OP_READ_BY_TYPE_REQ:
+ return "Read By Type req";
+ case ATT_OP_READ_BY_TYPE_RESP:
+ return "Read By Type resp";
+ case ATT_OP_READ_REQ:
+ return "Read req";
+ case ATT_OP_READ_RESP:
+ return "Read resp";
+ case ATT_OP_READ_BLOB_REQ:
+ return "Read Blob req";
+ case ATT_OP_READ_BLOB_RESP:
+ return "Read Blob resp";
+ case ATT_OP_READ_MULTI_REQ:
+ return "Read Multi req";
+ case ATT_OP_READ_MULTI_RESP:
+ return "Read Multi resp";
+ case ATT_OP_READ_BY_GROUP_REQ:
+ return "Read By Group req";
+ case ATT_OP_READ_BY_GROUP_RESP:
+ return "Read By Group resp";
+ case ATT_OP_WRITE_REQ:
+ return "Write req";
+ case ATT_OP_WRITE_RESP:
+ return "Write resp";
+ case ATT_OP_WRITE_CMD:
+ return "Write cmd";
+ case ATT_OP_PREP_WRITE_REQ:
+ return "Prepare Write req";
+ case ATT_OP_PREP_WRITE_RESP:
+ return "Prepare Write resp";
+ case ATT_OP_EXEC_WRITE_REQ:
+ return "Exec Write req";
+ case ATT_OP_EXEC_WRITE_RESP:
+ return "Exec Write resp";
+ case ATT_OP_HANDLE_NOTIFY:
+ return "Handle notify";
+ case ATT_OP_HANDLE_IND:
+ return "Handle indicate";
+ case ATT_OP_HANDLE_CNF:
+ return "Handle CNF";
+ case ATT_OP_SIGNED_WRITE_CMD:
+ return "Signed Write Cmd";
+ default:
+ return "Unknown";
+ }
+}
+
+static void att_handle_notify_dump(int level, struct frame *frm)
+{
+ uint16_t handle = btohs(htons(get_u16(frm)));
+
+ p_indent(level, frm);
+ printf("handle 0x%2.2x\n", handle);
+}
+
+void att_dump(int level, struct frame *frm)
+{
+ uint8_t op;
+
+ op = get_u8(frm);
+
+ p_indent(level, frm);
+ printf("Opcode: %d (%s)\n", op, attop2str(op));
+
+ switch (op) {
+ case ATT_OP_HANDLE_NOTIFY:
+ att_handle_notify_dump(level + 1, frm);
+ break;
+
+ default:
+ raw_dump(level, frm);
+ break;
+ }
+}
diff --git a/parser/l2cap.c b/parser/l2cap.c
index 5c5371f..963468c 100644
--- a/parser/l2cap.c
+++ b/parser/l2cap.c
@@ -898,6 +898,13 @@ static void l2cap_parse(int level, struct frame *frm)
raw_dump(level + 1, frm);
break;
+ case 0x1f:
+ if (!p_filter(FILT_ATT))
+ att_dump(level, frm);
+ else
+ raw_dump(level + 1, frm);
+ break;
+
default:
proto = get_proto(frm->handle, psm, 0);
diff --git a/parser/parser.h b/parser/parser.h
index 973ab22..f093b6b 100644
--- a/parser/parser.h
+++ b/parser/parser.h
@@ -77,6 +77,7 @@ struct frame {
#define FILT_HCRP 0x0200
#define FILT_AVDTP 0x0400
#define FILT_AVCTP 0x0800
+#define FILT_ATT 0x1000
#define FILT_OBEX 0x00010000
#define FILT_CAPI 0x00020000
@@ -229,6 +230,7 @@ void hidp_dump(int level, struct frame *frm);
void hcrp_dump(int level, struct frame *frm);
void avdtp_dump(int level, struct frame *frm);
void avctp_dump(int level, struct frame *frm);
+void att_dump(int level, struct frame *frm);
void obex_dump(int level, struct frame *frm);
void capi_dump(int level, struct frame *frm);
diff --git a/src/hcidump.c b/src/hcidump.c
index b344489..af086c7 100644
--- a/src/hcidump.c
+++ b/src/hcidump.c
@@ -824,6 +824,7 @@ static struct {
{ "cmtp", FILT_CMTP },
{ "hidp", FILT_HIDP },
{ "hcrp", FILT_HCRP },
+ { "att", FILT_ATT },
{ "avdtp", FILT_AVDTP },
{ "avctp", FILT_AVCTP },
{ "obex", FILT_OBEX },
--
1.7.1
^ permalink raw reply related
* Re: [PATCH 1/6] Add dump for ATT MTU req/resp and notify value
From: André Dieb @ 2011-02-09 13:57 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Andre Dieb Martins
In-Reply-To: <1297259619-10325-1-git-send-email-andre.dieb@signove.com>
This patchset misses a first patch that adds att.c. I'll be reposting
them along with it. Sorry for the inconvenience.
On Wed, Feb 9, 2011 at 11:53 AM, Andre Dieb Martins
<andre.dieb@signove.com> wrote:
> ---
> parser/att.c | 31 ++++++++++++++++++++++++++++++-
> 1 files changed, 30 insertions(+), 1 deletions(-)
>
> diff --git a/parser/att.c b/parser/att.c
> index b670694..05f9c23 100644
> --- a/parser/att.c
> +++ b/parser/att.c
> @@ -132,12 +132,35 @@ static const char *attop2str(uint8_t op)
> }
> }
>
> +static void att_mtu_req_dump(int level, struct frame *frm)
> +{
> + uint16_t client_rx_mtu = btohs(htons(get_u16(frm)));
> +
> + p_indent(level, frm);
> + printf("client rx mtu %d\n", client_rx_mtu);
> +}
> +
> +static void att_mtu_resp_dump(int level, struct frame *frm)
> +{
> + uint16_t server_rx_mtu = btohs(htons(get_u16(frm)));
> +
> + p_indent(level, frm);
> + printf("server rx mtu %d\n", server_rx_mtu);
> +}
> +
> static void att_handle_notify_dump(int level, struct frame *frm)
> {
> uint16_t handle = btohs(htons(get_u16(frm)));
>
> p_indent(level, frm);
> printf("handle 0x%2.2x\n", handle);
> +
> + p_indent(level, frm);
> + printf("value ");
> + while (frm->len > 0) {
> + printf("0x%.2x ", get_u8(frm));
> + }
> + printf("\n");
> }
>
> void att_dump(int level, struct frame *frm)
> @@ -147,9 +170,15 @@ void att_dump(int level, struct frame *frm)
> op = get_u8(frm);
>
> p_indent(level, frm);
> - printf("Opcode: %d (%s)\n", op, attop2str(op));
> + printf("Opcode %d (%s)\n", op, attop2str(op));
>
> switch (op) {
> + case ATT_OP_MTU_REQ:
> + att_mtu_req_dump(level + 1, frm);
> + break;
> + case ATT_OP_MTU_RESP:
> + att_mtu_resp_dump(level + 1, frm);
> + break;
> case ATT_OP_HANDLE_NOTIFY:
> att_handle_notify_dump(level + 1, frm);
> break;
> --
> 1.7.1
>
>
^ permalink raw reply
* [PATCH 6/6] Add ATT read by type req/resp dump
From: Andre Dieb Martins @ 2011-02-09 13:53 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Andre Dieb Martins
In-Reply-To: <1297259619-10325-1-git-send-email-andre.dieb@signove.com>
---
parser/att.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/parser/att.c b/parser/att.c
index 2a9da30..3c57d23 100644
--- a/parser/att.c
+++ b/parser/att.c
@@ -331,6 +331,54 @@ static void att_find_info_resp_dump(int level, struct frame *frm)
}
}
+static void att_read_by_type_req_dump(int level, struct frame *frm)
+{
+ uint16_t start = btohs(htons(get_u16(frm)));
+ uint16_t end = btohs(htons(get_u16(frm)));
+ int i;
+
+ p_indent(level, frm);
+ printf("start 0x%2.2x, end 0x%2.2x\n", start, end);
+
+ p_indent(level, frm);
+ if (frm->len == 2) {
+ printf("type-uuid 0x%2.2x\n", btohs(htons(get_u16(frm))));
+ } else if (frm->len == 16) {
+ printf("type-uuid ");
+ for (i = 0; i < 16; i++) {
+ printf("%02x", get_u8(frm));
+ if (i == 3 || i == 5 || i == 7 || i == 9)
+ printf("-");
+ }
+ printf("\n");
+ } else {
+ printf("malformed uuid (expected 2 or 16 octets)\n");
+ p_indent(level, frm);
+ raw_dump(level, frm);
+ }
+}
+
+static void att_read_by_type_resp_dump(int level, struct frame *frm)
+{
+ uint8_t length = get_u8(frm);
+
+ p_indent(level, frm);
+ printf("length: %d\n", length);
+
+ while (frm->len > 0) {
+ uint16_t handle = btohs(htons(get_u16(frm)));
+ int val_len = length - 2;
+ int i;
+
+ p_indent(level + 1, frm);
+ printf("handle 0x%2.2x, value ", handle);
+ for (i = 0; i < val_len; i++) {
+ printf("0x%.2x ", get_u8(frm));
+ }
+ printf("\n");
+ }
+}
+
static void att_read_req_dump(int level, struct frame *frm)
{
uint16_t handle = btohs(htons(get_u16(frm)));
@@ -379,6 +427,12 @@ void att_dump(int level, struct frame *frm)
case ATT_OP_FIND_INFO_RESP:
att_find_info_resp_dump(level + 1, frm);
break;
+ case ATT_OP_READ_BY_TYPE_REQ:
+ att_read_by_type_req_dump(level + 1, frm);
+ break;
+ case ATT_OP_READ_BY_TYPE_RESP:
+ att_read_by_type_resp_dump(level + 1, frm);
+ break;
case ATT_OP_READ_REQ:
att_read_req_dump(level + 1, frm);
break;
--
1.7.1
^ permalink raw reply related
* [PATCH 5/6] Add ATT dump for read req/resp
From: Andre Dieb Martins @ 2011-02-09 13:53 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Andre Dieb Martins
In-Reply-To: <1297259619-10325-1-git-send-email-andre.dieb@signove.com>
---
parser/att.c | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/parser/att.c b/parser/att.c
index b172f95..2a9da30 100644
--- a/parser/att.c
+++ b/parser/att.c
@@ -331,6 +331,14 @@ static void att_find_info_resp_dump(int level, struct frame *frm)
}
}
+static void att_read_req_dump(int level, struct frame *frm)
+{
+ uint16_t handle = btohs(htons(get_u16(frm)));
+
+ p_indent(level, frm);
+ printf("handle 0x%2.2x\n", handle);
+}
+
static void att_handle_notify_dump(int level, struct frame *frm)
{
uint16_t handle = btohs(htons(get_u16(frm)));
@@ -371,6 +379,12 @@ void att_dump(int level, struct frame *frm)
case ATT_OP_FIND_INFO_RESP:
att_find_info_resp_dump(level + 1, frm);
break;
+ case ATT_OP_READ_REQ:
+ att_read_req_dump(level + 1, frm);
+ break;
+ case ATT_OP_READ_RESP:
+ raw_dump(level + 1, frm);
+ break;
case ATT_OP_HANDLE_NOTIFY:
att_handle_notify_dump(level + 1, frm);
break;
--
1.7.1
^ permalink raw reply related
* [PATCH 4/6] Better ATT dump format
From: Andre Dieb Martins @ 2011-02-09 13:53 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Andre Dieb Martins
In-Reply-To: <1297259619-10325-1-git-send-email-andre.dieb@signove.com>
---
parser/att.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/parser/att.c b/parser/att.c
index 79a74b5..b172f95 100644
--- a/parser/att.c
+++ b/parser/att.c
@@ -265,10 +265,10 @@ static void att_error_dump(int level, struct frame *frm)
uint8_t err = get_u8(frm);
p_indent(level, frm);
- printf("Error: %s 0x%.2x\n", atterror2str(err), err);
+ printf("Error: %s (%d)\n", atterror2str(err), err);
p_indent(level, frm);
- printf("opcode %d (%s) on handle 0x%2.2x\n", op, attop2str(op), handle);
+ printf("%s (0x%.2x) on handle 0x%2.2x\n", attop2str(op), op, handle);
}
static void att_mtu_req_dump(int level, struct frame *frm)
@@ -353,7 +353,7 @@ void att_dump(int level, struct frame *frm)
op = get_u8(frm);
p_indent(level, frm);
- printf("Opcode %d (%s)\n", op, attop2str(op));
+ printf("ATT: %s (0x%.2x)\n", attop2str(op), op);
switch (op) {
case ATT_OP_ERROR:
--
1.7.1
^ permalink raw reply related
* [PATCH 3/6] Add ATT find info req/resp dump
From: Andre Dieb Martins @ 2011-02-09 13:53 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Andre Dieb Martins
In-Reply-To: <1297259619-10325-1-git-send-email-andre.dieb@signove.com>
---
parser/att.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 112 insertions(+), 1 deletions(-)
diff --git a/parser/att.c b/parser/att.c
index 526b7bf..79a74b5 100644
--- a/parser/att.c
+++ b/parser/att.c
@@ -36,6 +36,27 @@
#include "parser.h"
+#define GATT_PRIM_SVC_UUID 0x2800
+#define GATT_SND_SVC_UUID 0x2801
+#define GATT_INCLUDE_UUID 0x2802
+#define GATT_CHARAC_UUID 0x2803
+
+#define GATT_CHARAC_DEVICE_NAME 0x2A00
+#define GATT_CHARAC_APPEARANCE 0x2A01
+#define GATT_CHARAC_PERIPHERAL_PRIV_FLAG 0x2A02
+#define GATT_CHARAC_RECONNECTION_ADDRESS 0x2A03
+#define GATT_CHARAC_PERIPHERAL_PREF_CONN 0x2A04
+#define GATT_CHARAC_SERVICE_CHANGED 0x2A05
+
+#define GATT_CHARAC_EXT_PROPER_UUID 0x2900
+#define GATT_CHARAC_USER_DESC_UUID 0x2901
+#define GATT_CLIENT_CHARAC_CFG_UUID 0x2902
+#define GATT_SERVER_CHARAC_CFG_UUID 0x2903
+#define GATT_CHARAC_FMT_UUID 0x2904
+#define GATT_CHARAC_AGREG_FMT_UUID 0x2905
+
+
+
/* Attribute Protocol Opcodes */
#define ATT_OP_ERROR 0x01
#define ATT_OP_MTU_REQ 0x02
@@ -196,6 +217,47 @@ static const char * atterror2str(uint8_t err)
}
}
+static const char *uuid2str(uint16_t uuid)
+{
+ switch (uuid) {
+ case GATT_PRIM_SVC_UUID:
+ return "GATT Primary Service";
+ case GATT_SND_SVC_UUID:
+ return "GATT Secondary Service";
+ case GATT_INCLUDE_UUID:
+ return "GATT Include";
+ case GATT_CHARAC_UUID:
+ return "GATT Characteristic";
+ case GATT_CHARAC_DEVICE_NAME:
+ return "GATT(type) Device Name";
+ case GATT_CHARAC_APPEARANCE:
+ return "GATT(type) Appearance";
+ case GATT_CHARAC_PERIPHERAL_PRIV_FLAG:
+ return "GATT(type) Peripheral Privacy Flag";
+ case GATT_CHARAC_RECONNECTION_ADDRESS:
+ return "GATT(type) Characteristic Reconnection Address";
+ case GATT_CHARAC_PERIPHERAL_PREF_CONN:
+ return "GATT(type) Characteristic Preferred Connection Parameters";
+ case GATT_CHARAC_SERVICE_CHANGED:
+ return "GATT(type) Characteristic Service Changed";
+ case GATT_CHARAC_EXT_PROPER_UUID:
+ return "GATT(desc) Characteristic Extended Properties";
+ case GATT_CHARAC_USER_DESC_UUID:
+ return "GATT(desc) User Description";
+ case GATT_CLIENT_CHARAC_CFG_UUID:
+ return "GATT(desc) Client Characteristic Configuration";
+ case GATT_SERVER_CHARAC_CFG_UUID:
+ return "GATT(desc) Server Characteristic Configuration";
+ case GATT_CHARAC_FMT_UUID:
+ return "GATT(desc) Format";
+ case GATT_CHARAC_AGREG_FMT_UUID:
+ return "GATT(desc) Aggregate Format";
+ default:
+ return "Unknown";
+ }
+}
+
+
static void att_error_dump(int level, struct frame *frm)
{
uint8_t op = get_u8(frm);
@@ -225,6 +287,50 @@ static void att_mtu_resp_dump(int level, struct frame *frm)
printf("server rx mtu %d\n", server_rx_mtu);
}
+static void att_find_info_req_dump(int level, struct frame *frm)
+{
+ uint16_t start = btohs(htons(get_u16(frm)));
+ uint16_t end = btohs(htons(get_u16(frm)));
+
+ p_indent(level, frm);
+ printf("start 0x%2.2x, end 0x%2.2x\n", start, end);
+}
+
+static void att_find_info_resp_dump(int level, struct frame *frm)
+{
+ uint8_t fmt = get_u8(frm);
+
+ p_indent(level, frm);
+
+ if (fmt == 0x01) {
+ printf("format: uuid-16\n");
+
+ while (frm->len > 0) {
+ uint16_t handle = btohs(htons(get_u16(frm)));
+ uint16_t uuid = btohs(htons(get_u16(frm)));
+ p_indent(level + 1, frm);
+ printf("handle 0x%2.2x, uuid 0x%2.2x (%s)\n", handle, uuid,
+ uuid2str(uuid));
+ }
+ } else {
+ printf("format: uuid-128\n");
+
+ while (frm->len > 0) {
+ uint16_t handle = btohs(htons(get_u16(frm)));
+ int i;
+
+ p_indent(level + 1, frm);
+ printf("handle 0x%2.2x, uuid ", handle);
+ for (i = 0; i < 16; i++) {
+ printf("%02x", get_u8(frm));
+ if (i == 3 || i == 5 || i == 7 || i == 9)
+ printf("-");
+ }
+ printf("\n");
+ }
+ }
+}
+
static void att_handle_notify_dump(int level, struct frame *frm)
{
uint16_t handle = btohs(htons(get_u16(frm)));
@@ -259,10 +365,15 @@ void att_dump(int level, struct frame *frm)
case ATT_OP_MTU_RESP:
att_mtu_resp_dump(level + 1, frm);
break;
+ case ATT_OP_FIND_INFO_REQ:
+ att_find_info_req_dump(level + 1, frm);
+ break;
+ case ATT_OP_FIND_INFO_RESP:
+ att_find_info_resp_dump(level + 1, frm);
+ break;
case ATT_OP_HANDLE_NOTIFY:
att_handle_notify_dump(level + 1, frm);
break;
-
default:
raw_dump(level, frm);
break;
--
1.7.1
^ permalink raw reply related
* [PATCH 2/6] Add ATT error pdu dump
From: Andre Dieb Martins @ 2011-02-09 13:53 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Andre Dieb Martins
In-Reply-To: <1297259619-10325-1-git-send-email-andre.dieb@signove.com>
---
parser/att.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 80 insertions(+), 0 deletions(-)
diff --git a/parser/att.c b/parser/att.c
index 05f9c23..526b7bf 100644
--- a/parser/att.c
+++ b/parser/att.c
@@ -66,6 +66,26 @@
#define ATT_OP_HANDLE_CNF 0x1E
#define ATT_OP_SIGNED_WRITE_CMD 0xD2
+/* Error codes for Error response PDU */
+#define ATT_ECODE_INVALID_HANDLE 0x01
+#define ATT_ECODE_READ_NOT_PERM 0x02
+#define ATT_ECODE_WRITE_NOT_PERM 0x03
+#define ATT_ECODE_INVALID_PDU 0x04
+#define ATT_ECODE_INSUFF_AUTHEN 0x05
+#define ATT_ECODE_REQ_NOT_SUPP 0x06
+#define ATT_ECODE_INVALID_OFFSET 0x07
+#define ATT_ECODE_INSUFF_AUTHO 0x08
+#define ATT_ECODE_PREP_QUEUE_FULL 0x09
+#define ATT_ECODE_ATTR_NOT_FOUND 0x0A
+#define ATT_ECODE_ATTR_NOT_LONG 0x0B
+#define ATT_ECODE_INSUFF_ENCR_KEY_SIZE 0x0C
+#define ATT_ECODE_INVAL_ATTR_VALUE_LEN 0x0D
+#define ATT_ECODE_UNLIKELY 0x0E
+#define ATT_ECODE_INSUFF_ENC 0x0F
+#define ATT_ECODE_UNSUPP_GRP_TYPE 0x10
+#define ATT_ECODE_INSUFF_RESOURCES 0x11
+#define ATT_ECODE_IO 0xFF
+
/* Attribute Protocol Opcodes */
static const char *attop2str(uint8_t op)
@@ -132,6 +152,63 @@ static const char *attop2str(uint8_t op)
}
}
+static const char * atterror2str(uint8_t err)
+{
+ switch (err) {
+ case ATT_ECODE_INVALID_HANDLE:
+ return "Invalid handle";
+ case ATT_ECODE_READ_NOT_PERM:
+ return "Read not permitted";
+ case ATT_ECODE_WRITE_NOT_PERM:
+ return "Write not permitted";
+ case ATT_ECODE_INVALID_PDU:
+ return "Invalid PDU";
+ case ATT_ECODE_INSUFF_AUTHEN:
+ return "Insufficient authentication";
+ case ATT_ECODE_REQ_NOT_SUPP:
+ return "Request not supported";
+ case ATT_ECODE_INVALID_OFFSET:
+ return "Invalid offset";
+ case ATT_ECODE_INSUFF_AUTHO:
+ return "Insufficient authorization";
+ case ATT_ECODE_PREP_QUEUE_FULL:
+ return "Prepare queue full";
+ case ATT_ECODE_ATTR_NOT_FOUND:
+ return "Attribute not found";
+ case ATT_ECODE_ATTR_NOT_LONG:
+ return "Attribute not long";
+ case ATT_ECODE_INSUFF_ENCR_KEY_SIZE:
+ return "Insufficient encryption key size";
+ case ATT_ECODE_INVAL_ATTR_VALUE_LEN:
+ return "Invalid attribute value length";
+ case ATT_ECODE_UNLIKELY:
+ return "Unlikely error";
+ case ATT_ECODE_INSUFF_ENC:
+ return "Insufficient encryption";
+ case ATT_ECODE_UNSUPP_GRP_TYPE:
+ return "Unsupported group type";
+ case ATT_ECODE_INSUFF_RESOURCES:
+ return "Insufficient resources";
+ case ATT_ECODE_IO:
+ return "Application Error";
+ default:
+ return "Reserved";
+ }
+}
+
+static void att_error_dump(int level, struct frame *frm)
+{
+ uint8_t op = get_u8(frm);
+ uint16_t handle = btohs(htons(get_u16(frm)));
+ uint8_t err = get_u8(frm);
+
+ p_indent(level, frm);
+ printf("Error: %s 0x%.2x\n", atterror2str(err), err);
+
+ p_indent(level, frm);
+ printf("opcode %d (%s) on handle 0x%2.2x\n", op, attop2str(op), handle);
+}
+
static void att_mtu_req_dump(int level, struct frame *frm)
{
uint16_t client_rx_mtu = btohs(htons(get_u16(frm)));
@@ -173,6 +250,9 @@ void att_dump(int level, struct frame *frm)
printf("Opcode %d (%s)\n", op, attop2str(op));
switch (op) {
+ case ATT_OP_ERROR:
+ att_error_dump(level + 1, frm);
+ break;
case ATT_OP_MTU_REQ:
att_mtu_req_dump(level + 1, frm);
break;
--
1.7.1
^ permalink raw reply related
* [PATCH 1/6] Add dump for ATT MTU req/resp and notify value
From: Andre Dieb Martins @ 2011-02-09 13:53 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Andre Dieb Martins
---
parser/att.c | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/parser/att.c b/parser/att.c
index b670694..05f9c23 100644
--- a/parser/att.c
+++ b/parser/att.c
@@ -132,12 +132,35 @@ static const char *attop2str(uint8_t op)
}
}
+static void att_mtu_req_dump(int level, struct frame *frm)
+{
+ uint16_t client_rx_mtu = btohs(htons(get_u16(frm)));
+
+ p_indent(level, frm);
+ printf("client rx mtu %d\n", client_rx_mtu);
+}
+
+static void att_mtu_resp_dump(int level, struct frame *frm)
+{
+ uint16_t server_rx_mtu = btohs(htons(get_u16(frm)));
+
+ p_indent(level, frm);
+ printf("server rx mtu %d\n", server_rx_mtu);
+}
+
static void att_handle_notify_dump(int level, struct frame *frm)
{
uint16_t handle = btohs(htons(get_u16(frm)));
p_indent(level, frm);
printf("handle 0x%2.2x\n", handle);
+
+ p_indent(level, frm);
+ printf("value ");
+ while (frm->len > 0) {
+ printf("0x%.2x ", get_u8(frm));
+ }
+ printf("\n");
}
void att_dump(int level, struct frame *frm)
@@ -147,9 +170,15 @@ void att_dump(int level, struct frame *frm)
op = get_u8(frm);
p_indent(level, frm);
- printf("Opcode: %d (%s)\n", op, attop2str(op));
+ printf("Opcode %d (%s)\n", op, attop2str(op));
switch (op) {
+ case ATT_OP_MTU_REQ:
+ att_mtu_req_dump(level + 1, frm);
+ break;
+ case ATT_OP_MTU_RESP:
+ att_mtu_resp_dump(level + 1, frm);
+ break;
case ATT_OP_HANDLE_NOTIFY:
att_handle_notify_dump(level + 1, frm);
break;
--
1.7.1
^ permalink raw reply related
* Re: [PATCH v10] Bluetooth: btwilink driver
From: Pavan Savoy @ 2011-02-09 13:49 UTC (permalink / raw)
To: Gustavo F. Padovan; +Cc: linux-bluetooth, marcel
In-Reply-To: <20110209134740.GA2597@joana>
On Wed, Feb 9, 2011 at 7:17 PM, Gustavo F. Padovan
<padovan@profusion.mobi> wrote:
> Hi Pavan,
>
> * pavan_savoy@ti.com <pavan_savoy@ti.com> [2011-02-09 06:14:40 -0600]:
>
>> From: Pavan Savoy <pavan_savoy@ti.com>
>>
>> Gustavo,
>>
>> reposting v10,
>> fixing the really long goto label.
>> (from Ville) moving the reg_status before register.
>>
>> Find below the patch version v9.
>> Have taken care of Ville's comments.
>> In addition fixed the issue seen when built as module, with
>> repeated probe/remove of the platform driver.
>>
>> patch v8 comments taken care,
>>
>> As suggested, the modifications to TI ST driver to remove the bluetooth
>> references have been made and the changes have been merged to the
>> linux-next tree.
>>
>> Find below the patch for the btwilink driver,
>> I have taken care of your following comments,
>> 1. channel IDs and the offsets are now being taken from the
>> header file hci.h.
>> 2. removed the un-necessary BT_ERR.
>> 3. changed the order during return from st_register.
>> 4. continue to unregister even if 1st unregister fails.
>>
>> Please review and provide comments,
>>
>> Thanks & Regards,
>> Pavan Savoy
>>
>> -- patch description --
>>
>> This is the bluetooth protocol driver for the TI WiLink7 chipsets.
>> Texas Instrument's WiLink chipsets combine wireless technologies
>> like BT, FM, GPS and WLAN onto a single chip.
>>
>> This Bluetooth driver works on top of the TI_ST shared transport
>> line discipline driver which also allows other drivers like
>> FM V4L2 and GPS character driver to make use of the same UART interface.
>>
>> Kconfig and Makefile modifications to enable the Bluetooth
>> driver for Texas Instrument's WiLink 7 chipset.
>>
>> Signed-off-by: Pavan Savoy <pavan_savoy@ti.com>
>> ---
>> drivers/bluetooth/Kconfig | 10 +
>> drivers/bluetooth/Makefile | 1 +
>> drivers/bluetooth/btwilink.c | 395 ++++++++++++++++++++++++++++++++++++++++++
>> 3 files changed, 406 insertions(+), 0 deletions(-)
>> create mode 100644 drivers/bluetooth/btwilink.c
>
> Look good to me now. ;)
Thanks.
> The patch need to go through Greg's tree, together with the modifications in
> the core driver. Then,
>
> Acked-by: Gustavo F. Padovan <padovan@profusion.mobi>
So, I post it to lkml (& greg) now - to get it merged into his tree correct ?
> --
> Gustavo F. Padovan
> http://profusion.mobi
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply
* Re: [PATCH v10] Bluetooth: btwilink driver
From: Gustavo F. Padovan @ 2011-02-09 13:47 UTC (permalink / raw)
To: pavan_savoy; +Cc: linux-bluetooth, marcel
In-Reply-To: <1297253680-4412-1-git-send-email-pavan_savoy@ti.com>
Hi Pavan,
* pavan_savoy@ti.com <pavan_savoy@ti.com> [2011-02-09 06:14:40 -0600]:
> From: Pavan Savoy <pavan_savoy@ti.com>
>
> Gustavo,
>
> reposting v10,
> fixing the really long goto label.
> (from Ville) moving the reg_status before register.
>
> Find below the patch version v9.
> Have taken care of Ville's comments.
> In addition fixed the issue seen when built as module, with
> repeated probe/remove of the platform driver.
>
> patch v8 comments taken care,
>
> As suggested, the modifications to TI ST driver to remove the bluetooth
> references have been made and the changes have been merged to the
> linux-next tree.
>
> Find below the patch for the btwilink driver,
> I have taken care of your following comments,
> 1. channel IDs and the offsets are now being taken from the
> header file hci.h.
> 2. removed the un-necessary BT_ERR.
> 3. changed the order during return from st_register.
> 4. continue to unregister even if 1st unregister fails.
>
> Please review and provide comments,
>
> Thanks & Regards,
> Pavan Savoy
>
> -- patch description --
>
> This is the bluetooth protocol driver for the TI WiLink7 chipsets.
> Texas Instrument's WiLink chipsets combine wireless technologies
> like BT, FM, GPS and WLAN onto a single chip.
>
> This Bluetooth driver works on top of the TI_ST shared transport
> line discipline driver which also allows other drivers like
> FM V4L2 and GPS character driver to make use of the same UART interface.
>
> Kconfig and Makefile modifications to enable the Bluetooth
> driver for Texas Instrument's WiLink 7 chipset.
>
> Signed-off-by: Pavan Savoy <pavan_savoy@ti.com>
> ---
> drivers/bluetooth/Kconfig | 10 +
> drivers/bluetooth/Makefile | 1 +
> drivers/bluetooth/btwilink.c | 395 ++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 406 insertions(+), 0 deletions(-)
> create mode 100644 drivers/bluetooth/btwilink.c
Look good to me now. ;)
The patch need to go through Greg's tree, together with the modifications in
the core driver. Then,
Acked-by: Gustavo F. Padovan <padovan@profusion.mobi>
--
Gustavo F. Padovan
http://profusion.mobi
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox