Re: [PATCH BlueZ 2/9] client: Add register-service command

Hi Eramoto,

On Fri, Jun 30, 2017 at 8:50 AM, ERAMOTO Masaya
[off-list ref] wrote:

Hi Luiz,

On 2017=E5=B9=B406=E6=9C=8828=E6=97=A5 21:54, Luiz Augusto von Dentz wrot=

e:

quoted

From: Luiz Augusto von Dentz <redacted>

This adds register-service command which can be used to add GATT service=

s

quoted

to the application:

[bluetooth]# register-service 00001820-0000-1000-8000-00805f9b34fb
[NEW] Primary Service
      /org/bluez/app/service0x92a150
      00001820-0000-1000-8000-00805f9b34fb
      Internet Protocol Support
[bluetooth]# register-application
[CHG] Controller 00:1B:DC:07:31:88 UUIDs: 00001112-0000-1000-8000-00805f=

9b34fb

quoted

[CHG] Controller 00:1B:DC:07:31:88 UUIDs: 00001801-0000-1000-8000-00805f=

9b34fb

quoted

[CHG] Controller 00:1B:DC:07:31:88 UUIDs: 0000110e-0000-1000-8000-00805f=

9b34fb

quoted

[CHG] Controller 00:1B:DC:07:31:88 UUIDs: 0000112d-0000-1000-8000-00805f=

9b34fb

quoted

[CHG] Controller 00:1B:DC:07:31:88 UUIDs: 00001800-0000-1000-8000-00805f=

9b34fb

quoted

[CHG] Controller 00:1B:DC:07:31:88 UUIDs: 00001820-0000-1000-8000-00805f=

9b34fb

quoted

[CHG] Controller 00:1B:DC:07:31:88 UUIDs: 00001200-0000-1000-8000-00805f=

9b34fb

quoted

[CHG] Controller 00:1B:DC:07:31:88 UUIDs: 0000110c-0000-1000-8000-00805f=

9b34fb

quoted

[CHG] Controller 00:1B:DC:07:31:88 UUIDs: 0000110a-0000-1000-8000-00805f=

9b34fb

quoted

[CHG] Controller 00:1B:DC:07:31:88 UUIDs: 0000110b-0000-1000-8000-00805f=

9b34fb

quoted

Note: register-application still has to be called at the end to register
with bluetoothd as everything is done with ObjectManager.
---
 client/gatt.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++++--=

-------

quoted

 client/gatt.h |   3 ++
 client/main.c |  24 ++++++++++
 3 files changed, 145 insertions(+), 22 deletions(-)

diff --git a/client/gatt.c b/client/gatt.c
index 8b7a9c6..282f07e 100644
--- a/client/gatt.c
+++ b/client/gatt.c

@@ -45,22 +45,55 @@

 #define APP_PATH "/org/bluez/app"
 #define PROFILE_INTERFACE "org.bluez.GattProfile1"
+#define SERVICE_INTERFACE "org.bluez.GattService1"

 /* String display constants */
 #define COLORED_NEW  COLOR_GREEN "NEW" COLOR_OFF
 #define COLORED_CHG  COLOR_YELLOW "CHG" COLOR_OFF
 #define COLORED_DEL  COLOR_RED "DEL" COLOR_OFF

+struct service {
+     DBusConnection *conn;
+     char *path;
+     char *uuid;
+     bool primary;
+};
+
+static GList *local_services;
 static GList *services;
 static GList *characteristics;
 static GList *descriptors;
 static GList *managers;
 static GList *uuids;

-static void print_service(GDBusProxy *proxy, const char *description)
+static void print_service(struct service *service, const char *descript=

ion)

