From: Luiz Augusto von Dentz <[email protected]>
This adds support for bt_uhid_replay which enablind replaying
GET/SET_REPORT messages stored during the first time a device is
created.
---
src/shared/uhid.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++
src/shared/uhid.h | 1 +
2 files changed, 126 insertions(+)
diff --git a/src/shared/uhid.c b/src/shared/uhid.c
index 46edb3bfa3ba..1d04dc5a780c 100644
--- a/src/shared/uhid.c
+++ b/src/shared/uhid.c
@@ -30,6 +30,14 @@
#define MIN(x, y) ((x) < (y) ? (x) : (y))
#endif
+struct uhid_replay {
+ bool active;
+ struct queue *out;
+ struct queue *in;
+ struct queue *rout;
+ struct queue *rin;
+};
+
struct bt_uhid {
int ref_count;
struct io *io;
@@ -38,6 +46,7 @@ struct bt_uhid {
struct queue *input;
bool created;
bool started;
+ struct uhid_replay *replay;
};
struct uhid_notify {
@@ -47,6 +56,18 @@ struct uhid_notify {
void *user_data;
};
+static void uhid_replay_free(struct uhid_replay *replay)
+{
+ if (!replay)
+ return;
+
+ queue_destroy(replay->rin, NULL);
+ queue_destroy(replay->in, free);
+ queue_destroy(replay->rout, NULL);
+ queue_destroy(replay->out, free);
+ free(replay);
+}
+
static void uhid_free(struct bt_uhid *uhid)
{
if (uhid->io)
@@ -58,6 +79,8 @@ static void uhid_free(struct bt_uhid *uhid)
if (uhid->input)
queue_destroy(uhid->input, free);
+ uhid_replay_free(uhid->replay);
+
free(uhid);
}
@@ -73,6 +96,44 @@ static void notify_handler(void *data, void *user_data)
notify->func(ev, notify->user_data);
}
+static struct uhid_replay *uhid_replay_new(void)
+{
+ struct uhid_replay *replay = new0(struct uhid_replay, 1);
+
+ replay->out = queue_new();
+ replay->in = queue_new();
+
+ return replay;
+}
+
+static int bt_uhid_record(struct bt_uhid *uhid, bool input,
+ struct uhid_event *ev)
+{
+ if (!uhid)
+ return -EINVAL;
+
+ if (uhid->replay && uhid->replay->active) {
+ if (input)
+ queue_pop_head(uhid->replay->rin);
+ else
+ queue_pop_head(uhid->replay->rout);
+
+ return bt_uhid_replay(uhid);
+ }
+
+ if (!uhid->replay)
+ uhid->replay = uhid_replay_new();
+
+ if (input)
+ queue_push_tail(uhid->replay->in,
+ util_memdup(ev, sizeof(*ev)));
+ else
+ queue_push_tail(uhid->replay->out,
+ util_memdup(ev, sizeof(*ev)));
+
+ return 0;
+}
+
static bool uhid_read_handler(struct io *io, void *user_data)
{
struct bt_uhid *uhid = user_data;
@@ -93,6 +154,13 @@ static bool uhid_read_handler(struct io *io, void *user_data)
if ((size_t) len < sizeof(ev.type))
return false;
+ switch (ev.type) {
+ case UHID_GET_REPORT:
+ case UHID_SET_REPORT:
+ bt_uhid_record(uhid, false, &ev);
+ break;
+ }
+
queue_foreach(uhid->notify_list, notify_handler, &ev);
return true;
@@ -382,6 +450,9 @@ int bt_uhid_set_report_reply(struct bt_uhid *uhid, uint8_t id, uint8_t status)
rsp->id = id;
rsp->err = status;
+ if (bt_uhid_record(uhid, true, &ev) == -EALREADY)
+ return 0;
+
return bt_uhid_send(uhid, &ev);
}
@@ -412,6 +483,9 @@ int bt_uhid_get_report_reply(struct bt_uhid *uhid, uint8_t id, uint8_t number,
memcpy(&rsp->data[len], data, rsp->size - len);
done:
+ if (bt_uhid_record(uhid, true, &ev) == -EALREADY)
+ return 0;
+
return bt_uhid_send(uhid, &ev);
}
@@ -437,3 +511,54 @@ int bt_uhid_destroy(struct bt_uhid *uhid)
return err;
}
+
+static void queue_append(void *data, void *user_data)
+{
+ queue_push_tail(user_data, data);
+}
+
+static struct queue *queue_dup(struct queue *q)
+{
+ struct queue *dup;
+
+ if (!q || queue_isempty(q))
+ return NULL;
+
+ dup = queue_new();
+
+ queue_foreach(q, queue_append, dup);
+
+ return dup;
+}
+
+int bt_uhid_replay(struct bt_uhid *uhid)
+{
+ struct uhid_event *ev;
+
+ if (!uhid || !uhid->started)
+ return -EINVAL;
+
+ if (!uhid->replay)
+ return 0;
+
+ if (uhid->replay->active)
+ goto resend;
+
+ uhid->replay->active = true;
+ queue_destroy(uhid->replay->rin, NULL);
+ uhid->replay->rin = queue_dup(uhid->replay->in);
+
+ queue_destroy(uhid->replay->rout, NULL);
+ uhid->replay->rout = queue_dup(uhid->replay->out);
+
+resend:
+ ev = queue_pop_head(uhid->replay->rout);
+ if (!ev) {
+ uhid->replay->active = false;
+ return 0;
+ }
+
+ queue_foreach(uhid->notify_list, notify_handler, ev);
+
+ return 0;
+}
diff --git a/src/shared/uhid.h b/src/shared/uhid.h
index d70533882727..4e288cb192aa 100644
--- a/src/shared/uhid.h
+++ b/src/shared/uhid.h
@@ -42,3 +42,4 @@ int bt_uhid_set_report_reply(struct bt_uhid *uhid, uint8_t id, uint8_t status);
int bt_uhid_get_report_reply(struct bt_uhid *uhid, uint8_t id, uint8_t number,
uint8_t status, const void *data, size_t size);
int bt_uhid_destroy(struct bt_uhid *uhid);
+int bt_uhid_replay(struct bt_uhid *uhid);
--
2.44.0
From: Luiz Augusto von Dentz <[email protected]>
This makes use of bt_uhid_replay to replay the GET/SET_REPORT messages
recorded during the first time the device is created.
---
profiles/input/hog-lib.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/profiles/input/hog-lib.c b/profiles/input/hog-lib.c
index 8071e1364b10..0291adb6eb23 100644
--- a/profiles/input/hog-lib.c
+++ b/profiles/input/hog-lib.c
@@ -856,12 +856,14 @@ static void set_report(struct uhid_event *ev, void *user_data)
--size;
}
+ if (hog->attrib == NULL) {
+ err = -ENOTCONN;
+ goto fail;
+ }
+
DBG("Sending report type %d ID %d to handle 0x%X", report->type,
report->id, report->value_handle);
- if (hog->attrib == NULL)
- return;
-
hog->setrep_att = gatt_write_char(hog->attrib,
report->value_handle,
data, size, set_report_cb,
@@ -1726,6 +1728,11 @@ bool bt_hog_attach(struct bt_hog *hog, void *gatt)
"handle 0x%04x", r->value_handle);
}
+ /* Attempt to replay get/set report messages since the driver might not
+ * be aware the device has been disconnected in the meantime.
+ */
+ bt_uhid_replay(hog->uhid);
+
return true;
}
--
2.44.0
From: Luiz Augusto von Dentz <[email protected]>
This makes use of bt_uhid_replay to replay the GET/SET_REPORT messages
recorded as it offer the same functionality as hidp_replay.
---
profiles/input/device.c | 169 +---------------------------------------
src/shared/uhid.c | 1 +
2 files changed, 3 insertions(+), 167 deletions(-)
diff --git a/profiles/input/device.c b/profiles/input/device.c
index 21da16155b0c..2145c2da20f0 100644
--- a/profiles/input/device.c
+++ b/profiles/input/device.c
@@ -62,14 +62,6 @@ struct hidp_msg {
struct iovec *iov;
};
-struct hidp_replay {
- bool replaying;
- struct queue *out;
- struct queue *in;
- struct queue *re_out;
- struct queue *re_in;
-};
-
struct input_device {
struct btd_service *service;
struct btd_device *device;
@@ -93,7 +85,6 @@ struct input_device {
uint32_t report_rsp_id;
bool virtual_cable_unplug;
unsigned int idle_timer;
- struct hidp_replay *replay;
};
static int idle_timeout = 0;
@@ -129,30 +120,8 @@ static bool input_device_bonded(struct input_device *idev)
btd_device_get_bdaddr_type(idev->device));
}
-static void hidp_msg_free(void *data)
-{
- struct hidp_msg *msg = data;
-
- util_iov_free(msg->iov, 1);
- free(msg);
-}
-
-static void hidp_replay_free(struct hidp_replay *replay)
-{
- if (!replay)
- return;
-
- queue_destroy(replay->re_in, NULL);
- queue_destroy(replay->in, hidp_msg_free);
- queue_destroy(replay->re_out, NULL);
- queue_destroy(replay->out, hidp_msg_free);
- free(replay);
-}
-
static void input_device_free(struct input_device *idev)
{
- hidp_replay_free(idev->replay);
-
bt_uhid_unref(idev->uhid);
btd_service_unref(idev->service);
btd_device_unref(idev->device);
@@ -209,10 +178,6 @@ static int uhid_disconnect(struct input_device *idev, bool force)
if (!idev->virtual_cable_unplug && !force)
return 0;
- /* Destroy replay messages */
- hidp_replay_free(idev->replay);
- idev->replay = NULL;
-
bt_uhid_unregister_all(idev->uhid);
err = bt_uhid_destroy(idev->uhid);
@@ -288,96 +253,12 @@ static bool hidp_send_message(struct input_device *idev, GIOChannel *chan,
return true;
}
-static void hidp_replay_resend(struct input_device *idev)
-{
- struct hidp_msg *msg;
-
- if (!idev->replay || !idev->replay->replaying)
- return;
-
- msg = queue_pop_head(idev->replay->re_out);
- if (!msg) {
- DBG("uhid replay finished");
- idev->replay->replaying = false;
- return;
- }
-
- if (hidp_send_message(idev, NULL, msg->hdr, msg->iov->iov_base,
- msg->iov->iov_len))
- DBG("hdr 0x%02x size %zu", msg->hdr, msg->iov->iov_len);
- else
- error("uhid replay resend failed");
-}
-
-static void hidp_replay_recv(struct input_device *idev, uint8_t hdr,
- const uint8_t *data, size_t size)
-{
- struct hidp_msg *msg;
-
- if (!idev->replay || !idev->replay->replaying)
- return;
-
- msg = queue_pop_head(idev->replay->re_in);
-
- if (msg && (msg->hdr != hdr || msg->iov->iov_len != size ||
- memcmp(msg->iov->iov_base, data, size)))
- error("uhid replay input error... discarding");
-
- hidp_replay_resend(idev);
-}
-
-static struct hidp_replay *hidp_replay_new(void)
-{
- struct hidp_replay *replay = new0(struct hidp_replay, 1);
-
- replay->out = queue_new();
- replay->in = queue_new();
-
- return replay;
-}
-
-static void hidp_record_message(struct input_device *idev, bool out,
- uint8_t hdr, const uint8_t *data, size_t size)
-{
- struct hidp_msg *msg;
- struct iovec iov = { (void *)data, size };
-
- /* Only record messages if uhid has been created */
- if (!bt_uhid_created(idev->uhid))
- return;
-
- if (idev->replay && idev->replay->replaying) {
- if (!out)
- hidp_replay_recv(idev, hdr, data, size);
- return;
- }
-
- if (!idev->replay)
- idev->replay = hidp_replay_new();
-
- msg = new0(struct hidp_msg, 1);
- msg->hdr = hdr;
- msg->iov = util_iov_dup(&iov, 1);
-
- if (out) {
- DBG("output[%u]: hdr 0x%02x size %zu",
- queue_length(idev->replay->out), hdr, size);
- queue_push_tail(idev->replay->out, msg);
- } else {
- DBG("input[%u]: hdr 0x%02x size %zu",
- queue_length(idev->replay->in), hdr, size);
- queue_push_tail(idev->replay->in, msg);
- }
-}
-
static bool hidp_send_ctrl_message(struct input_device *idev, uint8_t hdr,
const uint8_t *data, size_t size)
{
if (hdr == (HIDP_TRANS_HID_CONTROL | HIDP_CTRL_VIRTUAL_CABLE_UNPLUG))
idev->virtual_cable_unplug = true;
- hidp_record_message(idev, true, hdr, data, size);
-
return hidp_send_message(idev, idev->ctrl_io, hdr, data, size);
}
@@ -684,12 +565,6 @@ static bool hidp_recv_ctrl_message(GIOChannel *chan, struct input_device *idev)
type = hdr & HIDP_HEADER_TRANS_MASK;
param = hdr & HIDP_HEADER_PARAM_MASK;
- /* While replaying don't involve the driver since it will likely get
- * confused with messages it already things it has received.
- */
- if (idev->replay && idev->replay->replaying)
- goto done;
-
switch (type) {
case HIDP_TRANS_HANDSHAKE:
hidp_recv_ctrl_handshake(idev, param);
@@ -707,9 +582,6 @@ static bool hidp_recv_ctrl_message(GIOChannel *chan, struct input_device *idev)
break;
}
-done:
- hidp_record_message(idev, false, hdr, data + 1, len - 1);
-
return true;
}
@@ -1108,49 +980,12 @@ static int ioctl_disconnect(struct input_device *idev, uint32_t flags)
return err;
}
-static void queue_append(void *data, void *user_data)
-{
- queue_push_tail(user_data, data);
-}
-
-static struct queue *queue_dup(struct queue *q)
-{
- struct queue *dup;
-
- if (!q || queue_isempty(q))
- return NULL;
-
- dup = queue_new();
-
- queue_foreach(q, queue_append, dup);
-
- return dup;
-}
-
-static void hidp_replay_init(struct input_device *idev)
-{
- if (!idev->replay || idev->replay->replaying)
- return;
-
- idev->replay->replaying = true;
-
- queue_destroy(idev->replay->re_in, NULL);
- idev->replay->re_in = queue_dup(idev->replay->in);
-
- queue_destroy(idev->replay->re_out, NULL);
- idev->replay->re_out = queue_dup(idev->replay->out);
-
- hidp_replay_resend(idev);
-}
-
static int uhid_connadd(struct input_device *idev, struct hidp_connadd_req *req)
{
int err;
- if (bt_uhid_created(idev->uhid)) {
- hidp_replay_init(idev);
- return 0;
- }
+ if (bt_uhid_created(idev->uhid))
+ return bt_uhid_replay(idev->uhid);
err = bt_uhid_create(idev->uhid, req->name, &idev->src, &idev->dst,
req->vendor, req->product, req->version,
diff --git a/src/shared/uhid.c b/src/shared/uhid.c
index 1d04dc5a780c..0a74c6d5c1ae 100644
--- a/src/shared/uhid.c
+++ b/src/shared/uhid.c
@@ -508,6 +508,7 @@ int bt_uhid_destroy(struct bt_uhid *uhid)
return err;
uhid->created = false;
+ uhid_replay_free(uhid->replay);
return err;
}
--
2.44.0
From: Luiz Augusto von Dentz <[email protected]>
This attempts to destroy input device if there is an attempt to
communicate with it while disconnected.
---
profiles/input/hog-lib.c | 39 +++++++++++++++++++++------------------
1 file changed, 21 insertions(+), 18 deletions(-)
diff --git a/profiles/input/hog-lib.c b/profiles/input/hog-lib.c
index 0291adb6eb23..d94a3ff102ef 100644
--- a/profiles/input/hog-lib.c
+++ b/profiles/input/hog-lib.c
@@ -825,6 +825,19 @@ static void set_report_cb(guint8 status, const guint8 *pdu,
error("bt_uhid_set_report_reply: %s", strerror(-err));
}
+static void uhid_destroy(struct bt_hog *hog)
+{
+ int err;
+
+ bt_uhid_unregister_all(hog->uhid);
+
+ err = bt_uhid_destroy(hog->uhid);
+ if (err < 0) {
+ error("bt_uhid_destroy: %s", strerror(-err));
+ return;
+ }
+}
+
static void set_report(struct uhid_event *ev, void *user_data)
{
struct bt_hog *hog = user_data;
@@ -833,6 +846,14 @@ static void set_report(struct uhid_event *ev, void *user_data)
int size;
int err;
+ /* Destroy input device if there is an attempt to communicate with it
+ * while disconnected.
+ */
+ if (hog->attrib == NULL) {
+ uhid_destroy(hog);
+ return;
+ }
+
/* uhid never sends reqs in parallel; if there's a req, it timed out */
if (hog->setrep_att) {
g_attrib_cancel(hog->attrib, hog->setrep_att);
@@ -856,11 +877,6 @@ static void set_report(struct uhid_event *ev, void *user_data)
--size;
}
- if (hog->attrib == NULL) {
- err = -ENOTCONN;
- goto fail;
- }
-
DBG("Sending report type %d ID %d to handle 0x%X", report->type,
report->id, report->value_handle);
@@ -1204,19 +1220,6 @@ static bool cancel_gatt_req(const void *data, const void *user_data)
return g_attrib_cancel(hog->attrib, req->id);
}
-static void uhid_destroy(struct bt_hog *hog)
-{
- int err;
-
- bt_uhid_unregister_all(hog->uhid);
-
- err = bt_uhid_destroy(hog->uhid);
- if (err < 0) {
- error("bt_uhid_destroy: %s", strerror(-err));
- return;
- }
-}
-
static void hog_free(void *data)
{
struct bt_hog *hog = data;
--
2.44.0
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=842985
---Test result---
Test Summary:
CheckPatch PASS 1.90 seconds
GitLint FAIL 1.48 seconds
BuildEll PASS 24.36 seconds
BluezMake PASS 1688.92 seconds
MakeCheck PASS 13.58 seconds
MakeDistcheck PASS 177.42 seconds
CheckValgrind PASS 246.86 seconds
CheckSmatch PASS 350.01 seconds
bluezmakeextell PASS 118.66 seconds
IncrementalBuild PASS 6173.01 seconds
ScanBuild PASS 1009.00 seconds
Details
##############################
Test: GitLint - FAIL
Desc: Run gitlint
Output:
[BlueZ,v2,4/4] hog-lib: Destroy uHID device if there is traffic while disconnected
WARNING: I3 - ignore-body-lines: gitlint will be switching from using Python regex 'match' (match beginning) to 'search' (match anywhere) semantics. Please review your ignore-body-lines.regex option accordingly. To remove this warning, set general.regex-style-search=True. More details: https://jorisroovers.github.io/gitlint/configuration/#regex-style-search
1: T1 Title exceeds max length (82>80): "[BlueZ,v2,4/4] hog-lib: Destroy uHID device if there is traffic while disconnected"
---
Regards,
Linux Bluetooth