All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH BlueZ v2 0/3] pbap: use the public DBus connection
@ 2025-06-11 13:06 Andrew Sayers
  2025-06-11 13:06 ` [PATCH BlueZ v2 1/3] obexd: Pass at_(un)register value to logind callbacks Andrew Sayers
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Andrew Sayers @ 2025-06-11 13:06 UTC (permalink / raw)
  To: linux-bluetooth; +Cc: luiz.dentz, pav, frederic.danis, Andrew Sayers

DBus requests are received by the public DBus connection, because it
registers the relevant bus name.  My previous patches told PBAP to
listen on a private connection, but DBus doesn't let connections share
bus names, so it needs to listen on the public connection instead.

This adds a little more complexity to the logind callbacks, to avoid
unregistering profiles during shutdown.  It also removes an API I
previously added, which is no longer used and would only encourage the
next person to make the same mistake.

While reviewing this change, it became obvious seat-detection should
be merged into the normal driver interface instead.  That change is
likely to add time and could create its own bugs, so this series fixes
the simple bug while we discuss the deeper issue.

Reported-by: Frédéric Danis <frederic.danis@collabora.com>
Closes: https://lore.kernel.org/linux-bluetooth/333ad76e-0aba-4f93-b141-8e69fb47535f@collabora.com/
Suggested-by: Pauli Virtanen <pav@iki.fi>
Signed-off-by: Andrew Sayers <kernel.org@pileofstuff.org>
--

Frédéric and Pauli - please let me know if you'd like to be CCed on
the architecture discussion.  Otherwise, I'll assume you're not
interested in that part of the problem.

V1 -> V2 Move instances of "(void)foo" below "int bar"
      (fixes a "mixed declarations and code" error)

Andrew Sayers (3):
      obexd: Pass at_(un)register value to logind callbacks
      pbap: use the public DBus connection
      Revert "obexd: Support creating private system/session bus connections"

 obexd/client/pbap.c       | 28 ++++++++++++++++++++++++----
 obexd/plugins/bluetooth.c |  6 ++++--
 obexd/src/logind.c        | 14 +++++++-------
 obexd/src/logind.h        |  8 ++++----
 obexd/src/main.c          |  8 --------
 obexd/src/obexd.h         |  2 --
 6 files changed, 39 insertions(+), 27 deletions(-)


^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH BlueZ 1/3] obexd: Pass at_(un)register value to logind callbacks
@ 2025-06-03 15:13 Andrew Sayers
  2025-06-03 16:43 ` pbap: use the public DBus connection bluez.test.bot
  0 siblings, 1 reply; 7+ messages in thread
From: Andrew Sayers @ 2025-06-03 15:13 UTC (permalink / raw)
  To: linux-bluetooth; +Cc: luiz.dentz, pav, frederic.danis, Andrew Sayers

Logind (un)registers callbacks that it calls when the user's state changes.
Callbacks may also be called during (un)registration.
Clients may need to handle those initial/final calls specially.

Pass an argument indicating whether this is being called during
(un)registration, and modify existing callbacks to ignore that argument.

Signed-off-by: Andrew Sayers <kernel.org@pileofstuff.org>
---
 obexd/client/pbap.c       |  6 ++++--
 obexd/plugins/bluetooth.c |  6 ++++--
 obexd/src/logind.c        | 14 +++++++-------
 obexd/src/logind.h        |  8 ++++----
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/obexd/client/pbap.c b/obexd/client/pbap.c
index 51b523592..64bb8ff72 100644
--- a/obexd/client/pbap.c
+++ b/obexd/client/pbap.c
@@ -1455,8 +1455,9 @@ static struct obc_driver pbap = {
 	.remove = pbap_remove
 };
 
-static int pbap_init_cb(void)
+static int pbap_init_cb(gboolean at_register)
 {
+	(void)at_register;
 	int err;
 
 	DBG("");
@@ -1482,8 +1483,9 @@ static int pbap_init_cb(void)
 	return 0;
 }
 
