From 2f4c576ad24324e13ae6522f0799fce23e1ef0bd Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Thu, 5 Jan 2023 14:01:57 -0800 Subject: hog-lib: Fix not handling BT_ATT_OP_HANDLE_NFY_MULT This is a temporary fix for not handling BT_ATT_OP_HANDLE_NFY_MULT in GAttr so the code will use g_attrib_attach_client to attach the bt_gatt_client instance which is then used to register notifications including those sent with BT_ATT_OP_HANDLE_NFY_MULT. Fixes: https://github.com/bluez/bluez/issues/71 --- profiles/input/hog-lib.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'profiles') diff --git a/profiles/input/hog-lib.c b/profiles/input/hog-lib.c index 021db386f..7ff1ede3d 100644 --- a/profiles/input/hog-lib.c +++ b/profiles/input/hog-lib.c @@ -374,6 +374,15 @@ static void report_value_cb(const guint8 *pdu, guint16 len, gpointer user_data) error("bt_uhid_send: %s (%d)", strerror(-err), -err); } +static void report_notify_destroy(void *user_data) +{ + struct report *report = user_data; + + DBG(""); + + report->notifyid = 0; +} + static void report_ccc_written_cb(guint8 status, const guint8 *pdu, guint16 plen, gpointer user_data) { @@ -393,7 +402,13 @@ static void report_ccc_written_cb(guint8 status, const guint8 *pdu, report->notifyid = g_attrib_register(hog->attrib, ATT_OP_HANDLE_NOTIFY, report->value_handle, - report_value_cb, report, NULL); + report_value_cb, report, + report_notify_destroy); + if (!report->notifyid) { + error("Unable to register report notification: handle 0x%04x", + report->value_handle); + goto remove; + } DBG("Report characteristic descriptor written: notifications enabled"); @@ -1798,7 +1813,11 @@ bool bt_hog_attach(struct bt_hog *hog, void *gatt) r->notifyid = g_attrib_register(hog->attrib, ATT_OP_HANDLE_NOTIFY, r->value_handle, - report_value_cb, r, NULL); + report_value_cb, r, + report_notify_destroy); + if (!r->notifyid) + error("Unable to register report notification: " + "handle 0x%04x", r->value_handle); } return true; -- cgit v1.2.1