From d8c3723d7081cd38b04e956694bb335ece75ac04 Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Tue, 20 May 2014 12:07:54 +0200 Subject: [PATCH] android/hal-ipc: Allow to pass custom path to IPC --- android/hal-bluetooth.c | 2 +- android/hal-ipc.c | 4 ++-- android/hal-ipc.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/hal-bluetooth.c b/android/hal-bluetooth.c index e9a677a40..c2a1085b9 100644 --- a/android/hal-bluetooth.c +++ b/android/hal-bluetooth.c @@ -420,7 +420,7 @@ static int init(bt_callbacks_t *callbacks) hal_ipc_register(HAL_SERVICE_ID_BLUETOOTH, ev_handlers, sizeof(ev_handlers)/sizeof(ev_handlers[0])); - if (!hal_ipc_init()) { + if (!hal_ipc_init(BLUEZ_HAL_SK_PATH, sizeof(BLUEZ_HAL_SK_PATH))) { bt_hal_cbacks = NULL; return BT_STATUS_FAIL; } diff --git a/android/hal-ipc.c b/android/hal-ipc.c index 8f5babe86..81d3a1bb1 100644 --- a/android/hal-ipc.c +++ b/android/hal-ipc.c @@ -229,7 +229,7 @@ static int accept_connection(int sk) return new_sk; } -bool hal_ipc_init(void) +bool hal_ipc_init(const char *path, size_t size) { struct sockaddr_un addr; int sk; @@ -246,7 +246,7 @@ bool hal_ipc_init(void) memset(&addr, 0, sizeof(addr)); addr.sun_family = AF_UNIX; - memcpy(addr.sun_path, BLUEZ_HAL_SK_PATH, sizeof(BLUEZ_HAL_SK_PATH)); + memcpy(addr.sun_path, path, size); if (bind(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) { err = errno; diff --git a/android/hal-ipc.h b/android/hal-ipc.h index 2fbf30f91..0d16cdb8f 100644 --- a/android/hal-ipc.h +++ b/android/hal-ipc.h @@ -21,7 +21,7 @@ struct hal_ipc_handler { size_t data_len; }; -bool hal_ipc_init(void); +bool hal_ipc_init(const char *path, size_t size); void hal_ipc_cleanup(void); int hal_ipc_cmd(uint8_t service_id, uint8_t opcode, uint16_t len, void *param, -- 2.47.3