[PATCH 1/5] lib/sdp: Fix typo

[PATCH 1/5] lib/sdp: Fix typo

[Jakub Tyszkowski]

---
 lib/sdp.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/sdp.c b/lib/sdp.c
index e5e4622..1f19953 100644
--- a/lib/sdp.c
+++ b/lib/sdp.c
@@ -3859,7 +3859,7 @@ int sdp_service_search_async(sdp_session_t *session, const sdp_list_t *search, u
 	reqhdr->plen = htons((t->reqsize + cstate_len) - sizeof(sdp_pdu_hdr_t));
 
 	if (sdp_send_req(session, t->reqbuf, t->reqsize + cstate_len) < 0) {
-		SDPERR("Error sendind data:%m");
+		SDPERR("Error sending data:%m");
 		t->err = errno;
 		goto end;
 	}
@@ -3970,7 +3970,7 @@ int sdp_service_attr_async(sdp_session_t *session, uint32_t handle, sdp_attrreq_
 	reqhdr->plen = htons((t->reqsize + cstate_len) - sizeof(sdp_pdu_hdr_t));
 
 	if (sdp_send_req(session, t->reqbuf, t->reqsize + cstate_len) < 0) {
-		SDPERR("Error sendind data:%m");
+		SDPERR("Error sending data:%m");
 		t->err = errno;
 		goto end;
 	}
@@ -4086,7 +4086,7 @@ int sdp_service_search_attr_async(sdp_session_t *session, const sdp_list_t *sear
 	reqhdr->plen = htons((t->reqsize + cstate_len) - sizeof(sdp_pdu_hdr_t));
 
 	if (sdp_send_req(session, t->reqbuf, t->reqsize + cstate_len) < 0) {
-		SDPERR("Error sendind data:%m");
+		SDPERR("Error sending data:%m");
 		t->err = errno;
 		goto end;
 	}
@@ -4327,7 +4327,7 @@ int sdp_process(sdp_session_t *session)
 		reqhdr->plen = htons(reqsize - sizeof(sdp_pdu_hdr_t));
 
 		if (sdp_send_req(session, t->reqbuf, reqsize) < 0) {
-			SDPERR("Error sendind data:%m(%d)", errno);
+			SDPERR("Error sending data:%m(%d)", errno);
 			status = 0xffff;
 			t->err = errno;
 			goto end;
-- 
1.9.1

[PATCH 2/5] android/hidhost: Fix indentation

[Jakub Tyszkowski]

---
 android/hidhost.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/hidhost.c b/android/hidhost.c
index 3dc3c25..ebed56d 100644
--- a/android/hidhost.c
+++ b/android/hidhost.c
@@ -110,7 +110,7 @@ struct hid_device {
 	uint8_t		last_hid_msg;
 	struct bt_hog	*hog;
 	guint		reconnect_id;
-	int sec_level;
+	int		sec_level;
 };
 
 static int device_cmp(gconstpointer s, gconstpointer user_data)
-- 
1.9.1

[PATCH 3/5] android/tester: Fix hdp cases not handling ssp correctly

[Jakub Tyszkowski]

---
 android/tester-hdp.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/android/tester-hdp.c b/android/tester-hdp.c
index bb73681..9ecef21 100644
--- a/android/tester-hdp.c
+++ b/android/tester-hdp.c
@@ -478,6 +478,7 @@ static struct test_case test_cases[] = {
 					BTHL_APP_REG_STATE_DEREG_SUCCESS),
 	),
 	TEST_CASE_BREDRLE("HDP Connect Source Reliable Channel",
+		ACTION_SUCCESS(set_default_ssp_request_handler, NULL),
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -498,6 +499,7 @@ static struct test_case test_cases[] = {
 						BTHL_CONN_STATE_CONNECTED),
 	),
 	TEST_CASE_BREDRLE("HDP Destroy Source Reliable Channel",
+		ACTION_SUCCESS(set_default_ssp_request_handler, NULL),
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -521,6 +523,7 @@ static struct test_case test_cases[] = {
 						BTHL_CONN_STATE_DESTROYED),
 	),
 	TEST_CASE_BREDRLE("HDP Connect Sink Streaming Channel",
+		ACTION_SUCCESS(set_default_ssp_request_handler, NULL),
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -544,6 +547,7 @@ static struct test_case test_cases[] = {
 						BTHL_CONN_STATE_CONNECTED),
 	),
 	TEST_CASE_BREDRLE("HDP Destroy Sink Streaming Channel",
+		ACTION_SUCCESS(set_default_ssp_request_handler, NULL),
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
-- 
1.9.1

[PATCH 4/5] android/tester: Indentation fix

[Jakub Tyszkowski]

---
 android/tester-main.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/android/tester-main.c b/android/tester-main.c
index c0f384c..fb8e11b 100644
--- a/android/tester-main.c
+++ b/android/tester-main.c
@@ -1884,8 +1884,7 @@ void bt_set_property_action(void)
 
 	prop = (bt_property_t *)current_data_step->set_data;
 
-	step->action_status = data->if_bluetooth->set_adapter_property(
-									prop);
+	step->action_status = data->if_bluetooth->set_adapter_property(prop);
 
 	schedule_action_verification(step);
 }
-- 
1.9.1

[PATCH 5/5] android/tester: Fix not cleaning up step lists

[Jakub Tyszkowski]

There were missing some cleanups for few testers.
---
 android/tester-main.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/android/tester-main.c b/android/tester-main.c
index fb8e11b..f5f46fb 100644
--- a/android/tester-main.c
+++ b/android/tester-main.c
@@ -2122,6 +2122,11 @@ static void tester_testcases_cleanup(void)
 {
 	remove_bluetooth_tests();
 	remove_socket_tests();
+	remove_hidhost_tests();
+	remove_gatt_tests();
+	remove_a2dp_tests();
+	remove_hdp_tests();
+	remove_pan_tests();
 }
 
 static void add_bluetooth_tests(void *data, void *user_data)
-- 
1.9.1

Re: [PATCH 1/5] lib/sdp: Fix typo

[Szymon Janc]

Hi Jakub,

On Wednesday 03 of September 2014 10:56:37 Jakub Tyszkowski wrote:
> ---
>  lib/sdp.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/lib/sdp.c b/lib/sdp.c
> index e5e4622..1f19953 100644
> --- a/lib/sdp.c
> +++ b/lib/sdp.c
> @@ -3859,7 +3859,7 @@ int sdp_service_search_async(sdp_session_t *session, const sdp_list_t *search, u
>  	reqhdr->plen = htons((t->reqsize + cstate_len) - sizeof(sdp_pdu_hdr_t));
>  
>  	if (sdp_send_req(session, t->reqbuf, t->reqsize + cstate_len) < 0) {
> -		SDPERR("Error sendind data:%m");
> +		SDPERR("Error sending data:%m");
>  		t->err = errno;
>  		goto end;
>  	}
> @@ -3970,7 +3970,7 @@ int sdp_service_attr_async(sdp_session_t *session, uint32_t handle, sdp_attrreq_
>  	reqhdr->plen = htons((t->reqsize + cstate_len) - sizeof(sdp_pdu_hdr_t));
>  
>  	if (sdp_send_req(session, t->reqbuf, t->reqsize + cstate_len) < 0) {
> -		SDPERR("Error sendind data:%m");
> +		SDPERR("Error sending data:%m");
>  		t->err = errno;
>  		goto end;
>  	}
> @@ -4086,7 +4086,7 @@ int sdp_service_search_attr_async(sdp_session_t *session, const sdp_list_t *sear
>  	reqhdr->plen = htons((t->reqsize + cstate_len) - sizeof(sdp_pdu_hdr_t));
>  
>  	if (sdp_send_req(session, t->reqbuf, t->reqsize + cstate_len) < 0) {
> -		SDPERR("Error sendind data:%m");
> +		SDPERR("Error sending data:%m");
>  		t->err = errno;
>  		goto end;
>  	}
> @@ -4327,7 +4327,7 @@ int sdp_process(sdp_session_t *session)
>  		reqhdr->plen = htons(reqsize - sizeof(sdp_pdu_hdr_t));
>  
>  		if (sdp_send_req(session, t->reqbuf, reqsize) < 0) {
> -			SDPERR("Error sendind data:%m(%d)", errno);
> +			SDPERR("Error sending data:%m(%d)", errno);
>  			status = 0xffff;
>  			t->err = errno;
>  			goto end;
 
All patches applied, thanks.

-- 
Best regards, 
Szymon Janc