From fc6cbace2c899123c584e92d2ba92a641f982072 Mon Sep 17 00:00:00 2001 From: Lukasz Rymanowski Date: Fri, 14 Mar 2014 15:07:30 +0100 Subject: [PATCH] android/client: Fix service search command We should be able to send NULL in case we want all the primary seavices --- android/client/if-gatt.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/android/client/if-gatt.c b/android/client/if-gatt.c index 17a491ef2..d8e348851 100644 --- a/android/client/if-gatt.c +++ b/android/client/if-gatt.c @@ -961,19 +961,21 @@ static void search_service_c(int argc, const char **argv, enum_func *enum_func, static void search_service_p(int argc, const char **argv) { int conn_id; - bt_uuid_t filter_uuid; RETURN_IF_NULL(if_gatt); VERIFY_CONN_ID(2, conn_id); /* uuid */ - if (argc <= 3) - memset(&filter_uuid, 0, sizeof(bt_uuid_t)); - else - gatt_str2bt_uuid_t(argv[3], -1, &filter_uuid); + if (argc <= 3) { + EXEC(if_gatt->client->search_service, conn_id, NULL); - EXEC(if_gatt->client->search_service, conn_id, &filter_uuid); + } else { + bt_uuid_t filter_uuid; + + gatt_str2bt_uuid_t(argv[3], -1, &filter_uuid); + EXEC(if_gatt->client->search_service, conn_id, &filter_uuid); + } } /* get_included_service */ -- 2.47.3