diff options
| author | Miao-chen Chou <mcchou@chromium.org> | 2020-09-11 23:51:29 -0700 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2020-09-14 12:38:38 -0700 |
| commit | 18e10e0c89f7df485517c422477f1ceffc8e58b7 (patch) | |
| tree | bc619a8e0565172c5b44c0e5c5001b05ce811a39 /src/adv_monitor.c | |
| parent | 1601b5ba301e3e9e290c9c009d944fb766bf146c (diff) | |
| download | bluez-18e10e0c89f7df485517c422477f1ceffc8e58b7.tar.gz | |
adv_monitor: Handle D-Bus client ready events
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.
Diffstat (limited to 'src/adv_monitor.c')
| -rw-r--r-- | src/adv_monitor.c | 26 |
1 files 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 */ |