quoted

 {
+     const char *text;
+
+     text =3D uuidstr_to_str(service->uuid);
+     if (!text)
+             rl_printf("%s%s%s%s Service\n\t%s\n\t%s\n",
+                                     description ? "[" : "",
+                                     description ? : "",
+                                     description ? "] " : "",
+                                     service->primary ? "Primary" :
+                                     "Secondary",
+                                     service->path, service->uuid);
+     else
+             rl_printf("%s%s%s%s Service\n\t%s\n\t%s\n\t%s\n",
+                                     description ? "[" : "",
+                                     description ? : "",
+                                     description ? "] " : "",
+                                     service->primary ? "Primary" :
+                                     "Secondary",
+                                     service->path, service->uuid, text=

);

quoted

+}
+
+static void print_service_proxy(GDBusProxy *proxy, const char *descript=

ion)

quoted

+{
+     struct service service;
      DBusMessageIter iter;
-     const char *uuid, *text;
+     const char *uuid;
      dbus_bool_t primary;

      if (g_dbus_proxy_get_property(proxy, "UUID", &iter) =3D=3D FALSE)

@@ -73,30 +106,18 @@ static void print_service(GDBusProxy *proxy, const =

char *description)

quoted

      dbus_message_iter_get_basic(&iter, &primary);

-     text =3D uuidstr_to_str(uuid);
-     if (!text)
-             rl_printf("%s%s%s%s Service\n\t%s\n\t%s\n",
-                                     description ? "[" : "",
-                                     description ? : "",
-                                     description ? "] " : "",
-                                     primary ? "Primary" : "Secondary",
-                                     g_dbus_proxy_get_path(proxy),
-                                     uuid);
-     else
-             rl_printf("%s%s%s%s Service\n\t%s\n\t%s\n\t%s\n",
-                                     description ? "[" : "",
-                                     description ? : "",
-                                     description ? "] " : "",
-                                     primary ? "Primary" : "Secondary",
-                                     g_dbus_proxy_get_path(proxy),
-                                     uuid, text);
+     service.path =3D (char *) g_dbus_proxy_get_path(proxy);
+     service.uuid =3D (char *) uuid;
+     service.primary =3D primary;
+
+     print_service(&service, description);
 }

 void gatt_add_service(GDBusProxy *proxy)
 {
      services =3D g_list_append(services, proxy);

-     print_service(proxy, COLORED_NEW);
+     print_service_proxy(proxy, COLORED_NEW);
 }

 void gatt_remove_service(GDBusProxy *proxy)

@@ -109,7 +130,7 @@ void gatt_remove_service(GDBusProxy *proxy)

      services =3D g_list_delete_link(services, l);

-     print_service(proxy, COLORED_DEL);
+     print_service_proxy(proxy, COLORED_DEL);
 }

 static void print_characteristic(GDBusProxy *proxy, const char *descrip=

tion)

quoted

@@ -272,7 +293,7 @@ static void list_attributes(const char *path, GList =

*source)

quoted

                      continue;

              if (source =3D=3D services) {
-                     print_service(proxy, NULL);
+                     print_service_proxy(proxy, NULL);
                      list_attributes(proxy_path, characteristics);
              } else if (source =3D=3D characteristics) {
                      print_characteristic(proxy, NULL);

@@ -798,3 +819,78 @@ void gatt_unregister_app(DBusConnection *conn, GDBu=

sProxy *proxy)

quoted

              return;
      }
 }
+
+static void service_free(void *data)
+{
+     struct service *service =3D data;
+
+     g_free(service->path);
+     g_free(service->uuid);
+     g_free(service);
+}
+
+static gboolean service_get_uuid(const GDBusPropertyTable *property,
+                                     DBusMessageIter *iter, void *data)
+{
+     struct service *service =3D data;
+
+     dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &service->u=

uid);

quoted

+
+     return TRUE;
+}
+
+static gboolean service_get_primary(const GDBusPropertyTable *property,
+                                     DBusMessageIter *iter, void *data)
+{
+     struct service *service =3D data;
+     dbus_bool_t primary;
+
+     primary =3D service->primary ? TRUE : FALSE;
+
+     dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &primary);
+
+     return TRUE;
+}
+
+static const GDBusPropertyTable service_properties[] =3D {
+     { "UUID", "s", service_get_uuid },
+     { "Primary", "b", service_get_primary },
+     { }
+};
+
+void gatt_register_service(DBusConnection *conn, GDBusProxy *proxy,
+                                                             wordexp_t =

*w)

