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 <kernel.org@xxxxxxxxxxxxxxx> --- Pauli pointed out timeout_handler() isn't required by the implementation, even though the documentation implies otherwise. Having thought about it over the weekend, it seems hard to avoid concluding both that timeout_handler() cannot be fully tested in the real world right now; and that any change to the API would likely happen in many years' time, when we've all forgotten how to fix the problem. So I've moved that bit to a separate patch, which can be bisected and reverted if necessary. Pauli - I appreciate the feedback and wanted to note it in the patch, without implying you wanted that function kept in. I've settled on a Cc: line, but happy to change it if you'd prefer. 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 V2 -> V3 Fix checkpatch.pl errors - thanks Luiz Note: false positive warning about commit #4 is still present - this URL can't be split or shortened without causing issues. V3 -> V4 Fix various bugs - thanks Pauli Split timeout_handler() into a separate patch - see above Andrew Sayers (6): 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 obexd: Support sd_login_monitor_get_timeout() 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 | 260 ++++++++++++++++++++++++++++++++++++++++++++++ obexd/src/logind.h | 26 +++++ obexd/src/main.c | 12 +++ obexd/src/obex.service.in | 9 -- obexd/src/obexd.h | 2 + 8 files changed, 364 insertions(+), 18 deletions(-)
