Return-Path: From: Jakub Tyszkowski To: linux-bluetooth@vger.kernel.org Subject: [PATCHv5 06/11] android/ipc-tester: Register services Date: Mon, 20 Jan 2014 10:36:05 +0100 Message-Id: <1390210570-28260-7-git-send-email-jakub.tyszkowski@tieto.com> In-Reply-To: <1390210570-28260-1-git-send-email-jakub.tyszkowski@tieto.com> References: <1390210570-28260-1-git-send-email-jakub.tyszkowski@tieto.com> Sender: linux-bluetooth-owner@vger.kernel.org List-ID: This patch adds basic bluetooth service registration during setup procedure. Without this daemon would reject commands for not registered services. --- android/ipc-tester.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/android/ipc-tester.c b/android/ipc-tester.c index 7cd50f5..816719c 100644 --- a/android/ipc-tester.c +++ b/android/ipc-tester.c @@ -407,13 +407,48 @@ static gboolean check_for_daemon(gpointer user_data) return false; } +static bool setup_module(int service_id) +{ + struct hal_hdr response; + struct hal_hdr expected_response; + + struct regmod_msg btmodule_msg = { + .header = { + .service_id = HAL_SERVICE_ID_CORE, + .opcode = HAL_OP_REGISTER_MODULE, + .len = sizeof(struct hal_cmd_register_module), + }, + .cmd = { + .service_id = service_id, + }, + }; + + if (write(cmd_sk, &btmodule_msg, sizeof(btmodule_msg)) < 0) + goto fail; + + if (read(cmd_sk, &response, sizeof(response)) < 0) + goto fail; + + expected_response = btmodule_msg.header; + expected_response.len = 0; + + if (memcmp(&response, &expected_response, sizeof(response)) == 0) + return true; + +fail: + tester_warn("Module registration failed."); + return false; +} + static void setup(const void *data) { + const struct generic_data *generic_data = data; struct test_data *test_data = tester_get_data(); int signal_fd[2]; char buf[1024]; pid_t pid; int len; + unsigned int i; if (pipe(signal_fd)) goto failed; @@ -451,9 +486,17 @@ static void setup(const void *data) tester_warn("Cannot initialize IPC mechanism!"); goto failed; } - /* TODO: register modules */ + tester_print("Will init %d services.", generic_data->num_services); + + for (i = 0; i < generic_data->num_services; i++) + if (!setup_module(generic_data->init_services[i])) { + cleanup_ipc(); + goto failed; + } test_data->setup_done = true; + + tester_setup_complete(); return; failed: -- 1.8.5.2