From patchwork Fri Apr 25 17:13:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Sayers X-Patchwork-Id: 885057 Received: from alt2.a-painless.mh.aa.net.uk (alt2.a-painless.mh.aa.net.uk [81.187.30.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61D7F1F3BAC for ; Fri, 25 Apr 2025 17:15:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=81.187.30.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745601340; cv=none; b=MaVUC3KA5MpbR34xqGtirQgHZxaS4qJSLv5SLqxGupke8lSRslRIOyG3bGt9w3jnHeZJfXzDH0iRWDDamSwpxFB1iHSDACxmH9Z1vIowycuh1VworDb7AfauQZkokOOPPSlE7M5MGNOq2mzmzhinLvZ4aAUCQHTUC6uWGepoZ40= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745601340; c=relaxed/simple; bh=F5TkCiC1YYyLTJG7eKCGP5llitXqEUf0RLnCcSBXU4Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Yjddc5WERNYmVx0cNdha2HhbqlTtJh2UnXOnYtaLaLrqCBzG3RZ4Kz9ybMRba2/oJ1aVCo6clQ6a2gHq9BqRz5mtLMWY8VIJpTqASdQFSPw6y+PpDQQufwzKXfSE9v5b9gr4dH03Na0wgsECAjv4HMMfz/aE15gDQcKf/ojoUdw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pileofstuff.org; spf=pass smtp.mailfrom=pileofstuff.org; arc=none smtp.client-ip=81.187.30.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pileofstuff.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pileofstuff.org Received: from f.e.3.8.2.2.5.b.8.9.9.0.4.5.1.6.0.5.8.0.9.1.8.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:819:850:6154:998:b522:83ef] helo=andrews-2024-laptop.lan) by painless-a.thn.aa.net.uk with esmtp (Exim 4.96) (envelope-from ) id 1u8MeE-0005GV-2c; Fri, 25 Apr 2025 18:15:34 +0100 From: Andrew Sayers To: linux-bluetooth@vger.kernel.org Cc: luiz.dentz@gmail.com, pav@iki.fi, Andrew Sayers Subject: [PATCH BlueZ v2 1/5] pbap: Support calling pbap_init() after pbap_exit() Date: Fri, 25 Apr 2025 18:13:00 +0100 Message-ID: <20250425171505.573271-2-kernel.org@pileofstuff.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425171505.573271-1-kernel.org@pileofstuff.org> References: <20250425171505.573271-1-kernel.org@pileofstuff.org> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 pbap_exit() didn't previously unregister itself thoroughly. That was fine if it was only called when the service was about to exit, because everything was implicitly unregistered when the process ended. But we need to be more scrupulous if this can be called throughout the program's lifecycle. Send the UnregisterProfile message directly from pbap_exit(), then call unregister_profile(). The UnregisterProfile message can't be sent directly from unregister_profile(), because that also needs to be called when register_profile() fails halfway through. Signed-off-by: Andrew Sayers --- obexd/client/pbap.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/obexd/client/pbap.c b/obexd/client/pbap.c index 2f234fadf..90f8bdc02 100644 --- a/obexd/client/pbap.c +++ b/obexd/client/pbap.c @@ -1485,8 +1485,20 @@ void pbap_exit(void) { DBG(""); - dbus_connection_unref(conn); - conn = NULL; + g_dbus_remove_watch(system_conn, listener_id); + + unregister_profile(); + + if (system_conn) { + dbus_connection_close(system_conn); + dbus_connection_unref(system_conn); + system_conn = NULL; + } + + if (conn) { + dbus_connection_unref(conn); + conn = NULL; + } obc_driver_unregister(&pbap); } From patchwork Fri Apr 25 17:13:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Sayers X-Patchwork-Id: 885059 Received: from alt2.a-painless.mh.aa.net.uk (alt2.a-painless.mh.aa.net.uk [81.187.30.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61BE035971 for ; Fri, 25 Apr 2025 17:15:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=81.187.30.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745601339; cv=none; b=NRdPAfnEXhb6id67s6/YoFn+Db5VcbzD3ZGHx4Rl4VB/mbtpUbJKUlxaiWtZaW5wgxKhAOIhYeCfvySVV7W3UQfPnVBzQaWNMAdvovdEUgEFxz8Ww7OAQVyA2/X6wQyrUJBw+zXZoZe1b9wuKi9Kf2yzKeglXqPyQupq8uekD98= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745601339; c=relaxed/simple; bh=d/WxBMxqdLm7vLrEYisbha2jKiJBkkQV3Qhf6tl7cGM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XfcgZnn+xooXgML7wTnPMqE6LXmlT1ADZU2QdEfDXuamv2lLAe15aSawsr4aVJPpTNtTcmewD/QmWv6loDrol4ppcVEpj21X88xB2JdiXzjzNkdOV4OO6qRLcQRptc7ARcmiVynpKAnjtDQnpXXoU5KSGlkQ3d4aCKgbfqAEvJE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pileofstuff.org; spf=pass smtp.mailfrom=pileofstuff.org; arc=none smtp.client-ip=81.187.30.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pileofstuff.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pileofstuff.org Received: from f.e.3.8.2.2.5.b.8.9.9.0.4.5.1.6.0.5.8.0.9.1.8.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:819:850:6154:998:b522:83ef] helo=andrews-2024-laptop.lan) by painless-a.thn.aa.net.uk with esmtp (Exim 4.96) (envelope-from ) id 1u8MeE-0005GV-39; Fri, 25 Apr 2025 18:15:34 +0100 From: Andrew Sayers To: linux-bluetooth@vger.kernel.org Cc: luiz.dentz@gmail.com, pav@iki.fi, Andrew Sayers Subject: [PATCH BlueZ v2 2/5] obexd/bluetooth: Support calling bluetooth_init() after bluetooth_exit() Date: Fri, 25 Apr 2025 18:13:01 +0100 Message-ID: <20250425171505.573271-3-kernel.org@pileofstuff.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425171505.573271-1-kernel.org@pileofstuff.org> References: <20250425171505.573271-1-kernel.org@pileofstuff.org> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 bluetooth_exit() didn't previously unregister itself thoroughly. That was fine if it was only called when the service was about to exit, because everything was implicitly unregistered when the process ended. But we need to be more scrupulous if this can be called throughout the program's lifecycle. Send UnregisterProfile messages directly from bluetooth_exit(), then call unregister_profile(profile). The UnregisterProfile message can't be sent directly from unregister_profile(), because that also needs to be called when register_profile() fails halfway through. Do not free profiles in bluetooth_exit() - profiles are needed by a future call to bluetooth_init(), or will be freed by bluetooth_stop() if necessary. Signed-off-by: Andrew Sayers --- obexd/plugins/bluetooth.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/obexd/plugins/bluetooth.c b/obexd/plugins/bluetooth.c index afb2215bd..8cf718922 100644 --- a/obexd/plugins/bluetooth.c +++ b/obexd/plugins/bluetooth.c @@ -440,12 +440,24 @@ static int bluetooth_init(void) static void bluetooth_exit(void) { + GSList *l; + g_dbus_remove_watch(connection, listener_id); - g_slist_free_full(profiles, profile_free); + for (l = profiles; l; l = l->next) { + struct bluetooth_profile *profile = l->data; + + if (profile->path == NULL) + continue; + + unregister_profile(profile); + } - if (connection) + if (connection) { + dbus_connection_close(connection); dbus_connection_unref(connection); + connection = NULL; + } obex_transport_driver_unregister(&driver); } From patchwork Fri Apr 25 17:13:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Sayers X-Patchwork-Id: 884616 Received: from alt2.a-painless.mh.aa.net.uk (alt2.a-painless.mh.aa.net.uk [81.187.30.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61C911DED5D for ; Fri, 25 Apr 2025 17:15:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=81.187.30.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745601340; cv=none; b=UqdwGD+5yyura2g0gVlG84fH/G5iyWLnlOnmBcwQPtHZ5Tci79lTRK0X9VITokxd6FoekJac6QZsBdfuB/7ZE35R9pjxeQJKchRJn3jSly0qAOuODzTKS2+LcX/opsOsqvq2S+RjoyFndFdYJvGK3bvQ25YQ6PCggGxzDpgBzO4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745601340; c=relaxed/simple; bh=iNoNFHPOntE9VXU3/sXp34BzYarmL3L23nkondhyhLM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o54hF0EQ41ka4HlnuCxBgxj5eGw5L+4OAlgGrYWwC0THegJW7d1Z/7TUXbsXwZxtwAV8bpF49OpwPcc4NU57YkICeYcoJFjw+grQl44Mu1sk5AUdGqWn2Pr86x6MiLObFKZLKBQr8Mojc/5fRwk0GLGDPjEVXJG+0xQmw5MF/aI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pileofstuff.org; spf=pass smtp.mailfrom=pileofstuff.org; arc=none smtp.client-ip=81.187.30.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pileofstuff.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pileofstuff.org Received: from f.e.3.8.2.2.5.b.8.9.9.0.4.5.1.6.0.5.8.0.9.1.8.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:819:850:6154:998:b522:83ef] helo=andrews-2024-laptop.lan) by painless-a.thn.aa.net.uk with esmtp (Exim 4.96) (envelope-from ) id 1u8MeF-0005GV-0J; Fri, 25 Apr 2025 18:15:34 +0100 From: Andrew Sayers To: linux-bluetooth@vger.kernel.org Cc: luiz.dentz@gmail.com, pav@iki.fi, Andrew Sayers Subject: [PATCH BlueZ v2 3/5] obexd: Support creating private system/session bus connections Date: Fri, 25 Apr 2025 18:13:02 +0100 Message-ID: <20250425171505.573271-4-kernel.org@pileofstuff.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425171505.573271-1-kernel.org@pileofstuff.org> References: <20250425171505.573271-1-kernel.org@pileofstuff.org> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Obexd can either connect to the system or session bus. We mostly share a common connection to that bus, but it can be useful to have a private connection. For example, this allows us to quickly unregister profiles when switching user. Add obex_setup_dbus_connection_private(), which creates a new connection to whichever bus was specified by the user. Signed-off-by: Andrew Sayers --- obexd/src/main.c | 8 ++++++++ obexd/src/obexd.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/obexd/src/main.c b/obexd/src/main.c index 703173662..ca95a70de 100644 --- a/obexd/src/main.c +++ b/obexd/src/main.c @@ -253,6 +253,14 @@ DBusConnection *obex_setup_dbus_connection(const char *name, return connection; } +DBusConnection *obex_setup_dbus_connection_private(const char *name, + DBusError *error) +{ + return g_dbus_setup_private(option_system_bus ? + DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, + name, error); +} + int main(int argc, char *argv[]) { GOptionContext *context; diff --git a/obexd/src/obexd.h b/obexd/src/obexd.h index 5e5edc4de..560db29ce 100644 --- a/obexd/src/obexd.h +++ b/obexd/src/obexd.h @@ -33,3 +33,5 @@ const char *obex_option_capability(void); DBusConnection *obex_get_dbus_connection(void); DBusConnection *obex_setup_dbus_connection(const char *name, DBusError *error); +DBusConnection *obex_setup_dbus_connection_private(const char *name, + DBusError *error); From patchwork Fri Apr 25 17:13:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Sayers X-Patchwork-Id: 884618 Received: from alt2.a-painless.mh.aa.net.uk (alt2.a-painless.mh.aa.net.uk [81.187.30.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61C36176AA1 for ; Fri, 25 Apr 2025 17:15:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=81.187.30.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745601339; cv=none; b=bg8xkg5R+QynUneMgs46aQQvWB+gdpp2Q404TlMC731hMjd36wXqueBCwRjT2ZNRaffJs4Qq4saNK74VRJNrkpbn4UEtoHs6x6BBP/5QVBeGsaENOKM6j6McD10l/0xsxl1ZO7MkY1I2ab6K9vZU9zcNYcwyldO/7PQ6YlxfMEA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745601339; c=relaxed/simple; bh=JGCP/Heva+y6s36qCmSc3EaMfKwPlJpvzwLSsQoJwjQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iSDcsTaJhXVwrvWSn0LJEPsNm3HOZp6dyBD2Pr/TiLMq9ijWBccmq8XSrCFqbdBTqKT8blN+Hn3RsOkBuIvl1OBwqMp0oAdxPXaTRnVFNO9lDtdw1ijBJigCNR9lL5sXUfBBOHzG+UOC5vS1KJ3PMkynRbIGnpOxDqkjkeiMyuE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pileofstuff.org; spf=pass smtp.mailfrom=pileofstuff.org; arc=none smtp.client-ip=81.187.30.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pileofstuff.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pileofstuff.org Received: from f.e.3.8.2.2.5.b.8.9.9.0.4.5.1.6.0.5.8.0.9.1.8.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:819:850:6154:998:b522:83ef] helo=andrews-2024-laptop.lan) by painless-a.thn.aa.net.uk with esmtp (Exim 4.96) (envelope-from ) id 1u8MeF-0005GV-0j; Fri, 25 Apr 2025 18:15:34 +0100 From: Andrew Sayers To: linux-bluetooth@vger.kernel.org Cc: luiz.dentz@gmail.com, pav@iki.fi, Andrew Sayers Subject: [PATCH BlueZ v2 4/5] obexd: Unregister profiles when the user is inactive Date: Fri, 25 Apr 2025 18:13:03 +0100 Message-ID: <20250425171505.573271-5-kernel.org@pileofstuff.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425171505.573271-1-kernel.org@pileofstuff.org> References: <20250425171505.573271-1-kernel.org@pileofstuff.org> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Obexd is usually run as a user service, and can exhibit surprising behaviour if two users are logged in at the same time. Unregister profiles when the user is detected to be off-seat. It may be impossible to detect whether a user is on-seat in some cases. For example, a version of obexd compiled with systemd support might be run outside of a systemd environment. Warn and leave services registered if that happens. Obexd can be run as a system service, in which case this check makes no sense. Disable this check when called with `--system-bus`. Obexd can also be run by a user that does not have an active session. For example, someone could use `ssh` to access the system. There might be a use case where someone needs Bluetooth access but can't log in with a keyboard, or there might be a security issue with doing so. This isn't handled explicitly by this patch, but a future patch could add support by calling `logind_set(FALSE)` in the same way as is currently done with `--system-bus`. Unregister profiles by closing private connections instead of sending UnregisterProfile on the shared connection. Pipewire has apparently found the latter to cause long shutdown delays, because bluetoothd may be shutting down and unable to handle this message. Based in large part on the wireplumber code mentioned by Pauli Virtanen: https://gitlab.freedesktop.org/pipewire/wireplumber/-/blob/master/modules/module-logind.c#L52 Other services are likely to need similar functionality, so I have created a gist to demonstrate the basic technique: https://gist.github.com/andrew-sayers/1c4a24f86a9a4c1b1e38d109f1bd1d1e Suggested-by: Pauli Virtanen Signed-off-by: Andrew Sayers --- Makefile.obexd | 10 ++ obexd/client/pbap.c | 17 ++- obexd/plugins/bluetooth.c | 14 ++- obexd/src/logind.c | 245 ++++++++++++++++++++++++++++++++++++++ obexd/src/logind.h | 26 ++++ obexd/src/main.c | 4 + 6 files changed, 311 insertions(+), 5 deletions(-) create mode 100644 obexd/src/logind.c create mode 100644 obexd/src/logind.h diff --git a/Makefile.obexd b/Makefile.obexd index 74dd977a0..b59cfaf8f 100644 --- a/Makefile.obexd +++ b/Makefile.obexd @@ -67,6 +67,7 @@ obexd_src_obexd_SOURCES = $(btio_sources) $(gobex_sources) \ obexd/src/main.c obexd/src/obexd.h \ obexd/src/plugin.h obexd/src/plugin.c \ obexd/src/log.h obexd/src/log.c \ + obexd/src/logind.h obexd/src/logind.c \ obexd/src/manager.h obexd/src/manager.c \ obexd/src/obex.h obexd/src/obex.c obexd/src/obex-priv.h \ obexd/src/mimetype.h obexd/src/mimetype.c \ @@ -96,6 +97,8 @@ obexd_src_obexd_LDADD = lib/libbluetooth-internal.la \ if EXTERNAL_PLUGINS obexd_src_obexd_LDFLAGS = $(AM_LDFLAGS) -Wl,--export-dynamic +else +obexd_src_obexd_LDFLAGS = endif obexd_src_obexd_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \ @@ -109,6 +112,13 @@ obexd-add-service-symlink: obexd-remove-service-symlink: endif +if OBEX +if SYSTEMD +obexd_src_obexd_CPPFLAGS += -DSYSTEMD +obexd_src_obexd_LDFLAGS += -lsystemd +endif +endif + obexd_src_obexd_SHORTNAME = obexd obexd_builtin_files = obexd/src/builtin.h $(obexd_builtin_nodist) diff --git a/obexd/client/pbap.c b/obexd/client/pbap.c index 90f8bdc02..51b523592 100644 --- a/obexd/client/pbap.c +++ b/obexd/client/pbap.c @@ -27,6 +27,7 @@ #include "gdbus/gdbus.h" #include "obexd/src/log.h" +#include "obexd/src/logind.h" #include "obexd/src/obexd.h" #include "transfer.h" @@ -1454,13 +1455,13 @@ static struct obc_driver pbap = { .remove = pbap_remove }; -int pbap_init(void) +static int pbap_init_cb(void) { int err; DBG(""); - conn = obex_get_dbus_connection(); + conn = obex_setup_dbus_connection_private(NULL, NULL); if (!conn) return -EIO; @@ -1481,7 +1482,7 @@ int pbap_init(void) return 0; } -void pbap_exit(void) +static void pbap_exit_cb(void) { DBG(""); @@ -1496,9 +1497,19 @@ void pbap_exit(void) } if (conn) { + dbus_connection_close(conn); dbus_connection_unref(conn); conn = NULL; } obc_driver_unregister(&pbap); } + +int pbap_init(void) +{ + return logind_register(pbap_init_cb, pbap_exit_cb); +} +void pbap_exit(void) +{ + return logind_unregister(pbap_init_cb, pbap_exit_cb); +} diff --git a/obexd/plugins/bluetooth.c b/obexd/plugins/bluetooth.c index 8cf718922..7ff27a8a8 100644 --- a/obexd/plugins/bluetooth.c +++ b/obexd/plugins/bluetooth.c @@ -35,6 +35,7 @@ #include "obexd/src/transport.h" #include "obexd/src/service.h" #include "obexd/src/log.h" +#include "obexd/src/logind.h" #define BT_RX_MTU 32767 #define BT_TX_MTU 32767 @@ -426,7 +427,7 @@ static const struct obex_transport_driver driver = { static unsigned int listener_id = 0; -static int bluetooth_init(void) +static int bluetooth_init_cb(void) { connection = g_dbus_setup_private(DBUS_BUS_SYSTEM, NULL, NULL); if (connection == NULL) @@ -438,7 +439,7 @@ static int bluetooth_init(void) return obex_transport_driver_register(&driver); } -static void bluetooth_exit(void) +static void bluetooth_exit_cb(void) { GSList *l; @@ -462,4 +463,13 @@ static void bluetooth_exit(void) obex_transport_driver_unregister(&driver); } +static int bluetooth_init(void) +{ + return logind_register(bluetooth_init_cb, bluetooth_exit_cb); +} +static void bluetooth_exit(void) +{ + return logind_unregister(bluetooth_init_cb, bluetooth_exit_cb); +} + OBEX_PLUGIN_DEFINE(bluetooth, bluetooth_init, bluetooth_exit) diff --git a/obexd/src/logind.c b/obexd/src/logind.c new file mode 100644 index 000000000..d2bbbd924 --- /dev/null +++ b/obexd/src/logind.c @@ -0,0 +1,245 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * + * Enable functionality only when the user is active + * + * Copyright (C) 2007-2010 Marcel Holtmann + * + * + */ + +#ifdef SYSTEMD + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "obexd/src/log.h" +#include "obexd/src/logind.h" + +sd_login_monitor *monitor; +int uid; +gboolean active = FALSE; +gboolean monitoring_enabled = TRUE; +guint source = 0; + +struct callback_pair +{ + logind_init_cb init_cb; + logind_exit_cb exit_cb; +}; + +GSList *callbacks = NULL; + +static void call_init_cb(gpointer data, gpointer user_data) +{ + int res = ((struct callback_pair *)data)->init_cb(); + if (res) + *(int *)user_data = res; +} +static void call_exit_cb(gpointer data, gpointer user_data) +{ + ((struct callback_pair *)data)->exit_cb(); +} + +static int update(void) +{ + char *state; + int res; + res = sd_login_monitor_flush(monitor); + if (res < 0) + return res; + res = sd_uid_get_state(uid, &state); + if (res < 0) + return res; + + if (g_strcmp0(state,"active")) { + if (!active) return 0; + } else { + res = sd_uid_get_seats(uid, 1, NULL); + if (res < 0) + return res; + if (active == !!res) return 0; + } + active ^= TRUE; + res = 0; + g_slist_foreach(callbacks, active ? call_init_cb : call_exit_cb, &res); + return res; +} + +static gboolean event_handler(GIOChannel *source, GIOCondition condition, + gpointer data) +{ + int res; + res = sd_login_monitor_flush(monitor); + if (res < 0) { + error("sd_login_monitor_flush(): %s", strerror(-res)); + return FALSE; + } + if (!monitoring_enabled) + return TRUE; + res = update(); + if (res < 0 ) { + error("update(): %s", strerror(-res)); + return FALSE; + } + return TRUE; +} + +static gboolean timeout_handler(gpointer user_data) +{ + uint64_t timeout_usec; + int res; + + if (!event_handler(NULL, 0, NULL)) + return FALSE; + + res = sd_login_monitor_get_timeout(monitor, &timeout_usec); + if (res < 0) { + error("sd_login_monitor_get_timeout(): %s", strerror(-res)); + return FALSE; + } + + if (timeout_usec > (uint64_t)-1) { + uint64_t time_usec; + struct timespec ts; + res = clock_gettime(CLOCK_MONOTONIC, &ts); + if (res < 0) return -errno; + time_usec = (uint64_t) ts.tv_sec * 1000000 + ts.tv_nsec / 1000; + if (time_usec > timeout_usec) return timeout_handler(user_data); + g_timeout_add((timeout_usec - time_usec + 999) / 1000, + timeout_handler, user_data); + } + + return FALSE; +} + +static int logind_init(void) +{ + GIOChannel *channel; + int events; + int fd; + int res; + + monitor = NULL; + + DBG(""); + + if (!monitoring_enabled) + return 0; + + uid = getuid(); + + res = sd_login_monitor_new("uid", &monitor); + if (res < 0) { + monitor = NULL; + goto FAIL; + } + + // Check this after creating the monitor, in case of race conditions: + res = update(); + if (res < 0) + goto FAIL; + + events = res = sd_login_monitor_get_events(monitor); + if (res < 0) + goto FAIL; + + fd = res = sd_login_monitor_get_fd(monitor); + if (res < 0) + goto FAIL; + + channel = g_io_channel_unix_new(fd); + + g_io_channel_set_close_on_unref(channel, TRUE); + g_io_channel_set_encoding(channel, NULL, NULL); + g_io_channel_set_buffered(channel, FALSE); + + source = g_io_add_watch(channel, events, event_handler, NULL); + + g_io_channel_unref(channel); + + timeout_handler(NULL); + + return 0; + + FAIL: + sd_login_monitor_unref(monitor); + monitoring_enabled = FALSE; + active = TRUE; + return res; +} + +static void logind_exit(void) +{ + if (source) { + g_source_remove(source); + source = 0; + } + sd_login_monitor_unref(monitor); +} + +static gint find_cb(gconstpointer a, gconstpointer b) +{ + return ((struct callback_pair *)a)->init_cb - (logind_init_cb)b; +} + +int logind_register(logind_init_cb init_cb, logind_exit_cb exit_cb) +{ + struct callback_pair *cbs; + + if (!monitoring_enabled) + return init_cb(); + if (callbacks == NULL) + { + int res = logind_init(); + if (res) { + error("logind_init(): %s - login detection disabled", + strerror(-res)); + return init_cb(); + } + } + cbs = g_new(struct callback_pair, 1); + cbs->init_cb = init_cb; + cbs->exit_cb = exit_cb; + callbacks = g_slist_prepend(callbacks, cbs); + return active ? init_cb() : 0; +} +void logind_unregister(logind_init_cb init_cb, logind_exit_cb exit_cb) +{ + GSList *cb_node; + if (!monitoring_enabled) + return exit_cb(); + if (active) + exit_cb(); + cb_node = g_slist_find_custom(callbacks, init_cb, find_cb); + if (cb_node != NULL) + callbacks = g_slist_delete_link(callbacks, cb_node); + if (callbacks == NULL) + logind_exit(); +} + +int logind_set(gboolean enabled) +{ + if (monitoring_enabled == enabled) + return 0; + monitoring_enabled = enabled; + if (enabled) { + active = FALSE; + return update(); + } else { + int res = 0; + active = TRUE; + g_slist_foreach(callbacks, call_exit_cb, &res); + return res; + } +} + +#endif diff --git a/obexd/src/logind.h b/obexd/src/logind.h new file mode 100644 index 000000000..1a92a8b87 --- /dev/null +++ b/obexd/src/logind.h @@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * + * Enable functionality only when the user is active + * + * Copyright (C) 2007-2010 Marcel Holtmann + * + * + */ + +#ifdef SYSTEMD + +typedef int (*logind_init_cb)(void); +typedef void (*logind_exit_cb)(void); + +int logind_register(logind_init_cb init_cb, logind_exit_cb exit_cb); +void logind_unregister(logind_init_cb init_cb, logind_exit_cb exit_cb); +int logind_set(gboolean enabled); + +#else + +#define logind_register(init_cb, exit_cb) init_cb() +#define logind_unregister(init_cb, exit_cb) exit_cb() +#define logind_set(enabled) 0 + +#endif diff --git a/obexd/src/main.c b/obexd/src/main.c index ca95a70de..df150973e 100644 --- a/obexd/src/main.c +++ b/obexd/src/main.c @@ -35,6 +35,7 @@ #include "../client/manager.h" #include "log.h" +#include "logind.h" #include "obexd.h" #include "server.h" @@ -283,6 +284,9 @@ int main(int argc, char *argv[]) __obex_log_init(option_debug, option_detach); + if (option_system_bus) + logind_set(FALSE); + DBG("Entering main loop"); main_loop = g_main_loop_new(NULL, FALSE); From patchwork Fri Apr 25 17:13:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Sayers X-Patchwork-Id: 885058 Received: from alt2.a-painless.mh.aa.net.uk (alt2.a-painless.mh.aa.net.uk [81.187.30.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CAB261F3BB2 for ; Fri, 25 Apr 2025 17:15:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=81.187.30.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745601340; cv=none; b=Rr3EJ29TT+oEUPElye2htrERAkBSFAlZp3cf7t1qIYQy1UlKE7rBLbIS+MhUKsp2iKWjG4GCbCIW86pWmc5hJC4F57ChUpqJjVqAnEA3Pcmv1s4kuAEWItYohvkQyu7UCQDMEYyGTVtIEs6057BckR3+4+D2Vk56lQ+RwsV9xho= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745601340; c=relaxed/simple; bh=/pORlkl6iy5CCHtXO4r13EYVKwWAZM7hO+8n2bM2/Qs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SL9Hcp6PWKo667lQ8suGMvMfubeYUoXKzotGoRsAFpRPxVsThAsWPGcvpvYqGnPIxTtHYm4FzWZnp+4fqjb4/rEG5S2OXXQMjkKWLxPmJeSWFqvI8D5Uf1Rg966PS6rd/Qv5hjjKMexmw8Iw43DvLxbsa/Q268Uu8mlTO/zs6Do= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pileofstuff.org; spf=pass smtp.mailfrom=pileofstuff.org; arc=none smtp.client-ip=81.187.30.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pileofstuff.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pileofstuff.org Received: from f.e.3.8.2.2.5.b.8.9.9.0.4.5.1.6.0.5.8.0.9.1.8.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:819:850:6154:998:b522:83ef] helo=andrews-2024-laptop.lan) by painless-a.thn.aa.net.uk with esmtp (Exim 4.96) (envelope-from ) id 1u8MeF-0005GV-19; Fri, 25 Apr 2025 18:15:34 +0100 From: Andrew Sayers To: linux-bluetooth@vger.kernel.org Cc: luiz.dentz@gmail.com, pav@iki.fi, Andrew Sayers Subject: [PATCH BlueZ v2 5/5] Revert "obexd: only run one instance at once" Date: Fri, 25 Apr 2025 18:13:04 +0100 Message-ID: <20250425171505.573271-6-kernel.org@pileofstuff.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425171505.573271-1-kernel.org@pileofstuff.org> References: <20250425171505.573271-1-kernel.org@pileofstuff.org> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 No longer needed now services can share resources. This reverts commit 8d472b8758dcdd89bf13cf2fb06a8846e1f483a0. Signed-off-by: Andrew Sayers --- obexd/src/obex.service.in | 9 --------- 1 file changed, 9 deletions(-) diff --git a/obexd/src/obex.service.in b/obexd/src/obex.service.in index f269bc513..cf4d8c985 100644 --- a/obexd/src/obex.service.in +++ b/obexd/src/obex.service.in @@ -1,19 +1,10 @@ [Unit] Description=Bluetooth OBEX service -# This is a user-specific service, but bluetooth is a device-specific protocol. -# Only run one instance at a time, even if multiple users log in at once: -ConditionPathExists=!/run/lock/bluez/obexd.lock -ConditionUser=!@system [Service] Type=dbus BusName=org.bluez.obex ExecStart=@PKGLIBEXECDIR@/obexd -# If the service fails on the following line, please ensure -# the bluez tmpfile has been installed in /usr/lib/tmpfiles.d/ -ExecStartPre=touch /run/lock/bluez/obexd.lock -ExecStopPost=rm -f /run/lock/bluez/obexd.lock - [Install] Alias=dbus-org.bluez.obex.service