quoted

+{
+     struct service *service;
+     bool primary =3D true;
+
+     if (w->we_wordc > 1) {
+             if (!strcmp(w->we_wordv[1], "yes")) {
+                     primary =3D true;
+             } else if (!strcmp(w->we_wordv[1], "no")) {
+                     primary =3D false;
+             } else {
+                     rl_printf("Invalid option: %s\n", w->we_wordv[0]);
+                     return;
+             }
+     }
+
+     service =3D g_new0(struct service, 1);
+     service->conn =3D conn;
+     service->uuid =3D g_strdup(w->we_wordv[0]);
+     service->path =3D g_strdup_printf("%s/service%p", APP_PATH, servic=

e);

quoted

+     service->primary =3D primary;
+
+     if (g_dbus_register_interface(conn, service->path,
+                                     SERVICE_INTERFACE, NULL, NULL,
+                                     service_properties, service,
+                                     service_free) =3D=3D FALSE) {
+             rl_printf("Failed to register service object\n");
+             service_free(service);
+             return;
+     }
+
+     rl_printf("Service registered at %s\n", service->path);
+
+     local_services =3D g_list_append(local_services, service);
+}

diff --git a/client/gatt.h b/client/gatt.h
index 4c9fd5b..7f116df 100644
--- a/client/gatt.h
+++ b/client/gatt.h

@@ -43,3 +43,6 @@ void gatt_remove_manager(GDBusProxy *proxy);

 void gatt_register_app(DBusConnection *conn, GDBusProxy *proxy, wordexp=

_t *w);

quoted

 void gatt_unregister_app(DBusConnection *conn, GDBusProxy *proxy);
+
+void gatt_register_service(DBusConnection *conn, GDBusProxy *proxy,
+                                                             wordexp_t =

*w);

quoted

diff --git a/client/main.c b/client/main.c
index 31d06b8..2bcf02c 100644
--- a/client/main.c
+++ b/client/main.c

@@ -1839,6 +1839,28 @@ static void cmd_unregister_app(const char *arg)
      gatt_unregister_app(dbus_conn, default_ctrl->proxy);
 }

+static void cmd_register_service(const char *arg)
+{
+     wordexp_t w;
+
+     if (check_default_ctrl() =3D=3D FALSE)
+             return;
+
+     if (wordexp(arg, &w, WRDE_NOCMD)) {
+             rl_printf("Invalid argument\n");
+             return;
+     }
+
+     if (w.we_wordc =3D=3D 0) {
+             rl_printf("Missing argument\n");
+             return;

It seems that the memory of the variable w leaks.

It does indeed.

quoted

+     }
+
+     gatt_register_service(dbus_conn, default_ctrl->proxy, &w);
+
+     wordfree(&w);
+}
+
 static void cmd_version(const char *arg)
 {
      rl_printf("Version %s\n", VERSION);

@@ -2141,6 +2163,8 @@ static const struct {
                                              "Register profile to conne=

ct" },

quoted

      { "unregister-application", NULL, cmd_unregister_app,
                                              "Unregister profile" },
+     { "register-service", "<UUID> <primary=3Dyes/no>", cmd_register_se=

rvice,

quoted

+                                     "Register application service" },

 - It seems that the second argument is optional.
 - I can not determine whether it needs string 'primary=3D' from the help=

 message.

So, if you do not restrict the description length, would you change to th=

e

following description:

        { "register-service", "<UUID> [yes/no]", cmd_register_service,
                "Register application service. If no, register as seconda=

ry" },

Sure thing.

quoted

      { "version",      NULL,       cmd_version, "Display version" },
      { "quit",         NULL,       cmd_quit, "Quit program" },
      { "exit",         NULL,       cmd_quit, "Quit program" },

Regards,
Eramoto

--=20
Luiz Augusto von Dentz