Re: [PATCH BlueZ 4/6] tools/btpclient: Add device found event

[Szymon Janc <szymon.janc@codecoup.pl>]

Hi Grzegorz,

On Thursday, 21 December 2017 17:47:18 CET Grzegorz Kolodziejczyk wrote:
> This patch adds device found event handler. It's called when rssi
> property of device changes and new device interface is added.
> ---
>  tools/btpclient.c | 42 ++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 42 insertions(+)
> 
> diff --git a/tools/btpclient.c b/tools/btpclient.c
> index 095c5ea3e..c0ad03b68 100644
> --- a/tools/btpclient.c
> +++ b/tools/btpclient.c
> @@ -399,6 +399,37 @@ failed:
>  	btp_send_error(btp, BTP_GAP_SERVICE, index, status);
>  }
> 
> +static void btp_gap_device_found_ev(struct l_dbus_proxy *proxy)
> +{
> +	struct btp_device_found_ev ev;
> +	const char *str;
> +
> +	if (!l_dbus_proxy_get_property(proxy, "Address", "s", &str) ||
> +					(str2addr(str, ev.address) != 6))
> +		return;
> +
> +	if (!l_dbus_proxy_get_property(proxy, "AddressType", "s", &str))
> +		return;
> +
> +	ev.address_type = strcmp(str, "public") ? BTP_GAP_ADDR_RANDOM :
> +							BTP_GAP_ADDR_PUBLIC;
> +
> +	if (!l_dbus_proxy_get_property(proxy, "RSSI", "n", &ev.rssi))

"n" expects pointer to int16_t so you need to use local tmp for this.
(this is due to no signed int8_t on D-Bus, only byte type)

> +		return;
> +
> +	/* TODO Temporary set all flags */
> +	ev.flags = (BTP_EV_GAP_DEVICE_FOUND_FLAG_RSSI |
> +					BTP_EV_GAP_DEVICE_FOUND_FLAG_AD |
> +					BTP_EV_GAP_DEVICE_FOUND_FLAG_SR);
> +
> +	/* TODO Add eir to device found event */
> +	ev.eir_len = 0;
> +
> +	btp_send(btp, BTP_GAP_SERVICE, BTP_EV_GAP_DEVICE_FOUND,
> +						BTP_INDEX_NON_CONTROLLER,
> +						sizeof(ev) + ev.eir_len, &ev);
> +}
> +
>  static void register_gap_service(void)
>  {
>  	btp_register(btp, BTP_GAP_SERVICE, BTP_OP_GAP_READ_SUPPORTED_COMMANDS,
> @@ -661,6 +692,8 @@ static void proxy_added(struct l_dbus_proxy *proxy, void
> *user_data)
> 
>  		l_queue_push_tail(adapter->devices, device);
> 
> +		btp_gap_device_found_ev(proxy);
> +
>  		return;
>  	}
> 
> @@ -782,6 +815,15 @@ static void property_changed(struct l_dbus_proxy
> *proxy, const char *name, update_current_settings(adapter, new_settings);
> 
>  		return;
> +	} else if (!strcmp(interface, "org.bluez.Device1")) {
> +		if (!strcmp(name, "RSSI")) {
> +			uint16_t rssi;

Should be int16_t.

> +
> +			if (!l_dbus_message_get_arguments(msg, "n", &rssi))
> +				return;
> +
> +			btp_gap_device_found_ev(proxy);
> +		}
>  	}
>  }


-- 
pozdrawiam
Szymon Janc