Re: [PATCH 2/2] android/gatt: Handle Unregister gatt client command

[Szymon Janc <szymon.janc@tieto.com>]

Hi Grzegorz,

On Friday 07 of March 2014 14:04:59 Grzegorz Kolodziejczyk wrote:
> This adds unregister gatt client app command handling.
> ---
>  android/gatt.c | 25 ++++++++++++++++++++++++-
>  1 file changed, 24 insertions(+), 1 deletion(-)
> 
> diff --git a/android/gatt.c b/android/gatt.c
> index f8f7208..1261c1f 100644
> --- a/android/gatt.c
> +++ b/android/gatt.c
> @@ -60,6 +60,13 @@ static int find_client_uuid(gconstpointer data,
> gconstpointer user_data) return 0;
>  }
> 
> +static int find_client_if(gconstpointer data, gconstpointer user_data)
> +{
> +	const int32_t exp_cif = *((int32_t *)user_data);

You can use int to pointer macro to pass int here.

> +	const int32_t cur_cif = ((struct gatt_client *)data)->client_if;

const struct gatt_client *client = data;

> +
> +	return cur_cif != exp_cif;
> +}
> 
>  static void handle_client_register(const void *buf, uint16_t len)
>  {
> @@ -110,10 +117,26 @@ failed:
> 
>  static void handle_client_unregister(const void *buf, uint16_t len)
>  {
> +	const struct hal_cmd_gatt_client_unregister *cmd = buf;
> +	int32_t client_if = cmd->client_if;

Why is this copy needed?

> +	GList *found_client_if;
> +
>  	DBG("");
> 
> -	ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_GATT,
> +	found_client_if = g_list_find_custom(gatt_client_list, &client_if,
> +								find_client_if);
> +	if (!found_client_if) {
> +		error("client_if: %d not found", client_if);
> +		ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_GATT,
>  			HAL_OP_GATT_CLIENT_UNREGISTER, HAL_STATUS_FAILED);

Lets follow this convention for error handling:

	status = HAL_STATUS_FAILED;
	goto failed;

> +		return;
> +	}
> +
> +	gatt_client_list = g_list_remove(gatt_client_list,
> +							found_client_if->data);
> +
> +	ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_GATT,
> +			HAL_OP_GATT_CLIENT_UNREGISTER, HAL_STATUS_SUCCESS);
>  }
> 
>  static void handle_client_scan(const void *buf, uint16_t len)

-- 
BR
Szymon Janc