* [RFC 3/4] android/system-emulator: Update property used for start/stop services
From: Szymon Janc @ 2014-01-14 15:28 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Szymon Janc
In-Reply-To: <1389713283-13038-1-git-send-email-szymon.janc@tieto.com>
---
android/system-emulator.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/android/system-emulator.c b/android/system-emulator.c
index f1c6622..0966a02 100644
--- a/android/system-emulator.c
+++ b/android/system-emulator.c
@@ -139,17 +139,17 @@ static void system_socket_callback(int fd, uint32_t events, void *user_data)
printf("Received %s\n", buf);
- if (!strcmp(buf, "ctl.start=bluetoothd")) {
+ if (!strcmp(buf, "bluetooth.start=bluetoothd")) {
if (daemon_pid > 0)
return;
ctl_start();
- } else if (!strcmp(buf, "ctl.start=bluetoothd-snoop")) {
+ } else if (!strcmp(buf, "bluetooth.start=bluetoothd-snoop")) {
if (snoop_pid > 0)
return;
snoop_start();
- } else if (!strcmp(buf, "ctl.stop=bluetoothd-snoop")) {
+ } else if (!strcmp(buf, "bluetooth.stop=bluetoothd-snoop")) {
if (snoop_pid > 0)
snoop_stop();
}
--
1.8.3.2
^ permalink raw reply related
* [RFC 2/4] android/hal: Update property used for start/stop services
From: Szymon Janc @ 2014-01-14 15:28 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Szymon Janc
In-Reply-To: <1389713283-13038-1-git-send-email-szymon.janc@tieto.com>
---
android/hal-bluetooth.c | 4 ++--
android/hal-ipc.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/android/hal-bluetooth.c b/android/hal-bluetooth.c
index be45836..76560da 100644
--- a/android/hal-bluetooth.c
+++ b/android/hal-bluetooth.c
@@ -822,12 +822,12 @@ static int config_hci_snoop_log(uint8_t enable)
{
DBG("enable %u", enable);
- if (enable && property_set("ctl.start", SNOOP_SERVICE_NAME) < 0) {
+ if (enable && property_set("bluetooth.start", SNOOP_SERVICE_NAME) < 0) {
error("Failed to start service %s", SNOOP_SERVICE_NAME);
return BT_STATUS_FAIL;
}
- if (!enable && property_set("ctl.stop", SNOOP_SERVICE_NAME) < 0) {
+ if (!enable && property_set("bluetooth.stop", SNOOP_SERVICE_NAME) < 0) {
error("Failed to stop service %s", SNOOP_SERVICE_NAME);
return BT_STATUS_FAIL;
}
diff --git a/android/hal-ipc.c b/android/hal-ipc.c
index 97f1bcd..56165df 100644
--- a/android/hal-ipc.c
+++ b/android/hal-ipc.c
@@ -259,7 +259,7 @@ bool hal_ipc_init(void)
}
/* Start Android Bluetooth daemon service */
- if (property_set("ctl.start", SERVICE_NAME) < 0) {
+ if (property_set("bluetooth.start", SERVICE_NAME) < 0) {
error("Failed to start service %s", SERVICE_NAME);
close(sk);
return false;
--
1.8.3.2
^ permalink raw reply related
* [RFC 1/4] android: Add sample init.bluetooth.rc file
From: Szymon Janc @ 2014-01-14 15:28 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Szymon Janc
This file is intended to be included from device init.rc.
---
android/Android.mk | 16 +++++++++++++++-
android/Makefile.am | 1 +
android/init.bluetooth.rc | 27 +++++++++++++++++++++++++++
3 files changed, 43 insertions(+), 1 deletion(-)
create mode 100644 android/init.bluetooth.rc
diff --git a/android/Android.mk b/android/Android.mk
index ae52ab4..f13e703 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -109,7 +109,7 @@ LOCAL_MODULE := bluetooth.default
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_REQUIRED_MODULES := bluetoothd bluetoothd-snoop
+LOCAL_REQUIRED_MODULES := bluetoothd bluetoothd-snoop init.bluetooth.rc
include $(BUILD_SHARED_LIBRARY)
@@ -263,3 +263,17 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := bluetoothd-snoop
include $(BUILD_EXECUTABLE)
+
+#
+# init.bleutooth.rc
+#
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := init.bluetooth.rc
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
+
+include $(BUILD_PREBUILT)
diff --git a/android/Makefile.am b/android/Makefile.am
index 7806f79..b205019 100644
--- a/android/Makefile.am
+++ b/android/Makefile.am
@@ -134,6 +134,7 @@ android_audio_a2dp_default_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version \
endif
EXTRA_DIST += android/Android.mk android/hal-ipc-api.txt android/README \
+ android/init.bluetooth.rc \
android/pics-gap.txt android/pics-hid.txt \
android/pics-pan.txt android/pics-did.txt \
android/pics-opp.txt android/pics-pbap.txt \
diff --git a/android/init.bluetooth.rc b/android/init.bluetooth.rc
new file mode 100644
index 0000000..e2be9e8
--- /dev/null
+++ b/android/init.bluetooth.rc
@@ -0,0 +1,27 @@
+chown bluetooth bluetooth /data/misc/bluetooth
+
+chown bluetooth bluetooth /dev/uhid
+
+on property:bluetooth.start=bluetoothd
+ start bluetoothd
+
+on property:bluetooth.stop=bluetoothd
+ stop bluetoothd
+
+on property:bluetooth.start=bluetoothd-snoop
+ start bluetoothd-snoop
+
+on property:bluetooth.stop=bluetoothd-snoop
+ stop bluetoothd-snoop
+
+service bluetoothd /system/bin/logwrapper /system/bin/bluetoothd
+ class main
+ group bluetooth net_admin
+ disabled
+ oneshot
+
+service bluetoothd-snoop /system/bin/bluetoothd-snoop
+ class main
+ group bluetooth net_admin
+ disabled
+ oneshot
--
1.8.3.2
^ permalink raw reply related
* [PATCH v2 15/15] android/tester: Add get device FRIENDLY_NAME prop fail test case
From: Grzegorz Kolodziejczyk @ 2014-01-14 13:54 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1389707686-30766-1-git-send-email-grzegorz.kolodziejczyk@tieto.com>
This adds device FRIENDLY NAME property fail test case.
---
android/android-tester.c | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/android/android-tester.c b/android/android-tester.c
index 94b00dd..7640eea 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -1568,6 +1568,25 @@ static const struct generic_data bt_dev_getprop_verinfo_fail_test = {
.expected_adapter_status = BT_STATUS_FAIL,
};
+static struct priority_property remote_getprop_fname_props[] = {
+ {
+ .prop.type = BT_PROPERTY_REMOTE_VERSION_INFO,
+ .prop.val = NULL,
+ .prop.len = 0,
+ },
+};
+
+static const struct generic_data bt_dev_getprop_fname_fail_test = {
+ .expected_hal_cb.discovery_state_changed_cb =
+ remote_discovery_state_changed_cb,
+ .expected_hal_cb.device_found_cb = remote_get_property_device_found_cb,
+ .expected_hal_cb.remote_device_properties_cb =
+ remote_test_device_properties_cb,
+ .expected_cb_count = 3,
+ .expected_properties = remote_getprop_fname_props,
+ .expected_adapter_status = BT_STATUS_FAIL,
+};
+
static bt_callbacks_t bt_callbacks = {
.size = sizeof(bt_callbacks),
.adapter_state_changed_cb = adapter_state_changed_cb,
@@ -2198,6 +2217,15 @@ static void test_dev_getprop_verinfo_fail(const void *test_data)
data->if_bluetooth->start_discovery();
}
+static void test_dev_getprop_fname_fail(const void *test_data)
+{
+ struct test_data *data = tester_get_data();
+
+ init_test_conditions(data);
+
+ data->if_bluetooth->start_discovery();
+}
+
/* Test Socket HAL */
static void adapter_socket_state_changed_cb(bt_state_t state)
@@ -2864,6 +2892,11 @@ int main(int argc, char *argv[])
setup_enabled_adapter,
test_dev_getprop_verinfo_fail, teardown);
+ test_bredrle("Bluetooth Device Get FRIENDLY_NAME - Fail",
+ &bt_dev_getprop_fname_fail_test,
+ setup_enabled_adapter,
+ test_dev_getprop_fname_fail, teardown);
+
test_bredrle("Socket Init", NULL, setup_socket_interface,
test_dummy, teardown);
--
1.8.5.2
^ permalink raw reply related
* [PATCH v2 14/15] android/tester: Add get device VERINFO property fail test case
From: Grzegorz Kolodziejczyk @ 2014-01-14 13:54 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1389707686-30766-1-git-send-email-grzegorz.kolodziejczyk@tieto.com>
This adds device VERSION INFO property fail test case.
---
android/android-tester.c | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/android/android-tester.c b/android/android-tester.c
index 89566d4..94b00dd 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -1549,6 +1549,25 @@ static const struct generic_data bt_dev_getprop_disctimeout_fail_test = {
.expected_adapter_status = BT_STATUS_FAIL,
};
+static struct priority_property remote_getprop_verinfo_props[] = {
+ {
+ .prop.type = BT_PROPERTY_REMOTE_VERSION_INFO,
+ .prop.val = NULL,
+ .prop.len = 0,
+ },
+};
+
+static const struct generic_data bt_dev_getprop_verinfo_fail_test = {
+ .expected_hal_cb.discovery_state_changed_cb =
+ remote_discovery_state_changed_cb,
+ .expected_hal_cb.device_found_cb = remote_get_property_device_found_cb,
+ .expected_hal_cb.remote_device_properties_cb =
+ remote_test_device_properties_cb,
+ .expected_cb_count = 3,
+ .expected_properties = remote_getprop_verinfo_props,
+ .expected_adapter_status = BT_STATUS_FAIL,
+};
+
static bt_callbacks_t bt_callbacks = {
.size = sizeof(bt_callbacks),
.adapter_state_changed_cb = adapter_state_changed_cb,
@@ -2170,6 +2189,15 @@ static void test_dev_getprop_disctimeout_fail(const void *test_data)
data->if_bluetooth->start_discovery();
}
+static void test_dev_getprop_verinfo_fail(const void *test_data)
+{
+ struct test_data *data = tester_get_data();
+
+ init_test_conditions(data);
+
+ data->if_bluetooth->start_discovery();
+}
+
/* Test Socket HAL */
static void adapter_socket_state_changed_cb(bt_state_t state)
@@ -2831,6 +2859,11 @@ int main(int argc, char *argv[])
setup_enabled_adapter,
test_dev_getprop_disctimeout_fail, teardown);
+ test_bredrle("Bluetooth Device Get VERSION_INFO - Fail",
+ &bt_dev_getprop_verinfo_fail_test,
+ setup_enabled_adapter,
+ test_dev_getprop_verinfo_fail, teardown);
+
test_bredrle("Socket Init", NULL, setup_socket_interface,
test_dummy, teardown);
--
1.8.5.2
^ permalink raw reply related
* [PATCH v2 13/15] android/tester: Add get device DISCTIMEOUT prop fail test case
From: Grzegorz Kolodziejczyk @ 2014-01-14 13:54 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1389707686-30766-1-git-send-email-grzegorz.kolodziejczyk@tieto.com>
This adds device DISCOVERY TIMEOUT property fail test case.
---
android/android-tester.c | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/android/android-tester.c b/android/android-tester.c
index 2192cc4..89566d4 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -1528,6 +1528,27 @@ static const struct generic_data bt_dev_getprop_bondeddev_fail_test = {
.expected_adapter_status = BT_STATUS_FAIL,
};
+static uint32_t remote_getprop_disctimeout_val = 120;
+
+static struct priority_property remote_getprop_disctimeout_props[] = {
+ {
+ .prop.type = BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT,
+ .prop.val = &remote_getprop_disctimeout_val,
+ .prop.len = sizeof(remote_getprop_disctimeout_val),
+ },
+};
+
+static const struct generic_data bt_dev_getprop_disctimeout_fail_test = {
+ .expected_hal_cb.discovery_state_changed_cb =
+ remote_discovery_state_changed_cb,
+ .expected_hal_cb.device_found_cb = remote_get_property_device_found_cb,
+ .expected_hal_cb.remote_device_properties_cb =
+ remote_test_device_properties_cb,
+ .expected_cb_count = 3,
+ .expected_properties = remote_getprop_disctimeout_props,
+ .expected_adapter_status = BT_STATUS_FAIL,
+};
+
static bt_callbacks_t bt_callbacks = {
.size = sizeof(bt_callbacks),
.adapter_state_changed_cb = adapter_state_changed_cb,
@@ -2140,6 +2161,15 @@ static void test_dev_getprop_bondeddev_fail(const void *test_data)
data->if_bluetooth->start_discovery();
}
+static void test_dev_getprop_disctimeout_fail(const void *test_data)
+{
+ struct test_data *data = tester_get_data();
+
+ init_test_conditions(data);
+
+ data->if_bluetooth->start_discovery();
+}
+
/* Test Socket HAL */
static void adapter_socket_state_changed_cb(bt_state_t state)
@@ -2796,6 +2826,11 @@ int main(int argc, char *argv[])
setup_enabled_adapter,
test_dev_getprop_bondeddev_fail, teardown);
+ test_bredrle("Bluetooth Device Get DISCOVERY_TIMEOUT - Fail",
+ &bt_dev_getprop_disctimeout_fail_test,
+ setup_enabled_adapter,
+ test_dev_getprop_disctimeout_fail, teardown);
+
test_bredrle("Socket Init", NULL, setup_socket_interface,
test_dummy, teardown);
--
1.8.5.2
^ permalink raw reply related
* [PATCH v2 12/15] android/tester: Add get device BONDED_DEV property fail test case
From: Grzegorz Kolodziejczyk @ 2014-01-14 13:54 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1389707686-30766-1-git-send-email-grzegorz.kolodziejczyk@tieto.com>
This adds device BONDED DEVICES property fail test case.
---
android/android-tester.c | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/android/android-tester.c b/android/android-tester.c
index a9f57e5..2192cc4 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -1509,6 +1509,25 @@ static const struct generic_data bt_dev_getprop_scanmode_fail_test = {
.expected_adapter_status = BT_STATUS_FAIL,
};
+static struct priority_property remote_getprop_bondeddev_props[] = {
+ {
+ .prop.type = BT_PROPERTY_ADAPTER_BONDED_DEVICES,
+ .prop.val = NULL,
+ .prop.len = 0,
+ },
+};
+
+static const struct generic_data bt_dev_getprop_bondeddev_fail_test = {
+ .expected_hal_cb.discovery_state_changed_cb =
+ remote_discovery_state_changed_cb,
+ .expected_hal_cb.device_found_cb = remote_get_property_device_found_cb,
+ .expected_hal_cb.remote_device_properties_cb =
+ remote_test_device_properties_cb,
+ .expected_cb_count = 3,
+ .expected_properties = remote_getprop_bondeddev_props,
+ .expected_adapter_status = BT_STATUS_FAIL,
+};
+
static bt_callbacks_t bt_callbacks = {
.size = sizeof(bt_callbacks),
.adapter_state_changed_cb = adapter_state_changed_cb,
@@ -2112,6 +2131,15 @@ static void test_dev_getprop_scanmode_fail(const void *test_data)
data->if_bluetooth->start_discovery();
}
+static void test_dev_getprop_bondeddev_fail(const void *test_data)
+{
+ struct test_data *data = tester_get_data();
+
+ init_test_conditions(data);
+
+ data->if_bluetooth->start_discovery();
+}
+
/* Test Socket HAL */
static void adapter_socket_state_changed_cb(bt_state_t state)
@@ -2763,6 +2791,11 @@ int main(int argc, char *argv[])
setup_enabled_adapter,
test_dev_getprop_scanmode_fail, teardown);
+ test_bredrle("Bluetooth Device Get BONDED_DEVICES - Fail",
+ &bt_dev_getprop_bondeddev_fail_test,
+ setup_enabled_adapter,
+ test_dev_getprop_bondeddev_fail, teardown);
+
test_bredrle("Socket Init", NULL, setup_socket_interface,
test_dummy, teardown);
--
1.8.5.2
^ permalink raw reply related
* [PATCH v2 11/15] android/tester: Add get device SCAN_MODE property fail test case
From: Grzegorz Kolodziejczyk @ 2014-01-14 13:54 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1389707686-30766-1-git-send-email-grzegorz.kolodziejczyk@tieto.com>
This adds device SCAN MODE property fail test case.
---
android/android-tester.c | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/android/android-tester.c b/android/android-tester.c
index 8eddf2a..a9f57e5 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -1488,6 +1488,27 @@ static const struct generic_data bt_dev_getprop_servrec_fail_test = {
.expected_adapter_status = BT_STATUS_FAIL,
};
+static bt_scan_mode_t remote_getprop_scanmode_val = BT_SCAN_MODE_CONNECTABLE;
+
+static struct priority_property remote_getprop_scanmode_props[] = {
+ {
+ .prop.type = BT_PROPERTY_ADAPTER_SCAN_MODE,
+ .prop.val = &remote_getprop_scanmode_val,
+ .prop.len = sizeof(remote_getprop_scanmode_val),
+ },
+};
+
+static const struct generic_data bt_dev_getprop_scanmode_fail_test = {
+ .expected_hal_cb.discovery_state_changed_cb =
+ remote_discovery_state_changed_cb,
+ .expected_hal_cb.device_found_cb = remote_get_property_device_found_cb,
+ .expected_hal_cb.remote_device_properties_cb =
+ remote_test_device_properties_cb,
+ .expected_cb_count = 3,
+ .expected_properties = remote_getprop_scanmode_props,
+ .expected_adapter_status = BT_STATUS_FAIL,
+};
+
static bt_callbacks_t bt_callbacks = {
.size = sizeof(bt_callbacks),
.adapter_state_changed_cb = adapter_state_changed_cb,
@@ -2082,6 +2103,15 @@ static void test_dev_getprop_servrec_fail(const void *test_data)
data->if_bluetooth->start_discovery();
}
+static void test_dev_getprop_scanmode_fail(const void *test_data)
+{
+ struct test_data *data = tester_get_data();
+
+ init_test_conditions(data);
+
+ data->if_bluetooth->start_discovery();
+}
+
/* Test Socket HAL */
static void adapter_socket_state_changed_cb(bt_state_t state)
@@ -2728,6 +2758,11 @@ int main(int argc, char *argv[])
setup_enabled_adapter,
test_dev_getprop_servrec_fail, teardown);
+ test_bredrle("Bluetooth Device Get SCAN_MODE - Fail",
+ &bt_dev_getprop_scanmode_fail_test,
+ setup_enabled_adapter,
+ test_dev_getprop_scanmode_fail, teardown);
+
test_bredrle("Socket Init", NULL, setup_socket_interface,
test_dummy, teardown);
--
1.8.5.2
^ permalink raw reply related
* [PATCH v2 10/15] android/tester: Add get device SERVREC property fail test case
From: Grzegorz Kolodziejczyk @ 2014-01-14 13:54 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1389707686-30766-1-git-send-email-grzegorz.kolodziejczyk@tieto.com>
This adds device SERVICE RECORD property fail test case.
---
android/android-tester.c | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/android/android-tester.c b/android/android-tester.c
index b7309e7..8eddf2a 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -1463,6 +1463,31 @@ static const struct generic_data bt_dev_getprop_bdaddr_fail_test = {
.expected_adapter_status = BT_STATUS_FAIL,
};
+static bt_service_record_t remote_getprop_servrec_val = {
+ .uuid = { {0x00} },
+ .channel = 12,
+ .name = "bt_name",
+};
+
+static struct priority_property remote_getprop_servrec_props[] = {
+ {
+ .prop.type = BT_PROPERTY_SERVICE_RECORD,
+ .prop.val = &remote_getprop_servrec_val,
+ .prop.len = sizeof(remote_getprop_servrec_val),
+ },
+};
+
+static const struct generic_data bt_dev_getprop_servrec_fail_test = {
+ .expected_hal_cb.discovery_state_changed_cb =
+ remote_discovery_state_changed_cb,
+ .expected_hal_cb.device_found_cb = remote_get_property_device_found_cb,
+ .expected_hal_cb.remote_device_properties_cb =
+ remote_test_device_properties_cb,
+ .expected_cb_count = 3,
+ .expected_properties = remote_getprop_servrec_props,
+ .expected_adapter_status = BT_STATUS_FAIL,
+};
+
static bt_callbacks_t bt_callbacks = {
.size = sizeof(bt_callbacks),
.adapter_state_changed_cb = adapter_state_changed_cb,
@@ -2048,6 +2073,15 @@ static void test_dev_getprop_bdaddr_fail(const void *test_data)
data->if_bluetooth->start_discovery();
}
+static void test_dev_getprop_servrec_fail(const void *test_data)
+{
+ struct test_data *data = tester_get_data();
+
+ init_test_conditions(data);
+
+ data->if_bluetooth->start_discovery();
+}
+
/* Test Socket HAL */
static void adapter_socket_state_changed_cb(bt_state_t state)
@@ -2689,6 +2723,11 @@ int main(int argc, char *argv[])
setup_enabled_adapter,
test_dev_getprop_bdaddr_fail, teardown);
+ test_bredrle("Bluetooth Device Get SERVICE_RECORD - Fail",
+ &bt_dev_getprop_servrec_fail_test,
+ setup_enabled_adapter,
+ test_dev_getprop_servrec_fail, teardown);
+
test_bredrle("Socket Init", NULL, setup_socket_interface,
test_dummy, teardown);
--
1.8.5.2
^ permalink raw reply related
* [PATCH v2 09/15] android/tester: Add get device BDADDR property fail test case
From: Grzegorz Kolodziejczyk @ 2014-01-14 13:54 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1389707686-30766-1-git-send-email-grzegorz.kolodziejczyk@tieto.com>
This adds device BDADDR property fail test case.
---
android/android-tester.c | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/android/android-tester.c b/android/android-tester.c
index 0381028..b7309e7 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -1440,6 +1440,29 @@ static const struct generic_data bt_dev_getprop_timpestamp_success_test = {
.expected_adapter_status = BT_STATUS_SUCCESS,
};
+static bt_bdaddr_t remote_getprop_bdaddr_val = {
+ .address = { 0x00, 0xaa, 0x01, 0x00, 0x00, 0x00 }
+};
+
+static struct priority_property remote_getprop_bdaddr_props[] = {
+ {
+ .prop.type = BT_PROPERTY_BDADDR,
+ .prop.val = &remote_getprop_bdaddr_val,
+ .prop.len = sizeof(remote_getprop_bdaddr_val),
+ },
+};
+
+static const struct generic_data bt_dev_getprop_bdaddr_fail_test = {
+ .expected_hal_cb.discovery_state_changed_cb =
+ remote_discovery_state_changed_cb,
+ .expected_hal_cb.device_found_cb = remote_get_property_device_found_cb,
+ .expected_hal_cb.remote_device_properties_cb =
+ remote_test_device_properties_cb,
+ .expected_cb_count = 3,
+ .expected_properties = remote_getprop_bdaddr_props,
+ .expected_adapter_status = BT_STATUS_FAIL,
+};
+
static bt_callbacks_t bt_callbacks = {
.size = sizeof(bt_callbacks),
.adapter_state_changed_cb = adapter_state_changed_cb,
@@ -2016,6 +2039,15 @@ static void test_dev_getprop_timestamp_success(const void *test_data)
data->if_bluetooth->start_discovery();
}
+static void test_dev_getprop_bdaddr_fail(const void *test_data)
+{
+ struct test_data *data = tester_get_data();
+
+ init_test_conditions(data);
+
+ data->if_bluetooth->start_discovery();
+}
+
/* Test Socket HAL */
static void adapter_socket_state_changed_cb(bt_state_t state)
@@ -2652,6 +2684,11 @@ int main(int argc, char *argv[])
setup_enabled_adapter,
test_dev_getprop_timestamp_success, teardown);
+ test_bredrle("Bluetooth Device Get BDADDR - Fail",
+ &bt_dev_getprop_bdaddr_fail_test,
+ setup_enabled_adapter,
+ test_dev_getprop_bdaddr_fail, teardown);
+
test_bredrle("Socket Init", NULL, setup_socket_interface,
test_dummy, teardown);
--
1.8.5.2
^ permalink raw reply related
* [PATCH v2 08/15] android/tester: Add get device TIMESTAMP prop success test case
From: Grzegorz Kolodziejczyk @ 2014-01-14 13:54 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1389707686-30766-1-git-send-email-grzegorz.kolodziejczyk@tieto.com>
This adds device TIMESTAMP property success test case.
---
android/android-tester.c | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/android/android-tester.c b/android/android-tester.c
index f69d269..0381028 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -1420,6 +1420,26 @@ static const struct generic_data bt_dev_getprop_rssi_success_test = {
.expected_adapter_status = BT_STATUS_SUCCESS,
};
+static struct priority_property remote_getprop_timestamp_props[] = {
+ {
+ .prop.type = BT_PROPERTY_REMOTE_DEVICE_TIMESTAMP,
+ .prop.val = NULL,
+ .prop.len = 4,
+ },
+};
+
+static const struct generic_data bt_dev_getprop_timpestamp_success_test = {
+ .expected_hal_cb.discovery_state_changed_cb =
+ remote_discovery_state_changed_cb,
+ .expected_hal_cb.device_found_cb = remote_get_property_device_found_cb,
+ .expected_hal_cb.remote_device_properties_cb =
+ remote_test_device_properties_cb,
+ .expected_cb_count = 3,
+ .expected_properties_num = 1,
+ .expected_properties = remote_getprop_timestamp_props,
+ .expected_adapter_status = BT_STATUS_SUCCESS,
+};
+
static bt_callbacks_t bt_callbacks = {
.size = sizeof(bt_callbacks),
.adapter_state_changed_cb = adapter_state_changed_cb,
@@ -1987,6 +2007,15 @@ static void test_dev_getprop_rssi_success(const void *test_data)
data->if_bluetooth->start_discovery();
}
+static void test_dev_getprop_timestamp_success(const void *test_data)
+{
+ struct test_data *data = tester_get_data();
+
+ init_test_conditions(data);
+
+ data->if_bluetooth->start_discovery();
+}
+
/* Test Socket HAL */
static void adapter_socket_state_changed_cb(bt_state_t state)
@@ -2618,6 +2647,11 @@ int main(int argc, char *argv[])
setup_enabled_adapter,
test_dev_getprop_rssi_success, teardown);
+ test_bredrle("Bluetooth Device Get TIMESTAMP - Success",
+ &bt_dev_getprop_timpestamp_success_test,
+ setup_enabled_adapter,
+ test_dev_getprop_timestamp_success, teardown);
+
test_bredrle("Socket Init", NULL, setup_socket_interface,
test_dummy, teardown);
--
1.8.5.2
^ permalink raw reply related
* [PATCH v2 07/15] android/tester: Add get device RSSI property success test case
From: Grzegorz Kolodziejczyk @ 2014-01-14 13:54 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1389707686-30766-1-git-send-email-grzegorz.kolodziejczyk@tieto.com>
This adds device RSSI property success test case.
---
android/android-tester.c | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/android/android-tester.c b/android/android-tester.c
index a63ed32..f69d269 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -1398,6 +1398,28 @@ static const struct generic_data bt_dev_getprop_tod_success_test = {
.expected_adapter_status = BT_STATUS_SUCCESS,
};
+static int32_t remote_getprop_rssi_val = -60;
+
+static struct priority_property remote_getprop_rssi_props[] = {
+ {
+ .prop.type = BT_PROPERTY_REMOTE_RSSI,
+ .prop.val = &remote_getprop_rssi_val,
+ .prop.len = sizeof(remote_getprop_rssi_val),
+ },
+};
+
+static const struct generic_data bt_dev_getprop_rssi_success_test = {
+ .expected_hal_cb.discovery_state_changed_cb =
+ remote_discovery_state_changed_cb,
+ .expected_hal_cb.device_found_cb = remote_get_property_device_found_cb,
+ .expected_hal_cb.remote_device_properties_cb =
+ remote_test_device_properties_cb,
+ .expected_cb_count = 3,
+ .expected_properties_num = 1,
+ .expected_properties = remote_getprop_rssi_props,
+ .expected_adapter_status = BT_STATUS_SUCCESS,
+};
+
static bt_callbacks_t bt_callbacks = {
.size = sizeof(bt_callbacks),
.adapter_state_changed_cb = adapter_state_changed_cb,
@@ -1956,6 +1978,15 @@ static void test_dev_getprop_tod_success(const void *test_data)
data->if_bluetooth->start_discovery();
}
+static void test_dev_getprop_rssi_success(const void *test_data)
+{
+ struct test_data *data = tester_get_data();
+
+ init_test_conditions(data);
+
+ data->if_bluetooth->start_discovery();
+}
+
/* Test Socket HAL */
static void adapter_socket_state_changed_cb(bt_state_t state)
@@ -2582,6 +2613,11 @@ int main(int argc, char *argv[])
setup_enabled_adapter,
test_dev_getprop_tod_success, teardown);
+ test_bredrle("Bluetooth Device Get RSSI - Success",
+ &bt_dev_getprop_rssi_success_test,
+ setup_enabled_adapter,
+ test_dev_getprop_rssi_success, teardown);
+
test_bredrle("Socket Init", NULL, setup_socket_interface,
test_dummy, teardown);
--
1.8.5.2
^ permalink raw reply related
* [PATCH v2 06/15] android/tester: Add get device TOD property success test case
From: Grzegorz Kolodziejczyk @ 2014-01-14 13:54 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1389707686-30766-1-git-send-email-grzegorz.kolodziejczyk@tieto.com>
This adds device TOD property success test case.
---
android/android-tester.c | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/android/android-tester.c b/android/android-tester.c
index c72b297..a63ed32 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -1376,6 +1376,28 @@ static const struct generic_data bt_dev_getprop_cod_success_test = {
.expected_adapter_status = BT_STATUS_SUCCESS,
};
+static bt_device_type_t remote_getprop_tod_val = BT_DEVICE_DEVTYPE_BREDR;
+
+static struct priority_property remote_getprop_tod_props[] = {
+ {
+ .prop.type = BT_PROPERTY_TYPE_OF_DEVICE,
+ .prop.val = &remote_getprop_tod_val,
+ .prop.len = sizeof(remote_getprop_tod_val),
+ },
+};
+
+static const struct generic_data bt_dev_getprop_tod_success_test = {
+ .expected_hal_cb.discovery_state_changed_cb =
+ remote_discovery_state_changed_cb,
+ .expected_hal_cb.device_found_cb = remote_get_property_device_found_cb,
+ .expected_hal_cb.remote_device_properties_cb =
+ remote_test_device_properties_cb,
+ .expected_cb_count = 3,
+ .expected_properties_num = 1,
+ .expected_properties = remote_getprop_tod_props,
+ .expected_adapter_status = BT_STATUS_SUCCESS,
+};
+
static bt_callbacks_t bt_callbacks = {
.size = sizeof(bt_callbacks),
.adapter_state_changed_cb = adapter_state_changed_cb,
@@ -1925,6 +1947,15 @@ static void test_dev_getprop_cod_success(const void *test_data)
data->if_bluetooth->start_discovery();
}
+static void test_dev_getprop_tod_success(const void *test_data)
+{
+ struct test_data *data = tester_get_data();
+
+ init_test_conditions(data);
+
+ data->if_bluetooth->start_discovery();
+}
+
/* Test Socket HAL */
static void adapter_socket_state_changed_cb(bt_state_t state)
@@ -2546,6 +2577,11 @@ int main(int argc, char *argv[])
setup_enabled_adapter,
test_dev_getprop_cod_success, teardown);
+ test_bredrle("Bluetooth Device Get TOD - Success",
+ &bt_dev_getprop_tod_success_test,
+ setup_enabled_adapter,
+ test_dev_getprop_tod_success, teardown);
+
test_bredrle("Socket Init", NULL, setup_socket_interface,
test_dummy, teardown);
--
1.8.5.2
^ permalink raw reply related
* [PATCH v2 05/15] android/tester: Add get device COD property success test case
From: Grzegorz Kolodziejczyk @ 2014-01-14 13:54 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1389707686-30766-1-git-send-email-grzegorz.kolodziejczyk@tieto.com>
This adds device COD property success test case.
---
android/android-tester.c | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/android/android-tester.c b/android/android-tester.c
index dbfde85..c72b297 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -1354,6 +1354,28 @@ static const struct generic_data bt_dev_getprop_uuids_success_test = {
.expected_adapter_status = BT_STATUS_SUCCESS,
};
+static uint32_t remote_getprop_cod_val = 0;
+
+static struct priority_property remote_getprop_cod_props[] = {
+ {
+ .prop.type = BT_PROPERTY_CLASS_OF_DEVICE,
+ .prop.val = &remote_getprop_cod_val,
+ .prop.len = sizeof(remote_getprop_cod_val),
+ },
+};
+
+static const struct generic_data bt_dev_getprop_cod_success_test = {
+ .expected_hal_cb.discovery_state_changed_cb =
+ remote_discovery_state_changed_cb,
+ .expected_hal_cb.device_found_cb = remote_get_property_device_found_cb,
+ .expected_hal_cb.remote_device_properties_cb =
+ remote_test_device_properties_cb,
+ .expected_cb_count = 3,
+ .expected_properties_num = 1,
+ .expected_properties = remote_getprop_cod_props,
+ .expected_adapter_status = BT_STATUS_SUCCESS,
+};
+
static bt_callbacks_t bt_callbacks = {
.size = sizeof(bt_callbacks),
.adapter_state_changed_cb = adapter_state_changed_cb,
@@ -1894,6 +1916,15 @@ static void test_dev_getprop_uuids_success(const void *test_data)
data->if_bluetooth->start_discovery();
}
+static void test_dev_getprop_cod_success(const void *test_data)
+{
+ struct test_data *data = tester_get_data();
+
+ init_test_conditions(data);
+
+ data->if_bluetooth->start_discovery();
+}
+
/* Test Socket HAL */
static void adapter_socket_state_changed_cb(bt_state_t state)
@@ -2510,6 +2541,11 @@ int main(int argc, char *argv[])
setup_enabled_adapter,
test_dev_getprop_uuids_success, teardown);
+ test_bredrle("Bluetooth Device Get COD - Success",
+ &bt_dev_getprop_cod_success_test,
+ setup_enabled_adapter,
+ test_dev_getprop_cod_success, teardown);
+
test_bredrle("Socket Init", NULL, setup_socket_interface,
test_dummy, teardown);
--
1.8.5.2
^ permalink raw reply related
* [PATCH v2 04/15] android/tester: Add get device UUIDS property success test case
From: Grzegorz Kolodziejczyk @ 2014-01-14 13:54 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1389707686-30766-1-git-send-email-grzegorz.kolodziejczyk@tieto.com>
This adds device UUIDS property success test case.
---
android/android-tester.c | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/android/android-tester.c b/android/android-tester.c
index bddcf7c..dbfde85 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -1334,6 +1334,26 @@ static const struct generic_data bt_dev_getprop_bdname_success_test = {
.expected_adapter_status = BT_STATUS_SUCCESS,
};
+static struct priority_property remote_getprop_uuids_props[] = {
+ {
+ .prop.type = BT_PROPERTY_UUIDS,
+ .prop.val = NULL,
+ .prop.len = 0,
+ },
+};
+
+static const struct generic_data bt_dev_getprop_uuids_success_test = {
+ .expected_hal_cb.discovery_state_changed_cb =
+ remote_discovery_state_changed_cb,
+ .expected_hal_cb.device_found_cb = remote_get_property_device_found_cb,
+ .expected_hal_cb.remote_device_properties_cb =
+ remote_test_device_properties_cb,
+ .expected_cb_count = 3,
+ .expected_properties_num = 1,
+ .expected_properties = remote_getprop_uuids_props,
+ .expected_adapter_status = BT_STATUS_SUCCESS,
+};
+
static bt_callbacks_t bt_callbacks = {
.size = sizeof(bt_callbacks),
.adapter_state_changed_cb = adapter_state_changed_cb,
@@ -1865,6 +1885,15 @@ static void test_dev_getprop_bdname_success(const void *test_data)
data->if_bluetooth->start_discovery();
}
+static void test_dev_getprop_uuids_success(const void *test_data)
+{
+ struct test_data *data = tester_get_data();
+
+ init_test_conditions(data);
+
+ data->if_bluetooth->start_discovery();
+}
+
/* Test Socket HAL */
static void adapter_socket_state_changed_cb(bt_state_t state)
@@ -2476,6 +2505,11 @@ int main(int argc, char *argv[])
setup_enabled_adapter,
test_dev_getprop_bdname_success, teardown);
+ test_bredrle("Bluetooth Device Get UUIDS - Success",
+ &bt_dev_getprop_uuids_success_test,
+ setup_enabled_adapter,
+ test_dev_getprop_uuids_success, teardown);
+
test_bredrle("Socket Init", NULL, setup_socket_interface,
test_dummy, teardown);
--
1.8.5.2
^ permalink raw reply related
* [PATCH v2 03/15] android/tester: Add get device BDNAME property success test case
From: Grzegorz Kolodziejczyk @ 2014-01-14 13:54 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1389707686-30766-1-git-send-email-grzegorz.kolodziejczyk@tieto.com>
This adds device BDNAME property success test case.
---
android/android-tester.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 57 insertions(+)
diff --git a/android/android-tester.c b/android/android-tester.c
index ba9af0f..bddcf7c 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -728,6 +728,27 @@ static void remote_getprops_device_found_cb(int num_properties,
data->if_bluetooth->get_remote_device_properties(&remote_addr);
}
+static void remote_get_property_device_found_cb(int num_properties,
+ bt_property_t *properties)
+{
+ struct test_data *data = tester_get_data();
+ const struct generic_data *test = data->test_data;
+ bt_status_t status;
+ uint8_t *bdaddr = (uint8_t *)hciemu_get_client_bdaddr(data->hciemu);
+ bt_bdaddr_t remote_addr;
+
+ const bt_property_t prop = test->expected_properties[0].prop;
+
+ bdaddr2android((const bdaddr_t *)bdaddr, &remote_addr.address);
+
+ if (data->cb_count == 2)
+ data->cb_count--;
+
+ status = data->if_bluetooth->get_remote_device_property(&remote_addr,
+ prop.type);
+ check_expected_status(status);
+}
+
static void device_found_cb(int num_properties, bt_property_t *properties)
{
struct test_data *data = tester_get_data();
@@ -1291,6 +1312,28 @@ static const struct generic_data bt_dev_getprops_success_test = {
.expected_adapter_status = BT_STATUS_NOT_EXPECTED,
};
+static const char remote_getprop_bdname_val[] = "00:AA:01:01:00:00";
+
+static struct priority_property remote_getprop_bdname_props[] = {
+ {
+ .prop.type = BT_PROPERTY_BDNAME,
+ .prop.val = &remote_getprop_bdname_val,
+ .prop.len = sizeof(remote_getprop_bdname_val) - 1,
+ },
+};
+
+static const struct generic_data bt_dev_getprop_bdname_success_test = {
+ .expected_hal_cb.discovery_state_changed_cb =
+ remote_discovery_state_changed_cb,
+ .expected_hal_cb.device_found_cb = remote_get_property_device_found_cb,
+ .expected_hal_cb.remote_device_properties_cb =
+ remote_test_device_properties_cb,
+ .expected_cb_count = 3,
+ .expected_properties_num = 1,
+ .expected_properties = remote_getprop_bdname_props,
+ .expected_adapter_status = BT_STATUS_SUCCESS,
+};
+
static bt_callbacks_t bt_callbacks = {
.size = sizeof(bt_callbacks),
.adapter_state_changed_cb = adapter_state_changed_cb,
@@ -1813,6 +1856,15 @@ static void test_dev_getprops_success(const void *test_data)
data->if_bluetooth->start_discovery();
}
+static void test_dev_getprop_bdname_success(const void *test_data)
+{
+ struct test_data *data = tester_get_data();
+
+ init_test_conditions(data);
+
+ data->if_bluetooth->start_discovery();
+}
+
/* Test Socket HAL */
static void adapter_socket_state_changed_cb(bt_state_t state)
@@ -2419,6 +2471,11 @@ int main(int argc, char *argv[])
setup_enabled_adapter,
test_dev_getprops_success, teardown);
+ test_bredrle("Bluetooth Device Get BDNAME - Success",
+ &bt_dev_getprop_bdname_success_test,
+ setup_enabled_adapter,
+ test_dev_getprop_bdname_success, teardown);
+
test_bredrle("Socket Init", NULL, setup_socket_interface,
test_dummy, teardown);
--
1.8.5.2
^ permalink raw reply related
* [PATCH v2 02/15] android/tester: Add get device properties success test case
From: Grzegorz Kolodziejczyk @ 2014-01-14 13:54 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1389707686-30766-1-git-send-email-grzegorz.kolodziejczyk@tieto.com>
This adds device properties success test case.
---
android/android-tester.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 124 insertions(+), 1 deletion(-)
diff --git a/android/android-tester.c b/android/android-tester.c
index a9dab69..ba9af0f 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -630,6 +630,20 @@ static void discovery_device_found_state_changed_cb(bt_discovery_state_t state)
}
}
+static void remote_discovery_state_changed_cb(bt_discovery_state_t state)
+{
+ struct test_data *data = tester_get_data();
+
+ if (state == BT_DISCOVERY_STARTED && data->cb_count == 3) {
+ data->cb_count--;
+ return;
+ }
+ if (state == BT_DISCOVERY_STOPPED && data->cb_count == 1) {
+ data->cb_count--;
+ check_cb_count();
+ }
+}
+
static void discovery_state_changed_cb(bt_discovery_state_t state)
{
struct test_data *data = tester_get_data();
@@ -699,6 +713,21 @@ static void discovery_device_found_cb(int num_properties,
}
}
+static void remote_getprops_device_found_cb(int num_properties,
+ bt_property_t *properties)
+{
+ struct test_data *data = tester_get_data();
+ uint8_t *bdaddr = (uint8_t *)hciemu_get_client_bdaddr(data->hciemu);
+ bt_bdaddr_t remote_addr;
+
+ bdaddr2android((const bdaddr_t *)bdaddr, &remote_addr.address);
+
+ if (data->cb_count == 2)
+ data->cb_count--;
+
+ data->if_bluetooth->get_remote_device_properties(&remote_addr);
+}
+
static void device_found_cb(int num_properties, bt_property_t *properties)
{
struct test_data *data = tester_get_data();
@@ -734,6 +763,30 @@ static void adapter_properties_cb(bt_status_t status, int num_properties,
}
}
+static void remote_test_device_properties_cb(bt_status_t status,
+ bt_bdaddr_t *bd_addr, int num_properties,
+ bt_property_t *properties)
+{
+ int i;
+
+ for (i = 0; i < num_properties; i++)
+ check_expected_property(properties[i]);
+}
+
+static void remote_device_properties_cb(bt_status_t status,
+ bt_bdaddr_t *bd_addr, int num_properties,
+ bt_property_t *properties)
+{
+ struct test_data *data = tester_get_data();
+ const struct generic_data *test = data->test_data;
+
+ if (data->test_init_done &&
+ test->expected_hal_cb.remote_device_properties_cb) {
+ test->expected_hal_cb.remote_device_properties_cb(status,
+ bd_addr, num_properties, properties);
+ }
+}
+
static bt_bdaddr_t enable_done_bdaddr_val = { {0x00} };
static const char enable_done_bdname_val[] = "BlueZ for Android";
static bt_uuid_t enable_done_uuids_val = {
@@ -1182,11 +1235,67 @@ static const struct generic_data bluetooth_discovery_device_found_test = {
.expected_adapter_status = BT_STATUS_NOT_EXPECTED,
};
+static const char remote_get_properties_bdname_val[] = "00:AA:01:01:00:00";
+static uint32_t remote_get_properties_cod_val = 0;
+static bt_device_type_t remote_get_properties_tod_val = BT_DEVICE_DEVTYPE_BREDR;
+static int32_t remote_get_properties_rssi_val = -60;
+
+static struct priority_property remote_getprops_props[] = {
+ {
+ .prop.type = BT_PROPERTY_BDNAME,
+ .prop.val = &remote_get_properties_bdname_val,
+ .prop.len = sizeof(remote_get_properties_bdname_val) - 1,
+ .prio = 1,
+ },
+ {
+ .prop.type = BT_PROPERTY_UUIDS,
+ .prop.val = NULL,
+ .prop.len = 0,
+ .prio = 2,
+ },
+ {
+ .prop.type = BT_PROPERTY_CLASS_OF_DEVICE,
+ .prop.val = &remote_get_properties_cod_val,
+ .prop.len = sizeof(remote_get_properties_cod_val),
+ .prio = 3,
+ },
+ {
+ .prop.type = BT_PROPERTY_TYPE_OF_DEVICE,
+ .prop.val = &remote_get_properties_tod_val,
+ .prop.len = sizeof(remote_get_properties_tod_val),
+ .prio = 4,
+ },
+ {
+ .prop.type = BT_PROPERTY_REMOTE_RSSI,
+ .prop.val = &remote_get_properties_rssi_val,
+ .prop.len = sizeof(remote_get_properties_rssi_val),
+ .prio = 5,
+ },
+ {
+ .prop.type = BT_PROPERTY_REMOTE_DEVICE_TIMESTAMP,
+ .prop.val = NULL,
+ .prop.len = 4,
+ .prio = 6,
+ },
+};
+
+static const struct generic_data bt_dev_getprops_success_test = {
+ .expected_hal_cb.discovery_state_changed_cb =
+ remote_discovery_state_changed_cb,
+ .expected_hal_cb.device_found_cb = remote_getprops_device_found_cb,
+ .expected_hal_cb.remote_device_properties_cb =
+ remote_test_device_properties_cb,
+ .expected_cb_count = 3,
+ .expected_properties_num = 6,
+ .expected_properties = remote_getprops_props,
+ .expected_adapter_status = BT_STATUS_NOT_EXPECTED,
+};
+
static bt_callbacks_t bt_callbacks = {
.size = sizeof(bt_callbacks),
.adapter_state_changed_cb = adapter_state_changed_cb,
.adapter_properties_cb = adapter_properties_cb,
- .remote_device_properties_cb = NULL,
+ .remote_device_properties_cb = remote_device_properties_cb,
.device_found_cb = device_found_cb,
.discovery_state_changed_cb = discovery_state_changed_cb,
.pin_request_cb = NULL,
@@ -1695,6 +1804,15 @@ static void test_discovery_device_found(const void *test_data)
data->if_bluetooth->start_discovery();
}
+static void test_dev_getprops_success(const void *test_data)
+{
+ struct test_data *data = tester_get_data();
+
+ init_test_conditions(data);
+
+ data->if_bluetooth->start_discovery();
+}
+
/* Test Socket HAL */
static void adapter_socket_state_changed_cb(bt_state_t state)
@@ -2296,6 +2414,11 @@ int main(int argc, char *argv[])
setup_enabled_adapter,
test_discovery_device_found, teardown);
+ test_bredrle("Bluetooth Device Get Props - Success",
+ &bt_dev_getprops_success_test,
+ setup_enabled_adapter,
+ test_dev_getprops_success, teardown);
+
test_bredrle("Socket Init", NULL, setup_socket_interface,
test_dummy, teardown);
--
1.8.5.2
^ permalink raw reply related
* [PATCH v2 01/15] android/tester: Fix for asynchronous test case condition check
From: Grzegorz Kolodziejczyk @ 2014-01-14 13:54 UTC (permalink / raw)
To: linux-bluetooth
This patch fixes checking the state of test case. Due to asynchronous of
callbacks during state check of every single condition, state can be
checked double time by callback condition check with pass status already
set in meantime. Now state is kept as one decremented int.
To pass it must be equal zero and cannot be checked set again.
Change-Id: I595c9f9606f1da41218a85c62c07881bd7bd8ee8
---
android/android-tester.c | 44 ++++++++++++++++++++------------------------
1 file changed, 20 insertions(+), 24 deletions(-)
diff --git a/android/android-tester.c b/android/android-tester.c
index 6f18e5c..a9dab69 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -88,14 +88,13 @@ struct test_data {
const btsock_interface_t *if_sock;
const bthh_interface_t *if_hid;
- bool mgmt_settings_set;
- bool cb_count_checked;
- bool status_checked;
- bool property_checked;
+ int conditions_left;
/* Set to true if test conditions are initialized */
bool test_init_done;
+ bool test_result_set;
+
int cb_count;
GSList *expected_properties_list;
};
@@ -106,20 +105,15 @@ static void test_update_state(void)
{
struct test_data *data = tester_get_data();
- if (!(data->cb_count_checked))
- return;
- if (!(data->mgmt_settings_set))
- return;
- if (!(data->status_checked))
- return;
- if (!(data->property_checked))
- return;
- tester_test_passed();
+ if (data->conditions_left == 0 && !data->test_result_set) {
+ data->test_result_set = true;
+ tester_test_passed();
+ }
}
static void test_mgmt_settings_set(struct test_data *data)
{
- data->mgmt_settings_set = true;
+ data->conditions_left--;
test_update_state();
}
@@ -155,7 +149,7 @@ static void check_cb_count(void)
return;
if (data->cb_count == 0) {
- data->cb_count_checked = true;
+ data->conditions_left--;
test_update_state();
}
}
@@ -186,7 +180,7 @@ static void expected_status_init(struct test_data *data)
const struct generic_data *test_data = data->test_data;
if (test_data->expected_adapter_status == BT_STATUS_NOT_EXPECTED)
- data->status_checked = true;
+ data->conditions_left--;
}
static void test_property_init(struct test_data *data)
@@ -195,8 +189,8 @@ static void test_property_init(struct test_data *data)
GSList *l = data->expected_properties_list;
int i;
- if (!test_data->expected_hal_cb.adapter_properties_cb) {
- data->property_checked = true;
+ if (!test_data->expected_properties_num) {
+ data->conditions_left--;
return;
}
@@ -210,6 +204,8 @@ static void init_test_conditions(struct test_data *data)
{
data->test_init_done = true;
+ data->conditions_left = 4;
+
expected_cb_count_init(data);
mgmt_cb_init(data);
expected_status_init(data);
@@ -222,7 +218,7 @@ static void check_expected_status(uint8_t status)
const struct generic_data *test_data = data->test_data;
if (test_data->expected_adapter_status == status) {
- data->status_checked = true;
+ data->conditions_left--;
test_update_state();
} else
tester_test_failed();
@@ -278,6 +274,9 @@ static void check_expected_property(bt_property_t received_prop)
GSList *l = data->expected_properties_list;
GSList *found_exp_prop;
+ if (!g_slist_length(l))
+ return;
+
found_exp_prop = g_slist_find_custom(l, &received_prop,
&locate_property);
@@ -293,15 +292,13 @@ static void check_expected_property(bt_property_t received_prop)
if (g_slist_length(l))
return;
- data->property_checked = true;
+ data->conditions_left--;
test_update_state();
}
static bool check_test_property(bt_property_t received_prop,
bt_property_t expected_prop)
{
- struct test_data *data = tester_get_data();
-
if (expected_prop.type && (expected_prop.type != received_prop.type))
return false;
if (expected_prop.len && (expected_prop.len != received_prop.len))
@@ -310,7 +307,7 @@ static bool check_test_property(bt_property_t received_prop,
expected_prop.len))
return false;
- return data->property_checked = true;
+ return true;
}
static void read_info_callback(uint8_t status, uint16_t length,
@@ -1444,7 +1441,6 @@ static void test_getprop_bdname_success(const void *test_data)
init_test_conditions(data);
adapter_status = data->if_bluetooth->set_adapter_property(prop);
- check_expected_status(adapter_status);
adapter_status = data->if_bluetooth->get_adapter_property((*prop).type);
check_expected_status(adapter_status);
--
1.8.5.2
^ permalink raw reply related
* [PATCHv2 8/8] androi/ipc-tester: Add more cases for malformed data
From: Jakub Tyszkowski @ 2014-01-14 12:14 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1389701685-1861-1-git-send-email-jakub.tyszkowski@tieto.com>
This patch adds tests for more types of possible data malformations.
---
android/ipc-negative-tester.c | 46 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/android/ipc-negative-tester.c b/android/ipc-negative-tester.c
index 8ec3308..cac7f59 100644
--- a/android/ipc-negative-tester.c
+++ b/android/ipc-negative-tester.c
@@ -585,6 +585,48 @@ static const struct generic_data malformed_data = {
.num_services = 1,
};
+static const struct generic_data malformed_data2 = {
+ .ipc_data = {
+ /* use proper msg */
+ .buffer = ®ister_bt_msg,
+ /* but write incomplete */
+ .len = sizeof(register_bt_msg) - 1,
+ },
+ .init_services = {HAL_SERVICE_ID_BLUETOOTH},
+ .num_services = 1,
+};
+
+struct malformed_data3_struct {
+ struct regmod_msg valid_msg;
+ int redundant_data;
+} __attribute__((packed));
+
+static struct malformed_data3_struct malformed_data3_msg = {
+ /* valid register service message */
+ .valid_msg = {
+ .header = {
+ .service_id = HAL_SERVICE_ID_CORE,
+ .opcode = HAL_OP_REGISTER_MODULE,
+ .len = sizeof(struct hal_cmd_register_module),
+ },
+ .cmd = {
+ .service_id = HAL_SERVICE_ID_CORE,
+ },
+ },
+ /* plus redundant data */
+ . redundant_data = 666,
+};
+
+static const struct generic_data malformed_data3 = {
+ .ipc_data = {
+ /* use malformed msg */
+ .buffer = &malformed_data3_msg,
+ .len = sizeof(malformed_data3_msg),
+ },
+ .init_services = {HAL_SERVICE_ID_BLUETOOTH},
+ .num_services = 1,
+};
+
struct hal_hdr enable_unknown_service_hdr = {
.service_id = HAL_SERVICE_ID_MAX + 1,
.opcode = HAL_OP_REGISTER_MODULE,
@@ -661,6 +703,10 @@ int main(int argc, char *argv[])
setup, ipc_send_tc, teardown);
test_bredrle("Malformed data (wrong payload declared)", &malformed_data,
setup, ipc_send_tc, teardown);
+ test_bredrle("Malformed data2 (undersized msg)", &malformed_data2,
+ setup, ipc_send_tc, teardown);
+ test_bredrle("Malformed data3 (oversized msg)", &malformed_data3,
+ setup, ipc_send_tc, teardown);
test_bredrle("Invalid service", &enable_unknown_service_data,
setup, ipc_send_tc, teardown);
test_bredrle("Enable unregistered service",
--
1.8.5.2
^ permalink raw reply related
* [PATCHv2 7/8] android/ipc-tester: Add basic negative test cases for IPC's daemon site
From: Jakub Tyszkowski @ 2014-01-14 12:14 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1389701685-1861-1-git-send-email-jakub.tyszkowski@tieto.com>
This patch add first few test cases checking for proper daemon
termination in case of receiving invalid IPC data.
---
android/ipc-negative-tester.c | 120 ++++++++++++++++++++++++++++++++++++++++--
1 file changed, 117 insertions(+), 3 deletions(-)
diff --git a/android/ipc-negative-tester.c b/android/ipc-negative-tester.c
index a5b05cb..8ec3308 100644
--- a/android/ipc-negative-tester.c
+++ b/android/ipc-negative-tester.c
@@ -540,22 +540,136 @@ static void ipc_send_tc(const void *data)
3, user, g_free); \
} while (0)
-static const struct generic_data dummy_data = {
+struct regmod_msg register_bt_msg = {
+ .header = {
+ .service_id = HAL_SERVICE_ID_CORE,
+ .opcode = HAL_OP_REGISTER_MODULE,
+ .len = sizeof(struct hal_cmd_register_module),
+ },
+ .cmd = {
+ .service_id = HAL_SERVICE_ID_CORE,
+ },
+};
+
+static const struct generic_data to_small_data = {
.ipc_data = {
- .buffer = "",
+ /* valid header and payload */
+ .buffer = ®ister_bt_msg,
+ /* but write only incomplete header */
.len = 1,
},
.init_services = {HAL_SERVICE_ID_BLUETOOTH},
.num_services = 1,
};
+struct regmod_msg register_bt_malformed_size_msg = {
+ .header = {
+ .service_id = HAL_SERVICE_ID_CORE,
+ .opcode = HAL_OP_REGISTER_MODULE,
+ /* wrong payload size declared */
+ .len = sizeof(struct hal_cmd_register_module) - 1,
+ },
+ .cmd = {
+ .service_id = HAL_SERVICE_ID_CORE,
+ },
+};
+
+static const struct generic_data malformed_data = {
+ .ipc_data = {
+ /* use malformed msg - wrong size declared */
+ .buffer = ®ister_bt_malformed_size_msg,
+ /* but write proper size */
+ .len = sizeof(register_bt_malformed_size_msg),
+ },
+ .init_services = {HAL_SERVICE_ID_BLUETOOTH},
+ .num_services = 1,
+};
+
+struct hal_hdr enable_unknown_service_hdr = {
+ .service_id = HAL_SERVICE_ID_MAX + 1,
+ .opcode = HAL_OP_REGISTER_MODULE,
+ .len = 0,
+};
+
+static const struct generic_data enable_unknown_service_data = {
+ .ipc_data = {
+ /* enable invalid service */
+ .buffer = &enable_unknown_service_hdr,
+ .len = sizeof(enable_unknown_service_hdr),
+ },
+ .init_services = {HAL_SERVICE_ID_BLUETOOTH},
+ .num_services = 1,
+};
+
+struct hal_hdr enable_bt_service_hdr = {
+ .service_id = HAL_SERVICE_ID_BLUETOOTH,
+ .opcode = HAL_OP_ENABLE,
+ .len = 0,
+};
+
+static const struct generic_data enable_unregistered_service_data = {
+ .ipc_data = {
+ /* valid msg */
+ .buffer = &enable_bt_service_hdr,
+ /* send the whole thing */
+ .len = sizeof(enable_bt_service_hdr),
+ },
+ /* but don't register it before enabling */
+ .init_services = {},
+ .num_services = 0,
+};
+
+struct hal_hdr invalid_opcode_hdr = {
+ .service_id = HAL_SERVICE_ID_BLUETOOTH,
+ .opcode = 0x16,
+ .len = 0,
+};
+
+static const struct generic_data invalid_opcode_data = {
+ .ipc_data = {
+ /* valid msg */
+ .buffer = &invalid_opcode_hdr,
+ /* send the whole thing */
+ .len = sizeof(invalid_opcode_hdr),
+ },
+ .init_services = {HAL_SERVICE_ID_BLUETOOTH},
+ .num_services = 1,
+};
+
+struct hal_hdr invalid_msg_size_hdr = {
+ .service_id = HAL_SERVICE_ID_BLUETOOTH,
+ .opcode = HAL_OP_CREATE_BOND,
+ .len = 0,
+};
+
+static const struct generic_data invalid_msg_size_data = {
+ .ipc_data = {
+ .buffer = &invalid_msg_size_hdr,
+ .len = sizeof(invalid_msg_size_hdr),
+ },
+ .init_services = {HAL_SERVICE_ID_BLUETOOTH},
+ .num_services = 1,
+};
+
int main(int argc, char *argv[])
{
snprintf(exec_dir, sizeof(exec_dir), "%s", dirname(argv[0]));
tester_init(&argc, &argv);
- test_bredrle("Test Dummy", &dummy_data, setup, ipc_send_tc, teardown);
+ test_bredrle("To small data", &to_small_data,
+ setup, ipc_send_tc, teardown);
+ test_bredrle("Malformed data (wrong payload declared)", &malformed_data,
+ setup, ipc_send_tc, teardown);
+ test_bredrle("Invalid service", &enable_unknown_service_data,
+ setup, ipc_send_tc, teardown);
+ test_bredrle("Enable unregistered service",
+ &enable_unregistered_service_data,
+ setup, ipc_send_tc, teardown);
+ test_bredrle("Invalid opcode", &invalid_opcode_data,
+ setup, ipc_send_tc, teardown);
+ test_bredrle("Invalid msg size for opcode", &invalid_msg_size_data,
+ setup, ipc_send_tc, teardown);
return tester_run();
}
--
1.8.5.2
^ permalink raw reply related
* [PATCHv2 6/8] android/ipc-tester: Register services
From: Jakub Tyszkowski @ 2014-01-14 12:14 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1389701685-1861-1-git-send-email-jakub.tyszkowski@tieto.com>
This patch adds basic bluetooth service registration during setup procedure.
Without this daemon would reject commands for not registered services.
---
android/ipc-negative-tester.c | 48 ++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 47 insertions(+), 1 deletion(-)
diff --git a/android/ipc-negative-tester.c b/android/ipc-negative-tester.c
index 46a8754..a5b05cb 100644
--- a/android/ipc-negative-tester.c
+++ b/android/ipc-negative-tester.c
@@ -404,13 +404,53 @@ failed:
return false;
}
+struct regmod_msg {
+ struct hal_hdr header;
+ struct hal_cmd_register_module cmd;
+} __attribute__((packed));
+
+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)) {
tester_setup_failed();
@@ -454,9 +494,15 @@ static void setup(const void *data)
return;
}
- /* 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]))
+ tester_setup_failed();
test_data->setup_done = true;
+
+ tester_setup_complete();
}
static void teardown(const void *data)
--
1.8.5.2
^ permalink raw reply related
* [PATCHv2 5/8] android/ipc-tester: Add sending test data with ipc
From: Jakub Tyszkowski @ 2014-01-14 12:14 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1389701685-1861-1-git-send-email-jakub.tyszkowski@tieto.com>
This patch adds some data structures used to send data with ipc during test setup
and run stage.
---
android/ipc-negative-tester.c | 30 +++++++++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/android/ipc-negative-tester.c b/android/ipc-negative-tester.c
index bbe4ce6..46a8754 100644
--- a/android/ipc-negative-tester.c
+++ b/android/ipc-negative-tester.c
@@ -49,6 +49,18 @@ struct test_data {
bool setup_done;
};
+struct ipc_data {
+ void *buffer;
+ size_t len;
+};
+
+struct generic_data {
+ struct ipc_data ipc_data;
+
+ unsigned int num_services;
+ int init_services[];
+};
+
#define CONNECT_TIMEOUT (5 * 1000)
#define SERVICE_NAME "bluetoothd"
@@ -461,6 +473,13 @@ static void teardown(const void *data)
static void ipc_send_tc(const void *data)
{
+ const struct generic_data *generic_data = data;
+ const struct ipc_data *ipc_data = &generic_data->ipc_data;
+
+ if (ipc_data->len) {
+ if (write(cmd_sk, ipc_data->buffer, ipc_data->len) < 0)
+ tester_test_failed();
+ }
}
#define test_bredrle(name, data, test_setup, test, test_teardown) \
@@ -475,13 +494,22 @@ static void ipc_send_tc(const void *data)
3, user, g_free); \
} while (0)
+static const struct generic_data dummy_data = {
+ .ipc_data = {
+ .buffer = "",
+ .len = 1,
+ },
+ .init_services = {HAL_SERVICE_ID_BLUETOOTH},
+ .num_services = 1,
+};
+
int main(int argc, char *argv[])
{
snprintf(exec_dir, sizeof(exec_dir), "%s", dirname(argv[0]));
tester_init(&argc, &argv);
- test_bredrle("Test Dummy", NULL, setup, ipc_send_tc, teardown);
+ test_bredrle("Test Dummy", &dummy_data, setup, ipc_send_tc, teardown);
return tester_run();
}
--
1.8.5.2
^ permalink raw reply related
* [PATCHv2 4/8] android/ipc-tester: Add daemon shutdown handler
From: Jakub Tyszkowski @ 2014-01-14 12:14 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1389701685-1861-1-git-send-email-jakub.tyszkowski@tieto.com>
Handle daemon shutdown asynchronously.
---
android/ipc-negative-tester.c | 45 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/android/ipc-negative-tester.c b/android/ipc-negative-tester.c
index 1736794..bbe4ce6 100644
--- a/android/ipc-negative-tester.c
+++ b/android/ipc-negative-tester.c
@@ -46,6 +46,7 @@ struct test_data {
struct hciemu *hciemu;
enum hciemu_type hciemu_type;
pid_t bluetoothd_pid;
+ bool setup_done;
};
#define CONNECT_TIMEOUT (5 * 1000)
@@ -353,6 +354,44 @@ static void cleanup_ipc(void)
cmd_sk = -1;
}
+static gboolean check_for_daemon(gpointer user_data)
+{
+ int status;
+ struct test_data *data = user_data;
+
+ if ((waitpid(data->bluetoothd_pid, &status, WNOHANG))
+ != data->bluetoothd_pid)
+ return true;
+
+ if (WIFEXITED(status)) {
+ tester_test_passed();
+ } else if (WIFSIGNALED(status)) {
+ switch (WTERMSIG(status)) {
+ case SIGTERM:
+ if (data->setup_done)
+ tester_test_passed();
+ else
+ tester_setup_failed();
+ break;
+ case SIGSEGV:
+ tester_warn("Daemon died with segmentation fault");
+ goto failed;
+ default:
+ tester_warn("Bad signal received %d", status);
+ goto failed;
+ }
+ }
+
+ return true;
+
+failed:
+ if (data->setup_done)
+ tester_test_failed();
+ else
+ tester_setup_failed();
+ return false;
+}
+
static void setup(const void *data)
{
struct test_data *test_data = tester_get_data();
@@ -393,6 +432,10 @@ static void setup(const void *data)
tester_setup_failed();
return;
}
+
+ g_idle_add_full(G_PRIORITY_DEFAULT_IDLE, check_for_daemon, test_data,
+ NULL);
+
if (!init_ipc()) {
tester_warn("Cannot initialize IPC mechanism!");
tester_setup_failed();
@@ -400,6 +443,8 @@ static void setup(const void *data)
}
/* TODO: register modules */
+
+ test_data->setup_done = true;
}
static void teardown(const void *data)
--
1.8.5.2
^ permalink raw reply related
* [PATCHv2 3/8] android/ipc-tester: Add IPC initialization
From: Jakub Tyszkowski @ 2014-01-14 12:14 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1389701685-1861-1-git-send-email-jakub.tyszkowski@tieto.com>
This patch adds IPC mechanism initialization.
The deamon is being started and IPC socket connection is established.
---
android/ipc-negative-tester.c | 122 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 122 insertions(+)
diff --git a/android/ipc-negative-tester.c b/android/ipc-negative-tester.c
index 78ca104..1736794 100644
--- a/android/ipc-negative-tester.c
+++ b/android/ipc-negative-tester.c
@@ -17,6 +17,8 @@
#include <stdlib.h>
#include <unistd.h>
+#include <errno.h>
+#include <poll.h>
#include <sys/socket.h>
#include <sys/types.h>
@@ -32,6 +34,8 @@
#include "src/shared/mgmt.h"
#include "src/shared/hciemu.h"
+#include "hal-msg.h"
+#include <cutils/properties.h>
#define WAIT_FOR_SIGNAL_TIME 2 /* in seconds */
#define EMULATOR_SIGNAL "emulator_started"
@@ -44,8 +48,14 @@ struct test_data {
pid_t bluetoothd_pid;
};
+#define CONNECT_TIMEOUT (5 * 1000)
+#define SERVICE_NAME "bluetoothd"
+
static char exec_dir[PATH_MAX + 1];
+static int cmd_sk = -1;
+static int notif_sk = -1;
+
static void read_info_callback(uint8_t status, uint16_t length,
const void *param, void *user_data)
{
@@ -240,6 +250,109 @@ failed:
close(fd);
}
+static int accept_connection(int sk)
+{
+ int err;
+ struct pollfd pfd;
+ int new_sk;
+
+ memset(&pfd, 0 , sizeof(pfd));
+ pfd.fd = sk;
+ pfd.events = POLLIN;
+
+ err = poll(&pfd, 1, CONNECT_TIMEOUT);
+ if (err < 0) {
+ err = errno;
+ tester_warn("Failed to poll: %d (%s)", err, strerror(err));
+ return -errno;
+ }
+
+ if (err == 0) {
+ tester_warn("bluetoothd connect timeout");
+ return -errno;
+ }
+
+ new_sk = accept(sk, NULL, NULL);
+ if (new_sk < 0) {
+ err = errno;
+ tester_warn("Failed to accept socket: %d (%s)",
+ err, strerror(err));
+ return -errno;
+ }
+
+ return new_sk;
+}
+
+static bool init_ipc(void)
+{
+ struct sockaddr_un addr;
+
+ int sk;
+ int err;
+
+ sk = socket(AF_LOCAL, SOCK_SEQPACKET, 0);
+ if (sk < 0) {
+ err = errno;
+ tester_warn("Failed to create socket: %d (%s)", err,
+ strerror(err));
+ return false;
+ }
+
+ memset(&addr, 0, sizeof(addr));
+ addr.sun_family = AF_UNIX;
+
+ memcpy(addr.sun_path, BLUEZ_HAL_SK_PATH, sizeof(BLUEZ_HAL_SK_PATH));
+
+ if (bind(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+ err = errno;
+ tester_warn("Failed to bind socket: %d (%s)", err,
+ strerror(err));
+ close(sk);
+ return false;
+ }
+
+ if (listen(sk, 2) < 0) {
+ err = errno;
+ tester_warn("Failed to listen on socket: %d (%s)", err,
+ strerror(err));
+ close(sk);
+ return false;
+ }
+
+ /* Start Android Bluetooth daemon service */
+ if (property_set("ctl.start", SERVICE_NAME) < 0) {
+ tester_warn("Failed to start service %s", SERVICE_NAME);
+ close(sk);
+ return false;
+ }
+
+ cmd_sk = accept_connection(sk);
+ if (cmd_sk < 0) {
+ close(sk);
+ return false;
+ }
+
+ notif_sk = accept_connection(sk);
+ if (notif_sk < 0) {
+ close(sk);
+ close(cmd_sk);
+ cmd_sk = -1;
+ return false;
+ }
+
+ tester_print("bluetoothd connected");
+
+ close(sk);
+
+ return true;
+}
+
+static void cleanup_ipc(void)
+{
+ close(cmd_sk);
+ cmd_sk = -1;
+}
+
static void setup(const void *data)
{
struct test_data *test_data = tester_get_data();
@@ -280,12 +393,21 @@ static void setup(const void *data)
tester_setup_failed();
return;
}
+ if (!init_ipc()) {
+ tester_warn("Cannot initialize IPC mechanism!");
+ tester_setup_failed();
+ return;
+ }
+
+ /* TODO: register modules */
}
static void teardown(const void *data)
{
struct test_data *test_data = tester_get_data();
+ cleanup_ipc();
+
if (test_data->bluetoothd_pid)
waitpid(test_data->bluetoothd_pid, NULL, 0);
--
1.8.5.2
^ permalink raw reply related
* [PATCHv2 2/8] android/ipc-tester: Run daemon in separate process
From: Jakub Tyszkowski @ 2014-01-14 12:14 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1389701685-1861-1-git-send-email-jakub.tyszkowski@tieto.com>
This patch adds new process waiting to run daemon when needed.
---
android/ipc-negative-tester.c | 124 +++++++++++++++++++++++++++++++++++++++++-
1 file changed, 123 insertions(+), 1 deletion(-)
diff --git a/android/ipc-negative-tester.c b/android/ipc-negative-tester.c
index 0c2edda..78ca104 100644
--- a/android/ipc-negative-tester.c
+++ b/android/ipc-negative-tester.c
@@ -15,8 +15,14 @@
*
*/
+#include <stdlib.h>
#include <unistd.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/un.h>
+#include <libgen.h>
#include <glib.h>
#include "lib/bluetooth.h"
@@ -27,13 +33,19 @@
#include "src/shared/hciemu.h"
+#define WAIT_FOR_SIGNAL_TIME 2 /* in seconds */
+#define EMULATOR_SIGNAL "emulator_started"
+
struct test_data {
struct mgmt *mgmt;
uint16_t mgmt_index;
struct hciemu *hciemu;
enum hciemu_type hciemu_type;
+ pid_t bluetoothd_pid;
};
+static char exec_dir[PATH_MAX + 1];
+
static void read_info_callback(uint8_t status, uint16_t length,
const void *param, void *user_data)
{
@@ -162,13 +174,121 @@ static void test_post_teardown(const void *data)
test_data->hciemu = NULL;
}
+static void bluetoothd_start(int hci_index)
+{
+ char prg_name[PATH_MAX + 1];
+ char index[8];
+ char *prg_argv[4];
+
+ snprintf(prg_name, sizeof(prg_name), "%s/%s", exec_dir, "bluetoothd");
+ snprintf(index, sizeof(index), "%d", hci_index);
+
+ prg_argv[0] = prg_name;
+ prg_argv[1] = "-i";
+ prg_argv[2] = index;
+ prg_argv[3] = NULL;
+
+ if (!tester_use_debug())
+ fclose(stderr);
+
+ execve(prg_argv[0], prg_argv, NULL);
+}
+
+static void emulator(int pipe, int hci_index)
+{
+ static const char SYSTEM_SOCKET_PATH[] = "\0android_system";
+ char buf[1024];
+ struct sockaddr_un addr;
+ struct timeval tv;
+ int fd;
+ ssize_t len;
+
+ fd = socket(PF_LOCAL, SOCK_DGRAM | SOCK_CLOEXEC, 0);
+ if (fd < 0)
+ goto failed;
+
+ tv.tv_sec = WAIT_FOR_SIGNAL_TIME;
+ tv.tv_usec = 0;
+ setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, sizeof(tv));
+
+ memset(&addr, 0, sizeof(addr));
+ addr.sun_family = AF_UNIX;
+ memcpy(addr.sun_path, SYSTEM_SOCKET_PATH, sizeof(SYSTEM_SOCKET_PATH));
+
+ if (bind(fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+ perror("Failed to bind system socket");
+ goto failed;
+ }
+
+ len = write(pipe, EMULATOR_SIGNAL, sizeof(EMULATOR_SIGNAL));
+
+ if (len != sizeof(EMULATOR_SIGNAL))
+ goto failed;
+
+ memset(buf, 0, sizeof(buf));
+
+ len = read(fd, buf, sizeof(buf));
+ if (len <= 0 || (strcmp(buf, "ctl.start=bluetoothd")))
+ goto failed;
+
+ close(pipe);
+ close(fd);
+ bluetoothd_start(hci_index);
+
+failed:
+ close(pipe);
+ close(fd);
+}
+
static void setup(const void *data)
{
- tester_setup_failed();
+ struct test_data *test_data = tester_get_data();
+ int signal_fd[2];
+ char buf[1024];
+ pid_t pid;
+ int len;
+
+ if (pipe(signal_fd)) {
+ tester_setup_failed();
+ return;
+ }
+
+ pid = fork();
+
+ if (pid < 0) {
+ close(signal_fd[0]);
+ close(signal_fd[1]);
+ tester_setup_failed();
+ return;
+ }
+
+ if (pid == 0) {
+ if (!tester_use_debug())
+ fclose(stderr);
+
+ close(signal_fd[0]);
+ emulator(signal_fd[1], test_data->mgmt_index);
+ exit(0);
+ }
+
+ close(signal_fd[1]);
+ test_data->bluetoothd_pid = pid;
+
+ len = read(signal_fd[0], buf, sizeof(buf));
+ if (len <= 0 || (strcmp(buf, EMULATOR_SIGNAL))) {
+ close(signal_fd[0]);
+ tester_setup_failed();
+ return;
+ }
}
static void teardown(const void *data)
{
+ struct test_data *test_data = tester_get_data();
+
+ if (test_data->bluetoothd_pid)
+ waitpid(test_data->bluetoothd_pid, NULL, 0);
+
tester_teardown_complete();
}
@@ -190,6 +310,8 @@ static void ipc_send_tc(const void *data)
int main(int argc, char *argv[])
{
+ snprintf(exec_dir, sizeof(exec_dir), "%s", dirname(argv[0]));
+
tester_init(&argc, &argv);
test_bredrle("Test Dummy", NULL, setup, ipc_send_tc, teardown);
--
1.8.5.2
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox