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.
Fixes: https://github.com/bluez/bluez/issues/777
---
profiles/input/device.c | 89 +++++++++++++++++++++++++++------------
profiles/input/input.conf | 2 +-
2 files changed, 64 insertions(+), 27 deletions(-)
diff --git a/profiles/input/device.c b/profiles/input/device.c
index 1b28cdc17..5c52ec98a 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,57 @@ 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);
+
+ if (connection_disconnect(idev, 0) == -ENOTCONN) {
+ /* Force UHID_DESTROY on idle */
+ if (idev->uhid)
+ uhid_disconnect(idev, true);
+ }
+
+ 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 +244,8 @@ static bool hidp_send_message(GIOChannel *chan, uint8_t hdr,
return false;
}
+ input_device_idle_reset(idev);
+
return true;
}
@@ -200,13 +255,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 +352,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 +370,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 +555,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 00a34eb63..fc20c58b6 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
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=836747
---Test result---
Test Summary:
CheckPatch PASS 0.51 seconds
GitLint PASS 0.30 seconds
BuildEll PASS 24.03 seconds
BluezMake PASS 1635.29 seconds
MakeCheck PASS 16.04 seconds
MakeDistcheck PASS 174.94 seconds
CheckValgrind PASS 243.79 seconds
CheckSmatch PASS 345.49 seconds
bluezmakeextell PASS 117.45 seconds
IncrementalBuild PASS 1424.62 seconds
ScanBuild PASS 994.25 seconds
---
Regards,
Linux Bluetooth