* Re: [PATCH 1/2] android/hidhost: Fix memory leak
From: Johan Hedberg @ 2013-11-13 14:48 UTC (permalink / raw)
To: Andrei Emeltchenko; +Cc: linux-bluetooth
In-Reply-To: <1384352974-24036-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
Hi Andrei,
On Wed, Nov 13, 2013, Andrei Emeltchenko wrote:
> ---
> android/hidhost.c | 1 +
> 1 file changed, 1 insertion(+)
Both patches have been applied. Thanks.
Johan
^ permalink raw reply
* [PATCH 2/2] android: Core service should be always registered
From: Szymon Janc @ 2013-11-13 14:47 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Szymon Janc
In-Reply-To: <1384354033-21724-1-git-send-email-szymon.janc@tieto.com>
Core service is used to register other services and shall be always
consider registered.
---
android/main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/android/main.c b/android/main.c
index 12284f7..03720e8 100644
--- a/android/main.c
+++ b/android/main.c
@@ -74,7 +74,8 @@ static guint adapter_timeout = 0;
static GIOChannel *hal_cmd_io = NULL;
static GIOChannel *hal_notif_io = NULL;
-static bool services[HAL_SERVICE_ID_MAX + 1] = { false };
+/* Core Service (ID=0) should be always consider registered */
+static bool services[HAL_SERVICE_ID_MAX + 1] = { true, false };
static void service_register(void *buf, uint16_t len)
{
--
1.8.4.2
^ permalink raw reply related
* [PATCH 1/2] android: Shutdown if IPC command for unregistered service is received
From: Szymon Janc @ 2013-11-13 14:47 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Szymon Janc
Sending commands to not registered services is violation of IPC spec
and should result in daemon shutdown.
---
android/main.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/android/main.c b/android/main.c
index 36cc8aa..12284f7 100644
--- a/android/main.c
+++ b/android/main.c
@@ -252,6 +252,12 @@ static gboolean cmd_watch_cb(GIOChannel *io, GIOCondition cond,
DBG("service_id %u opcode %u len %u", msg->service_id, msg->opcode,
msg->len);
+ if (msg->service_id > HAL_SERVICE_ID_MAX ||
+ !services[msg->service_id]) {
+ error("HAL command of not registered service, terminating");
+ goto fail;
+ }
+
switch (msg->service_id) {
case HAL_SERVICE_ID_CORE:
handle_service_core(msg->opcode, msg->payload, msg->len);
--
1.8.4.2
^ permalink raw reply related
* [PATCH 2/2] android/hidhost: Use correct error structure
From: Andrei Emeltchenko @ 2013-11-13 14:29 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1384352974-24036-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
android/hidhost.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/android/hidhost.c b/android/hidhost.c
index ff3eae0..3c1f074 100644
--- a/android/hidhost.c
+++ b/android/hidhost.c
@@ -1128,12 +1128,12 @@ static void connect_cb(GIOChannel *chan, GError *err, gpointer user_data)
return;
}
- bt_io_get(chan, &err,
+ bt_io_get(chan, &gerr,
BT_IO_OPT_SOURCE_BDADDR, &src,
BT_IO_OPT_DEST_BDADDR, &dst,
BT_IO_OPT_PSM, &psm,
BT_IO_OPT_INVALID);
- if (err) {
+ if (gerr) {
error("%s", gerr->message);
g_io_channel_shutdown(chan, TRUE, NULL);
g_error_free(gerr);
--
1.7.10.4
^ permalink raw reply related
* [PATCH 1/2] android/hidhost: Fix memory leak
From: Andrei Emeltchenko @ 2013-11-13 14:29 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
android/hidhost.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/android/hidhost.c b/android/hidhost.c
index 910014f..ff3eae0 100644
--- a/android/hidhost.c
+++ b/android/hidhost.c
@@ -1136,6 +1136,7 @@ static void connect_cb(GIOChannel *chan, GError *err, gpointer user_data)
if (err) {
error("%s", gerr->message);
g_io_channel_shutdown(chan, TRUE, NULL);
+ g_error_free(gerr);
return;
}
--
1.7.10.4
^ permalink raw reply related
* bluetoothd failure after a "malloc retun NULL" injection (attachment fix)
From: Oprisenescu, CatalinX @ 2013-11-13 14:09 UTC (permalink / raw)
To: linux-bluetooth@vger.kernel.org; +Cc: Trandafir, IonutX
[-- Attachment #1: Type: text/plain, Size: 1303 bytes --]
Hello,
Following is an issue encountered and handled using bluez-5.10 on a 32bit Tizen 2.0 IVI based distribution.
If malloc returns a random NULL bluetoothd exits with core dumped.
In this case we do the following:
-start bluetoothd,
-at a random malloc call from any library (*lib*.so*), a random NULL will be returned by bluetoothd with a ld_preloaded library.
~# LD_PRELOAD=/root/lib_wrapper.so /usr/libexec/bluetooth/bluetoothd -E
Analyzing the dump, it points directly to a DBUS_ERROR_NO_MEMORY which, after handling, keeps bluetoothd from dumping and allowing it to return the fatal error occurred as exit status, thus failing gracefully.
A fix proposal, handling the use-case is attached.
Regards,
Calin Oprisenescu.
--------------------------------------------------------------
Intel Shannon Limited
Registered in Ireland
Registered Office: Collinstown Industrial Park, Leixlip, County Kildare
Registered Number: 308263
Business address: Dromore House, East Park, Shannon, Co. Clare
This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
[-- Attachment #2: 0001-Provide-fix-for-malloc-null-injection.patch --]
[-- Type: application/octet-stream, Size: 967 bytes --]
From 567732c84278f94fc3d8c749c0e40de349e9f00a Mon Sep 17 00:00:00 2001
From: Calin Oprisenescu <catalinx.oprisenescu@intel.com>
Date: Tue, 5 Nov 2013 12:27:20 +0200
Subject: [PATCH] Provide fix for malloc null injection ASD100001565
Change-Id: I7a249f815335e65ae6771d5d1ff58497dbdbb7db
Author: Calin Oprisenescu <catalinx.oprisenescu@intel.com>
Committer: Calin Oprisenescu <catalinx.oprisenescu@intel.com>
---
src/main.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/main.c b/src/main.c
index 91d90b4..3bf2ae4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -427,6 +427,10 @@ static int connect_dbus(void)
conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, BLUEZ_NAME, &err);
if (!conn) {
if (dbus_error_is_set(&err)) {
+ if (dbus_error_has_name (&err, DBUS_ERROR_NO_MEMORY)) {
+ dbus_error_free(&err);
+ return -ENOMEM;
+ }
g_printerr("D-Bus setup failed: %s\n", err.message);
dbus_error_free(&err);
return -EIO;
--
1.8.4.msysgit.0
^ permalink raw reply related
* bluetoothd failure after a "malloc retun NULL" injection
From: Oprisenescu, CatalinX @ 2013-11-13 14:05 UTC (permalink / raw)
To: linux-bluetooth@vger.kernel.org; +Cc: Trandafir, IonutX
Hello,
Following is a issue encountered and handled using bluez-5.10 on a 32bit Tizen 2.0 IVI based distribution.
If malloc returns a random NULL bluetoothd exits with core dumped.
In this case we do the following:
-start bluetoothd,
-at a random malloc call from any library (*lib*.so*), a random NULL will be returned by bluetoothd with a ld_preloaded library.
~# LD_PRELOAD=/root/lib_wrapper.so /usr/libexec/bluetooth/bluetoothd -E
Analizyng the dump, it points directly to a DBUS_ERROR_NO_MEMORY which, after handling, keeps bluetoothd from dumping and allowing it to return the fatal error occurred as exit status, thus failing gracefully.
A fix proposal, handling the use-case is attached.
Regards,
Calin Oprisenescu.
--------------------------------------------------------------
Intel Shannon Limited
Registered in Ireland
Registered Office: Collinstown Industrial Park, Leixlip, County Kildare
Registered Number: 308263
Business address: Dromore House, East Park, Shannon, Co. Clare
This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
^ permalink raw reply
* Re: shutdown(3) and bluetooth.
From: John W. Linville @ 2013-11-13 14:02 UTC (permalink / raw)
To: David Miller; +Cc: davej, netdev, linux-bluetooth, linux-wireless
In-Reply-To: <20131112.161350.946584501122269943.davem@davemloft.net>
On Tue, Nov 12, 2013 at 04:13:50PM -0500, David Miller wrote:
> From: Dave Jones <davej@redhat.com>
> Date: Tue, 12 Nov 2013 16:11:25 -0500
>
> > Is shutdown() allowed to block indefinitely ? The man page doesn't say either way,
> > and I've noticed that my fuzz tester occasionally hangs for days spinning in bt_sock_wait_state()
> >
> > Is there something I should be doing to guarantee that this operation
> > will either time out, or return instantly ?
> >
> > In this specific case, I doubt anything is on the "sender" end of the socket, so
> > it's going to be waiting forever for a state change that won't arrive.
>
> Adding bluetooth and wireless lists. Dave, please consult MAINTAINERS when
> asking questions like this, thanks!
I don't have an authoritative answer. I do, however, seem to recall
that trying to shutdown a SunOS box with a hung NFS mount would seem
to hang forever. I don't think that is a great metric for how we
should behave, of course...
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply
* Re: [RFCv1 4/9] android/hal-sock: Initial listen handle
From: Andrei Emeltchenko @ 2013-11-13 13:56 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <20131113121537.GA11291@x220.p-661hnu-f1>
Hi Johan,
On Wed, Nov 13, 2013 at 02:15:37PM +0200, Johan Hedberg wrote:
> > +struct rfcomm_slot {
> > + int fd;
> > + int hal_fd;
> > + int real_sock;
> > + uint32_t channel;
> > +};
>
> You should really have comments here for what each struct member is used
> for (you have this info in your cover letter but it should also be part
> of the code). Why do you keep hal_fd here? Shouldn't we close it on our
> side as soon as we've handed it over to the HAL?
Basically hal_fd is needed until it is passed to the Android framework.
Do you want it to be like this:
int hal_fd;
rfslot = create_rfslot(&hal_fd, int sock);
send(hal_fd);
close(hal_fd);
Best regards
Andrei Emeltchenko
^ permalink raw reply
* Adapter name reset on suspend/resume
From: Bastien Nocera @ 2013-11-13 13:44 UTC (permalink / raw)
To: linux-bluetooth
Heya,
After suspending and resuming my laptop, hci0's name is reset to what
looks like the factory name:
$ hciconfig -a | grep Name
Name: 'BCM20702A'
This is the device in question:
Bus 001 Device 004: ID 0a5c:21e6 Broadcom Corp. BCM20702 Bluetooth 4.0 [ThinkPad]
And my laptop is a Lenovo X1 Carbon.
Neither udevadm nor btmon show the device going away on suspend and
coming back on resume.
Any ideas?
^ permalink raw reply
* [PATCH BlueZ] audio/A2DP: Return -ENOPROTOOPT if record doesn't exist
From: Luiz Augusto von Dentz @ 2013-11-13 13:26 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
In case record is not registered it means no endpoint is available so
return -ENOPROTOOPT to indicate that it is currently not available.
---
profiles/audio/a2dp.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c
index 6b3d6b2..864cb18 100644
--- a/profiles/audio/a2dp.c
+++ b/profiles/audio/a2dp.c
@@ -1861,10 +1861,22 @@ static void a2dp_sink_remove(struct btd_service *service)
static int a2dp_source_connect(struct btd_service *service)
{
struct btd_device *dev = btd_service_get_device(service);
+ struct btd_adapter *adapter = device_get_adapter(dev);
+ struct a2dp_server *server;
const char *path = device_get_path(dev);
DBG("path %s", path);
+ server = find_server(servers, adapter);
+ if (!server || !server->sink_enabled) {
+ DBG("Unexpected error: cannot find server");
+ return -EPROTONOSUPPORT;
+ }
+
+ /* Return protocol not available if no record/endpoint exists */
+ if (server->sink_record_id == 0)
+ return -ENOPROTOOPT;
+
return source_connect(service);
}
@@ -1881,10 +1893,22 @@ static int a2dp_source_disconnect(struct btd_service *service)
static int a2dp_sink_connect(struct btd_service *service)
{
struct btd_device *dev = btd_service_get_device(service);
+ struct btd_adapter *adapter = device_get_adapter(dev);
+ struct a2dp_server *server;
const char *path = device_get_path(dev);
DBG("path %s", path);
+ server = find_server(servers, adapter);
+ if (!server || !server->source_enabled) {
+ DBG("Unexpected error: cannot find server");
+ return -EPROTONOSUPPORT;
+ }
+
+ /* Return protocol not available if no record/endpoint exists */
+ if (server->source_record_id == 0)
+ return -ENOPROTOOPT;
+
return sink_connect(service);
}
--
1.8.3.1
^ permalink raw reply related
* Re: [RFCv1 4/9] android/hal-sock: Initial listen handle
From: Johan Hedberg @ 2013-11-13 13:16 UTC (permalink / raw)
To: Andrei Emeltchenko, linux-bluetooth
In-Reply-To: <20131113125213.GG21468@aemeltch-MOBL1>
Hi Andrei,
On Wed, Nov 13, 2013, Andrei Emeltchenko wrote:
> > A table would probably make more sense here. What about the SDP records
> > that need to be registered? Also, I'd stick to the assigned numbers from
> > our doc/assigned-numbers.txt.
>
> If I use table then we need a loop here.
Correct.
> So shall we change default Android assigned number to ours? Some devices
> assume that numbers and we would have worse interoperability.
A device which hard-codes a remote RFCOMM channel and never does an SDP
lookup wouldn't be able to pass qualification or interoperate with any
device that doesn't have the same hard-coded channel. So I really doubt
such devices exist on the market, unless you can provide some proof.
Johan
^ permalink raw reply
* Re: [RFCv1 4/9] android/hal-sock: Initial listen handle
From: Andrei Emeltchenko @ 2013-11-13 12:52 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <20131113121537.GA11291@x220.p-661hnu-f1>
Hi Johan,
On Wed, Nov 13, 2013 at 02:15:37PM +0200, Johan Hedberg wrote:
> Hi Andrei,
>
> On Mon, Nov 11, 2013, Andrei Emeltchenko wrote:
> > Handle HAL socket listen call. Create RFCOMM socket and wait for events.
> > ---
> > android/socket.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
> > 1 file changed, 92 insertions(+), 2 deletions(-)
> >
> > diff --git a/android/socket.c b/android/socket.c
> > index c283c5f..80cb39e 100644
> > --- a/android/socket.c
> > +++ b/android/socket.c
> > @@ -27,22 +27,112 @@
> >
> > #include <glib.h>
> > #include <stdbool.h>
> > +#include <errno.h>
> >
> > #include "lib/bluetooth.h"
> > +#include "btio/btio.h"
> > #include "log.h"
> > #include "hal-msg.h"
> > #include "hal-ipc.h"
> > #include "ipc.h"
> > +#include "adapter.h"
> > #include "socket.h"
> >
> > +/* Simple list of RFCOMM server sockets */
> > +GList *rfcomm_srv_list = NULL;
> > +/* Simple list of RFCOMM accepted sockets */
> > +GList *rfcomm_accepted_list = NULL;
>
> What are these lists needed for? When/how will their items be freed?
> How about calling them "servers" and "connections"?
I will add code freeing those.
>
> > +struct rfcomm_slot {
> > + int fd;
> > + int hal_fd;
> > + int real_sock;
> > + uint32_t channel;
> > +};
>
> You should really have comments here for what each struct member is used
> for (you have this info in your cover letter but it should also be part
> of the code). Why do you keep hal_fd here? Shouldn't we close it on our
> side as soon as we've handed it over to the HAL? Why do you use uint32_t
> for the channel? RFCOMM channels are uint8_t and have a range of 1-31.
I will change it to int since we need to write int to Android framework.
>
> > +static struct rfcomm_slot *create_rfslot(int sock)
> > {
> > - DBG("Not implemented");
> > + int fds[2] = {-1, -1};
> > + struct rfcomm_slot *rfslot;
> > +
> > + if (socketpair(AF_LOCAL, SOCK_STREAM, 0, fds) < 0) {
> > + error("socketpair(): %s", strerror(errno));
> > + return NULL;
> > + }
> > +
> > + rfslot = g_malloc0(sizeof(*rfslot));
> > + rfslot->fd = fds[0];
> > + rfslot->hal_fd = fds[1];
> > + rfslot->real_sock = sock;
> > +
> > + return rfslot;
> > +}
> > +
> > +static const uint8_t UUID_PBAP[] = {
> > + 0x00, 0x00, 0x11, 0x2F, 0x00, 0x00, 0x10, 0x00,
> > + 0x80, 0x00, 0x00, 0x80, 0x5F, 0x9B, 0x34, 0xFB
> > +};
> > +#define RFCOMM_CHAN_PBAP 19
> > +
> > +static const uint8_t UUID_OPP[] = {
> > + 0x00, 0x00, 0x11, 0x05, 0x00, 0x00, 0x10, 0x00,
> > + 0x80, 0x00, 0x00, 0x80, 0x5F, 0x9B, 0x34, 0xFB
> > +};
> > +#define RFCOMM_CHAN_OPP 12
>
> A table would probably make more sense here. What about the SDP records
> that need to be registered? Also, I'd stick to the assigned numbers from
> our doc/assigned-numbers.txt.
If I use table then we need a loop here.
So shall we change default Android assigned number to ours? Some devices
assume that numbers and we would have worse interoperability.
Best regards
Andrei Emeltchenko
>
> > +static int handle_listen(void *buf)
> > +{
> > + struct hal_cmd_sock_listen *cmd = buf;
> > + const bdaddr_t *src = bt_adapter_get_address();
> > + struct rfcomm_slot *rfslot;
> > + GIOChannel *io;
> > + GError *err = NULL;
> > + int ch;
> > +
> > + DBG("");
> > +
> > + ch = get_rfcomm_chan(cmd->uuid);
> > + if (ch < 0)
> > + return -1;
> > +
> > + DBG("rfcomm channel %u", ch);
> > +
> > + rfslot = create_rfslot(-1);
> > +
> > + io = bt_io_listen(connect_cb, NULL, rfslot, NULL, &err,
> > + BT_IO_OPT_SOURCE_BDADDR, src,
> > + BT_IO_OPT_CHANNEL, ch,
> > + BT_IO_OPT_INVALID);
>
> Might make sense to pass a proper GDestroyNotify callback here so that
> once you finally implement proper freeing of data it can be done in a
> clean way.
>
> Johan
^ permalink raw reply
* Re: [RFCv1 4/9] android/hal-sock: Initial listen handle
From: Johan Hedberg @ 2013-11-13 12:15 UTC (permalink / raw)
To: Andrei Emeltchenko; +Cc: linux-bluetooth
In-Reply-To: <1384178627-25991-5-git-send-email-Andrei.Emeltchenko.news@gmail.com>
Hi Andrei,
On Mon, Nov 11, 2013, Andrei Emeltchenko wrote:
> Handle HAL socket listen call. Create RFCOMM socket and wait for events.
> ---
> android/socket.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 92 insertions(+), 2 deletions(-)
>
> diff --git a/android/socket.c b/android/socket.c
> index c283c5f..80cb39e 100644
> --- a/android/socket.c
> +++ b/android/socket.c
> @@ -27,22 +27,112 @@
>
> #include <glib.h>
> #include <stdbool.h>
> +#include <errno.h>
>
> #include "lib/bluetooth.h"
> +#include "btio/btio.h"
> #include "log.h"
> #include "hal-msg.h"
> #include "hal-ipc.h"
> #include "ipc.h"
> +#include "adapter.h"
> #include "socket.h"
>
> +/* Simple list of RFCOMM server sockets */
> +GList *rfcomm_srv_list = NULL;
> +/* Simple list of RFCOMM accepted sockets */
> +GList *rfcomm_accepted_list = NULL;
What are these lists needed for? When/how will their items be freed?
How about calling them "servers" and "connections"?
> +struct rfcomm_slot {
> + int fd;
> + int hal_fd;
> + int real_sock;
> + uint32_t channel;
> +};
You should really have comments here for what each struct member is used
for (you have this info in your cover letter but it should also be part
of the code). Why do you keep hal_fd here? Shouldn't we close it on our
side as soon as we've handed it over to the HAL? Why do you use uint32_t
for the channel? RFCOMM channels are uint8_t and have a range of 1-31.
> +static struct rfcomm_slot *create_rfslot(int sock)
> {
> - DBG("Not implemented");
> + int fds[2] = {-1, -1};
> + struct rfcomm_slot *rfslot;
> +
> + if (socketpair(AF_LOCAL, SOCK_STREAM, 0, fds) < 0) {
> + error("socketpair(): %s", strerror(errno));
> + return NULL;
> + }
> +
> + rfslot = g_malloc0(sizeof(*rfslot));
> + rfslot->fd = fds[0];
> + rfslot->hal_fd = fds[1];
> + rfslot->real_sock = sock;
> +
> + return rfslot;
> +}
> +
> +static const uint8_t UUID_PBAP[] = {
> + 0x00, 0x00, 0x11, 0x2F, 0x00, 0x00, 0x10, 0x00,
> + 0x80, 0x00, 0x00, 0x80, 0x5F, 0x9B, 0x34, 0xFB
> +};
> +#define RFCOMM_CHAN_PBAP 19
> +
> +static const uint8_t UUID_OPP[] = {
> + 0x00, 0x00, 0x11, 0x05, 0x00, 0x00, 0x10, 0x00,
> + 0x80, 0x00, 0x00, 0x80, 0x5F, 0x9B, 0x34, 0xFB
> +};
> +#define RFCOMM_CHAN_OPP 12
A table would probably make more sense here. What about the SDP records
that need to be registered? Also, I'd stick to the assigned numbers from
our doc/assigned-numbers.txt.
> +static int handle_listen(void *buf)
> +{
> + struct hal_cmd_sock_listen *cmd = buf;
> + const bdaddr_t *src = bt_adapter_get_address();
> + struct rfcomm_slot *rfslot;
> + GIOChannel *io;
> + GError *err = NULL;
> + int ch;
> +
> + DBG("");
> +
> + ch = get_rfcomm_chan(cmd->uuid);
> + if (ch < 0)
> + return -1;
> +
> + DBG("rfcomm channel %u", ch);
> +
> + rfslot = create_rfslot(-1);
> +
> + io = bt_io_listen(connect_cb, NULL, rfslot, NULL, &err,
> + BT_IO_OPT_SOURCE_BDADDR, src,
> + BT_IO_OPT_CHANNEL, ch,
> + BT_IO_OPT_INVALID);
Might make sense to pass a proper GDestroyNotify callback here so that
once you finally implement proper freeing of data it can be done in a
clean way.
Johan
^ permalink raw reply
* Re: [RFC] android/debug: Move debug functions to hal-utils.c
From: Andrei Emeltchenko @ 2013-11-13 11:35 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1383923100-19574-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
On Fri, Nov 08, 2013 at 05:05:00PM +0200, Andrei Emeltchenko wrote:
> From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Any comment on this patch?
Best regards
Andrei Emeltchenko
>
> Debug functions will be used by HALs and haltest.
> ---
> android/Android.mk | 2 -
> android/Makefile.am | 3 -
> android/client/if-av.c | 1 +
> android/client/if-bt.c | 1 +
> android/client/if-hf.c | 1 +
> android/client/if-hh.c | 1 +
> android/client/if-main.h | 2 -
> android/client/if-pan.c | 1 +
> android/client/if-sock.c | 1 +
> android/client/textconv.c | 300 ---------------------------------------------
> android/client/textconv.h | 120 ------------------
> android/hal-bluetooth.c | 3 +-
> android/hal-utils.c | 269 ++++++++++++++++++++++++++++++++++++++++
> android/hal-utils.h | 103 ++++++++++++++++
> 14 files changed, 379 insertions(+), 429 deletions(-)
> delete mode 100644 android/client/textconv.c
> delete mode 100644 android/client/textconv.h
>
> diff --git a/android/Android.mk b/android/Android.mk
> index 0bc0e82..53c766b 100644
> --- a/android/Android.mk
> +++ b/android/Android.mk
> @@ -87,7 +87,6 @@ LOCAL_SRC_FILES := \
> hal-hidhost.c \
> hal-pan.c \
> hal-a2dp.c \
> - client/textconv.c \
> hal-utils.c \
>
> LOCAL_C_INCLUDES += \
> @@ -118,7 +117,6 @@ LOCAL_SRC_FILES := \
> client/pollhandler.c \
> client/terminal.c \
> client/history.c \
> - client/textconv.c \
> client/tabcompletion.c \
> client/if-av.c \
> client/if-bt.c \
> diff --git a/android/Makefile.am b/android/Makefile.am
> index debe7c1..e81d1a5 100644
> --- a/android/Makefile.am
> +++ b/android/Makefile.am
> @@ -59,7 +59,6 @@ android_haltest_SOURCES = android/client/haltest.c \
> android/client/pollhandler.c \
> android/client/terminal.c \
> android/client/history.c \
> - android/client/textconv.c \
> android/client/tabcompletion.c \
> android/client/if-av.c \
> android/client/if-bt.c \
> @@ -102,9 +101,7 @@ EXTRA_DIST += android/client/terminal.c \
> android/client/if-hh.c \
> android/client/if-pan.c \
> android/client/if-sock.c \
> - android/client/textconv.c \
> android/client/tabcompletion.c \
> - android/client/textconv.h \
> android/client/if-main.h \
> android/client/pollhandler.h \
> android/client/history.h \
> diff --git a/android/client/if-av.c b/android/client/if-av.c
> index 3f133eb..0470e0d 100644
> --- a/android/client/if-av.c
> +++ b/android/client/if-av.c
> @@ -16,6 +16,7 @@
> */
>
> #include "if-main.h"
> +#include "../hal-utils.h"
>
> const btav_interface_t *if_av = NULL;
>
> diff --git a/android/client/if-bt.c b/android/client/if-bt.c
> index 10ae125..0cd43db 100644
> --- a/android/client/if-bt.c
> +++ b/android/client/if-bt.c
> @@ -17,6 +17,7 @@
>
> #include "if-main.h"
> #include "terminal.h"
> +#include "../hal-utils.h"
>
> const bt_interface_t *if_bluetooth;
>
> diff --git a/android/client/if-hf.c b/android/client/if-hf.c
> index c23fb13..d0e7a66 100644
> --- a/android/client/if-hf.c
> +++ b/android/client/if-hf.c
> @@ -16,6 +16,7 @@
> */
>
> #include "if-main.h"
> +#include "../hal-utils.h"
>
> const bthf_interface_t *if_hf = NULL;
>
> diff --git a/android/client/if-hh.c b/android/client/if-hh.c
> index 005b13a..b8ebc8e 100644
> --- a/android/client/if-hh.c
> +++ b/android/client/if-hh.c
> @@ -23,6 +23,7 @@
>
> #include "if-main.h"
> #include "pollhandler.h"
> +#include "../hal-utils.h"
>
> const bthh_interface_t *if_hh = NULL;
>
> diff --git a/android/client/if-main.h b/android/client/if-main.h
> index dea7237..a83f48b 100644
> --- a/android/client/if-main.h
> +++ b/android/client/if-main.h
> @@ -44,8 +44,6 @@
> #include <hardware/bt_gatt_server.h>
> #endif
>
> -#include "textconv.h"
> -
> /* Interfaces from hal that can be populated during application lifetime */
> extern const bt_interface_t *if_bluetooth;
> extern const btav_interface_t *if_av;
> diff --git a/android/client/if-pan.c b/android/client/if-pan.c
> index dcc7e80..a11f2a3 100644
> --- a/android/client/if-pan.c
> +++ b/android/client/if-pan.c
> @@ -18,6 +18,7 @@
> #include <hardware/bluetooth.h>
>
> #include "if-main.h"
> +#include "../hal-utils.h"
>
> const btpan_interface_t *if_pan = NULL;
>
> diff --git a/android/client/if-sock.c b/android/client/if-sock.c
> index dcaf048..2cd06e8 100644
> --- a/android/client/if-sock.c
> +++ b/android/client/if-sock.c
> @@ -21,6 +21,7 @@
>
> #include "if-main.h"
> #include "pollhandler.h"
> +#include "../hal-utils.h"
>
> const btsock_interface_t *if_sock = NULL;
>
> diff --git a/android/client/textconv.c b/android/client/textconv.c
> deleted file mode 100644
> index dcbe53e..0000000
> --- a/android/client/textconv.c
> +++ /dev/null
> @@ -1,300 +0,0 @@
> -/*
> - * Copyright (C) 2013 Intel Corporation
> - *
> - * Licensed under the Apache License, Version 2.0 (the "License");
> - * you may not use this file except in compliance with the License.
> - * You may obtain a copy of the License at
> - *
> - * http://www.apache.org/licenses/LICENSE-2.0
> - *
> - * Unless required by applicable law or agreed to in writing, software
> - * distributed under the License is distributed on an "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> - * See the License for the specific language governing permissions and
> - * limitations under the License.
> - *
> - */
> -
> -#include <string.h>
> -#include <stdio.h>
> -#include <hardware/bluetooth.h>
> -
> -#include "../hal-utils.h"
> -
> -#include "textconv.h"
> -
> -/*
> - * Following are maps of defines found in bluetooth header files to strings
> - *
> - * Those mappings are used to accurately use defines as input parameters in
> - * command line as well as for printing of statuses
> - */
> -
> -INTMAP(bt_status_t, -1, "(unknown)")
> - DELEMENT(BT_STATUS_SUCCESS),
> - DELEMENT(BT_STATUS_FAIL),
> - DELEMENT(BT_STATUS_NOT_READY),
> - DELEMENT(BT_STATUS_NOMEM),
> - DELEMENT(BT_STATUS_BUSY),
> - DELEMENT(BT_STATUS_DONE),
> - DELEMENT(BT_STATUS_UNSUPPORTED),
> - DELEMENT(BT_STATUS_PARM_INVALID),
> - DELEMENT(BT_STATUS_UNHANDLED),
> - DELEMENT(BT_STATUS_AUTH_FAILURE),
> - DELEMENT(BT_STATUS_RMT_DEV_DOWN),
> -ENDMAP
> -
> -INTMAP(bt_state_t, -1, "(unknown)")
> - DELEMENT(BT_STATE_OFF),
> - DELEMENT(BT_STATE_ON),
> -ENDMAP
> -
> -INTMAP(bt_device_type_t, -1, "(unknown)")
> - DELEMENT(BT_DEVICE_DEVTYPE_BREDR),
> - DELEMENT(BT_DEVICE_DEVTYPE_BLE),
> - DELEMENT(BT_DEVICE_DEVTYPE_DUAL),
> -ENDMAP
> -
> -INTMAP(bt_scan_mode_t, -1, "(unknown)")
> - DELEMENT(BT_SCAN_MODE_NONE),
> - DELEMENT(BT_SCAN_MODE_CONNECTABLE),
> - DELEMENT(BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE),
> -ENDMAP
> -
> -INTMAP(bt_discovery_state_t, -1, "(unknown)")
> - DELEMENT(BT_DISCOVERY_STOPPED),
> - DELEMENT(BT_DISCOVERY_STARTED),
> -ENDMAP
> -
> -INTMAP(bt_acl_state_t, -1, "(unknown)")
> - DELEMENT(BT_ACL_STATE_CONNECTED),
> - DELEMENT(BT_ACL_STATE_DISCONNECTED),
> -ENDMAP
> -
> -INTMAP(bt_bond_state_t, -1, "(unknown)")
> - DELEMENT(BT_BOND_STATE_NONE),
> - DELEMENT(BT_BOND_STATE_BONDING),
> - DELEMENT(BT_BOND_STATE_BONDED),
> -ENDMAP
> -
> -INTMAP(bt_ssp_variant_t, -1, "(unknown)")
> - DELEMENT(BT_SSP_VARIANT_PASSKEY_CONFIRMATION),
> - DELEMENT(BT_SSP_VARIANT_PASSKEY_ENTRY),
> - DELEMENT(BT_SSP_VARIANT_CONSENT),
> - DELEMENT(BT_SSP_VARIANT_PASSKEY_NOTIFICATION),
> -ENDMAP
> -
> -INTMAP(bt_property_type_t, -1, "(unknown)")
> - DELEMENT(BT_PROPERTY_BDNAME),
> - DELEMENT(BT_PROPERTY_BDADDR),
> - DELEMENT(BT_PROPERTY_UUIDS),
> - DELEMENT(BT_PROPERTY_CLASS_OF_DEVICE),
> - DELEMENT(BT_PROPERTY_TYPE_OF_DEVICE),
> - DELEMENT(BT_PROPERTY_SERVICE_RECORD),
> - DELEMENT(BT_PROPERTY_ADAPTER_SCAN_MODE),
> - DELEMENT(BT_PROPERTY_ADAPTER_BONDED_DEVICES),
> - DELEMENT(BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT),
> - DELEMENT(BT_PROPERTY_REMOTE_FRIENDLY_NAME),
> - DELEMENT(BT_PROPERTY_REMOTE_RSSI),
> -#if PLATFORM_SDK_VERSION > 17
> - DELEMENT(BT_PROPERTY_REMOTE_VERSION_INFO),
> -#endif
> - DELEMENT(BT_PROPERTY_REMOTE_DEVICE_TIMESTAMP),
> -ENDMAP
> -
> -INTMAP(bt_cb_thread_evt, -1, "(unknown)")
> - DELEMENT(ASSOCIATE_JVM),
> - DELEMENT(DISASSOCIATE_JVM),
> -ENDMAP
> -
> -/* Find first index of given value in table m */
> -int int2str_findint(int v, const struct int2str m[])
> -{
> - int i;
> -
> - for (i = 0; m[i].str; ++i) {
> - if (m[i].val == v)
> - return i;
> - }
> - return -1;
> -}
> -
> -/* Find first index of given string in table m */
> -int int2str_findstr(const char *str, const struct int2str m[])
> -{
> - int i;
> -
> - for (i = 0; m[i].str; ++i) {
> - if (strcmp(m[i].str, str) == 0)
> - return i;
> - }
> - return -1;
> -}
> -
> -/*
> - * convert bd_addr to string
> - * buf must be at least 18 char long
> - *
> - * returns buf
> - */
> -const char *bt_bdaddr_t2str(const bt_bdaddr_t *bd_addr, char *buf)
> -{
> - const uint8_t *p = bd_addr->address;
> -
> - snprintf(buf, MAX_ADDR_STR_LEN, "%02x:%02x:%02x:%02x:%02x:%02x",
> - p[0], p[1], p[2], p[3], p[4], p[5]);
> -
> - return buf;
> -}
> -
> -/* converts string to bt_bdaddr_t */
> -void str2bt_bdaddr_t(const char *str, bt_bdaddr_t *bd_addr)
> -{
> - uint8_t *p = bd_addr->address;
> -
> - sscanf(str, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
> - &p[0], &p[1], &p[2], &p[3], &p[4], &p[5]);
> -}
> -
> -/* converts string to uuid */
> -void str2bt_uuid_t(const char *str, bt_uuid_t *uuid)
> -{
> - int i = 0;
> -
> - memcpy(uuid, BT_BASE_UUID, sizeof(bt_uuid_t));
> -
> - while (*str && i < (int) sizeof(bt_uuid_t)) {
> - while (*str == '-')
> - str++;
> -
> - if (sscanf(str, "%02hhx", &uuid->uu[i]) != 1)
> - break;
> -
> - i++;
> - str += 2;
> - }
> -}
> -
> -const char *enum_defines(void *v, int i)
> -{
> - const struct int2str *m = v;
> -
> - return m[i].str != NULL ? m[i].str : NULL;
> -}
> -
> -const char *enum_strings(void *v, int i)
> -{
> - const char **m = v;
> -
> - return m[i] != NULL ? m[i] : NULL;
> -}
> -
> -const char *enum_one_string(void *v, int i)
> -{
> - const char *m = v;
> -
> - return (i == 0) && (m[0] != 0) ? m : NULL;
> -}
> -
> -const char *bdaddr2str(const bt_bdaddr_t *bd_addr)
> -{
> - static char buf[MAX_ADDR_STR_LEN];
> -
> - return bt_bdaddr_t2str(bd_addr, buf);
> -}
> -
> -const char *btproperty2str(const bt_property_t *property)
> -{
> - static char buf[4096];
> - char *p;
> -
> - p = buf + sprintf(buf, "type=%s len=%d val=",
> - bt_property_type_t2str(property->type),
> - property->len);
> -
> - switch (property->type) {
> - case BT_PROPERTY_BDNAME:
> - case BT_PROPERTY_REMOTE_FRIENDLY_NAME:
> - snprintf(p, property->len + 1, "%s",
> - ((bt_bdname_t *) property->val)->name);
> - break;
> -
> - case BT_PROPERTY_BDADDR:
> - sprintf(p, "%s", bdaddr2str((bt_bdaddr_t *) property->val));
> - break;
> -
> - case BT_PROPERTY_CLASS_OF_DEVICE:
> - sprintf(p, "%06x", *((int *) property->val));
> - break;
> -
> - case BT_PROPERTY_TYPE_OF_DEVICE:
> - sprintf(p, "%s", bt_device_type_t2str(
> - *((bt_device_type_t *) property->val)));
> - break;
> -
> - case BT_PROPERTY_REMOTE_RSSI:
> - sprintf(p, "%d", *((char *) property->val));
> - break;
> -
> - case BT_PROPERTY_ADAPTER_SCAN_MODE:
> - sprintf(p, "%s",
> - bt_scan_mode_t2str(*((bt_scan_mode_t *) property->val)));
> - break;
> -
> - case BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT:
> - sprintf(p, "%d", *((int *) property->val));
> - break;
> -
> - case BT_PROPERTY_ADAPTER_BONDED_DEVICES:
> - {
> - int count = property->len / sizeof(bt_bdaddr_t);
> - char *ptr = property->val;
> -
> - strcat(p, "{");
> -
> - while (count--) {
> - strcat(p, bdaddr2str((bt_bdaddr_t *) ptr));
> - if (count)
> - strcat(p, ", ");
> - ptr += sizeof(bt_bdaddr_t);
> - }
> -
> - strcat(p, "}");
> -
> - }
> - break;
> -
> - case BT_PROPERTY_UUIDS:
> - {
> - int count = property->len / sizeof(bt_uuid_t);
> - uint8_t *ptr = property->val;
> -
> - strcat(p, "{");
> -
> - while (count--) {
> - strcat(p, btuuid2str(ptr));
> - if (count)
> - strcat(p, ", ");
> - ptr += sizeof(bt_uuid_t);
> - }
> -
> - strcat(p, "}");
> -
> - }
> - break;
> -
> - case BT_PROPERTY_SERVICE_RECORD:
> - {
> - bt_service_record_t *rec = property->val;
> -
> - sprintf(p, "{%s, %d, %s}", btuuid2str(rec->uuid.uu),
> - rec->channel, rec->name);
> - }
> - break;
> -
> - default:
> - sprintf(p, "%p", property->val);
> - }
> -
> - return buf;
> -}
> diff --git a/android/client/textconv.h b/android/client/textconv.h
> deleted file mode 100644
> index 0a72805..0000000
> --- a/android/client/textconv.h
> +++ /dev/null
> @@ -1,120 +0,0 @@
> -/*
> - * Copyright (C) 2013 Intel Corporation
> - *
> - * Licensed under the Apache License, Version 2.0 (the "License");
> - * you may not use this file except in compliance with the License.
> - * You may obtain a copy of the License at
> - *
> - * http://www.apache.org/licenses/LICENSE-2.0
> - *
> - * Unless required by applicable law or agreed to in writing, software
> - * distributed under the License is distributed on an "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> - * See the License for the specific language governing permissions and
> - * limitations under the License.
> - *
> - */
> -
> -/**
> - * Begin mapping section
> - *
> - * There are some mappings between integer values (enums) and strings
> - * to be presented to user. To make it easier to convert between those two
> - * set of macros is given. It is specially useful when we want to have
> - * strings that match constants from header files like:
> - * BT_STATUS_SUCCESS (0) and corresponding "BT_STATUS_SUCCESS"
> - * Example of usage:
> - *
> - * INTMAP(int, -1, "invalid")
> - * DELEMENT(BT_STATUS_SUCCESS)
> - * DELEMENT(BT_STATUS_FAIL)
> - * MELEMENT(123, "Some strange value")
> - * ENDMAP
> - *
> - * Just by doing this we have mapping table plus two functions:
> - * int str2int(const char *str);
> - * const char *int2str(int v);
> - *
> - * second argument to INTMAP specifies value to be returned from
> - * str2int function when there is not mapping for such number
> - * third argument specifies default value to be returned from int2str
> - *
> - * If same mapping is to be used in several source files put
> - * INTMAP in c file and DECINTMAP in h file.
> - *
> - * For mappings that are to be used in single file only
> - * use SINTMAP which will create the same but everything will be marked
> - * as static.
> - */
> -
> -struct int2str {
> - int val; /* int value */
> - const char *str; /* corresponding string */
> -};
> -
> -int int2str_findint(int v, const struct int2str m[]);
> -int int2str_findstr(const char *str, const struct int2str m[]);
> -const char *enum_defines(void *v, int i);
> -const char *enum_strings(void *v, int i);
> -const char *enum_one_string(void *v, int i);
> -
> -#define TYPE_ENUM(type) ((void *) &__##type##2str[0])
> -#define DECINTMAP(type) \
> -extern struct int2str __##type##2str[]; \
> -const char *type##2##str(type v); \
> -type str##2##type(const char *str); \
> -
> -#define INTMAP(type, deft, defs) \
> -const char *type##2##str(type v) \
> -{ \
> - int i = int2str_findint((int) v, __##type##2str); \
> - return (i < 0) ? defs : __##type##2str[i].str; \
> -} \
> -type str##2##type(const char *str) \
> -{ \
> - int i = int2str_findstr(str, __##type##2str); \
> - return (i < 0) ? (type) deft : (type) (__##type##2str[i].val); \
> -} \
> -struct int2str __##type##2str[] = {
> -
> -#define SINTMAP(type, deft, defs) \
> -static struct int2str __##type##2str[]; \
> -static inline const char *type##2##str(type v) \
> -{ \
> - int i = int2str_findint((int) v, __##type##2str); \
> - return (i < 0) ? defs : __##type##2str[i].str; \
> -} \
> -static inline type str##2##type(const char *str) \
> -{ \
> - int i = int2str_findstr(str, __##type##2str); \
> - return (i < 0) ? (type) deft : (type) (__##type##2str[i].val); \
> -} \
> -static struct int2str __##type##2str[] = {
> -
> -#define ENDMAP {0, NULL} };
> -
> -/* use this to generate string from header file constant */
> -#define MELEMENT(v, s) {v, s}
> -/* use this to have arbitrary mapping from int to string */
> -#define DELEMENT(s) {s, #s}
> -/* End of mapping section */
> -
> -#define MAX_ADDR_STR_LEN 18
> -const char *bt_bdaddr_t2str(const bt_bdaddr_t *bd_addr, char *buf);
> -void str2bt_bdaddr_t(const char *str, bt_bdaddr_t *bd_addr);
> -
> -void str2bt_uuid_t(const char *str, bt_uuid_t *uuid);
> -
> -const char *btproperty2str(const bt_property_t *property);
> -const char *bdaddr2str(const bt_bdaddr_t *bd_addr);
> -
> -DECINTMAP(bt_status_t);
> -DECINTMAP(bt_state_t);
> -DECINTMAP(bt_device_type_t);
> -DECINTMAP(bt_scan_mode_t);
> -DECINTMAP(bt_discovery_state_t);
> -DECINTMAP(bt_acl_state_t);
> -DECINTMAP(bt_bond_state_t);
> -DECINTMAP(bt_ssp_variant_t);
> -DECINTMAP(bt_property_type_t);
> -DECINTMAP(bt_cb_thread_evt);
> diff --git a/android/hal-bluetooth.c b/android/hal-bluetooth.c
> index 3e5d41f..5c14649 100644
> --- a/android/hal-bluetooth.c
> +++ b/android/hal-bluetooth.c
> @@ -24,8 +24,7 @@
> #include "hal.h"
> #include "hal-msg.h"
> #include "hal-ipc.h"
> -
> -#include "client/textconv.h"
> +#include "hal-utils.h"
>
> static const bt_callbacks_t *bt_hal_cbacks = NULL;
>
> diff --git a/android/hal-utils.c b/android/hal-utils.c
> index 7ac5047..4f44d98 100644
> --- a/android/hal-utils.c
> +++ b/android/hal-utils.c
> @@ -55,3 +55,272 @@ const char *btuuid2str(const uint8_t *uuid)
>
> return bt_uuid_t2str(uuid, buf);
> }
> +
> +INTMAP(bt_status_t, -1, "(unknown)")
> + DELEMENT(BT_STATUS_SUCCESS),
> + DELEMENT(BT_STATUS_FAIL),
> + DELEMENT(BT_STATUS_NOT_READY),
> + DELEMENT(BT_STATUS_NOMEM),
> + DELEMENT(BT_STATUS_BUSY),
> + DELEMENT(BT_STATUS_DONE),
> + DELEMENT(BT_STATUS_UNSUPPORTED),
> + DELEMENT(BT_STATUS_PARM_INVALID),
> + DELEMENT(BT_STATUS_UNHANDLED),
> + DELEMENT(BT_STATUS_AUTH_FAILURE),
> + DELEMENT(BT_STATUS_RMT_DEV_DOWN),
> +ENDMAP
> +
> +INTMAP(bt_state_t, -1, "(unknown)")
> + DELEMENT(BT_STATE_OFF),
> + DELEMENT(BT_STATE_ON),
> +ENDMAP
> +
> +INTMAP(bt_device_type_t, -1, "(unknown)")
> + DELEMENT(BT_DEVICE_DEVTYPE_BREDR),
> + DELEMENT(BT_DEVICE_DEVTYPE_BLE),
> + DELEMENT(BT_DEVICE_DEVTYPE_DUAL),
> +ENDMAP
> +
> +INTMAP(bt_scan_mode_t, -1, "(unknown)")
> + DELEMENT(BT_SCAN_MODE_NONE),
> + DELEMENT(BT_SCAN_MODE_CONNECTABLE),
> + DELEMENT(BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE),
> +ENDMAP
> +
> +INTMAP(bt_discovery_state_t, -1, "(unknown)")
> + DELEMENT(BT_DISCOVERY_STOPPED),
> + DELEMENT(BT_DISCOVERY_STARTED),
> +ENDMAP
> +
> +INTMAP(bt_acl_state_t, -1, "(unknown)")
> + DELEMENT(BT_ACL_STATE_CONNECTED),
> + DELEMENT(BT_ACL_STATE_DISCONNECTED),
> +ENDMAP
> +
> +INTMAP(bt_bond_state_t, -1, "(unknown)")
> + DELEMENT(BT_BOND_STATE_NONE),
> + DELEMENT(BT_BOND_STATE_BONDING),
> + DELEMENT(BT_BOND_STATE_BONDED),
> +ENDMAP
> +
> +INTMAP(bt_ssp_variant_t, -1, "(unknown)")
> + DELEMENT(BT_SSP_VARIANT_PASSKEY_CONFIRMATION),
> + DELEMENT(BT_SSP_VARIANT_PASSKEY_ENTRY),
> + DELEMENT(BT_SSP_VARIANT_CONSENT),
> + DELEMENT(BT_SSP_VARIANT_PASSKEY_NOTIFICATION),
> +ENDMAP
> +
> +INTMAP(bt_property_type_t, -1, "(unknown)")
> + DELEMENT(BT_PROPERTY_BDNAME),
> + DELEMENT(BT_PROPERTY_BDADDR),
> + DELEMENT(BT_PROPERTY_UUIDS),
> + DELEMENT(BT_PROPERTY_CLASS_OF_DEVICE),
> + DELEMENT(BT_PROPERTY_TYPE_OF_DEVICE),
> + DELEMENT(BT_PROPERTY_SERVICE_RECORD),
> + DELEMENT(BT_PROPERTY_ADAPTER_SCAN_MODE),
> + DELEMENT(BT_PROPERTY_ADAPTER_BONDED_DEVICES),
> + DELEMENT(BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT),
> + DELEMENT(BT_PROPERTY_REMOTE_FRIENDLY_NAME),
> + DELEMENT(BT_PROPERTY_REMOTE_RSSI),
> +#if PLATFORM_SDK_VERSION > 17
> + DELEMENT(BT_PROPERTY_REMOTE_VERSION_INFO),
> +#endif
> + DELEMENT(BT_PROPERTY_REMOTE_DEVICE_TIMESTAMP),
> +ENDMAP
> +
> +INTMAP(bt_cb_thread_evt, -1, "(unknown)")
> + DELEMENT(ASSOCIATE_JVM),
> + DELEMENT(DISASSOCIATE_JVM),
> +ENDMAP
> +
> +/* Find first index of given value in table m */
> +int int2str_findint(int v, const struct int2str m[])
> +{
> + int i;
> +
> + for (i = 0; m[i].str; ++i) {
> + if (m[i].val == v)
> + return i;
> + }
> + return -1;
> +}
> +
> +/* Find first index of given string in table m */
> +int int2str_findstr(const char *str, const struct int2str m[])
> +{
> + int i;
> +
> + for (i = 0; m[i].str; ++i) {
> + if (strcmp(m[i].str, str) == 0)
> + return i;
> + }
> + return -1;
> +}
> +
> +/*
> + * convert bd_addr to string
> + * buf must be at least 18 char long
> + *
> + * returns buf
> + */
> +const char *bt_bdaddr_t2str(const bt_bdaddr_t *bd_addr, char *buf)
> +{
> + const uint8_t *p = bd_addr->address;
> +
> + snprintf(buf, MAX_ADDR_STR_LEN, "%02x:%02x:%02x:%02x:%02x:%02x",
> + p[0], p[1], p[2], p[3], p[4], p[5]);
> +
> + return buf;
> +}
> +
> +/* converts string to bt_bdaddr_t */
> +void str2bt_bdaddr_t(const char *str, bt_bdaddr_t *bd_addr)
> +{
> + uint8_t *p = bd_addr->address;
> +
> + sscanf(str, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
> + &p[0], &p[1], &p[2], &p[3], &p[4], &p[5]);
> +}
> +
> +/* converts string to uuid */
> +void str2bt_uuid_t(const char *str, bt_uuid_t *uuid)
> +{
> + int i = 0;
> +
> + memcpy(uuid, BT_BASE_UUID, sizeof(bt_uuid_t));
> +
> + while (*str && i < (int) sizeof(bt_uuid_t)) {
> + while (*str == '-')
> + str++;
> +
> + if (sscanf(str, "%02hhx", &uuid->uu[i]) != 1)
> + break;
> +
> + i++;
> + str += 2;
> + }
> +}
> +
> +const char *enum_defines(void *v, int i)
> +{
> + const struct int2str *m = v;
> +
> + return m[i].str != NULL ? m[i].str : NULL;
> +}
> +
> +const char *enum_strings(void *v, int i)
> +{
> + const char **m = v;
> +
> + return m[i] != NULL ? m[i] : NULL;
> +}
> +
> +const char *enum_one_string(void *v, int i)
> +{
> + const char *m = v;
> +
> + return (i == 0) && (m[0] != 0) ? m : NULL;
> +}
> +
> +const char *bdaddr2str(const bt_bdaddr_t *bd_addr)
> +{
> + static char buf[MAX_ADDR_STR_LEN];
> +
> + return bt_bdaddr_t2str(bd_addr, buf);
> +}
> +
> +const char *btproperty2str(const bt_property_t *property)
> +{
> + static char buf[4096];
> + char *p;
> +
> + p = buf + sprintf(buf, "type=%s len=%d val=",
> + bt_property_type_t2str(property->type),
> + property->len);
> +
> + switch (property->type) {
> + case BT_PROPERTY_BDNAME:
> + case BT_PROPERTY_REMOTE_FRIENDLY_NAME:
> + snprintf(p, property->len + 1, "%s",
> + ((bt_bdname_t *) property->val)->name);
> + break;
> +
> + case BT_PROPERTY_BDADDR:
> + sprintf(p, "%s", bdaddr2str((bt_bdaddr_t *) property->val));
> + break;
> +
> + case BT_PROPERTY_CLASS_OF_DEVICE:
> + sprintf(p, "%06x", *((int *) property->val));
> + break;
> +
> + case BT_PROPERTY_TYPE_OF_DEVICE:
> + sprintf(p, "%s", bt_device_type_t2str(
> + *((bt_device_type_t *) property->val)));
> + break;
> +
> + case BT_PROPERTY_REMOTE_RSSI:
> + sprintf(p, "%d", *((char *) property->val));
> + break;
> +
> + case BT_PROPERTY_ADAPTER_SCAN_MODE:
> + sprintf(p, "%s",
> + bt_scan_mode_t2str(*((bt_scan_mode_t *) property->val)));
> + break;
> +
> + case BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT:
> + sprintf(p, "%d", *((int *) property->val));
> + break;
> +
> + case BT_PROPERTY_ADAPTER_BONDED_DEVICES:
> + {
> + int count = property->len / sizeof(bt_bdaddr_t);
> + char *ptr = property->val;
> +
> + strcat(p, "{");
> +
> + while (count--) {
> + strcat(p, bdaddr2str((bt_bdaddr_t *) ptr));
> + if (count)
> + strcat(p, ", ");
> + ptr += sizeof(bt_bdaddr_t);
> + }
> +
> + strcat(p, "}");
> +
> + }
> + break;
> +
> + case BT_PROPERTY_UUIDS:
> + {
> + int count = property->len / sizeof(bt_uuid_t);
> + uint8_t *ptr = property->val;
> +
> + strcat(p, "{");
> +
> + while (count--) {
> + strcat(p, btuuid2str(ptr));
> + if (count)
> + strcat(p, ", ");
> + ptr += sizeof(bt_uuid_t);
> + }
> +
> + strcat(p, "}");
> +
> + }
> + break;
> +
> + case BT_PROPERTY_SERVICE_RECORD:
> + {
> + bt_service_record_t *rec = property->val;
> +
> + sprintf(p, "{%s, %d, %s}", btuuid2str(rec->uuid.uu),
> + rec->channel, rec->name);
> + }
> + break;
> +
> + default:
> + sprintf(p, "%p", property->val);
> + }
> +
> + return buf;
> +}
> diff --git a/android/hal-utils.h b/android/hal-utils.h
> index 8c74653..75de7e9 100644
> --- a/android/hal-utils.h
> +++ b/android/hal-utils.h
> @@ -15,8 +15,11 @@
> *
> */
>
> +#include <hardware/bluetooth.h>
> +
> #define MAX_UUID_STR_LEN 37
> #define HAL_UUID_LEN 16
> +#define MAX_ADDR_STR_LEN 18
>
> static const char BT_BASE_UUID[] = {
> 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
> @@ -25,3 +28,103 @@ static const char BT_BASE_UUID[] = {
>
> const char *bt_uuid_t2str(const uint8_t *uuid, char *buf);
> const char *btuuid2str(const uint8_t *uuid);
> +const char *bt_bdaddr_t2str(const bt_bdaddr_t *bd_addr, char *buf);
> +void str2bt_bdaddr_t(const char *str, bt_bdaddr_t *bd_addr);
> +void str2bt_uuid_t(const char *str, bt_uuid_t *uuid);
> +const char *btproperty2str(const bt_property_t *property);
> +const char *bdaddr2str(const bt_bdaddr_t *bd_addr);
> +
> +/**
> + * Begin mapping section
> + *
> + * There are some mappings between integer values (enums) and strings
> + * to be presented to user. To make it easier to convert between those two
> + * set of macros is given. It is specially useful when we want to have
> + * strings that match constants from header files like:
> + * BT_STATUS_SUCCESS (0) and corresponding "BT_STATUS_SUCCESS"
> + * Example of usage:
> + *
> + * INTMAP(int, -1, "invalid")
> + * DELEMENT(BT_STATUS_SUCCESS)
> + * DELEMENT(BT_STATUS_FAIL)
> + * MELEMENT(123, "Some strange value")
> + * ENDMAP
> + *
> + * Just by doing this we have mapping table plus two functions:
> + * int str2int(const char *str);
> + * const char *int2str(int v);
> + *
> + * second argument to INTMAP specifies value to be returned from
> + * str2int function when there is not mapping for such number
> + * third argument specifies default value to be returned from int2str
> + *
> + * If same mapping is to be used in several source files put
> + * INTMAP in c file and DECINTMAP in h file.
> + *
> + * For mappings that are to be used in single file only
> + * use SINTMAP which will create the same but everything will be marked
> + * as static.
> + */
> +
> +struct int2str {
> + int val; /* int value */
> + const char *str; /* corresponding string */
> +};
> +
> +int int2str_findint(int v, const struct int2str m[]);
> +int int2str_findstr(const char *str, const struct int2str m[]);
> +const char *enum_defines(void *v, int i);
> +const char *enum_strings(void *v, int i);
> +const char *enum_one_string(void *v, int i);
> +
> +#define TYPE_ENUM(type) ((void *) &__##type##2str[0])
> +#define DECINTMAP(type) \
> +extern struct int2str __##type##2str[]; \
> +const char *type##2##str(type v); \
> +type str##2##type(const char *str); \
> +
> +#define INTMAP(type, deft, defs) \
> +const char *type##2##str(type v) \
> +{ \
> + int i = int2str_findint((int) v, __##type##2str); \
> + return (i < 0) ? defs : __##type##2str[i].str; \
> +} \
> +type str##2##type(const char *str) \
> +{ \
> + int i = int2str_findstr(str, __##type##2str); \
> + return (i < 0) ? (type) deft : (type) (__##type##2str[i].val); \
> +} \
> +struct int2str __##type##2str[] = {
> +
> +#define SINTMAP(type, deft, defs) \
> +static struct int2str __##type##2str[]; \
> +static inline const char *type##2##str(type v) \
> +{ \
> + int i = int2str_findint((int) v, __##type##2str); \
> + return (i < 0) ? defs : __##type##2str[i].str; \
> +} \
> +static inline type str##2##type(const char *str) \
> +{ \
> + int i = int2str_findstr(str, __##type##2str); \
> + return (i < 0) ? (type) deft : (type) (__##type##2str[i].val); \
> +} \
> +static struct int2str __##type##2str[] = {
> +
> +#define ENDMAP {0, NULL} };
> +
> +/* use this to generate string from header file constant */
> +#define MELEMENT(v, s) {v, s}
> +/* use this to have arbitrary mapping from int to string */
> +#define DELEMENT(s) {s, #s}
> +/* End of mapping section */
> +
> +DECINTMAP(bt_status_t);
> +DECINTMAP(bt_state_t);
> +DECINTMAP(bt_device_type_t);
> +DECINTMAP(bt_scan_mode_t);
> +DECINTMAP(bt_discovery_state_t);
> +DECINTMAP(bt_acl_state_t);
> +DECINTMAP(bt_bond_state_t);
> +DECINTMAP(bt_ssp_variant_t);
> +DECINTMAP(bt_property_type_t);
> +DECINTMAP(bt_cb_thread_evt);
> --
> 1.7.10.4
>
> --
> 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_v3 3/3] android/pan: Handle connection and control state notifications
From: Johan Hedberg @ 2013-11-13 11:16 UTC (permalink / raw)
To: Ravi Kumar Veeramally; +Cc: Szymon Janc, linux-bluetooth
In-Reply-To: <5283506A.4090105@linux.intel.com>
Hi Ravi,
On Wed, Nov 13, 2013, Ravi Kumar Veeramally wrote:
> On 11/13/2013 11:59 AM, Szymon Janc wrote:
> >Hi,
> >
> >>>>+
> >>>>+ switch (opcode) {
> >>>>+ case HAL_EV_PAN_CONN_STATE:
> >>>>+ handle_conn_state(buf);
> >>>>+ break;
> >>>>+ case HAL_EV_PAN_CTRL_STATE:
> >>>>+ handle_ctrl_state(buf);
> >>>>+ break;
> >>>>+ default:
> >>>>+ DBG("Unhandled callback opcode=0x%x", opcode);
> >>>>+ break;
> >>>>+ }
> >>>> }
> >>>What I don't like about this is that you're not pushing the data length
> >>>to the handler functions. If you did that the handler functions could:
> >>>
> >>> if (len < sizeof(*ev))
> >>> return;
> >>>
> >>>Instead of return we could also just abort - what's the general policy
> >>>on the HAL side regarding invalid data from the daemon? How does this
> >>>relate to the work Szymon is doing to add proper checks for the IPC
> >>>data? Is that only for the daemon side?
> >>>
> >>>Are we missing similar checks in other HALs too?
> >> Yes, we are not doing similar checks in other HALs
> >>(hal-bluetooth/a2dp/hid/) too.
> >> Very few places in hal-bluetooth length is passing but validation is
> >>not done.
> >> I will fix them all and send you the patch.
> >As mentioned in my RFC, messages have very similar format and can be checked
> >in single place using some common macros. I'm now working on addressing Johan
> >comments in that RFC. As suggested I'm going to use tables of handlers instead
> >switch-case and this should also allow to refactor current code to avoid
> >switch-cases we currently have. Services will simply register own tables of
> >handlers for service they implement. Idea is that check will be done in common
> >place and then handlers will have form of void handle_foo(struct foo *ev) with
> >guarantee that passed command/event is memory size valid.
> >
> >Plan is to make this generic code use both by hal and daemon.
> >
> >So, I'm not sure if it makes much sense to fix passing buf+len to all handlers
> >we have now.
> >
> >If you have other ideas for this please comment.
> >
> Ok, good to know.
> Johan: Can you now apply my left over patch?
Yes, it's already done, however I'd really like to see the patches to
fix all this asap.
Johan
^ permalink raw reply
* Re: [PATCH_v3 3/3] android/pan: Handle connection and control state notifications
From: Ravi Kumar Veeramally @ 2013-11-13 10:11 UTC (permalink / raw)
To: Szymon Janc, Johan Hedberg; +Cc: linux-bluetooth
In-Reply-To: <1726751.Pm6h7gxZKd@uw000953>
On 11/13/2013 11:59 AM, Szymon Janc wrote:
> Hi,
>
>>>> +
>>>> + switch (opcode) {
>>>> + case HAL_EV_PAN_CONN_STATE:
>>>> + handle_conn_state(buf);
>>>> + break;
>>>> + case HAL_EV_PAN_CTRL_STATE:
>>>> + handle_ctrl_state(buf);
>>>> + break;
>>>> + default:
>>>> + DBG("Unhandled callback opcode=0x%x", opcode);
>>>> + break;
>>>> + }
>>>> }
>>> What I don't like about this is that you're not pushing the data length
>>> to the handler functions. If you did that the handler functions could:
>>>
>>> if (len < sizeof(*ev))
>>> return;
>>>
>>> Instead of return we could also just abort - what's the general policy
>>> on the HAL side regarding invalid data from the daemon? How does this
>>> relate to the work Szymon is doing to add proper checks for the IPC
>>> data? Is that only for the daemon side?
>>>
>>> Are we missing similar checks in other HALs too?
>> Yes, we are not doing similar checks in other HALs
>> (hal-bluetooth/a2dp/hid/) too.
>> Very few places in hal-bluetooth length is passing but validation is
>> not done.
>> I will fix them all and send you the patch.
> As mentioned in my RFC, messages have very similar format and can be checked
> in single place using some common macros. I'm now working on addressing Johan
> comments in that RFC. As suggested I'm going to use tables of handlers instead
> switch-case and this should also allow to refactor current code to avoid
> switch-cases we currently have. Services will simply register own tables of
> handlers for service they implement. Idea is that check will be done in common
> place and then handlers will have form of void handle_foo(struct foo *ev) with
> guarantee that passed command/event is memory size valid.
>
> Plan is to make this generic code use both by hal and daemon.
>
> So, I'm not sure if it makes much sense to fix passing buf+len to all handlers
> we have now.
>
> If you have other ideas for this please comment.
>
Ok, good to know.
Johan: Can you now apply my left over patch?
Thanks,
Ravi.
^ permalink raw reply
* [RFC v4 6/6] Bluetooth: Manually enable or disable 6LoWPAN between devices
From: Jukka Rissanen @ 2013-11-13 10:11 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1384337495-9043-1-git-send-email-jukka.rissanen@linux.intel.com>
This is a temporary patch where user can manually enable or
disable BT 6LoWPAN functionality between devices.
Eventually the connection is established automatically if
the devices are advertising suitable capability and this patch
can be removed.
Before connecting the devices do this
echo 1 > /sys/kernel/debug/bluetooth/hci0/6lowpan
This enables 6LoWPAN support and creates the bt0 interface
automatically when devices are finally connected.
Rebooting or unloading the bluetooth kernel module will also clear the
settings from the kernel.
Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
---
net/bluetooth/6lowpan.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++
net/bluetooth/6lowpan.h | 1 +
net/bluetooth/hci_core.c | 4 ++
3 files changed, 110 insertions(+)
diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
index 5f0489c..579a75f 100644
--- a/net/bluetooth/6lowpan.c
+++ b/net/bluetooth/6lowpan.c
@@ -26,6 +26,8 @@
*/
#include <linux/version.h>
+#include <linux/debugfs.h>
+#include <linux/string.h>
#include <linux/bitops.h>
#include <linux/if_arp.h>
#include <linux/netdevice.h>
@@ -1571,6 +1573,109 @@ static struct notifier_block bt_6lowpan_dev_notifier = {
.notifier_call = device_event,
};
+static LIST_HEAD(user_enabled);
+DEFINE_RWLOCK(enabled_lock);
+
+struct lowpan_enabled {
+ __u8 dev_name[HCI_MAX_NAME_LENGTH];
+ bool enabled;
+ struct list_head list;
+};
+
+static int debugfs_show(struct seq_file *f, void *p)
+{
+ struct lowpan_enabled *entry, *tmp;
+ bool found = false;
+
+ write_lock(&enabled_lock);
+ list_for_each_entry_safe(entry, tmp, &user_enabled, list) {
+ seq_printf(f, "%d\n", entry->enabled);
+ found = true;
+ }
+ write_unlock(&enabled_lock);
+
+ if (!found)
+ seq_printf(f, "0\n");
+
+ return 0;
+}
+
+static int debugfs_open(struct inode *inode, struct file *file)
+{
+ return single_open(file, debugfs_show, inode->i_private);
+}
+
+static ssize_t writer(struct file *fp, const char __user *user_buffer,
+ size_t count, loff_t *position)
+{
+ struct hci_dev *hdev = fp->f_inode->i_private;
+ struct lowpan_enabled *entry = NULL, *tmp;
+ bool new_value, old_value;
+ char buf[3] = { 0 };
+ ssize_t ret;
+
+ BT_DBG("dev %s count %zd", hdev->dev_name, count);
+
+ ret = simple_write_to_buffer(buf, 2, position, user_buffer, count);
+ if (ret <= 0)
+ return ret;
+
+ if (strtobool(buf, &new_value) < 0)
+ return -EINVAL;
+
+ ret = -ENOENT;
+
+ write_lock(&enabled_lock);
+ list_for_each_entry_safe(entry, tmp, &user_enabled, list) {
+ if (!strncmp(entry->dev_name, hdev->dev_name,
+ HCI_MAX_NAME_LENGTH)) {
+ old_value = entry->enabled;
+ entry->enabled = new_value;
+ ret = 0;
+ break;
+ }
+ }
+ write_unlock(&enabled_lock);
+
+ if (ret == 0 && old_value == new_value)
+ return count;
+
+ if (ret < 0) {
+ entry = kzalloc(sizeof(*entry), GFP_KERNEL);
+ if (!entry)
+ return -ENOMEM;
+
+ strncpy(entry->dev_name, hdev->dev_name, HCI_MAX_NAME_LENGTH);
+ entry->enabled = new_value;
+
+ write_lock(&enabled_lock);
+ INIT_LIST_HEAD(&entry->list);
+ list_add(&entry->list, &user_enabled);
+ write_unlock(&enabled_lock);
+ }
+
+ if (new_value == true)
+ set_bit(HCI_6LOWPAN_ENABLED, &hdev->dev_flags);
+ else
+ clear_bit(HCI_6LOWPAN_ENABLED, &hdev->dev_flags);
+
+ return count;
+}
+
+static const struct file_operations ble_6lowpan_debugfs_fops = {
+ .open = debugfs_open,
+ .read = seq_read,
+ .write = writer,
+ .llseek = seq_lseek,
+ .release = single_release,
+};
+
+void bt_6lowpan_add_debugfs(struct hci_dev *hdev)
+{
+ debugfs_create_file("6lowpan", 0644, hdev->debugfs, hdev,
+ &ble_6lowpan_debugfs_fops);
+}
+
int bt_6lowpan_init(void)
{
return register_netdevice_notifier(&bt_6lowpan_dev_notifier);
diff --git a/net/bluetooth/6lowpan.h b/net/bluetooth/6lowpan.h
index 680eac8..5f60cf2 100644
--- a/net/bluetooth/6lowpan.h
+++ b/net/bluetooth/6lowpan.h
@@ -22,5 +22,6 @@ int bt_6lowpan_add_conn(struct l2cap_conn *conn);
int bt_6lowpan_del_conn(struct l2cap_conn *conn);
int bt_6lowpan_init(void);
void bt_6lowpan_cleanup(void);
+void bt_6lowpan_add_debugfs(struct hci_dev *hdev);
#endif /* __6LOWPAN_H */
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 03e8355..a229ce0 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -34,6 +34,8 @@
#include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h>
+#include "6lowpan.h"
+
static void hci_rx_work(struct work_struct *work);
static void hci_cmd_work(struct work_struct *work);
static void hci_tx_work(struct work_struct *work);
@@ -1408,6 +1410,8 @@ static int __hci_init(struct hci_dev *hdev)
hdev, &conn_max_interval_fops);
}
+ bt_6lowpan_add_debugfs(hdev);
+
return 0;
}
--
1.8.3.1
^ permalink raw reply related
* [RFC v4 5/6] Bluetooth: Enable 6LoWPAN if device supports it
From: Jukka Rissanen @ 2013-11-13 10:11 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1384337495-9043-1-git-send-email-jukka.rissanen@linux.intel.com>
Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
---
include/net/bluetooth/hci.h | 1 +
include/net/bluetooth/hci_core.h | 1 +
net/bluetooth/hci_event.c | 3 +++
net/bluetooth/l2cap_core.c | 3 +++
4 files changed, 8 insertions(+)
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 1784c48..f8f8447 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -131,6 +131,7 @@ enum {
HCI_PERIODIC_INQ,
HCI_FAST_CONNECTABLE,
HCI_BREDR_ENABLED,
+ HCI_6LOWPAN_ENABLED,
};
/* A mask for the flags that are supposed to remain when a reset happens
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 8c0ab3d..e689052 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -449,6 +449,7 @@ enum {
HCI_CONN_SSP_ENABLED,
HCI_CONN_POWER_SAVE,
HCI_CONN_REMOTE_OOB,
+ HCI_CONN_6LOWPAN,
};
static inline bool hci_conn_ssp_enabled(struct hci_conn *conn)
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 5fb3df6..5f81245 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -3533,6 +3533,9 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
conn->handle = __le16_to_cpu(ev->handle);
conn->state = BT_CONNECTED;
+ if (test_bit(HCI_6LOWPAN_ENABLED, &hdev->dev_flags))
+ set_bit(HCI_CONN_6LOWPAN, &conn->flags);
+
hci_conn_add_sysfs(conn);
hci_proto_connect_cfm(conn, ev->status);
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 155485f..df475c7 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -6517,6 +6517,9 @@ int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr)
static bool is_bt_6lowpan(struct hci_conn *hcon)
{
+ if (hcon->type == LE_LINK && test_bit(HCI_CONN_6LOWPAN, &hcon->flags))
+ return true;
+
return false;
}
--
1.8.3.1
^ permalink raw reply related
* [RFC v4 4/6] Bluetooth: Enable 6LoWPAN support for BT LE devices
From: Jukka Rissanen @ 2013-11-13 10:11 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1384337495-9043-1-git-send-email-jukka.rissanen@linux.intel.com>
Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
---
net/bluetooth/6lowpan.c | 1042 ++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 1040 insertions(+), 2 deletions(-)
diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
index 85754e2..5f0489c 100644
--- a/net/bluetooth/6lowpan.c
+++ b/net/bluetooth/6lowpan.c
@@ -11,6 +11,20 @@
GNU General Public License for more details.
*/
+/*
+ * The compression, uncompression and IPv6 packet code
+ * is from net/ieee802154/6lowpan.c with these copyrights
+ *
+ * Copyright 2011, Siemens AG
+ * written by Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
+ *
+ * Based on patches from Jon Smirl <jonsmirl@gmail.com>
+ * Copyright (c) 2011 Jon Smirl <jonsmirl@gmail.com>
+ *
+ * Jon's code is based on 6lowpan implementation for Contiki which is:
+ * Copyright (c) 2008, Swedish Institute of Computer Science.
+ */
+
#include <linux/version.h>
#include <linux/bitops.h>
#include <linux/if_arp.h>
@@ -172,8 +186,574 @@ static inline void raw_dump_table(const char *caller, char *msg,
16, 1, buf, len, false);
}
-static int recv_pkt(struct sk_buff *skb, struct net_device *dev)
+static inline bool fetch_skb(struct sk_buff *skb,
+ void *data, const unsigned int len)
+{
+ if (unlikely(!pskb_may_pull(skb, len)))
+ return true;
+
+ skb_copy_from_linear_data(skb, data, len);
+ skb_pull(skb, len);
+
+ return false;
+}
+
+/*
+ * Uncompress address function for source and
+ * destination address(non-multicast).
+ *
+ * address_mode is sam value or dam value.
+ */
+static int uncompress_addr(struct sk_buff *skb,
+ struct in6_addr *ipaddr,
+ const u8 address_mode,
+ const u8 *lladdr)
+{
+ bool fail;
+
+ switch (address_mode) {
+ case LOWPAN_IPHC_ADDR_00:
+ /* for global link addresses */
+ fail = fetch_skb(skb, ipaddr->s6_addr, 16);
+ break;
+ case LOWPAN_IPHC_ADDR_01:
+ /* fe:80::XXXX:XXXX:XXXX:XXXX */
+ ipaddr->s6_addr[0] = 0xFE;
+ ipaddr->s6_addr[1] = 0x80;
+ fail = fetch_skb(skb, &ipaddr->s6_addr[8], 8);
+ break;
+ case LOWPAN_IPHC_ADDR_02:
+ /* fe:80::ff:fe00:XXXX */
+ ipaddr->s6_addr[0] = 0xFE;
+ ipaddr->s6_addr[1] = 0x80;
+ ipaddr->s6_addr[11] = 0xFF;
+ ipaddr->s6_addr[12] = 0xFE;
+ fail = fetch_skb(skb, &ipaddr->s6_addr[14], 2);
+ break;
+ case LOWPAN_IPHC_ADDR_03:
+ fail = false;
+ /* XXX: support only normal addr (IEEE802154_ADDR_LONG) atm */
+
+ /* fe:80::XXXX:XXXX:XXXX:XXXX
+ * \_________________/
+ * hwaddr
+ */
+ ipaddr->s6_addr[0] = 0xFE;
+ ipaddr->s6_addr[1] = 0x80;
+ memcpy(&ipaddr->s6_addr[8], lladdr, EUI64_ADDR_LEN);
+ break;
+ default:
+ pr_debug("Invalid address mode value: 0x%x\n", address_mode);
+ return -EINVAL;
+ }
+
+ if (fail) {
+ pr_debug("Failed to fetch skb data\n");
+ return -EIO;
+ }
+
+ raw_dump_inline(NULL, "Reconstructed ipv6 addr is",
+ ipaddr->s6_addr, 16);
+
+ return 0;
+}
+
+/*
+ * Uncompress address function for source context
+ * based address(non-multicast).
+ */
+static int uncompress_context_based_src_addr(struct sk_buff *skb,
+ struct in6_addr *ipaddr,
+ const u8 sam)
+{
+ switch (sam) {
+ case LOWPAN_IPHC_ADDR_00:
+ /* unspec address ::
+ * Do nothing, address is already ::
+ */
+ break;
+ case LOWPAN_IPHC_ADDR_01:
+ /* TODO */
+ case LOWPAN_IPHC_ADDR_02:
+ /* TODO */
+ case LOWPAN_IPHC_ADDR_03:
+ /* TODO */
+ netdev_warn(skb->dev, "SAM value 0x%x not supported\n", sam);
+ return -EINVAL;
+ default:
+ pr_debug("Invalid sam value: 0x%x\n", sam);
+ return -EINVAL;
+ }
+
+ raw_dump_inline(NULL,
+ "Reconstructed context based ipv6 src addr is",
+ ipaddr->s6_addr, 16);
+
+ return 0;
+}
+
+/*
+ * This func is called when the packet from BT LE device
+ * needs to be sent upper layers.
+ */
+static int give_skb_to_upper(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ struct sk_buff *skb_cp;
+ int ret = NET_RX_SUCCESS;
+
+ skb_cp = skb_copy(skb, GFP_ATOMIC);
+ if (!skb_cp) {
+ ret = -ENOMEM;
+ } else {
+ ret = netif_rx(skb_cp);
+
+ BT_DBG("receive skb %d", ret);
+ if (ret < 0)
+ ret = NET_RX_DROP;
+ }
+
+ return ret;
+}
+
+static inline int fetch_skb_u8(struct sk_buff *skb, u8 *val)
+{
+ if (unlikely(!pskb_may_pull(skb, 1)))
+ return -EINVAL;
+
+ *val = skb->data[0];
+ skb_pull(skb, 1);
+
+ return 0;
+}
+
+static inline int fetch_skb_u16(struct sk_buff *skb, u16 *val)
{
+ if (unlikely(!pskb_may_pull(skb, 2)))
+ return -EINVAL;
+
+ *val = (skb->data[0] << 8) | skb->data[1];
+ skb_pull(skb, 2);
+
+ return 0;
+}
+
+static int skb_deliver(struct sk_buff *skb, struct ipv6hdr *hdr,
+ struct net_device *dev)
+{
+ struct sk_buff *new;
+ int stat;
+
+ new = skb_copy_expand(skb, sizeof(struct ipv6hdr), skb_tailroom(skb),
+ GFP_ATOMIC);
+ kfree_skb(skb);
+
+ if (!new)
+ return -ENOMEM;
+
+ skb_push(new, sizeof(struct ipv6hdr));
+ skb_reset_network_header(new);
+ skb_copy_to_linear_data(new, hdr, sizeof(struct ipv6hdr));
+
+ new->protocol = htons(ETH_P_IPV6);
+ new->pkt_type = PACKET_HOST;
+ new->dev = dev;
+
+ raw_dump_table(__func__,
+ "raw skb data dump before receiving",
+ new->data, new->len);
+
+ stat = give_skb_to_upper(new, dev);
+
+ kfree_skb(new);
+
+ return stat;
+}
+
+/* Uncompress function for multicast destination address,
+ * when M bit is set.
+ */
+static int
+lowpan_uncompress_multicast_daddr(struct sk_buff *skb,
+ struct in6_addr *ipaddr,
+ const u8 dam)
+{
+ bool fail;
+
+ switch (dam) {
+ case LOWPAN_IPHC_DAM_00:
+ /* 00: 128 bits. The full address
+ * is carried in-line.
+ */
+ fail = fetch_skb(skb, ipaddr->s6_addr, 16);
+ break;
+ case LOWPAN_IPHC_DAM_01:
+ /* 01: 48 bits. The address takes
+ * the form ffXX::00XX:XXXX:XXXX.
+ */
+ ipaddr->s6_addr[0] = 0xFF;
+ fail = fetch_skb(skb, &ipaddr->s6_addr[1], 1);
+ fail |= fetch_skb(skb, &ipaddr->s6_addr[11], 5);
+ break;
+ case LOWPAN_IPHC_DAM_10:
+ /* 10: 32 bits. The address takes
+ * the form ffXX::00XX:XXXX.
+ */
+ ipaddr->s6_addr[0] = 0xFF;
+ fail = fetch_skb(skb, &ipaddr->s6_addr[1], 1);
+ fail |= fetch_skb(skb, &ipaddr->s6_addr[13], 3);
+ break;
+ case LOWPAN_IPHC_DAM_11:
+ /* 11: 8 bits. The address takes
+ * the form ff02::00XX.
+ */
+ ipaddr->s6_addr[0] = 0xFF;
+ ipaddr->s6_addr[1] = 0x02;
+ fail = fetch_skb(skb, &ipaddr->s6_addr[15], 1);
+ break;
+ default:
+ pr_debug("DAM value has a wrong value: 0x%x\n", dam);
+ return -EINVAL;
+ }
+
+ if (fail) {
+ pr_debug("Failed to fetch skb data\n");
+ return -EIO;
+ }
+
+ raw_dump_inline(NULL, "Reconstructed ipv6 multicast addr is",
+ ipaddr->s6_addr, 16);
+
+ return 0;
+}
+
+static int
+uncompress_udp_header(struct sk_buff *skb, struct udphdr *uh)
+{
+ u8 tmp;
+
+ if (!uh)
+ goto err;
+
+ if (fetch_skb_u8(skb, &tmp))
+ goto err;
+
+ if ((tmp & LOWPAN_NHC_UDP_MASK) == LOWPAN_NHC_UDP_ID) {
+ pr_debug("UDP header uncompression\n");
+ switch (tmp & LOWPAN_NHC_UDP_CS_P_11) {
+ case LOWPAN_NHC_UDP_CS_P_00:
+ memcpy(&uh->source, &skb->data[0], 2);
+ memcpy(&uh->dest, &skb->data[2], 2);
+ skb_pull(skb, 4);
+ break;
+ case LOWPAN_NHC_UDP_CS_P_01:
+ memcpy(&uh->source, &skb->data[0], 2);
+ uh->dest =
+ skb->data[2] + LOWPAN_NHC_UDP_8BIT_PORT;
+ skb_pull(skb, 3);
+ break;
+ case LOWPAN_NHC_UDP_CS_P_10:
+ uh->source = skb->data[0] + LOWPAN_NHC_UDP_8BIT_PORT;
+ memcpy(&uh->dest, &skb->data[1], 2);
+ skb_pull(skb, 3);
+ break;
+ case LOWPAN_NHC_UDP_CS_P_11:
+ uh->source =
+ LOWPAN_NHC_UDP_4BIT_PORT + (skb->data[0] >> 4);
+ uh->dest =
+ LOWPAN_NHC_UDP_4BIT_PORT + (skb->data[0] & 0x0f);
+ skb_pull(skb, 1);
+ break;
+ default:
+ pr_debug("ERROR: unknown UDP format\n");
+ goto err;
+ break;
+ }
+
+ pr_debug("uncompressed UDP ports: src = %d, dst = %d\n",
+ uh->source, uh->dest);
+
+ /* copy checksum */
+ memcpy(&uh->check, &skb->data[0], 2);
+ skb_pull(skb, 2);
+
+ /*
+ * UDP lenght needs to be infered from the lower layers
+ * here, we obtain the hint from the remaining size of the
+ * frame
+ */
+ uh->len = htons(skb->len + sizeof(struct udphdr));
+ pr_debug("uncompressed UDP length: src = %d", uh->len);
+ } else {
+ pr_debug("ERROR: unsupported NH format\n");
+ goto err;
+ }
+
+ return 0;
+err:
+ return -EINVAL;
+}
+
+/* TTL uncompression values */
+static const u8 lowpan_ttl_values[] = { 0, 1, 64, 255 };
+
+static int process_data(struct sk_buff *skb, struct net_device *dev,
+ struct l2cap_conn *conn)
+{
+ struct ipv6hdr hdr = {};
+ u8 tmp, iphc0, iphc1, num_context = 0;
+ const u8 *_saddr = NULL, *_daddr = NULL;
+ struct lowpan_info *info;
+ struct peer *peer;
+ int err;
+
+ raw_dump_table(__func__, "raw skb data dump uncompressed",
+ skb->data, skb->len);
+
+ /* at least two bytes will be used for the encoding */
+ if (skb->len < 2)
+ goto drop;
+
+ if (fetch_skb_u8(skb, &iphc0))
+ goto drop;
+
+ info = lowpan_info(dev);
+
+ if (fetch_skb_u8(skb, &iphc1))
+ goto drop;
+
+ write_lock(&devices_lock);
+ peer = peer_lookup_conn(info, conn);
+ write_unlock(&devices_lock);
+ if (!peer)
+ goto drop;
+
+ _saddr = peer->eui64_addr;
+ _daddr = info->net->dev_addr;
+
+ /* another if the CID flag is set */
+ if (iphc1 & LOWPAN_IPHC_CID) {
+ pr_debug("CID flag is set, increase header with one\n");
+ if (fetch_skb_u8(skb, &num_context))
+ goto drop;
+ }
+
+ hdr.version = 6;
+
+ /* Traffic Class and Flow Label */
+ switch ((iphc0 & LOWPAN_IPHC_TF) >> 3) {
+ /*
+ * Traffic Class and FLow Label carried in-line
+ * ECN + DSCP + 4-bit Pad + Flow Label (4 bytes)
+ */
+ case 0: /* 00b */
+ if (fetch_skb_u8(skb, &tmp))
+ goto drop;
+
+ memcpy(&hdr.flow_lbl, &skb->data[0], 3);
+ skb_pull(skb, 3);
+ hdr.priority = ((tmp >> 2) & 0x0f);
+ hdr.flow_lbl[0] = ((tmp >> 2) & 0x30) | (tmp << 6) |
+ (hdr.flow_lbl[0] & 0x0f);
+ break;
+ /*
+ * Traffic class carried in-line
+ * ECN + DSCP (1 byte), Flow Label is elided
+ */
+ case 2: /* 10b */
+ if (fetch_skb_u8(skb, &tmp))
+ goto drop;
+
+ hdr.priority = ((tmp >> 2) & 0x0f);
+ hdr.flow_lbl[0] = ((tmp << 6) & 0xC0) | ((tmp >> 2) & 0x30);
+ break;
+ /*
+ * Flow Label carried in-line
+ * ECN + 2-bit Pad + Flow Label (3 bytes), DSCP is elided
+ */
+ case 1: /* 01b */
+ if (fetch_skb_u8(skb, &tmp))
+ goto drop;
+
+ hdr.flow_lbl[0] = (skb->data[0] & 0x0F) | ((tmp >> 2) & 0x30);
+ memcpy(&hdr.flow_lbl[1], &skb->data[0], 2);
+ skb_pull(skb, 2);
+ break;
+ /* Traffic Class and Flow Label are elided */
+ case 3: /* 11b */
+ break;
+ default:
+ break;
+ }
+
+ /* Next Header */
+ if ((iphc0 & LOWPAN_IPHC_NH_C) == 0) {
+ /* Next header is carried inline */
+ if (fetch_skb_u8(skb, &(hdr.nexthdr)))
+ goto drop;
+
+ pr_debug("NH flag is set, next header carried inline: %02x\n",
+ hdr.nexthdr);
+ }
+
+ /* Hop Limit */
+ if ((iphc0 & 0x03) != LOWPAN_IPHC_TTL_I)
+ hdr.hop_limit = lowpan_ttl_values[iphc0 & 0x03];
+ else {
+ if (fetch_skb_u8(skb, &(hdr.hop_limit)))
+ goto drop;
+ }
+
+ /* Extract SAM to the tmp variable */
+ tmp = ((iphc1 & LOWPAN_IPHC_SAM) >> LOWPAN_IPHC_SAM_BIT) & 0x03;
+
+ if (iphc1 & LOWPAN_IPHC_SAC) {
+ /* Source address context based uncompression */
+ pr_debug("SAC bit is set. Handle context based source address.\n");
+ err = uncompress_context_based_src_addr(
+ skb, &hdr.saddr, tmp);
+ } else {
+ /* Source address uncompression */
+ pr_debug("source address stateless compression\n");
+ err = uncompress_addr(skb, &hdr.saddr, tmp, _saddr);
+ }
+
+ /* Check on error of previous branch */
+ if (err)
+ goto drop;
+
+ /* Extract DAM to the tmp variable */
+ tmp = ((iphc1 & LOWPAN_IPHC_DAM_11) >> LOWPAN_IPHC_DAM_BIT) & 0x03;
+
+ /* check for Multicast Compression */
+ if (iphc1 & LOWPAN_IPHC_M) {
+ if (iphc1 & LOWPAN_IPHC_DAC) {
+ pr_debug("dest: context-based mcast compression\n");
+ /* TODO: implement this */
+ } else {
+ err = lowpan_uncompress_multicast_daddr(
+ skb, &hdr.daddr, tmp);
+ if (err)
+ goto drop;
+ }
+ } else {
+ err = uncompress_addr(skb, &hdr.daddr, tmp, _daddr);
+ pr_debug("dest: stateless compression mode %d dest %pI6c\n",
+ tmp, &hdr.daddr);
+ if (err)
+ goto drop;
+ }
+
+ /* UDP data uncompression */
+ if (iphc0 & LOWPAN_IPHC_NH_C) {
+ struct udphdr uh;
+ struct sk_buff *new;
+ if (uncompress_udp_header(skb, &uh))
+ goto drop;
+
+ /*
+ * replace the compressed UDP head by the uncompressed UDP
+ * header
+ */
+ new = skb_copy_expand(skb, sizeof(struct udphdr),
+ skb_tailroom(skb), GFP_ATOMIC);
+ kfree_skb(skb);
+
+ if (!new)
+ return -ENOMEM;
+
+ skb = new;
+
+ skb_push(skb, sizeof(struct udphdr));
+ skb_reset_transport_header(skb);
+ skb_copy_to_linear_data(skb, &uh, sizeof(struct udphdr));
+
+ raw_dump_table(__func__, "raw UDP header dump",
+ (u8 *)&uh, sizeof(uh));
+
+ hdr.nexthdr = UIP_PROTO_UDP;
+ }
+
+ hdr.payload_len = htons(skb->len);
+
+ pr_debug("skb headroom size = %d, data length = %d\n",
+ skb_headroom(skb), skb->len);
+
+ pr_debug("IPv6 header dump:\n\tversion = %d\n\tlength = %d\n\t"
+ "nexthdr = 0x%02x\n\thop_lim = %d\n\tdest = %pI6c\n",
+ hdr.version, ntohs(hdr.payload_len), hdr.nexthdr,
+ hdr.hop_limit, &hdr.daddr);
+
+ raw_dump_table(__func__, "raw header dump", (u8 *)&hdr,
+ sizeof(hdr));
+
+ return skb_deliver(skb, &hdr, dev);
+
+drop:
+ kfree_skb(skb);
+ return -EINVAL;
+}
+
+static int recv_pkt(struct sk_buff *skb, struct net_device *dev,
+ struct l2cap_conn *conn)
+{
+ struct sk_buff *local_skb;
+
+ if (!netif_running(dev))
+ goto drop;
+
+ if (dev->type != ARPHRD_RAWIP)
+ goto drop;
+
+ /* check that it's our buffer */
+ if (skb->data[0] == LOWPAN_DISPATCH_IPV6) {
+ /* Copy the packet so that the IPv6 header is
+ * properly aligned.
+ */
+ local_skb = skb_copy_expand(skb, NET_SKB_PAD - 1,
+ skb_tailroom(skb), GFP_ATOMIC);
+ if (!local_skb)
+ goto drop;
+
+ local_skb->protocol = htons(ETH_P_IPV6);
+ local_skb->pkt_type = PACKET_HOST;
+
+ skb_reset_network_header(local_skb);
+ skb_set_transport_header(local_skb, sizeof(struct ipv6hdr));
+
+ if (give_skb_to_upper(local_skb, dev) != NET_RX_SUCCESS) {
+ kfree_skb(local_skb);
+ goto drop;
+ }
+
+ dev->stats.rx_bytes += skb->len;
+ dev->stats.rx_packets++;
+
+ kfree_skb(local_skb);
+ kfree_skb(skb);
+ } else {
+ switch (skb->data[0] & 0xe0) {
+ case LOWPAN_DISPATCH_IPHC: /* ipv6 datagram */
+ local_skb = skb_clone(skb, GFP_ATOMIC);
+ if (!local_skb)
+ goto drop;
+ if (process_data(local_skb, dev, conn)
+ != NET_RX_SUCCESS)
+ goto drop;
+
+ dev->stats.rx_bytes += skb->len;
+ dev->stats.rx_packets++;
+
+ kfree_skb(skb);
+ break;
+ default:
+ break;
+ }
+ }
+
+ return NET_RX_SUCCESS;
+
+drop:
kfree_skb(skb);
return NET_RX_DROP;
}
@@ -202,19 +782,472 @@ static void do_send(struct l2cap_conn *conn, struct sk_buff *skb)
BT_DBG("conn %p, skb %p len %d priority %u", conn, skb, skb->len,
skb->priority);
+ hci_send_acl(conn->hchan, skb, ACL_START);
return;
}
+static inline int skbuff_copy(void *msg, int len,
+ int count, int mtu,
+ struct sk_buff *skb,
+ struct net_device *dev)
+{
+ struct sk_buff **frag;
+ int sent = 0;
+
+ memcpy(skb_put(skb, count), msg, count);
+
+ sent += count;
+ msg += count;
+ len -= count;
+
+ dev->stats.tx_bytes += count;
+ dev->stats.tx_packets++;
+
+ raw_dump_table(__func__, "Sending", skb->data, skb->len);
+
+ /* Continuation fragments (no L2CAP header) */
+ frag = &skb_shinfo(skb)->frag_list;
+ while (len > 0) {
+ struct sk_buff *tmp;
+
+ count = min_t(unsigned int, mtu, len);
+
+ tmp = bt_skb_alloc(count, GFP_KERNEL);
+ if (IS_ERR(tmp))
+ return PTR_ERR(tmp);
+
+ *frag = tmp;
+
+ memcpy(skb_put(*frag, count), msg, count);
+
+ raw_dump_table(__func__, "Sending fragment",
+ (*frag)->data, count);
+
+ (*frag)->priority = skb->priority;
+
+ sent += count;
+ msg += count;
+ len -= count;
+
+ skb->len += (*frag)->len;
+ skb->data_len += (*frag)->len;
+
+ frag = &(*frag)->next;
+
+ dev->stats.tx_bytes += count;
+ dev->stats.tx_packets++;
+ }
+
+ return sent;
+}
+
+static struct sk_buff *create_pdu(struct l2cap_conn *conn,
+ void *msg, size_t len,
+ u32 priority,
+ struct net_device *dev)
+{
+ struct sk_buff *skb;
+ int err, count;
+ struct l2cap_hdr *lh;
+
+ if (conn->mtu > (L2CAP_LE_MIN_MTU + L2CAP_HDR_SIZE))
+ /* XXX: This should be not needed and atm is only used for
+ * testing purposes */
+ conn->mtu = L2CAP_LE_MIN_MTU + L2CAP_HDR_SIZE;
+
+ count = min_t(unsigned int, (conn->mtu - L2CAP_HDR_SIZE), len);
+
+ BT_DBG("conn %p len %zu mtu %d count %d", conn, len, conn->mtu, count);
+
+ skb = bt_skb_alloc(count + L2CAP_HDR_SIZE, GFP_KERNEL);
+ if (IS_ERR(skb))
+ return skb;
+
+ skb->priority = priority;
+
+ lh = (struct l2cap_hdr *)skb_put(skb, L2CAP_HDR_SIZE);
+ lh->cid = cpu_to_le16(L2CAP_FC_6LOWPAN);
+ lh->len = cpu_to_le16(len);
+
+ err = skbuff_copy(msg, len, count, conn->mtu, skb, dev);
+ if (unlikely(err < 0)) {
+ kfree_skb(skb);
+ BT_DBG("skbuff copy %d failed", err);
+ return ERR_PTR(err);
+ }
+
+ return skb;
+}
+
static int conn_send(struct l2cap_conn *conn,
void *msg, size_t len, u32 priority,
struct net_device *dev)
{
- struct sk_buff *skb = {0};
+ struct sk_buff *skb;
+
+ skb = create_pdu(conn, msg, len, priority, dev);
+ if (IS_ERR(skb))
+ return -EINVAL;
do_send(conn, skb);
return 0;
}
+static u8 lowpan_compress_addr_64(u8 **hc06_ptr, u8 shift,
+ const struct in6_addr *ipaddr,
+ const unsigned char *lladdr)
+{
+ u8 val = 0;
+
+ if (is_addr_mac_addr_based(ipaddr, lladdr)) {
+ val = 3; /* 0-bits */
+ pr_debug("address compression 0 bits\n");
+ } else if (lowpan_is_iid_16_bit_compressable(ipaddr)) {
+ /* compress IID to 16 bits xxxx::XXXX */
+ memcpy(*hc06_ptr, &ipaddr->s6_addr16[7], 2);
+ *hc06_ptr += 2;
+ val = 2; /* 16-bits */
+ raw_dump_inline(NULL, "Compressed ipv6 addr is (16 bits)",
+ *hc06_ptr - 2, 2);
+ } else {
+ /* do not compress IID => xxxx::IID */
+ memcpy(*hc06_ptr, &ipaddr->s6_addr16[4], 8);
+ *hc06_ptr += 8;
+ val = 1; /* 64-bits */
+ raw_dump_inline(NULL, "Compressed ipv6 addr is (64 bits)",
+ *hc06_ptr - 8, 8);
+ }
+
+ return rol8(val, shift);
+}
+
+static void compress_udp_header(u8 **hc06_ptr, struct sk_buff *skb)
+{
+ struct udphdr *uh = udp_hdr(skb);
+
+ if (((uh->source & LOWPAN_NHC_UDP_4BIT_MASK) ==
+ LOWPAN_NHC_UDP_4BIT_PORT) &&
+ ((uh->dest & LOWPAN_NHC_UDP_4BIT_MASK) ==
+ LOWPAN_NHC_UDP_4BIT_PORT)) {
+ pr_debug("UDP header: both ports compression to 4 bits\n");
+ **hc06_ptr = LOWPAN_NHC_UDP_CS_P_11;
+ **(hc06_ptr + 1) = /* subtraction is faster */
+ (u8)((uh->dest - LOWPAN_NHC_UDP_4BIT_PORT) +
+ ((uh->source & LOWPAN_NHC_UDP_4BIT_PORT) << 4));
+ *hc06_ptr += 2;
+ } else if ((uh->dest & LOWPAN_NHC_UDP_8BIT_MASK) ==
+ LOWPAN_NHC_UDP_8BIT_PORT) {
+ pr_debug("UDP header: remove 8 bits of dest\n");
+ **hc06_ptr = LOWPAN_NHC_UDP_CS_P_01;
+ memcpy(*hc06_ptr + 1, &uh->source, 2);
+ **(hc06_ptr + 3) = (u8)(uh->dest - LOWPAN_NHC_UDP_8BIT_PORT);
+ *hc06_ptr += 4;
+ } else if ((uh->source & LOWPAN_NHC_UDP_8BIT_MASK) ==
+ LOWPAN_NHC_UDP_8BIT_PORT) {
+ pr_debug("UDP header: remove 8 bits of source\n");
+ **hc06_ptr = LOWPAN_NHC_UDP_CS_P_10;
+ memcpy(*hc06_ptr + 1, &uh->dest, 2);
+ **(hc06_ptr + 3) = (u8)(uh->source - LOWPAN_NHC_UDP_8BIT_PORT);
+ *hc06_ptr += 4;
+ } else {
+ pr_debug("UDP header: can't compress\n");
+ **hc06_ptr = LOWPAN_NHC_UDP_CS_P_00;
+ memcpy(*hc06_ptr + 1, &uh->source, 2);
+ memcpy(*hc06_ptr + 3, &uh->dest, 2);
+ *hc06_ptr += 5;
+ }
+
+ /* checksum is always inline */
+ memcpy(*hc06_ptr, &uh->check, 2);
+ *hc06_ptr += 2;
+
+ /* skip the UDP header */
+ skb_pull(skb, sizeof(struct udphdr));
+}
+
+static inline int lowpan_fetch_skb_u8(struct sk_buff *skb, u8 *val)
+{
+ if (unlikely(!pskb_may_pull(skb, 1)))
+ return -EINVAL;
+
+ *val = skb->data[0];
+ skb_pull(skb, 1);
+
+ return 0;
+}
+
+static inline int lowpan_fetch_skb_u16(struct sk_buff *skb, u16 *val)
+{
+ if (unlikely(!pskb_may_pull(skb, 2)))
+ return -EINVAL;
+
+ *val = (skb->data[0] << 8) | skb->data[1];
+ skb_pull(skb, 2);
+
+ return 0;
+}
+
+static void get_dest_bdaddr(struct in6_addr *ip6_daddr,
+ bdaddr_t *addr, u8 *addr_type)
+{
+ u8 *eui64;
+
+ eui64 = ip6_daddr->s6_addr + 8;
+
+ addr->b[0] = eui64[7];
+ addr->b[1] = eui64[6];
+ addr->b[2] = eui64[5];
+ addr->b[3] = eui64[2];
+ addr->b[4] = eui64[1];
+ addr->b[5] = eui64[0];
+
+ addr->b[5] ^= 2;
+
+ /* Set universal/local bit to 0 */
+ if (addr->b[5] & 1) {
+ addr->b[5] &= ~1;
+ *addr_type = BDADDR_LE_PUBLIC;
+ } else
+ *addr_type = BDADDR_LE_RANDOM;
+}
+
+static int header_create(struct sk_buff *skb, struct net_device *dev,
+ unsigned short type, const void *_daddr,
+ const void *_saddr, unsigned int len)
+{
+ u8 tmp, iphc0, iphc1, *hc06_ptr;
+ struct lowpan_info *info;
+ struct peer *peer;
+ struct ipv6hdr *hdr;
+ bdaddr_t addr, *any = BDADDR_ANY;
+ u8 *saddr, *daddr = any->b;
+ u8 addr_type;
+ u8 head[100] = {0};
+
+ if (type != ETH_P_IPV6)
+ return -EINVAL;
+
+ hdr = ipv6_hdr(skb);
+ hc06_ptr = head + 2;
+
+ pr_debug("IPv6 header dump:\n\tversion = %d\n\tlength = %d\n"
+ "\tnexthdr = 0x%02x\n\thop_lim = %d\n\tdest = %pI6c\n",
+ hdr->version, ntohs(hdr->payload_len), hdr->nexthdr,
+ hdr->hop_limit, &hdr->daddr);
+
+ raw_dump_table(__func__, "raw skb network header dump",
+ skb_network_header(skb), sizeof(struct ipv6hdr));
+
+ info = lowpan_info(dev);
+
+ if (ipv6_addr_is_multicast(&hdr->daddr)) {
+ memcpy(&lowpan_cb(skb)->addr, &hdr->daddr,
+ sizeof(struct in6_addr));
+ lowpan_cb(skb)->conn = NULL;
+ } else {
+ /*
+ * Get destination BT device from skb.
+ * If there is no such peer then discard the packet.
+ */
+ get_dest_bdaddr(&hdr->daddr, &addr, &addr_type);
+
+ BT_DBG("dest addr %pMR type %d", &addr, addr_type);
+
+ write_lock(&devices_lock);
+ peer = peer_lookup_ba(info, addr_type, &addr);
+ write_unlock(&devices_lock);
+
+ if (!peer) {
+ BT_DBG("no such peer %pMR found", &addr);
+ return -ENOENT;
+ }
+
+ daddr = peer->eui64_addr;
+
+ memcpy(&lowpan_cb(skb)->addr, &hdr->daddr,
+ sizeof(struct in6_addr));
+ lowpan_cb(skb)->conn = peer->conn;
+ }
+
+ saddr = info->net->dev_addr;
+
+ raw_dump_inline(__func__, "saddr",
+ (unsigned char *)saddr, 8);
+
+ /*
+ * As we copy some bit-length fields, in the IPHC encoding bytes,
+ * we sometimes use |=
+ * If the field is 0, and the current bit value in memory is 1,
+ * this does not work. We therefore reset the IPHC encoding here
+ */
+ iphc0 = LOWPAN_DISPATCH_IPHC;
+ iphc1 = 0;
+
+ /* TODO: context lookup */
+
+ raw_dump_inline(__func__, "daddr",
+ (unsigned char *)daddr, 8);
+
+ raw_dump_table(__func__,
+ "sending raw skb network uncompressed packet",
+ skb->data, skb->len);
+
+ /*
+ * Traffic class, flow label
+ * If flow label is 0, compress it. If traffic class is 0, compress it
+ * We have to process both in the same time as the offset of traffic
+ * class depends on the presence of version and flow label
+ */
+
+ /* hc06 format of TC is ECN | DSCP , original one is DSCP | ECN */
+ tmp = (hdr->priority << 4) | (hdr->flow_lbl[0] >> 4);
+ tmp = ((tmp & 0x03) << 6) | (tmp >> 2);
+
+ if (((hdr->flow_lbl[0] & 0x0F) == 0) &&
+ (hdr->flow_lbl[1] == 0) && (hdr->flow_lbl[2] == 0)) {
+ /* flow label can be compressed */
+ iphc0 |= LOWPAN_IPHC_FL_C;
+ if ((hdr->priority == 0) &&
+ ((hdr->flow_lbl[0] & 0xF0) == 0)) {
+ /* compress (elide) all */
+ iphc0 |= LOWPAN_IPHC_TC_C;
+ } else {
+ /* compress only the flow label */
+ *hc06_ptr = tmp;
+ hc06_ptr += 1;
+ }
+ } else {
+ /* Flow label cannot be compressed */
+ if ((hdr->priority == 0) &&
+ ((hdr->flow_lbl[0] & 0xF0) == 0)) {
+ /* compress only traffic class */
+ iphc0 |= LOWPAN_IPHC_TC_C;
+ *hc06_ptr = (tmp & 0xc0) | (hdr->flow_lbl[0] & 0x0F);
+ memcpy(hc06_ptr + 1, &hdr->flow_lbl[1], 2);
+ hc06_ptr += 3;
+ } else {
+ /* compress nothing */
+ memcpy(hc06_ptr, &hdr, 4);
+ /* replace the top byte with new ECN | DSCP format */
+ *hc06_ptr = tmp;
+ hc06_ptr += 4;
+ }
+ }
+
+ /* NOTE: payload length is always compressed */
+
+ /* Next Header is compress if UDP */
+ if (hdr->nexthdr == UIP_PROTO_UDP)
+ iphc0 |= LOWPAN_IPHC_NH_C;
+
+ if ((iphc0 & LOWPAN_IPHC_NH_C) == 0) {
+ *hc06_ptr = hdr->nexthdr;
+ hc06_ptr += 1;
+ }
+
+ /*
+ * Hop limit
+ * if 1: compress, encoding is 01
+ * if 64: compress, encoding is 10
+ * if 255: compress, encoding is 11
+ * else do not compress
+ */
+ switch (hdr->hop_limit) {
+ case 1:
+ iphc0 |= LOWPAN_IPHC_TTL_1;
+ break;
+ case 64:
+ iphc0 |= LOWPAN_IPHC_TTL_64;
+ break;
+ case 255:
+ iphc0 |= LOWPAN_IPHC_TTL_255;
+ break;
+ default:
+ *hc06_ptr = hdr->hop_limit;
+ hc06_ptr += 1;
+ break;
+ }
+
+ /* source address compression */
+ if (is_addr_unspecified(&hdr->saddr)) {
+ pr_debug("source address is unspecified, setting SAC\n");
+ iphc1 |= LOWPAN_IPHC_SAC;
+ /* TODO: context lookup */
+ } else if (is_addr_link_local(&hdr->saddr)) {
+ iphc1 |= lowpan_compress_addr_64(&hc06_ptr,
+ LOWPAN_IPHC_SAM_BIT, &hdr->saddr, saddr);
+ pr_debug("source address unicast link-local %pI6c "
+ "iphc1 0x%02x\n", &hdr->saddr, iphc1);
+ } else {
+ pr_debug("send the full source address\n");
+ memcpy(hc06_ptr, &hdr->saddr.s6_addr16[0], 16);
+ hc06_ptr += 16;
+ }
+
+ /* destination address compression */
+ if (is_addr_mcast(&hdr->daddr)) {
+ pr_debug("destination address is multicast: ");
+ iphc1 |= LOWPAN_IPHC_M;
+ if (lowpan_is_mcast_addr_compressable8(&hdr->daddr)) {
+ pr_debug("compressed to 1 octet\n");
+ iphc1 |= LOWPAN_IPHC_DAM_11;
+ /* use last byte */
+ *hc06_ptr = hdr->daddr.s6_addr[15];
+ hc06_ptr += 1;
+ } else if (lowpan_is_mcast_addr_compressable32(&hdr->daddr)) {
+ pr_debug("compressed to 4 octets\n");
+ iphc1 |= LOWPAN_IPHC_DAM_10;
+ /* second byte + the last three */
+ *hc06_ptr = hdr->daddr.s6_addr[1];
+ memcpy(hc06_ptr + 1, &hdr->daddr.s6_addr[13], 3);
+ hc06_ptr += 4;
+ } else if (lowpan_is_mcast_addr_compressable48(&hdr->daddr)) {
+ pr_debug("compressed to 6 octets\n");
+ iphc1 |= LOWPAN_IPHC_DAM_01;
+ /* second byte + the last five */
+ *hc06_ptr = hdr->daddr.s6_addr[1];
+ memcpy(hc06_ptr + 1, &hdr->daddr.s6_addr[11], 5);
+ hc06_ptr += 6;
+ } else {
+ pr_debug("using full address\n");
+ iphc1 |= LOWPAN_IPHC_DAM_00;
+ memcpy(hc06_ptr, &hdr->daddr.s6_addr[0], 16);
+ hc06_ptr += 16;
+ }
+ } else {
+ /* TODO: context lookup */
+ if (is_addr_link_local(&hdr->daddr)) {
+ iphc1 |= lowpan_compress_addr_64(&hc06_ptr,
+ LOWPAN_IPHC_DAM_BIT, &hdr->daddr, daddr);
+ pr_debug("dest address unicast link-local %pI6c "
+ "iphc1 0x%02x\n", &hdr->daddr, iphc1);
+ } else {
+ pr_debug("dest address unicast %pI6c\n", &hdr->daddr);
+ memcpy(hc06_ptr, &hdr->daddr.s6_addr16[0], 16);
+ hc06_ptr += 16;
+ }
+ }
+
+ /* UDP header compression */
+ if (hdr->nexthdr == UIP_PROTO_UDP)
+ compress_udp_header(&hc06_ptr, skb);
+
+ head[0] = iphc0;
+ head[1] = iphc1;
+
+ skb_pull(skb, sizeof(struct ipv6hdr));
+
+ memcpy(skb_push(skb, hc06_ptr - head), head, hc06_ptr - head);
+
+ BT_DBG("header len %d skb %u", (int)(hc06_ptr - head), skb->len);
+
+ skb_reset_network_header(skb);
+
+ raw_dump_table(__func__, "raw skb data dump compressed",
+ skb->data, skb->len);
+ return 0;
+}
+
/* Packet to BT LE device */
static int send_pkt(struct l2cap_conn *conn, const void *saddr,
const void *daddr, struct sk_buff *skb,
@@ -305,6 +1338,10 @@ static const struct net_device_ops netdev_ops = {
.ndo_start_xmit = xmit,
};
+static struct header_ops header_ops = {
+ .create = header_create,
+};
+
static void netdev_setup(struct net_device *dev)
{
dev->addr_len = EUI64_ADDR_LEN;
@@ -318,6 +1355,7 @@ static void netdev_setup(struct net_device *dev)
dev->watchdog_timeo = 0;
dev->netdev_ops = &netdev_ops;
+ dev->header_ops = &header_ops;
dev->destructor = free_netdev;
}
--
1.8.3.1
^ permalink raw reply related
* [RFC v4 3/6] Bluetooth: Initial skeleton code for BT 6LoWPAN
From: Jukka Rissanen @ 2013-11-13 10:11 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1384337495-9043-1-git-send-email-jukka.rissanen@linux.intel.com>
Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
---
include/net/bluetooth/l2cap.h | 1 +
net/bluetooth/6lowpan.c | 544 ++++++++++++++++++++++++++++++++++++++++++
net/bluetooth/6lowpan.h | 26 ++
net/bluetooth/Makefile | 2 +-
net/bluetooth/l2cap_core.c | 22 +-
5 files changed, 593 insertions(+), 2 deletions(-)
create mode 100644 net/bluetooth/6lowpan.c
create mode 100644 net/bluetooth/6lowpan.h
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 5132990..c28ac0d 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -133,6 +133,7 @@ struct l2cap_conninfo {
#define L2CAP_FC_L2CAP 0x02
#define L2CAP_FC_CONNLESS 0x04
#define L2CAP_FC_A2MP 0x08
+#define L2CAP_FC_6LOWPAN 0x3e
/* L2CAP Control Field bit masks */
#define L2CAP_CTRL_SAR 0xC000
diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
new file mode 100644
index 0000000..85754e2
--- /dev/null
+++ b/net/bluetooth/6lowpan.c
@@ -0,0 +1,544 @@
+/*
+ Copyright (c) 2013 Intel Corp.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 and
+ only version 2 as published by the Free Software Foundation.
+
+ 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.
+*/
+
+#include <linux/version.h>
+#include <linux/bitops.h>
+#include <linux/if_arp.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+
+#include <net/ipv6.h>
+#include <net/ip6_route.h>
+#include <net/addrconf.h>
+
+#include <net/af_ieee802154.h>
+
+#include <net/bluetooth/bluetooth.h>
+#include <net/bluetooth/hci_core.h>
+#include <net/bluetooth/l2cap.h>
+
+#include "../ieee802154/6lowpan.h" /* for the compression defines */
+
+#define IFACE_NAME_TEMPLATE "bt%d"
+#define EUI64_ADDR_LEN 8
+
+struct skb_cb {
+ struct in6_addr addr;
+ struct l2cap_conn *conn;
+};
+#define lowpan_cb(skb) ((struct skb_cb *)((skb)->cb))
+
+/*
+ * The devices list contains those devices that we are acting
+ * as a proxy. The BT 6LoWPAN device is a virtual device that
+ * connects to the Bluetooth LE device. The real connection to
+ * BT device is done via l2cap layer. There exists one
+ * virtual device / one BT 6LoWPAN network (=hciX device).
+ * The list contains struct lowpan_dev elements.
+ */
+static LIST_HEAD(bt_6lowpan_devices);
+static DEFINE_RWLOCK(devices_lock);
+
+struct lowpan_dev {
+ struct net_device *dev;
+ struct work_struct delete_netdev;
+ struct list_head list;
+};
+
+struct peer {
+ struct list_head list;
+ struct l2cap_conn *conn;
+
+ /* peer addresses in various formats */
+ unsigned char eui64_addr[EUI64_ADDR_LEN];
+ struct in6_addr peer_addr;
+};
+
+struct lowpan_info {
+ struct net_device *net;
+ struct list_head peers;
+ int peer_count;
+};
+
+static inline struct lowpan_info *lowpan_info(const struct net_device *dev)
+{
+ return netdev_priv(dev);
+}
+
+static inline void peer_add(struct lowpan_info *info, struct peer *peer)
+{
+ list_add(&peer->list, &info->peers);
+ info->peer_count++;
+}
+
+static inline void peer_del(struct lowpan_info *info, struct peer *peer)
+{
+ list_del(&peer->list);
+ info->peer_count--;
+ if (info->peer_count < 0) {
+ BT_ERR("peer count underflow");
+ info->peer_count = 0;
+ }
+}
+
+static inline struct peer *peer_lookup_ba(struct lowpan_info *info,
+ __u8 type, bdaddr_t *ba)
+{
+ struct peer *peer, *tmp;
+
+ BT_DBG("peers %d addr %pMR type %d", info->peer_count, ba, type);
+
+ list_for_each_entry_safe(peer, tmp, &info->peers, list) {
+ BT_DBG("addr %pMR type %d",
+ &peer->conn->hcon->dst, peer->conn->hcon->dst_type);
+
+ if (!bacmp(&peer->conn->hcon->dst, ba))
+ return peer;
+ }
+
+ return NULL;
+}
+
+static inline struct peer *peer_lookup_conn(struct lowpan_info *info,
+ struct l2cap_conn *conn)
+{
+ struct peer *peer, *tmp;
+
+ list_for_each_entry_safe(peer, tmp, &info->peers, list) {
+ if (peer->conn == conn)
+ return peer;
+ }
+
+ return NULL;
+}
+
+static struct peer *lookup_peer(struct l2cap_conn *conn,
+ struct lowpan_info **dev)
+{
+ struct lowpan_dev *entry, *tmp;
+ struct peer *peer = NULL;
+
+ write_lock(&devices_lock);
+
+ list_for_each_entry_safe(entry, tmp, &bt_6lowpan_devices, list) {
+ struct lowpan_info *info = lowpan_info(entry->dev);
+
+ if (dev)
+ *dev = info;
+
+ peer = peer_lookup_conn(info, conn);
+ if (peer)
+ break;
+ }
+
+ write_unlock(&devices_lock);
+
+ return peer;
+}
+
+/* print data in line */
+static inline void raw_dump_inline(const char *caller, char *msg,
+ unsigned char *buf, int len)
+{
+ if (msg)
+ pr_debug("%s():%s: ", caller, msg);
+ print_hex_dump_debug("", DUMP_PREFIX_NONE,
+ 16, 1, buf, len, false);
+}
+
+/*
+ * print data in a table format:
+ *
+ * addr: xx xx xx xx xx xx
+ * addr: xx xx xx xx xx xx
+ * ...
+ */
+static inline void raw_dump_table(const char *caller, char *msg,
+ unsigned char *buf, int len)
+{
+ if (msg)
+ pr_debug("%s():%s:\n", caller, msg);
+ print_hex_dump_debug("\t", DUMP_PREFIX_OFFSET,
+ 16, 1, buf, len, false);
+}
+
+static int recv_pkt(struct sk_buff *skb, struct net_device *dev)
+{
+ kfree_skb(skb);
+ return NET_RX_DROP;
+}
+
+/* Packet from BT LE device */
+int bt_6lowpan_recv(struct l2cap_conn *conn, struct sk_buff *skb)
+{
+ struct lowpan_info *info = NULL;
+ struct peer *peer;
+ int err = -ENOENT;
+
+ peer = lookup_peer(conn, &info);
+ if (!peer)
+ return -ENOENT;
+
+ if (info && info->net) {
+ err = recv_pkt(skb, info->net, conn);
+ BT_DBG("recv pkt %d", err);
+ }
+
+ return err;
+}
+
+static void do_send(struct l2cap_conn *conn, struct sk_buff *skb)
+{
+ BT_DBG("conn %p, skb %p len %d priority %u", conn, skb, skb->len,
+ skb->priority);
+
+ return;
+}
+
+static int conn_send(struct l2cap_conn *conn,
+ void *msg, size_t len, u32 priority,
+ struct net_device *dev)
+{
+ struct sk_buff *skb = {0};
+
+ do_send(conn, skb);
+ return 0;
+}
+
+/* Packet to BT LE device */
+static int send_pkt(struct l2cap_conn *conn, const void *saddr,
+ const void *daddr, struct sk_buff *skb,
+ struct net_device *dev)
+{
+ raw_dump_table(__func__, "raw skb data dump before fragmentation",
+ skb->data, skb->len);
+
+ return conn_send(conn, skb->data, skb->len, 0, dev);
+}
+
+static int send_mcast_pkt(struct sk_buff *skb, struct net_device *dev)
+{
+ struct sk_buff *local_skb;
+ struct lowpan_dev *entry, *tmp;
+ int err = 0;
+
+ write_lock(&devices_lock);
+
+ list_for_each_entry_safe(entry, tmp, &bt_6lowpan_devices, list) {
+ struct peer *pentry, *ptmp;
+ struct lowpan_info *info;
+
+ if (entry->dev != dev)
+ continue;
+
+ info = lowpan_info(entry->dev);
+
+ list_for_each_entry_safe(pentry, ptmp, &info->peers, list) {
+ local_skb = skb_clone(skb, GFP_ATOMIC);
+
+ err = send_pkt(pentry->conn, dev->dev_addr,
+ pentry->eui64_addr,
+ local_skb, dev);
+
+ kfree_skb(local_skb);
+ }
+ }
+
+ write_unlock(&devices_lock);
+
+ return err;
+}
+
+static netdev_tx_t xmit(struct sk_buff *skb, struct net_device *dev)
+{
+ int err = -ENOENT;
+ unsigned char *eui64_addr;
+ struct lowpan_info *info;
+ struct peer *peer;
+ bdaddr_t addr;
+ u8 addr_type;
+
+ if (ipv6_addr_is_multicast(&lowpan_cb(skb)->addr)) {
+ /*
+ * We need to send the packet to every device
+ * behind this interface.
+ */
+ err = send_mcast_pkt(skb, dev);
+ } else {
+ get_dest_bdaddr(&lowpan_cb(skb)->addr, &addr, &addr_type);
+ eui64_addr = lowpan_cb(skb)->addr.s6_addr + 8;
+ info = lowpan_info(dev);
+
+ write_lock(&devices_lock);
+ peer = peer_lookup_ba(info, addr_type, &addr);
+ write_unlock(&devices_lock);
+
+ BT_DBG("xmit from %s to %pMR (%pI6c), peer %p", dev->name,
+ &addr, &lowpan_cb(skb)->addr, peer);
+
+ if (peer && peer->conn)
+ err = send_pkt(peer->conn,
+ dev->dev_addr,
+ eui64_addr,
+ skb,
+ dev);
+ }
+ dev_kfree_skb(skb);
+
+ if (err)
+ BT_DBG("ERROR: xmit failed (%d)", err);
+
+ return (err < 0) ? NET_XMIT_DROP : err;
+}
+
+static const struct net_device_ops netdev_ops = {
+ .ndo_start_xmit = xmit,
+};
+
+static void netdev_setup(struct net_device *dev)
+{
+ dev->addr_len = EUI64_ADDR_LEN;
+ dev->type = ARPHRD_RAWIP;
+
+ dev->hard_header_len = 0;
+ dev->needed_tailroom = 0;
+ dev->mtu = IPV6_MIN_MTU;
+ dev->tx_queue_len = 0;
+ dev->flags = IFF_RUNNING | IFF_POINTOPOINT;
+ dev->watchdog_timeo = 0;
+
+ dev->netdev_ops = &netdev_ops;
+ dev->destructor = free_netdev;
+}
+
+static struct device_type bt_type = {
+ .name = "bluetooth",
+};
+
+static void set_addr(u8 *eui, u8 *addr, u8 addr_type)
+{
+ /* addr is the BT address in little-endian format */
+ eui[0] = addr[5];
+ eui[1] = addr[4];
+ eui[2] = addr[3];
+ eui[3] = 0xFF;
+ eui[4] = 0xFE;
+ eui[5] = addr[2];
+ eui[6] = addr[1];
+ eui[7] = addr[0];
+
+ eui[0] ^= 2;
+
+ /*
+ * Universal/local bit set, RFC 4291
+ */
+ if (addr_type == BDADDR_LE_PUBLIC)
+ eui[0] |= 1;
+ else
+ eui[0] &= ~1;
+}
+
+static void set_dev_addr(struct net_device *net, bdaddr_t *addr,
+ u8 addr_type)
+{
+ net->addr_assign_type = NET_ADDR_PERM;
+ set_addr(net->dev_addr, addr->b, addr_type);
+ net->dev_addr[0] ^= 2;
+}
+
+static void ifup(struct net_device *net)
+{
+ int err;
+
+ rtnl_lock();
+ err = dev_open(net);
+ if (err < 0)
+ BT_INFO("iface %s cannot be opened (%d)", net->name, err);
+ rtnl_unlock();
+}
+
+/*
+ * This gets called when BT LE 6LoWPAN device is connected. We then
+ * create network device that acts as a proxy between BT LE device
+ * and kernel network stack.
+ */
+int bt_6lowpan_add_conn(struct l2cap_conn *conn)
+{
+ struct lowpan_info *dev = NULL;
+ struct peer *peer = NULL;
+ struct net_device *net;
+ struct lowpan_dev *entry;
+ int err = 0;
+
+ peer = lookup_peer(conn, &dev);
+ if (peer)
+ return -EEXIST;
+
+ /*
+ * If net device exists already, just add route.
+ */
+ if (dev && !peer)
+ goto add_peer;
+
+ net = alloc_netdev(sizeof(struct lowpan_info), IFACE_NAME_TEMPLATE,
+ netdev_setup);
+ if (!net)
+ return -ENOMEM;
+
+ dev = netdev_priv(net);
+ dev->net = net;
+ INIT_LIST_HEAD(&dev->peers);
+
+ set_dev_addr(net, &conn->hcon->src, conn->hcon->src_type);
+
+ net->netdev_ops = &netdev_ops;
+ SET_NETDEV_DEV(net, &conn->hcon->dev);
+ SET_NETDEV_DEVTYPE(net, &bt_type);
+
+ err = register_netdev(net);
+ if (err < 0) {
+ BT_INFO("register_netdev failed %d", err);
+ free_netdev(net);
+ goto out;
+ }
+
+ BT_DBG("ifindex %d peer bdaddr %pMR my addr %pMR",
+ net->ifindex, &conn->hcon->dst, &conn->hcon->src);
+ set_bit(__LINK_STATE_PRESENT, &net->state);
+
+ entry = kzalloc(sizeof(struct lowpan_dev), GFP_KERNEL);
+ if (!entry) {
+ unregister_netdev(net);
+ return -ENOMEM;
+ }
+
+ entry->dev = net;
+
+ write_lock(&devices_lock);
+ INIT_LIST_HEAD(&entry->list);
+ list_add(&entry->list, &bt_6lowpan_devices);
+ write_unlock(&devices_lock);
+
+ ifup(net);
+
+add_peer:
+ peer = kzalloc(sizeof(struct peer), GFP_KERNEL);
+ if (!peer)
+ return -ENOMEM;
+
+ peer->conn = conn;
+ memset(&peer->peer_addr, 0, sizeof(struct in6_addr));
+
+ /* RFC 2464 ch. 5 */
+ peer->peer_addr.s6_addr[0] = 0xFE;
+ peer->peer_addr.s6_addr[1] = 0x80;
+ set_addr((u8 *)&peer->peer_addr.s6_addr + 8, conn->hcon->dst.b,
+ conn->hcon->dst_type);
+
+ memcpy(&peer->eui64_addr, (u8 *)&peer->peer_addr.s6_addr + 8,
+ EUI64_ADDR_LEN);
+
+ write_lock(&devices_lock);
+ INIT_LIST_HEAD(&peer->list);
+ peer_add(dev, peer);
+ write_unlock(&devices_lock);
+
+ netdev_notify_peers(dev->net); /* send neighbour adv at startup */
+
+out:
+ return err;
+}
+
+static void delete_netdev(struct work_struct *work)
+{
+ struct lowpan_dev *entry = container_of(work, struct lowpan_dev,
+ delete_netdev);
+
+ unregister_netdev(entry->dev);
+
+ /* The entry pointer is deleted in device_event() */
+}
+
+int bt_6lowpan_del_conn(struct l2cap_conn *conn)
+{
+ struct lowpan_dev *entry, *tmp;
+ struct lowpan_info *info = NULL;
+ struct peer *peer;
+ int err = -ENOENT;
+
+ write_lock(&devices_lock);
+
+ list_for_each_entry_safe(entry, tmp, &bt_6lowpan_devices, list) {
+ info = lowpan_info(entry->dev);
+ peer = peer_lookup_conn(info, conn);
+ if (peer) {
+ peer_del(info, peer);
+ err = 0;
+ break;
+ }
+ }
+
+ write_unlock(&devices_lock);
+
+ if (!err && info && info->peer_count == 0) {
+ /*
+ * This function is called with hci dev lock held which means
+ * that we must delete the netdevice in worker thread.
+ */
+ INIT_WORK(&entry->delete_netdev, delete_netdev);
+ schedule_work(&entry->delete_netdev);
+ }
+
+ return err;
+}
+
+static int device_event(struct notifier_block *unused,
+ unsigned long event, void *ptr)
+{
+ struct net_device *dev = netdev_notifier_info_to_dev(ptr);
+ struct lowpan_dev *entry, *tmp;
+
+ if (dev->type != ARPHRD_RAWIP)
+ return NOTIFY_DONE;
+
+ switch (event) {
+ case NETDEV_UNREGISTER:
+ write_lock(&devices_lock);
+ list_for_each_entry_safe(entry, tmp, &bt_6lowpan_devices,
+ list) {
+ if (entry->dev == dev) {
+ list_del(&entry->list);
+ kfree(entry);
+ break;
+ }
+ }
+ write_unlock(&devices_lock);
+ break;
+ }
+
+ return NOTIFY_DONE;
+}
+
+static struct notifier_block bt_6lowpan_dev_notifier = {
+ .notifier_call = device_event,
+};
+
+int bt_6lowpan_init(void)
+{
+ return register_netdevice_notifier(&bt_6lowpan_dev_notifier);
+}
+
+void bt_6lowpan_cleanup(void)
+{
+ unregister_netdevice_notifier(&bt_6lowpan_dev_notifier);
+}
diff --git a/net/bluetooth/6lowpan.h b/net/bluetooth/6lowpan.h
new file mode 100644
index 0000000..680eac8
--- /dev/null
+++ b/net/bluetooth/6lowpan.h
@@ -0,0 +1,26 @@
+/*
+ Copyright (c) 2013 Intel Corp.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 and
+ only version 2 as published by the Free Software Foundation.
+
+ 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.
+*/
+
+#ifndef __6LOWPAN_H
+#define __6LOWPAN_H
+
+#include <linux/skbuff.h>
+#include <net/bluetooth/l2cap.h>
+
+int bt_6lowpan_recv(struct l2cap_conn *conn, struct sk_buff *skb);
+int bt_6lowpan_add_conn(struct l2cap_conn *conn);
+int bt_6lowpan_del_conn(struct l2cap_conn *conn);
+int bt_6lowpan_init(void);
+void bt_6lowpan_cleanup(void);
+
+#endif /* __6LOWPAN_H */
diff --git a/net/bluetooth/Makefile b/net/bluetooth/Makefile
index 6a791e7..80cb215 100644
--- a/net/bluetooth/Makefile
+++ b/net/bluetooth/Makefile
@@ -10,6 +10,6 @@ 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 l2cap_core.o l2cap_sock.o smp.o sco.o lib.o \
- a2mp.o amp.o
+ a2mp.o amp.o 6lowpan.o
subdir-ccflags-y += -D__CHECK_ENDIAN__
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 4af3821..155485f 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -40,6 +40,7 @@
#include "smp.h"
#include "a2mp.h"
#include "amp.h"
+#include "6lowpan.h"
bool disable_ertm;
@@ -6473,6 +6474,10 @@ static void l2cap_recv_frame(struct l2cap_conn *conn, struct sk_buff *skb)
l2cap_conn_del(conn->hcon, EACCES);
break;
+ case L2CAP_FC_6LOWPAN:
+ bt_6lowpan_recv(conn, skb);
+ break;
+
default:
l2cap_data_channel(conn, cid, skb);
break;
@@ -6510,6 +6515,11 @@ int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr)
return exact ? lm1 : lm2;
}
+static bool is_bt_6lowpan(struct hci_conn *hcon)
+{
+ return false;
+}
+
void l2cap_connect_cfm(struct hci_conn *hcon, u8 status)
{
struct l2cap_conn *conn;
@@ -6518,8 +6528,12 @@ void l2cap_connect_cfm(struct hci_conn *hcon, u8 status)
if (!status) {
conn = l2cap_conn_add(hcon);
- if (conn)
+ if (conn) {
l2cap_conn_ready(conn);
+
+ if (is_bt_6lowpan(hcon))
+ bt_6lowpan_add_conn(conn);
+ }
} else {
l2cap_conn_del(hcon, bt_to_errno(status));
}
@@ -6540,6 +6554,9 @@ void l2cap_disconn_cfm(struct hci_conn *hcon, u8 reason)
{
BT_DBG("hcon %p reason %d", hcon, reason);
+ if (is_bt_6lowpan(hcon))
+ bt_6lowpan_del_conn(hcon->l2cap_data);
+
l2cap_conn_del(hcon, bt_to_errno(reason));
}
@@ -6817,11 +6834,14 @@ int __init l2cap_init(void)
l2cap_debugfs = debugfs_create_file("l2cap", 0444, bt_debugfs,
NULL, &l2cap_debugfs_fops);
+ bt_6lowpan_init();
+
return 0;
}
void l2cap_exit(void)
{
+ bt_6lowpan_cleanup();
debugfs_remove(l2cap_debugfs);
l2cap_cleanup_sockets();
}
--
1.8.3.1
^ permalink raw reply related
* [RFC v4 2/6] ipv6: Add checks for RAWIP ARP type
From: Jukka Rissanen @ 2013-11-13 10:11 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1384337495-9043-1-git-send-email-jukka.rissanen@linux.intel.com>
Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
---
net/ipv6/addrconf.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index d6ff126..cde1061 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1797,6 +1797,7 @@ static int ipv6_generate_eui64(u8 *eui, struct net_device *dev)
return addrconf_ifid_sit(eui, dev);
case ARPHRD_IPGRE:
return addrconf_ifid_gre(eui, dev);
+ case ARPHRD_RAWIP:
case ARPHRD_IEEE802154:
return addrconf_ifid_eui64(eui, dev);
case ARPHRD_IEEE1394:
@@ -2681,7 +2682,8 @@ static void addrconf_dev_config(struct net_device *dev)
(dev->type != ARPHRD_INFINIBAND) &&
(dev->type != ARPHRD_IEEE802154) &&
(dev->type != ARPHRD_IEEE1394) &&
- (dev->type != ARPHRD_TUNNEL6)) {
+ (dev->type != ARPHRD_TUNNEL6) &&
+ (dev->type != ARPHRD_RAWIP)) {
/* Alas, we support only Ethernet autoconfiguration. */
return;
}
--
1.8.3.1
^ permalink raw reply related
* [RFC v4 1/6] net: if_arp: add ARPHRD_RAWIP type
From: Jukka Rissanen @ 2013-11-13 10:11 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1384337495-9043-1-git-send-email-jukka.rissanen@linux.intel.com>
This is used when there is no L2 header before IP header.
Example of this is Bluetooth 6LoWPAN network.
The RAWIP header type value is already used in some Android kernels
so same value is used here in order not to break userspace.
Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
---
include/uapi/linux/if_arp.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/uapi/linux/if_arp.h b/include/uapi/linux/if_arp.h
index d7fea34..06fc69f 100644
--- a/include/uapi/linux/if_arp.h
+++ b/include/uapi/linux/if_arp.h
@@ -59,6 +59,7 @@
#define ARPHRD_LAPB 516 /* LAPB */
#define ARPHRD_DDCMP 517 /* Digital's DDCMP protocol */
#define ARPHRD_RAWHDLC 518 /* Raw HDLC */
+#define ARPHRD_RAWIP 530 /* Raw IP */
#define ARPHRD_TUNNEL 768 /* IPIP tunnel */
#define ARPHRD_TUNNEL6 769 /* IP6IP6 tunnel */
--
1.8.3.1
^ permalink raw reply related
* [RFC v4 0/6] Bluetooth LE 6LoWPAN
From: Jukka Rissanen @ 2013-11-13 10:11 UTC (permalink / raw)
To: linux-bluetooth
Hi,
this is 6LoWPAN code for BT LE as described in
http://tools.ietf.org/html/draft-ietf-6lowpan-btle-12
v4:
- removed the route setting code, neighbour discovery
should allow the devices to discover each other
- fix the uncompression of Traffic Class in IPv6 header,
this makes ssh to work between devices over a BT 6lowpan link
- removed setting of /proc conf options, they were useless
and not to be done in kernel module anyway
v3:
- misc changes according to Marcel's comments
- supports multiple connections / interface
- removed unused fragmentation code
- setup 6lowpan connection automatically if enabled via debugfs
The automatic 6lowpan enabling is done by setting
echo 1 > /sys/kernel/debug/bluetooth/hci0/6lowpan
before devices are connected.
v2:
- Change ARPHRD_IEEE802154 to ARPHRD_RAWIP. The generic code
in patches 1 and 2 is also sent to netdev mailing list.
- Sending route exporting patch 5 to netdev ml
- Check private/public BT address and toggle universal/local bit
accordingly in patch 3.
- The virtual interface template name is now shorter (bt%d)
- Various function name renames
- devtype of the interface set to "bluetooth"
v1:
- initial release
TODO:
- Discovery of 6LoWPAN service needs be automatic (UUID support)
- Refactor compression and uncompression code after these are fixed
in net/ieee802154/6lowpan.c. Bluetooth 6LoWPAN should be able to share
that part of the code.
Known issues:
- no UUID handling yet
Cheers,
Jukka
Jukka Rissanen (6):
net: if_arp: add ARPHRD_RAWIP type
ipv6: Add checks for RAWIP ARP type
Bluetooth: Initial skeleton code for BT 6LoWPAN
Bluetooth: Enable 6LoWPAN support for BT LE devices
Bluetooth: Enable 6LoWPAN if device supports it
Bluetooth: Manually enable or disable 6LoWPAN between devices
include/net/bluetooth/hci.h | 1 +
include/net/bluetooth/hci_core.h | 1 +
include/net/bluetooth/l2cap.h | 1 +
include/uapi/linux/if_arp.h | 1 +
net/bluetooth/6lowpan.c | 1687 ++++++++++++++++++++++++++++++++++++++
net/bluetooth/6lowpan.h | 27 +
net/bluetooth/Makefile | 2 +-
net/bluetooth/hci_core.c | 4 +
net/bluetooth/hci_event.c | 3 +
net/bluetooth/l2cap_core.c | 25 +-
net/ipv6/addrconf.c | 4 +-
11 files changed, 1753 insertions(+), 3 deletions(-)
create mode 100644 net/bluetooth/6lowpan.c
create mode 100644 net/bluetooth/6lowpan.h
--
1.8.3.1
^ permalink raw reply
* Re: [PATCH_v3 3/3] android/pan: Handle connection and control state notifications
From: Szymon Janc @ 2013-11-13 9:59 UTC (permalink / raw)
To: Ravi Kumar Veeramally; +Cc: linux-bluetooth, Johan Hedberg
In-Reply-To: <52834A76.4050600@linux.intel.com>
Hi,
> >> +
> >> + switch (opcode) {
> >> + case HAL_EV_PAN_CONN_STATE:
> >> + handle_conn_state(buf);
> >> + break;
> >> + case HAL_EV_PAN_CTRL_STATE:
> >> + handle_ctrl_state(buf);
> >> + break;
> >> + default:
> >> + DBG("Unhandled callback opcode=0x%x", opcode);
> >> + break;
> >> + }
> >> }
> > What I don't like about this is that you're not pushing the data length
> > to the handler functions. If you did that the handler functions could:
> >
> > if (len < sizeof(*ev))
> > return;
> >
> > Instead of return we could also just abort - what's the general policy
> > on the HAL side regarding invalid data from the daemon? How does this
> > relate to the work Szymon is doing to add proper checks for the IPC
> > data? Is that only for the daemon side?
> >
> > Are we missing similar checks in other HALs too?
>
> Yes, we are not doing similar checks in other HALs
> (hal-bluetooth/a2dp/hid/) too.
> Very few places in hal-bluetooth length is passing but validation is
> not done.
> I will fix them all and send you the patch.
As mentioned in my RFC, messages have very similar format and can be checked
in single place using some common macros. I'm now working on addressing Johan
comments in that RFC. As suggested I'm going to use tables of handlers instead
switch-case and this should also allow to refactor current code to avoid
switch-cases we currently have. Services will simply register own tables of
handlers for service they implement. Idea is that check will be done in common
place and then handlers will have form of void handle_foo(struct foo *ev) with
guarantee that passed command/event is memory size valid.
Plan is to make this generic code use both by hal and daemon.
So, I'm not sure if it makes much sense to fix passing buf+len to all handlers
we have now.
If you have other ideas for this please comment.
--
BR
Szymon Janc
^ 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