* [PATCHv3 1/4] android/hal: Send get_remote_services cmd
@ 2013-11-04 8:06 Marcin Kraglak
2013-11-04 8:06 ` [PATCHv3 2/4] android: Add stub of get_remote_services command Marcin Kraglak
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Marcin Kraglak @ 2013-11-04 8:06 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Marcin Kraglak
diff --git a/android/hal-bluetooth.c b/android/hal-bluetooth.c
index 7334d24..88c7b99 100644
--- a/android/hal-bluetooth.c
+++ b/android/hal-bluetooth.c
@@ -515,12 +515,18 @@ static int get_remote_service_record(bt_bdaddr_t *remote_addr, bt_uuid_t *uuid)
static int get_remote_services(bt_bdaddr_t *remote_addr)
{
+ struct hal_cmd_get_remote_services cmd;
+
DBG("bdaddr: %s", bdaddr2str(remote_addr));
if (!interface_ready())
return BT_STATUS_NOT_READY;
- return BT_STATUS_UNSUPPORTED;
+ memcpy(cmd.bdaddr, remote_addr, sizeof(cmd.bdaddr));
+
+ return hal_ipc_cmd(HAL_SERVICE_ID_BLUETOOTH,
+ HAL_OP_GET_REMOTE_SERVICES, sizeof(cmd), &cmd, 0,
+ NULL, NULL);
}
static int start_discovery(void)
--
1.8.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCHv3 2/4] android: Add stub of get_remote_services command
2013-11-04 8:06 [PATCHv3 1/4] android/hal: Send get_remote_services cmd Marcin Kraglak
@ 2013-11-04 8:06 ` Marcin Kraglak
2013-11-04 8:24 ` Johan Hedberg
2013-11-04 8:06 ` [PATCHv3 3/4] android: Initial implementation of get_remote_services Marcin Kraglak
2013-11-04 8:06 ` [PATCHv3 4/4] android: Pass found uuids to remote_device_properties_cb Marcin Kraglak
2 siblings, 1 reply; 6+ messages in thread
From: Marcin Kraglak @ 2013-11-04 8:06 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Marcin Kraglak
diff --git a/android/adapter.c b/android/adapter.c
index 6f2a061..af62b11 100644
--- a/android/adapter.c
+++ b/android/adapter.c
@@ -1459,6 +1459,11 @@ static uint8_t ssp_reply(void *buf, uint16_t len)
return status;
}
+static uint8_t get_remote_services(void *buf, uint16_t len)
+{
+ return HAL_STATUS_UNSUPPORTED;
+}
+
void bt_adapter_handle_cmd(GIOChannel *io, uint8_t opcode, void *buf,
uint16_t len)
{
@@ -1563,6 +1568,11 @@ void bt_adapter_handle_cmd(GIOChannel *io, uint8_t opcode, void *buf,
goto error;
break;
+ case HAL_OP_GET_REMOTE_SERVICES:
+ status = get_remote_services(buf, len);
+ if (status != HAL_STATUS_SUCCESS)
+ goto error;
+ break;
default:
DBG("Unhandled command, opcode 0x%x", opcode);
goto error;
--
1.8.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCHv3 3/4] android: Initial implementation of get_remote_services
2013-11-04 8:06 [PATCHv3 1/4] android/hal: Send get_remote_services cmd Marcin Kraglak
2013-11-04 8:06 ` [PATCHv3 2/4] android: Add stub of get_remote_services command Marcin Kraglak
@ 2013-11-04 8:06 ` Marcin Kraglak
2013-11-04 8:06 ` [PATCHv3 4/4] android: Pass found uuids to remote_device_properties_cb Marcin Kraglak
2 siblings, 0 replies; 6+ messages in thread
From: Marcin Kraglak @ 2013-11-04 8:06 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Marcin Kraglak
diff --git a/android/adapter.c b/android/adapter.c
index af62b11..0470522 100644
--- a/android/adapter.c
+++ b/android/adapter.c
@@ -35,6 +35,10 @@
#include "src/shared/mgmt.h"
#include "src/glib-helper.h"
#include "src/eir.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
+#include "lib/uuid.h"
+#include "src/sdp-client.h"
#include "log.h"
#include "hal-msg.h"
#include "ipc.h"
@@ -45,6 +49,8 @@
#define DEFAULT_IO_CAPABILITY 0x01
static GIOChannel *notification_io = NULL;
+/* This list contains addresses which are asked for records */
+static GList *sdp_req_list;
struct bt_adapter {
uint16_t index;
@@ -63,6 +69,20 @@ struct bt_adapter {
bool discovering;
};
+struct browse_req {
+ bdaddr_t *bdaddr;
+ GSList *uuids;
+ int search_uuid;
+ int reconnect_attempt;
+};
+
+static const uint16_t uuid_list[] = {
+ L2CAP_UUID,
+ PNP_INFO_SVCLASS_ID,
+ PUBLIC_BROWSE_GROUP,
+ 0
+};
+
static struct bt_adapter *adapter;
static GSList *found_devices = NULL;
@@ -1459,9 +1479,80 @@ static uint8_t ssp_reply(void *buf, uint16_t len)
return status;
}
+static void browse_req_free(struct browse_req *req)
+{
+ g_free(req->bdaddr);
+ g_slist_free_full(req->uuids, g_free);
+ g_free(req);
+}
+
+static void update_records(struct browse_req *req, sdp_list_t *recs)
+{
+ /* TODO cache found uuids */
+}
+
+static void browse_cb(sdp_list_t *recs, int err, gpointer user_data)
+{
+ struct browse_req *req = user_data;
+ uuid_t uuid;
+
+ /* If we have a valid response and req->search_uuid == 2, then L2CAP
+ * UUID & PNP searching was successful -- we are done */
+ if (err < 0 || req->search_uuid == 2) {
+ if (err == -ECONNRESET && req->reconnect_attempt < 1) {
+ req->search_uuid--;
+ req->reconnect_attempt++;
+ } else {
+ goto done;
+ }
+ }
+
+ update_records(req, recs);
+
+ /* Search for mandatory uuids */
+ if (uuid_list[req->search_uuid]) {
+ sdp_uuid16_create(&uuid, uuid_list[req->search_uuid++]);
+ bt_search_service(&adapter->bdaddr, req->bdaddr, &uuid,
+ browse_cb, user_data, NULL);
+ return;
+ }
+
+done:
+ sdp_req_list = g_list_remove(sdp_req_list, req->bdaddr);
+ browse_req_free(req);
+}
+
static uint8_t get_remote_services(void *buf, uint16_t len)
{
- return HAL_STATUS_UNSUPPORTED;
+ struct hal_cmd_get_remote_services *cmd = buf;
+ struct browse_req *req;
+ bdaddr_t *addr;
+ uuid_t uuid;
+ int err;
+
+ addr = g_new0(bdaddr_t, 1);
+ android2bdaddr(&cmd->bdaddr, addr);
+
+ if (g_list_find_custom(sdp_req_list, addr, bdaddr_cmp)) {
+ g_free(addr);
+ return HAL_STATUS_DONE;
+ }
+
+ sdp_req_list = g_list_append(sdp_req_list, addr);
+
+ req = g_new0(struct browse_req, 1);
+ req->bdaddr = addr;
+ sdp_uuid16_create(&uuid, uuid_list[req->search_uuid++]);
+
+ err = bt_search_service(&adapter->bdaddr,
+ req->bdaddr, &uuid, browse_cb, req, NULL);
+ if (err) {
+ sdp_req_list = g_list_remove(sdp_req_list, req->bdaddr);
+ browse_req_free(req);
+ return HAL_STATUS_FAILED;
+ }
+
+ return HAL_STATUS_SUCCESS;
}
void bt_adapter_handle_cmd(GIOChannel *io, uint8_t opcode, void *buf,
--
1.8.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCHv3 4/4] android: Pass found uuids to remote_device_properties_cb
2013-11-04 8:06 [PATCHv3 1/4] android/hal: Send get_remote_services cmd Marcin Kraglak
2013-11-04 8:06 ` [PATCHv3 2/4] android: Add stub of get_remote_services command Marcin Kraglak
2013-11-04 8:06 ` [PATCHv3 3/4] android: Initial implementation of get_remote_services Marcin Kraglak
@ 2013-11-04 8:06 ` Marcin Kraglak
2013-11-04 8:32 ` Szymon Janc
2 siblings, 1 reply; 6+ messages in thread
From: Marcin Kraglak @ 2013-11-04 8:06 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Marcin Kraglak
diff --git a/android/adapter.c b/android/adapter.c
index 0470522..9fe7d7d 100644
--- a/android/adapter.c
+++ b/android/adapter.c
@@ -1486,9 +1486,87 @@ static void browse_req_free(struct browse_req *req)
g_free(req);
}
+static void fill_uuids(GSList *list, void *buf)
+{
+ for (; list; list = (GSList *)g_list_next(list)) {
+ memcpy(buf, list->data, sizeof(uint128_t));
+ buf += sizeof(uint128_t);
+ }
+}
+
+static void remote_uuids_callback(struct browse_req *req)
+{
+ struct hal_ev_remote_device_props *ev;
+ int len;
+
+ len = sizeof(*ev) + sizeof(struct hal_property) + (sizeof(uint128_t) *
+ g_slist_length(req->uuids));
+ ev = g_malloc(len);
+
+ ev->status = HAL_STATUS_SUCCESS;
+ bdaddr2android(req->bdaddr, &ev->bdaddr);
+ ev->num_props = 1;
+ ev->props[0].type = HAL_PROP_DEVICE_UUIDS;
+ ev->props[0].len = sizeof(uint128_t) * g_slist_length(req->uuids);
+ fill_uuids(req->uuids, ev->props[0].val);
+
+ ipc_send(notification_io, HAL_SERVICE_ID_BLUETOOTH,
+ HAL_EV_REMOTE_DEVICE_PROPS, len, ev, -1);
+
+ g_free(ev);
+}
+
+static int uuid_128_cmp(gconstpointer a, gconstpointer b)
+{
+ return memcmp(a, b, sizeof(uint128_t));
+}
+
static void update_records(struct browse_req *req, sdp_list_t *recs)
{
- /* TODO cache found uuids */
+ for (; recs; recs = recs->next) {
+ sdp_record_t *rec = (sdp_record_t *) recs->data;
+ sdp_list_t *svcclass = NULL;
+ uuid_t uuid128;
+ uuid_t *temp;
+ uint8_t *u;
+
+ if (!rec)
+ break;
+
+ if (sdp_get_service_classes(rec, &svcclass) < 0)
+ continue;
+
+ if (svcclass == NULL)
+ continue;
+
+ temp = svcclass->data;
+
+ switch (temp->type) {
+ case SDP_UUID16:
+ sdp_uuid16_to_uuid128(&uuid128, temp);
+ break;
+ case SDP_UUID32:
+ sdp_uuid32_to_uuid128(&uuid128, temp);
+ break;
+ case SDP_UUID128:
+ memcpy(&uuid128, temp, sizeof(uuid_t));
+ break;
+ default:
+ continue;
+ }
+
+ u = g_malloc(16);/* size of 128 bit uuid */
+ memcpy(u, &uuid128.value.uuid128,
+ sizeof(uuid128.value.uuid128));
+
+ /* Check if uuid is already added */
+ if (g_slist_find_custom(req->uuids, u, uuid_128_cmp))
+ g_free(u);
+ else
+ req->uuids = g_slist_append(req->uuids, u);
+
+ sdp_list_free(svcclass, free);
+ }
}
static void browse_cb(sdp_list_t *recs, int err, gpointer user_data)
@@ -1518,6 +1596,7 @@ static void browse_cb(sdp_list_t *recs, int err, gpointer user_data)
}
done:
+ remote_uuids_callback(req);
sdp_req_list = g_list_remove(sdp_req_list, req->bdaddr);
browse_req_free(req);
}
--
1.8.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCHv3 2/4] android: Add stub of get_remote_services command
2013-11-04 8:06 ` [PATCHv3 2/4] android: Add stub of get_remote_services command Marcin Kraglak
@ 2013-11-04 8:24 ` Johan Hedberg
0 siblings, 0 replies; 6+ messages in thread
From: Johan Hedberg @ 2013-11-04 8:24 UTC (permalink / raw)
To: Marcin Kraglak; +Cc: linux-bluetooth
Hi Marcin,
On Mon, Nov 04, 2013, Marcin Kraglak wrote:
> diff --git a/android/adapter.c b/android/adapter.c
> index 6f2a061..af62b11 100644
> --- a/android/adapter.c
> +++ b/android/adapter.c
> @@ -1459,6 +1459,11 @@ static uint8_t ssp_reply(void *buf, uint16_t len)
> return status;
> }
>
> +static uint8_t get_remote_services(void *buf, uint16_t len)
> +{
> + return HAL_STATUS_UNSUPPORTED;
> +}
> +
> void bt_adapter_handle_cmd(GIOChannel *io, uint8_t opcode, void *buf,
> uint16_t len)
> {
> @@ -1563,6 +1568,11 @@ void bt_adapter_handle_cmd(GIOChannel *io, uint8_t opcode, void *buf,
> goto error;
>
> break;
> + case HAL_OP_GET_REMOTE_SERVICES:
> + status = get_remote_services(buf, len);
> + if (status != HAL_STATUS_SUCCESS)
> + goto error;
> + break;
> default:
> DBG("Unhandled command, opcode 0x%x", opcode);
> goto error;
The first two patches have been applied. I still need to do a more
thorough review of the other two before applying, and right this moment
I didn't have time for that.
Johan
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCHv3 4/4] android: Pass found uuids to remote_device_properties_cb
2013-11-04 8:06 ` [PATCHv3 4/4] android: Pass found uuids to remote_device_properties_cb Marcin Kraglak
@ 2013-11-04 8:32 ` Szymon Janc
0 siblings, 0 replies; 6+ messages in thread
From: Szymon Janc @ 2013-11-04 8:32 UTC (permalink / raw)
To: Marcin Kraglak; +Cc: linux-bluetooth
Hi Marcin,
> diff --git a/android/adapter.c b/android/adapter.c
> index 0470522..9fe7d7d 100644
> --- a/android/adapter.c
> +++ b/android/adapter.c
> @@ -1486,9 +1486,87 @@ static void browse_req_free(struct browse_req *req)
> g_free(req);
> }
>
> +static void fill_uuids(GSList *list, void *buf)
> +{
> + for (; list; list = (GSList *)g_list_next(list)) {
This should use g_slist_next().
> + memcpy(buf, list->data, sizeof(uint128_t));
> + buf += sizeof(uint128_t);
> + }
> +}
> +
> +static void remote_uuids_callback(struct browse_req *req)
> +{
> + struct hal_ev_remote_device_props *ev;
> + int len;
> +
> + len = sizeof(*ev) + sizeof(struct hal_property) + (sizeof(uint128_t) *
> + g_slist_length(req->uuids));
> + ev = g_malloc(len);
> +
> + ev->status = HAL_STATUS_SUCCESS;
> + bdaddr2android(req->bdaddr, &ev->bdaddr);
> + ev->num_props = 1;
> + ev->props[0].type = HAL_PROP_DEVICE_UUIDS;
> + ev->props[0].len = sizeof(uint128_t) * g_slist_length(req->uuids);
> + fill_uuids(req->uuids, ev->props[0].val);
> +
> + ipc_send(notification_io, HAL_SERVICE_ID_BLUETOOTH,
> + HAL_EV_REMOTE_DEVICE_PROPS, len, ev, -1);
> +
> + g_free(ev);
> +}
> +
> +static int uuid_128_cmp(gconstpointer a, gconstpointer b)
> +{
> + return memcmp(a, b, sizeof(uint128_t));
> +}
> +
> static void update_records(struct browse_req *req, sdp_list_t *recs)
> {
> - /* TODO cache found uuids */
> + for (; recs; recs = recs->next) {
> + sdp_record_t *rec = (sdp_record_t *) recs->data;
> + sdp_list_t *svcclass = NULL;
> + uuid_t uuid128;
> + uuid_t *temp;
> + uint8_t *u;
> +
> + if (!rec)
> + break;
> +
> + if (sdp_get_service_classes(rec, &svcclass) < 0)
> + continue;
> +
> + if (svcclass == NULL)
> + continue;
> +
> + temp = svcclass->data;
> +
> + switch (temp->type) {
> + case SDP_UUID16:
> + sdp_uuid16_to_uuid128(&uuid128, temp);
> + break;
> + case SDP_UUID32:
> + sdp_uuid32_to_uuid128(&uuid128, temp);
> + break;
> + case SDP_UUID128:
> + memcpy(&uuid128, temp, sizeof(uuid_t));
> + break;
> + default:
> + continue;
> + }
> +
> + u = g_malloc(16);/* size of 128 bit uuid */
> + memcpy(u, &uuid128.value.uuid128,
> + sizeof(uuid128.value.uuid128));
> +
> + /* Check if uuid is already added */
> + if (g_slist_find_custom(req->uuids, u, uuid_128_cmp))
> + g_free(u);
> + else
> + req->uuids = g_slist_append(req->uuids, u);
> +
> + sdp_list_free(svcclass, free);
> + }
> }
>
> static void browse_cb(sdp_list_t *recs, int err, gpointer user_data)
> @@ -1518,6 +1596,7 @@ static void browse_cb(sdp_list_t *recs, int err, gpointer user_data)
> }
>
> done:
> + remote_uuids_callback(req);
> sdp_req_list = g_list_remove(sdp_req_list, req->bdaddr);
> browse_req_free(req);
> }
>
--
BR
Szymon Janc
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-11-04 8:32 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-04 8:06 [PATCHv3 1/4] android/hal: Send get_remote_services cmd Marcin Kraglak
2013-11-04 8:06 ` [PATCHv3 2/4] android: Add stub of get_remote_services command Marcin Kraglak
2013-11-04 8:24 ` Johan Hedberg
2013-11-04 8:06 ` [PATCHv3 3/4] android: Initial implementation of get_remote_services Marcin Kraglak
2013-11-04 8:06 ` [PATCHv3 4/4] android: Pass found uuids to remote_device_properties_cb Marcin Kraglak
2013-11-04 8:32 ` Szymon Janc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox