Each adapter has its own SDP registry wich will be managed
separately. This patch makes a wrapper over attrib_create_sdp
function using the default adapter in order to keep backward
compatibility with the gatt server interface until the api is
finally updated.
---
src/attrib-server.c | 203 ++++++++++++++++++++++++++++++---------------------
1 files changed, 120 insertions(+), 83 deletions(-)
diff --git a/src/attrib-server.c b/src/attrib-server.c
index e8dade8..5a5024c 100644
--- a/src/attrib-server.c
+++ b/src/attrib-server.c
@@ -73,8 +73,6 @@ struct group_elem {
static GIOChannel *le_io = NULL;
static GSList *clients = NULL;
-static uint32_t gatt_sdp_handle = 0;
-static uint32_t gap_sdp_handle = 0;
struct gatt_adapter {
struct btd_adapter *adapter;
@@ -159,6 +157,30 @@ static gint adapter_cmp(gconstpointer a, gconstpointer b)
return -1;
}
+static struct gatt_adapter *get_default_gatt_adapter(void)
+{
+ struct gatt_adapter *gatt_adapter;
+ struct btd_adapter *adapter;
+ GSList *l;
+
+ adapter = manager_get_default_adapter();
+ if (adapter == NULL) {
+ error("Can't get default adapter");
+ return NULL;
+ }
+
+ l = g_slist_find_custom(adapters, adapter, adapter_cmp);
+ if (l == NULL) {
+ error("Not GATT server initialized on adapter %s",
+ adapter_get_path(adapter));
+ return NULL;
+ }
+
+ gatt_adapter = l->data;
+
+ return gatt_adapter;
+}
+
static sdp_record_t *server_record_new(uuid_t *uuid, uint16_t start, uint16_t end)
{
sdp_list_t *svclass_id, *apseq, *proto[2], *root, *aproto;
@@ -230,6 +252,85 @@ static int attribute_cmp(gconstpointer a1, gconstpointer a2)
return attrib1->handle - attrib2->handle;
}
+static struct attribute *find_primary_range(struct gatt_adapter *gatt_adapter,
+ uint16_t start, uint16_t *end)
+{
+ struct attribute *attrib;
+ guint h = start;
+ GSList *l;
+
+ if (end == NULL)
+ return NULL;
+
+ l = g_slist_find_custom(gatt_adapter->database, GUINT_TO_POINTER(h),
+ handle_cmp);
+ if (!l)
+ return NULL;
+
+ attrib = l->data;
+
+ if (bt_uuid_cmp(&attrib->uuid, &prim_uuid) != 0)
+ return NULL;
+
+ *end = start;
+
+ for (l = l->next; l; l = l->next) {
+ struct attribute *a = l->data;
+
+ if (bt_uuid_cmp(&a->uuid, &prim_uuid) == 0 ||
+ bt_uuid_cmp(&a->uuid, &snd_uuid) == 0)
+ break;
+
+ *end = a->handle;
+ }
+
+ return attrib;
+}
+
+static uint32_t attrib_create_sdp_new(struct gatt_adapter *gatt_adapter,
+ uint16_t handle, const char *name)
+{
+ sdp_record_t *record;
+ struct attribute *a;
+ uint16_t end = 0;
+ uuid_t svc, gap_uuid;
+ bdaddr_t addr;
+
+ a = find_primary_range(gatt_adapter, handle, &end);
+
+ if (a == NULL)
+ return 0;
+
+ if (a->len == 2)
+ sdp_uuid16_create(&svc, att_get_u16(a->data));
+ else if (a->len == 16)
+ sdp_uuid128_create(&svc, a->data);
+ else
+ return 0;
+
+ record = server_record_new(&svc, handle, end);
+ if (record == NULL)
+ return 0;
+
+ if (name)
+ sdp_set_info_attr(record, name, "BlueZ", NULL);
+
+ sdp_uuid16_create(&gap_uuid, GENERIC_ACCESS_PROFILE_ID);
+ if (sdp_uuid_cmp(&svc, &gap_uuid) == 0) {
+ sdp_set_url_attr(record, "http://www.bluez.org/";,
+ "http://www.bluez.org/";,
+ "http://www.bluez.org/";);
+ }
+
+ adapter_get_address(gatt_adapter->adapter, &addr);
+ if (add_record_to_server(&addr, record) < 0)
+ sdp_record_free(record);
+ else
+ return record->handle;
+
+ return 0;
+}
+
static uint8_t att_check_reqs(struct gatt_channel *channel, uint8_t opcode,
int reqs)
{
@@ -586,39 +687,6 @@ static int find_by_type(uint16_t start, uint16_t end, bt_uuid_t *uuid,
return len;
}
-static struct attribute *find_primary_range(uint16_t start, uint16_t *end)
-{
- struct attribute *attrib;
- guint h = start;
- GSList *l;
-
- if (end == NULL)
- return NULL;
-
- l = g_slist_find_custom(database, GUINT_TO_POINTER(h), handle_cmp);
- if (!l)
- return NULL;
-
- attrib = l->data;
-
- if (bt_uuid_cmp(&attrib->uuid, &prim_uuid) != 0)
- return NULL;
-
- *end = start;
-
- for (l = l->next; l; l = l->next) {
- struct attribute *a = l->data;
-
- if (bt_uuid_cmp(&a->uuid, &prim_uuid) == 0 ||
- bt_uuid_cmp(&a->uuid, &snd_uuid) == 0)
- break;
-
- *end = a->handle;
- }
-
- return attrib;
-}
-
static uint16_t read_value(struct gatt_channel *channel, uint16_t handle,
uint8_t *pdu, int len)
{
@@ -998,7 +1066,7 @@ static void confirm_event(GIOChannel *io, void *user_data)
return;
}
-static gboolean register_core_services(void)
+static gboolean register_core_services(struct gatt_adapter *gatt_adapter)
{
uint8_t atval[256];
bt_uuid_t uuid;
@@ -1035,10 +1103,12 @@ static gboolean register_core_services(void)
att_put_u16(appearance, &atval[0]);
attrib_db_add(appearance_handle, &uuid, ATT_NONE, ATT_NOT_PERMITTED,
atval, 2);
- gap_sdp_handle = attrib_create_sdp(0x0001, "Generic Access Profile");
- if (gap_sdp_handle == 0) {
+
+ gatt_adapter->gap_sdp_handle = attrib_create_sdp_new(gatt_adapter,
+ 0x0001, "Generic Access Profile");
+ if (gatt_adapter->gap_sdp_handle == 0) {
error("Failed to register GAP service record");
- goto failed;
+ return FALSE;
}
/* GATT service: primary service definition */
@@ -1046,20 +1116,14 @@ static gboolean register_core_services(void)
att_put_u16(GENERIC_ATTRIB_PROFILE_ID, &atval[0]);
attrib_db_add(0x0010, &uuid, ATT_NONE, ATT_NOT_PERMITTED, atval, 2);
- gatt_sdp_handle = attrib_create_sdp(0x0010,
- "Generic Attribute Profile");
- if (gatt_sdp_handle == 0) {
+ gatt_adapter->gatt_sdp_handle = attrib_create_sdp_new(gatt_adapter,
+ 0x0010, "Generic Attribute Profile");
+ if (gatt_adapter->gatt_sdp_handle == 0) {
error("Failed to register GATT service record");
- goto failed;
+ return FALSE;;
}
return TRUE;
-
-failed:
- if (gap_sdp_handle)
- remove_record_from_server(gap_sdp_handle);
-
- return FALSE;
}
static int attrib_adapter_probe(struct btd_adapter *adapter)
@@ -1090,7 +1154,7 @@ static int attrib_adapter_probe(struct btd_adapter *adapter)
return -1;
}
- if (!register_core_services()) {
+ if (!register_core_services(gatt_adapter)) {
g_io_channel_unref(gatt_adapter->l2cap_io);
free_gatt_adapter(gatt_adapter);
return -1;
@@ -1144,47 +1208,20 @@ int attrib_server_init(void)
void attrib_server_exit(void)
{
btd_unregister_adapter_driver(&attrib_adapter_driver);
+ g_slist_free_full(database, attrib_free);
}
uint32_t attrib_create_sdp(uint16_t handle, const char *name)
{
- sdp_record_t *record;
- struct attribute *a;
- uint16_t end = 0;
- uuid_t svc, gap_uuid;
-
- a = find_primary_range(handle, &end);
-
- if (a == NULL)
- return 0;
+ struct gatt_adapter *gatt_adapter;
- if (a->len == 2)
- sdp_uuid16_create(&svc, att_get_u16(a->data));
- else if (a->len == 16)
- sdp_uuid128_create(&svc, a->data);
- else
- return 0;
+ DBG("Deprecated function");
- record = server_record_new(&svc, handle, end);
- if (record == NULL)
+ gatt_adapter = get_default_gatt_adapter();
+ if (gatt_adapter == NULL)
return 0;
- if (name)
- sdp_set_info_attr(record, name, "BlueZ", NULL);
-
- sdp_uuid16_create(&gap_uuid, GENERIC_ACCESS_PROFILE_ID);
- if (sdp_uuid_cmp(&svc, &gap_uuid) == 0) {
- sdp_set_url_attr(record, "http://www.bluez.org/";,
- "http://www.bluez.org/";,
- "http://www.bluez.org/";);
- }
-
- if (add_record_to_server(BDADDR_ANY, record) < 0)
- sdp_record_free(record);
- else
- return record->handle;
-
- return 0;
+ return attrib_create_sdp_new(gatt_adapter, handle, name);
}
void attrib_free_sdp(uint32_t sdp_handle)
--
1.7.8
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
