korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2025-01-06 03:23:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

tools/btpclient: Add identity resolve event

Browse Source 
This patch adds identity resolve event handler.
This commit is contained in:
Grzegorz Kolodziejczyk 2018-02-28 13:41:28 +01:00 committed by Szymon Janc
parent 73ff4f4427
commit caf7d2aa78
1 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
tools/btpclient.c
View File

@ -66,6 +66,8 @@ struct btp_adapter {
struct btp_device { struct btp_device {
struct l_dbus_proxy *proxy; struct l_dbus_proxy *proxy;
uint8_t address_type;
bdaddr_t address;
}; };
static struct l_queue *adapters; static struct l_queue *adapters;
@ -2520,6 +2522,34 @@ static void btp_gap_device_connection_ev(struct l_dbus_proxy *proxy,
} }
} }
static void btp_identity_resolved_ev(struct l_dbus_proxy *proxy)
{
struct btp_device *dev = find_device_by_proxy(proxy);
struct btp_adapter *adapter = find_adapter_by_device(dev);
struct btp_gap_identity_resolved_ev ev;
char *str_addr, *str_addr_type;
uint8_t identity_address_type;
if (!l_dbus_proxy_get_property(proxy, "Address", "s", &str_addr))
return;
if (!l_dbus_proxy_get_property(proxy, "AddressType", "s",
&str_addr_type))
return;
identity_address_type = strcmp(str_addr_type, "public") ?
BTP_GAP_ADDR_RANDOM : BTP_GAP_ADDR_PUBLIC;
str2ba(str_addr, &ev.identity_address);
ev.identity_address_type = identity_address_type;
memcpy(&ev.address, &dev->address, sizeof(ev.address));
ev.address_type = dev->address_type;
btp_send(btp, BTP_GAP_SERVICE, BTP_EV_GAP_IDENTITY_RESOLVED,
adapter->index, sizeof(ev), &ev);
}
static void register_gap_service(void) static void register_gap_service(void)
{ {
btp_register(btp, BTP_GAP_SERVICE, BTP_OP_GAP_READ_SUPPORTED_COMMANDS, btp_register(btp, BTP_GAP_SERVICE, BTP_OP_GAP_READ_SUPPORTED_COMMANDS,
@ -2809,7 +2839,7 @@ static void proxy_added(struct l_dbus_proxy *proxy, void *user_data)
if (!strcmp(interface, "org.bluez.Device1")) { if (!strcmp(interface, "org.bluez.Device1")) {
struct btp_adapter *adapter; struct btp_adapter *adapter;
struct btp_device *device; struct btp_device *device;
char *str; char *str, *str_addr, *str_addr_type;
if (!l_dbus_proxy_get_property(proxy, "Adapter", "o", &str)) if (!l_dbus_proxy_get_property(proxy, "Adapter", "o", &str))
return; return;
@ -2825,6 +2855,20 @@ static void proxy_added(struct l_dbus_proxy *proxy, void *user_data)
btp_gap_device_found_ev(proxy); btp_gap_device_found_ev(proxy);
if (!l_dbus_proxy_get_property(proxy, "Address", "s",
&str_addr))
return;
if (!l_dbus_proxy_get_property(proxy, "AddressType", "s",
&str_addr_type))
return;
device->address_type = strcmp(str_addr_type, "public") ?
BTP_GAP_ADDR_RANDOM :
BTP_GAP_ADDR_PUBLIC;
if (!str2ba(str_addr, &device->address))
return;
return; return;
} }
@ -2956,6 +3000,11 @@ static void property_changed(struct l_dbus_proxy *proxy, const char *name,
return; return;
btp_gap_device_connection_ev(proxy, prop); btp_gap_device_connection_ev(proxy, prop);
} else if (!strcmp(name, "AddressType")) {
/* Addres property change came first along with address
* type.
*/
btp_identity_resolved_ev(proxy);
} }
} }
} }