diff options
| author | Vinicius Costa Gomes <vinicius.gomes@openbossa.org> | 2011-03-28 19:40:50 -0300 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2011-03-30 19:15:54 +0300 |
| commit | a0b6c596e9bc3873cc150d0663a792b79d591efa (patch) | |
| tree | 40edceaab7811bfdf2e91b03ddfd8626336120d2 | |
| parent | fc19dbe0d03b4d142934ca1544a76e5ad91ee827 (diff) | |
| download | bluez-a0b6c596e9bc3873cc150d0663a792b79d591efa.tar.gz | |
Add support for re-using the attrib channel
In some cases, when the device is already connected there's no need
to create another GAttrib instance.
This will allow the Attrib client to use the connection already
estabilished, this will be very useful when we support more
LE profiles.
| -rw-r--r-- | attrib/client.c | 6 | ||||
| -rw-r--r-- | attrib/client.h | 3 | ||||
| -rw-r--r-- | src/adapter.c | 3 | ||||
| -rw-r--r-- | src/device.c | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/attrib/client.c b/attrib/client.c index acd35f93..28e57042 100644 --- a/attrib/client.c +++ b/attrib/client.c @@ -1046,7 +1046,8 @@ static void register_primaries(struct gatt_service *gatt, GSList *primaries) } int attrib_client_register(DBusConnection *connection, - struct btd_device *device, int psm, GSList *primaries) + struct btd_device *device, int psm, + GAttrib *attrib, GSList *primaries) { struct btd_adapter *adapter = device_get_adapter(device); const char *path = device_get_path(device); @@ -1065,6 +1066,9 @@ int attrib_client_register(DBusConnection *connection, bacpy(&gatt->dba, &dba); gatt->psm = psm; + if (attrib) + gatt->attrib = g_attrib_ref(attrib); + register_primaries(gatt, primaries); gatt_services = g_slist_append(gatt_services, gatt); diff --git a/attrib/client.h b/attrib/client.h index 650b0c10..b4a4eccb 100644 --- a/attrib/client.h +++ b/attrib/client.h @@ -23,5 +23,6 @@ */ int attrib_client_register(DBusConnection *connection, - struct btd_device *device, int psm, GSList *primaries); + struct btd_device *device, int psm, + GAttrib *attrib, GSList *primaries); void attrib_client_unregister(struct btd_device *device); diff --git a/src/adapter.c b/src/adapter.c index a85345bc..c7ffd990 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -58,6 +58,7 @@ #include "storage.h" #include "attrib-server.h" #include "att.h" +#include "gattrib.h" #include "attrib/client.h" /* Flags Descriptions */ @@ -2185,7 +2186,7 @@ static void create_stored_device_from_primary(char *key, char *value, } /* FIXME: Need the correct psm */ - attrib_client_register(connection, device, -1, services); + attrib_client_register(connection, device, -1, NULL, services); device_probe_drivers(device, uuids); diff --git a/src/device.c b/src/device.c index 511c9d02..fa5764e0 100644 --- a/src/device.c +++ b/src/device.c @@ -1548,7 +1548,7 @@ static void primary_cb(GSList *services, guint8 status, gpointer user_data) device_probe_drivers(device, uuids); /* FIXME: Need the correct psm */ - attrib_client_register(req->conn, device, -1, services); + attrib_client_register(req->conn, device, -1, req->attrib, services); g_slist_free(uuids); |