This adds a handler of client ready events. The handler replies to the
RegisterMonitor() method call.
The following tests were performed.
- Call RegisterMonitor() and expect to receive a return.
Reviewed-by: Yun-Hao Chung <howardchung@xxxxxxxxxx>
Reviewed-by: Manish Mandlik <mmandlik@xxxxxxxxxxxx>
---
(no changes since v1)
src/adv_monitor.c | 26 +++++++++++++++++++-------
1 file changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/adv_monitor.c b/src/adv_monitor.c
index d9c5c7262..b42a47b9c 100644
--- a/src/adv_monitor.c
+++ b/src/adv_monitor.c
@@ -123,9 +123,22 @@ static void app_disconnect_cb(DBusConnection *conn, void *user_data)
app_destroy(app);
}
+/* Handles the ready signal of Adv Monitor app */
+static void app_ready_cb(GDBusClient *client, void *user_data)
+{
+ struct adv_monitor_app *app = user_data;
+ uint16_t adapter_id = app->manager->adapter_id;
+
+ btd_info(adapter_id, "Path %s reserved for Adv Monitor app %s",
+ app->path, app->owner);
+
+ app_reply_msg(app, dbus_message_new_method_return(app->reg));
+}
+
/* Creates an app object, initiates it and sets D-Bus event handlers */
static struct adv_monitor_app *app_create(DBusConnection *conn,
- const char *sender, const char *path,
+ DBusMessage *msg, const char *sender,
+ const char *path,
struct btd_adv_monitor_manager *manager)
{
struct adv_monitor_app *app;
@@ -150,7 +163,9 @@ static struct adv_monitor_app *app_create(DBusConnection *conn,
g_dbus_client_set_disconnect_watch(app->client, app_disconnect_cb, app);
g_dbus_client_set_proxy_handlers(app->client, NULL, NULL, NULL, NULL);
- g_dbus_client_set_ready_watch(app->client, NULL, NULL);
+ g_dbus_client_set_ready_watch(app->client, app_ready_cb, app);
+
+ app->reg = dbus_message_ref(msg);
return app;
}
@@ -195,7 +210,7 @@ static DBusMessage *register_monitor(DBusConnection *conn, DBusMessage *msg,
if (queue_find(manager->apps, app_match, &match))
return btd_error_already_exists(msg);
- app = app_create(conn, match.owner, match.path, manager);
+ app = app_create(conn, msg, match.owner, match.path, manager);
if (!app) {
btd_error(manager->adapter_id,
"Failed to reserve %s for Adv Monitor app %s",
@@ -206,10 +221,7 @@ static DBusMessage *register_monitor(DBusConnection *conn, DBusMessage *msg,
queue_push_tail(manager->apps, app);
- btd_info(manager->adapter_id, "Path %s reserved for Adv Monitor app %s",
- match.path, match.owner);
-
- return dbus_message_new_method_return(msg);
+ return NULL;
}
/* Handles UnregisterMonitor D-Bus call */
--
2.26.2
