obexd: unregister profiles when the user is inactive
Subsystems (2)
v2 cover obexd: unregister profiles when the user is inactive
This is a follow-up to "obexd: only run one instance at once". Instead of refusing to run parallel services, it unregisters profiles when the user is inactive. This avoids the need for tmpfiles, and avoids issues where the user with the obex service logs out, leaving obex disabled altogether.
Luiz previously suggested moving this to systemd, but I haven't had much luck getting the systemd devs to accept changes, and Pauli's mention of elogind (i.e. logind without systemd) suggests it's probably better to avoid the dependency anyway.
I considered writing a separate D-Bus service that would notify you when the session became (in)active, but D-Bus doesn't have particularly strong guarantees about how long messages take to deliver, which could lead to race conditions between instances on overloaded systems.
I also considered writing some kind of library, but there's not much code to deduplicate, and most of it would need to be reworked for every service that uses it. So I wrote a gist for people to copy/paste:
https://gist.github.com/andrew-sayers/1c4a24f86a9a4c1b1e38d109f1bd1d1e
---
V1 -> V2 Open/close private DBus connections instead of
calling UnregisterProfile (thanks Pauli Virtanen)
Add obex_setup_dbus_connection_private() (to enable the above) Fix CI errors
Minor issues I missed last time:
* s/regster/register/ in e-mail subject lines
* s/login_.*_cb/logind_$1_cb/g in logind.[ch]
* remove watches on exit in pbap.c and bluetooth.c
Andrew Sayers (5):
pbap: Support calling pbap_init() after pbap_exit() obexd/bluetooth: Support calling bluetooth_init() after bluetooth_exit()
obexd: Support creating private system/session bus connections
obexd: Unregister profiles when the user is inactive
Revert "obexd: only run one instance at once"
Makefile.obexd | 10 ++ obexd/client/pbap.c | 33 ++++++- obexd/plugins/bluetooth.c | 30 +++++- obexd/src/logind.c | 245 ++++++++++++++++++++++++++++++++++++++++++++++ obexd/src/logind.h | 26 +++++ obexd/src/main.c | 12 +++ obexd/src/obex.service.in | 9 -- obexd/src/obexd.h | 2 + 8 files changed, 349 insertions(+), 18 deletions(-)
PATCH v2 1/5 pbap: Support calling pbap_init() after pbap_exit()
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.
--- obexd/client/pbap.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
obexd/client/pbap.c +14 -2
@@ -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); }
Signature · 1 line
2.49.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=957129
---Test result---
Test Summary:
CheckPatch PENDING 0.25 seconds GitLint PENDING 0.25 seconds BuildEll PASS 20.80 seconds BluezMake PASS 2817.24 seconds MakeCheck PASS 20.61 seconds MakeDistcheck PASS 205.37 seconds CheckValgrind PASS 282.66 seconds CheckSmatch PASS 310.44 seconds bluezmakeextell PASS 131.19 seconds IncrementalBuild PENDING 0.27 seconds ScanBuild PASS 933.51 seconds
Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script
Output:
##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:
##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series Output:
---
Regards,
Linux Bluetooth
PATCH v2 2/5 obexd/bluetooth: Support calling bluetooth_init() after bluetooth_exit()
In reply to Andrew Sayersbluetooth_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.
--- obexd/plugins/bluetooth.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
obexd/plugins/bluetooth.c +14 -2
@@ -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); }
Signature · 1 line
2.49.0
PATCH v2 3/5 obexd: Support creating private system/session bus connections
In reply to Andrew SayersObexd 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.
--- obexd/src/main.c | 8 ++++++++ obexd/src/obexd.h | 2 ++ 2 files changed, 10 insertions(+)
obexd/src/main.c +8 -0
@@ -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;
obexd/src/obexd.h +2 -0
@@ -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);
Signature · 1 line
2.49.0
PATCH v2 4/5 obexd: Unregister profiles when the user is inactive
In reply to Andrew SayersObexd 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
--- 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
Makefile.obexd +10 -0
@@ -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)
obexd/client/pbap.c +14 -3
@@ -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); +}
obexd/plugins/bluetooth.c +12 -2
@@ -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)
obexd/src/logind.c new file +245 -0
245 lines not on this page · raw message
obexd/src/logind.h new file +26 -0
@@ -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 <[email protected]> +* +* +*/ + +#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
obexd/src/main.c +4 -0
@@ -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);
Signature · 1 line
2.49.0
PATCH v2 5/5 Revert "obexd: only run one instance at once"
In reply to Andrew SayersNo longer needed now services can share resources.
This reverts commit 8d472b8758dcdd89bf13cf2fb06a8846e1f483a0.
--- obexd/src/obex.service.in | 9 --------- 1 file changed, 9 deletions(-)
obexd/src/obex.service.in +0 -9
@@ -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
Signature · 1 line
2.49.0
Luiz Augusto von Dentz
maintainerHi Andrew,
Quoted 42 lines · Andrew Sayers
This is a follow-up to "obexd: only run one instance at once". Instead of refusing to run parallel services, it unregisters profiles when the user is inactive. This avoids the need for tmpfiles, and avoids issues where the user with the obex service logs out, leaving obex disabled altogether.
Luiz previously suggested moving this to systemd, but I haven't had much luck getting the systemd devs to accept changes, and Pauli's mention of elogind (i.e. logind without systemd) suggests it's probably better to avoid the dependency anyway.
I considered writing a separate D-Bus service that would notify you when the session became (in)active, but D-Bus doesn't have particularly strong guarantees about how long messages take to deliver, which could lead to race conditions between instances on overloaded systems.
I also considered writing some kind of library, but there's not much code to deduplicate, and most of it would need to be reworked for every service that uses it. So I wrote a gist for people to copy/paste:
https://gist.github.com/andrew-sayers/1c4a24f86a9a4c1b1e38d109f1bd1d1e
Signed-off-by Andrew Sayers <[email protected]>---
V1 -> V2 Open/close private DBus connections instead of
calling UnregisterProfile (thanks Pauli Virtanen)
Addobex_setup_dbus_connection_private()(to enable the above) Fix CI errors
Minor issues I missed last time:
* s/regster/register/ in e-mail subject lines
* s/login_.*_cb/logind_$1_cb/g in logind.[ch]
* remove watches on exit inpbap.candbluetooth.cAndrew Sayers (5):
pbap: Support callingpbap_init()afterpbap_exit()obexd/bluetooth: Support callingbluetooth_init()afterbluetooth_exit()
obexd: Support creating private system/session bus connections
obexd: Unregister profiles when the user is inactive
Revert "obexd: only run one instance at once"
Quoted 9 lines
Makefile.obexd | 10 ++ obexd/client/pbap.c | 33 ++++++- obexd/plugins/bluetooth.c | 30 +++++- obexd/src/logind.c | 245 ++++++++++++++++++++++++++++++++++++++++++++++ obexd/src/logind.h | 26 +++++ obexd/src/main.c | 12 +++ obexd/src/obex.service.in | 9 -- obexd/src/obexd.h | 2 + 8 files changed, 349 insertions(+), 18 deletions(-)
Seems that the coding style is not quite right:
https://github.com/bluez/bluez/actions/runs/14670164969/job/41174608664?pr=1198
I'm adding .clang-format and .editorconfig in order to make it simpler for linters and editor to detect the coding style automatically.
Signature · 1 line
Luiz Augusto von Dentz