Hi Mikel,
* Mikel Astiz <mikel.astiz.oss@xxxxxxxxx> [2013-06-06 10:21:37 +0200]:
> From: Mikel Astiz <mikel.astiz@xxxxxxxxxxxx>
>
> Add a D-Bus interface to represent a service that is supported by a
> device.
> ---
> src/device.c | 8 ++++++--
> src/service.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
> src/service.h | 2 +-
> 3 files changed, 60 insertions(+), 4 deletions(-)
>
> diff --git a/src/device.c b/src/device.c
> index 57bfc86..c03db12 100644
> --- a/src/device.c
> +++ b/src/device.c
> @@ -177,6 +177,7 @@ struct btd_device {
> GSList *uuids;
> GSList *primaries; /* List of primary services */
> GSList *services; /* List of btd_service */
> + unsigned int service_id;
> GSList *pending; /* Pending services */
> GSList *watches; /* List of disconnect_data */
> gboolean temporary;
> @@ -2132,6 +2133,7 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
>
> str2ba(address, &device->bdaddr);
> device->adapter = adapter;
> + device->service_id = 1;
>
> return btd_device_ref(device);
> }
> @@ -2477,11 +2479,12 @@ static void dev_probe(struct btd_profile *p, void *user_data)
>
> service = service_create(d->dev, p);
>
> - if (service_probe(service) < 0) {
> + if (service_probe(service, d->dev->service_id) < 0) {
> btd_service_unref(service);
> return;
> }
>
> + d->dev->service_id++;
> d->dev->services = g_slist_append(d->dev->services, service);
> }
>
> @@ -2499,11 +2502,12 @@ void device_probe_profile(gpointer a, gpointer b)
>
> service = service_create(device, profile);
>
> - if (service_probe(service) < 0) {
> + if (service_probe(service, device->service_id) < 0) {
> btd_service_unref(service);
> return;
> }
>
> + device->service_id++;
> device->services = g_slist_append(device->services, service);
>
> if (!profile->auto_connect || !device->general_connect)
> diff --git a/src/service.c b/src/service.c
> index aef9502..7b9e271 100644
> --- a/src/service.c
> +++ b/src/service.c
> @@ -38,6 +38,7 @@
> #include <bluetooth/bluetooth.h>
>
> #include <glib.h>
> +#include <gdbus/gdbus.h>
>
> #include "log.h"
>
> @@ -45,6 +46,10 @@
> #include "device.h"
> #include "profile.h"
> #include "service.h"
> +#include "dbus-common.h"
> +#include "error.h"
> +
> +#define SERVICE_INTERFACE "org.bluez.Service1"
>
> struct btd_service {
> int ref;
> @@ -53,6 +58,9 @@ struct btd_service {
> void *user_data;
> btd_service_state_t state;
> int err;
> + char *path;
> + DBusMessage *connect_msg;
> + DBusMessage *disconnect_msg;
> };
>
> struct service_state_callback {
> @@ -63,6 +71,9 @@ struct service_state_callback {
>
> static GSList *state_callbacks = NULL;
>
> +static int service_register(struct btd_service *service, unsigned int id);
> +static void service_unregister(struct btd_service *service);
> +
> static const char *state2str(btd_service_state_t state)
> {
> switch (state) {
> @@ -149,7 +160,7 @@ struct btd_service *service_create(struct btd_device *device,
> return service;
> }
>
> -int service_probe(struct btd_service *service)
> +int service_probe(struct btd_service *service, unsigned int id)
> {
> char addr[18];
> int err;
> @@ -159,6 +170,7 @@ int service_probe(struct btd_service *service)
> err = service->profile->device_probe(service);
> if (err == 0) {
> change_state(service, BTD_SERVICE_STATE_DISCONNECTED, 0);
> + service_register(service, id); /* Ignore errors */
> return 0;
> }
>
> @@ -170,10 +182,12 @@ int service_probe(struct btd_service *service)
>
> void service_shutdown(struct btd_service *service)
> {
> + service_unregister(service);
> change_state(service, BTD_SERVICE_STATE_UNAVAILABLE, 0);
> service->profile->device_remove(service);
> service->device = NULL;
> service->profile = NULL;
> + service_unregister(service);
Didn't get why you are calling service_unregister twice here.
Gustavo
--
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
