diff --git a/client/gatt.c b/client/gatt.c
index 3185c31..4466490 100644
--- a/client/gatt.c
+++ b/client/gatt.c
rl_prompt_input(chrc->path, "Enter value:", chrc_set_value, chrc);
}
+
+static struct chrc *chrc_find(const char *pattern)
+{
+ GList *l, *lc;
+ struct service *service;
+ struct chrc *chrc;
+
+ for (l = local_services; l; l = g_list_next(l)) {
+ service = l->data;
+
+ for (lc = service->chrcs; lc; lc = g_list_next(lc)) {
+ chrc = lc->data;
+
+ /* match object path */
+ if (!strcmp(chrc->path, pattern))
+ return chrc;
+
+ /* match UUID */
+ if (!strcmp(chrc->uuid, pattern))
+ return chrc;
+ }
+ }
+
+ return NULL;
+}
+
+void gatt_unregister_chrc(DBusConnection *conn, GDBusProxy *proxy,
+ wordexp_t *w)
+{
+ struct chrc *chrc;
+
+ chrc = chrc_find(w->we_wordv[0]);
+ if (!chrc) {
+ rl_printf("Failed to unregister characteristic object\n");
+ return;
+ }
+
+ chrc->service->chrcs = g_list_remove(chrc->service->chrcs, chrc);
+
+ chrc_unregister(chrc);
+}
diff --git a/client/gatt.h b/client/gatt.h
index 4ecf642..0acce4d 100644
--- a/client/gatt.h
+++ b/client/gatt.h
wordexp_t *w);
void gatt_register_chrc(DBusConnection *conn, GDBusProxy *proxy, wordexp_t *w);
+void gatt_unregister_chrc(DBusConnection *conn, GDBusProxy *proxy,
+ wordexp_t *w);
diff --git a/client/main.c b/client/main.c
index 34271aa..f3dfa2c 100644
--- a/client/main.c
+++ b/client/main.c
wordfree(&w);
}
+static void cmd_unregister_characteristic(const char *arg)
+{
+ wordexp_t w;
+
+ if (check_default_ctrl() == FALSE)
+ return;
+
+ if (wordexp(arg, &w, WRDE_NOCMD)) {
+ rl_printf("Invalid argument\n");
+ return;
+ }
+
+ if (w.we_wordc < 1) {
+ rl_printf("Missing arguments\n");
+ goto done;
+ }
+
+ gatt_unregister_chrc(dbus_conn, default_ctrl->proxy, &w);
+
+done:
+ wordfree(&w);
+}
+
static void cmd_version(const char *arg)
{
rl_printf("Version %s\n", VERSION);
{ "register-characteristic", "<UUID> <Flags=read,write,notify...>",
cmd_register_characteristic,
"Register application characteristic" },
+ { "unregister-characteristic", "<UUID/object>",
+ cmd_unregister_characteristic,
+ "Unregister application characteristic" },
{ "version", NULL, cmd_version, "Display version" },
{ "quit", NULL, cmd_quit, "Quit program" },
{ "exit", NULL, cmd_quit, "Quit program" },