-static void pbap_exit_cb(void)
+static void pbap_exit_cb(gboolean at_unregister)
 {
+	(void)at_unregister;
 	DBG("");
 
 	g_dbus_remove_watch(system_conn, listener_id);
diff --git a/obexd/plugins/bluetooth.c b/obexd/plugins/bluetooth.c
index 7ff27a8a8..ad37e636d 100644
--- a/obexd/plugins/bluetooth.c
+++ b/obexd/plugins/bluetooth.c
@@ -427,8 +427,9 @@ static const struct obex_transport_driver driver = {
 
 static unsigned int listener_id = 0;
 
-static int bluetooth_init_cb(void)
+static int bluetooth_init_cb(gboolean at_register)
 {
+	(void)at_register;
 	connection = g_dbus_setup_private(DBUS_BUS_SYSTEM, NULL, NULL);
 	if (connection == NULL)
 		return -EPERM;
@@ -439,8 +440,9 @@ static int bluetooth_init_cb(void)
 	return obex_transport_driver_register(&driver);
 }
 
-static void bluetooth_exit_cb(void)
+static void bluetooth_exit_cb(gboolean at_unregister)
 {
+	(void)at_unregister;
 	GSList *l;
 
 	g_dbus_remove_watch(connection, listener_id);
diff --git a/obexd/src/logind.c b/obexd/src/logind.c
index a0eb62b1e..b4279b209 100644
--- a/obexd/src/logind.c
+++ b/obexd/src/logind.c
@@ -43,13 +43,13 @@ static void call_init_cb(gpointer data, gpointer user_data)
 {
 	int res;
 
-	res = ((struct callback_pair *)data)->init_cb();
+	res = ((struct callback_pair *)data)->init_cb(FALSE);
 	if (res)
 		*(int *)user_data = res;
 }
 static void call_exit_cb(gpointer data, gpointer user_data)
 {
-	((struct callback_pair *)data)->exit_cb();
+	((struct callback_pair *)data)->exit_cb(FALSE);
 }
 
 static int update(void)
@@ -229,7 +229,7 @@ int logind_register(logind_init_cb init_cb, logind_exit_cb exit_cb)
 	struct callback_pair *cbs;
 
 	if (!monitoring_enabled)
-		return init_cb();
+		return init_cb(TRUE);
 	if (callbacks == NULL) {
 		int res;
 
@@ -237,23 +237,23 @@ int logind_register(logind_init_cb init_cb, logind_exit_cb exit_cb)
 		if (res) {
 			error("logind_init(): %s - login detection disabled",
 				strerror(-res));
-			return init_cb();
+			return init_cb(TRUE);
 		}
 	}
 	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;
+	return active ? init_cb(TRUE) : 0;
 }
 void logind_unregister(logind_init_cb init_cb, logind_exit_cb exit_cb)
 {
 	GSList *cb_node;
 
 	if (!monitoring_enabled)
-		return exit_cb();
+		return exit_cb(TRUE);
 	if (active)
-		exit_cb();
+		exit_cb(TRUE);
 	cb_node = g_slist_find_custom(callbacks, init_cb, find_cb);
 	if (cb_node != NULL)
 		callbacks = g_slist_delete_link(callbacks, cb_node);
diff --git a/obexd/src/logind.h b/obexd/src/logind.h
index eb3ff8d7b..3cdb03338 100644
--- a/obexd/src/logind.h
+++ b/obexd/src/logind.h
@@ -8,8 +8,8 @@
  *
  */
 
-typedef int (*logind_init_cb)(void);
-typedef void (*logind_exit_cb)(void);
+typedef int (*logind_init_cb)(gboolean at_register);
+typedef void (*logind_exit_cb)(gboolean at_unregister);
 
 #ifdef SYSTEMD
 
@@ -22,12 +22,12 @@ int logind_set(gboolean enabled);
 static inline int logind_register(logind_init_cb init_cb,
 					logind_exit_cb exit_cb)
 {
-	return init_cb();
+	return init_cb(TRUE);
 }
 static inline void logind_unregister(logind_init_cb init_cb,
 					logind_exit_cb exit_cb)
 {
-	return exit_cb();
+	return exit_cb(TRUE);
 }
 static inline int logind_set(gboolean enabled)
 {
-- 
2.49.0


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2025-06-11 14:50 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-06-11 13:06 [PATCH BlueZ v2 0/3] pbap: use the public DBus connection Andrew Sayers
2025-06-11 13:06 ` [PATCH BlueZ v2 1/3] obexd: Pass at_(un)register value to logind callbacks Andrew Sayers
2025-06-11 14:35   ` pbap: use the public DBus connection bluez.test.bot
2025-06-11 13:06 ` [PATCH BlueZ v2 2/3] " Andrew Sayers
2025-06-11 13:06 ` [PATCH BlueZ v2 3/3] Revert "obexd: Support creating private system/session bus connections" Andrew Sayers
2025-06-11 14:50 ` [PATCH BlueZ v2 0/3] pbap: use the public DBus connection patchwork-bot+bluetooth
  -- strict thread matches above, loose matches on Subject: below --
2025-06-03 15:13 [PATCH BlueZ 1/3] obexd: Pass at_(un)register value to logind callbacks Andrew Sayers
2025-06-03 16:43 ` pbap: use the public DBus connection bluez.test.bot

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.