From: Luiz Augusto von Dentz <[email protected]>
When uhid is in use IdleTimeout was not taking any effect, this also
attempt to force the destroy the input device node to make it useful
for users that don't want to keep the input node forever.
---
profiles/input/device.c | 86 +++++++++++++++++++++++++++------------
profiles/input/input.conf | 2 +-
2 files changed, 61 insertions(+), 27 deletions(-)
diff --git a/profiles/input/device.c b/profiles/input/device.c
index 1b28cdc174b1..b622ee8cd681 100644
--- a/profiles/input/device.c
+++ b/profiles/input/device.c
@@ -77,6 +77,7 @@ struct input_device {
unsigned int report_req_timer;
uint32_t report_rsp_id;
bool virtual_cable_unplug;
+ unsigned int idle_timer;
};
static int idle_timeout = 0;
@@ -139,6 +140,9 @@ static void input_device_free(struct input_device *idev)
g_free(idev->req);
}
+ if (idev->idle_timer)
+ timeout_remove(idev->idle_timer);
+
if (idev->reconnect_timer > 0)
timeout_remove(idev->reconnect_timer);
@@ -156,8 +160,54 @@ static void virtual_cable_unplug(struct input_device *idev)
idev->virtual_cable_unplug = false;
}
-static bool hidp_send_message(GIOChannel *chan, uint8_t hdr,
- const uint8_t *data, size_t size)
+static int uhid_disconnect(struct input_device *idev, bool force)
+{
+ int err;
+
+ if (!bt_uhid_created(idev->uhid))
+ return 0;
+
+ /* Only destroy the node if virtual cable unplug flag has been set */
+ if (!idev->virtual_cable_unplug && !force)
+ return 0;
+
+ bt_uhid_unregister_all(idev->uhid);
+
+ err = bt_uhid_destroy(idev->uhid);
+ if (err < 0) {
+ error("bt_uhid_destroy: %s", strerror(-err));
+ return err;
+ }
+
+ return err;
+}
+
+static bool input_device_idle_timeout(gpointer user_data)
+{
+ struct input_device *idev = user_data;
+
+ idev->idle_timer = 0;
+
+ DBG("path=%s", idev->path);
+
+ uhid_disconnect(idev, true);
+ connection_disconnect(idev, 0);
+
+ return false;
+}
+
+static void input_device_idle_reset(struct input_device *idev)
+{
+ timeout_remove(idev->idle_timer);
+
+ if (idle_timeout)
+ idev->idle_timer = timeout_add_seconds(idle_timeout,
+ input_device_idle_timeout, idev,
+ NULL);
+}
+
+static bool hidp_send_message(struct input_device *idev, GIOChannel *chan,
+ uint8_t hdr, const uint8_t *data, size_t size)
{
int fd;
ssize_t len;
@@ -191,6 +241,8 @@ static bool hidp_send_message(GIOChannel *chan, uint8_t hdr,
return false;
}
+ input_device_idle_reset(idev);
+
return true;
}
@@ -200,13 +252,13 @@ static bool hidp_send_ctrl_message(struct input_device *idev, uint8_t hdr,
if (hdr == (HIDP_TRANS_HID_CONTROL | HIDP_CTRL_VIRTUAL_CABLE_UNPLUG))
idev->virtual_cable_unplug = true;
- return hidp_send_message(idev->ctrl_io, hdr, data, size);
+ return hidp_send_message(idev, idev->ctrl_io, hdr, data, size);
}
static bool hidp_send_intr_message(struct input_device *idev, uint8_t hdr,
const uint8_t *data, size_t size)
{
- return hidp_send_message(idev->intr_io, hdr, data, size);
+ return hidp_send_message(idev, idev->intr_io, hdr, data, size);
}
static bool uhid_send_get_report_reply(struct input_device *idev,
@@ -297,6 +349,8 @@ static bool hidp_recv_intr_data(GIOChannel *chan, struct input_device *idev)
return true;
}
+ input_device_idle_reset(idev);
+
hdr = data[0];
if (hdr != (HIDP_TRANS_DATA | HIDP_DATA_RTYPE_INPUT)) {
DBG("unsupported HIDP protocol header 0x%02x", hdr);
@@ -313,28 +367,6 @@ static bool hidp_recv_intr_data(GIOChannel *chan, struct input_device *idev)
return true;
}
-static int uhid_disconnect(struct input_device *idev, bool force)
-{
- int err;
-
- if (!bt_uhid_created(idev->uhid))
- return 0;
-
- /* Only destroy the node if virtual cable unplug flag has been set */
- if (!idev->virtual_cable_unplug && !force)
- return 0;
-
- bt_uhid_unregister_all(idev->uhid);
-
- err = bt_uhid_destroy(idev->uhid);
- if (err < 0) {
- error("bt_uhid_destroy: %s", strerror(-err));
- return err;
- }
-
- return err;
-}
-
static gboolean intr_watch_cb(GIOChannel *chan, GIOCondition cond, gpointer data)
{
struct input_device *idev = data;
@@ -520,6 +552,8 @@ static bool hidp_recv_ctrl_message(GIOChannel *chan, struct input_device *idev)
return true;
}
+ input_device_idle_reset(idev);
+
hdr = data[0];
type = hdr & HIDP_HEADER_TRANS_MASK;
param = hdr & HIDP_HEADER_PARAM_MASK;
diff --git a/profiles/input/input.conf b/profiles/input/input.conf
index 00a34eb63de1..fc20c58b6b32 100644
--- a/profiles/input/input.conf
+++ b/profiles/input/input.conf
@@ -6,7 +6,7 @@
# Set idle timeout (in minutes) before the connection will
# be disconnect (defaults to 0 for no timeout)
-#IdleTimeout=30
+#IdleTimeout=0
# Enable HID protocol handling in userspace input profile
# Defaults to true (Use UHID instead of kernel HIDP)
--
2.44.0
From: Luiz Augusto von Dentz <[email protected]>
This changes IdleTimeout unit to be in seconds instead of in minutes
which offer better granularity.
---
profiles/input/input.conf | 5 +++--
profiles/input/manager.c | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/profiles/input/input.conf b/profiles/input/input.conf
index fc20c58b6b32..273e15bc9c80 100644
--- a/profiles/input/input.conf
+++ b/profiles/input/input.conf
@@ -4,8 +4,9 @@
# particular interface
[General]
-# Set idle timeout (in minutes) before the connection will
-# be disconnect (defaults to 0 for no timeout)
+# Set idle timeout (in seconds) before the connection will be disconnect and
+# the input device is removed.
+# Defaults: 0 (disabled)
#IdleTimeout=0
# Enable HID protocol handling in userspace input profile
diff --git a/profiles/input/manager.c b/profiles/input/manager.c
index 92789a003c89..f4598bcd4e47 100644
--- a/profiles/input/manager.c
+++ b/profiles/input/manager.c
@@ -89,7 +89,7 @@ static int input_init(void)
"IdleTimeout", &err);
if (!err) {
DBG("input.conf: IdleTimeout=%d", idle_timeout);
- input_set_idle_timeout(idle_timeout * 60);
+ input_set_idle_timeout(idle_timeout);
} else
g_clear_error(&err);
--
2.44.0
From: Luiz Augusto von Dentz <[email protected]>
This adds replay support when uhid is in use and the input node is keep
while disconnected:
Fixes: https://github.com/bluez/bluez/issues/777
---
profiles/input/device.c | 169 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 168 insertions(+), 1 deletion(-)
diff --git a/profiles/input/device.c b/profiles/input/device.c
index b622ee8cd681..b3d69d86f3d4 100644
--- a/profiles/input/device.c
+++ b/profiles/input/device.c
@@ -42,6 +42,8 @@
#include "src/sdp-client.h"
#include "src/shared/timeout.h"
#include "src/shared/uhid.h"
+#include "src/shared/util.h"
+#include "src/shared/queue.h"
#include "device.h"
#include "hidp_defs.h"
@@ -55,6 +57,19 @@ enum reconnect_mode_t {
RECONNECT_ANY
};
+struct hidp_msg {
+ uint8_t hdr;
+ 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;
@@ -78,6 +93,7 @@ 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;
@@ -113,8 +129,30 @@ 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);
@@ -246,12 +284,95 @@ static bool hidp_send_message(struct input_device *idev, GIOChannel *chan,
return true;
}
+static void hidp_replay_send(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;
+ }
+
+ DBG("hdr 0x%02x size %zu", msg->hdr, msg->iov->iov_len);
+
+ hidp_send_message(idev, NULL, msg->hdr, msg->iov->iov_base,
+ msg->iov->iov_len);
+}
+
+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_send(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);
}
@@ -558,6 +679,12 @@ 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);
@@ -575,6 +702,9 @@ 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;
}
@@ -973,12 +1103,49 @@ 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_send(idev);
+}
+
static int uhid_connadd(struct input_device *idev, struct hidp_connadd_req *req)
{
int err;
- if (bt_uhid_created(idev->uhid))
+ if (bt_uhid_created(idev->uhid)) {
+ hidp_replay_init(idev);
return 0;
+ }
err = bt_uhid_create(idev->uhid, req->name, &idev->src, &idev->dst,
req->vendor, req->product, req->version,
--
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=840335
---Test result---
Test Summary:
CheckPatch PASS 1.03 seconds
GitLint PASS 0.63 seconds
BuildEll PASS 25.58 seconds
BluezMake PASS 1883.06 seconds
MakeCheck PASS 13.83 seconds
MakeDistcheck PASS 188.00 seconds
CheckValgrind PASS 260.24 seconds
CheckSmatch PASS 370.62 seconds
bluezmakeextell PASS 126.41 seconds
IncrementalBuild PASS 5072.22 seconds
ScanBuild PASS 1092.23 seconds
---
Regards,
Linux Bluetooth