summaryrefslogtreecommitdiffstats
path: root/dbus
diff options
context:
space:
mode:
Diffstat (limited to 'dbus')
-rw-r--r--dbus/dbus-bus.c20
-rw-r--r--dbus/dbus-bus.h2
-rw-r--r--dbus/dbus-connection-internal.h1
-rw-r--r--dbus/dbus-connection.c65
4 files changed, 68 insertions, 20 deletions
diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c
index eae46051..fd58fab8 100644
--- a/dbus/dbus-bus.c
+++ b/dbus/dbus-bus.c
@@ -28,6 +28,7 @@
#include "dbus-message.h"
#include "dbus-marshal-validate.h"
#include "dbus-threads-internal.h"
+#include "dbus-connection-internal.h"
#include <string.h>
/**
@@ -303,20 +304,29 @@ ensure_bus_data (DBusConnection *connection)
}
/* internal function that checks to see if this
- is a shared bus connection and if it is unref it */
+ is a shared connection owned by the bus and if it is unref it */
void
-_dbus_bus_check_connection_and_unref (DBusConnection *connection)
+_dbus_bus_check_connection_and_unref_unlocked (DBusConnection *connection)
{
+ _DBUS_LOCK (bus);
+
if (bus_connections[DBUS_BUS_SYSTEM] == connection)
{
bus_connections[DBUS_BUS_SYSTEM] = NULL;
- dbus_connection_unref (connection);
+ _dbus_connection_unref_unlocked (connection);
}
else if (bus_connections[DBUS_BUS_SESSION] == connection)
{
bus_connections[DBUS_BUS_SESSION] = NULL;
- dbus_connection_unref (connection);
+ _dbus_connection_unref_unlocked (connection);
}
+ else if (bus_connections[DBUS_BUS_STARTER] == connection)
+ {
+ bus_connections[DBUS_BUS_STARTER] = NULL;
+ _dbus_connection_unref_unlocked (connection);
+ }
+
+ _DBUS_UNLOCK (bus);
}
static DBusConnection *
@@ -394,7 +404,7 @@ internal_bus_get (DBusBusType type,
if (!dbus_bus_register (connection, error))
{
_DBUS_ASSERT_ERROR_IS_SET (error);
- dbus_connection_close (connection);
+ _dbus_connection_close_internal (connection);
dbus_connection_unref (connection);
_DBUS_UNLOCK (bus);
diff --git a/dbus/dbus-bus.h b/dbus/dbus-bus.h
index c47af153..6cefe353 100644
--- a/dbus/dbus-bus.h
+++ b/dbus/dbus-bus.h
@@ -68,7 +68,7 @@ void dbus_bus_remove_match (DBusConnection *connection,
const char *rule,
DBusError *error);
-void _dbus_bus_check_connection_and_unref (DBusConnection *connection);
+void _dbus_bus_check_connection_and_unref_unlocked (DBusConnection *connection);
DBUS_END_DECLS
diff --git a/dbus/dbus-connection-internal.h b/dbus/dbus-connection-internal.h
index adf17862..4506f634 100644
--- a/dbus/dbus-connection-internal.h
+++ b/dbus/dbus-connection-internal.h
@@ -77,6 +77,7 @@ DBusConnection* _dbus_connection_new_for_transport (DBusTransport
void _dbus_connection_do_iteration_unlocked (DBusConnection *connection,
unsigned int flags,
int timeout_milliseconds);
+void _dbus_connection_close_internal (DBusConnection *connection);
DBusPendingCall* _dbus_pending_call_new (DBusConnection *connection,
int timeout_milliseconds,
diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index 06c08d01..8033c4a5 100644
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -239,7 +239,9 @@ struct DBusConnection
char *server_guid; /**< GUID of server if we are in shared_connections, #NULL if server GUID is unknown or connection is private */
unsigned int shareable : 1; /**< #TRUE if connection can go in shared_connections once we know the GUID */
-
+
+ unsigned int shared : 1; /** < #TRUE if connection is shared and we hold a ref to it */
+
unsigned int dispatch_acquired : 1; /**< Someone has dispatch path (can drain incoming queue) */
unsigned int io_path_acquired : 1; /**< Someone has transport io path (can use the transport to read/write messages) */
@@ -1360,6 +1362,7 @@ shared_connections_shutdown (void *data)
_DBUS_LOCK (shared_connections);
_dbus_assert (_dbus_hash_table_get_n_entries (shared_connections) == 0);
+
_dbus_hash_table_unref (shared_connections);
shared_connections = NULL;
@@ -1474,6 +1477,10 @@ connection_record_shared_unlocked (DBusConnection *connection,
}
connection->server_guid = guid_in_connection;
+ connection->shared = TRUE;
+
+ /* get a hard ref on this connection */
+ dbus_connection_ref (connection);
_dbus_verbose ("stored connection to %s to be shared\n",
connection->server_guid);
@@ -1489,7 +1496,7 @@ static void
connection_forget_shared_unlocked (DBusConnection *connection)
{
HAVE_LOCK_CHECK (connection);
-
+
if (connection->server_guid == NULL)
return;
@@ -1505,6 +1512,8 @@ connection_forget_shared_unlocked (DBusConnection *connection)
dbus_free (connection->server_guid);
connection->server_guid = NULL;
+ /* remove the hash ref */
+ _dbus_connection_unref_unlocked (connection);
_DBUS_UNLOCK (shared_connections);
}
@@ -1605,7 +1614,7 @@ _dbus_connection_open_internal (const char *address,
!connection_record_shared_unlocked (connection, guid))
{
_DBUS_SET_OOM (&tmp_error);
- dbus_connection_close (connection);
+ _dbus_connection_close_internal (connection);
dbus_connection_unref (connection);
connection = NULL;
}
@@ -1896,6 +1905,32 @@ dbus_connection_unref (DBusConnection *connection)
_dbus_connection_last_unref (connection);
}
+static void
+_dbus_connection_close_internal_and_unlock (DBusConnection *connection)
+{
+ DBusDispatchStatus status;
+
+ _dbus_verbose ("Disconnecting %p\n", connection);
+
+ _dbus_transport_disconnect (connection->transport);
+
+ _dbus_verbose ("%s middle\n", _DBUS_FUNCTION_NAME);
+ status = _dbus_connection_get_dispatch_status_unlocked (connection);
+
+ /* this calls out to user code */
+ _dbus_connection_update_dispatch_status_and_unlock (connection, status);
+}
+
+void
+_dbus_connection_close_internal (DBusConnection *connection)
+{
+ _dbus_assert (connection != NULL);
+ _dbus_assert (connection->generation == _dbus_current_generation);
+
+ CONNECTION_LOCK (connection);
+ _dbus_connection_close_internal_and_unlock (connection);
+}
+
/**
* Closes the connection, so no further data can be sent or received.
* Any further attempts to send data will result in errors. This
@@ -1907,27 +1942,29 @@ dbus_connection_unref (DBusConnection *connection)
* dbus_connection_set_dispatch_status_function(), as the disconnect
* message it generates needs to be dispatched.
*
+ * If the connection is a shared connection we print out a warning that
+ * you can not close shared connection and we return. Internal calls
+ * should use _dbus_connection_close_internal() to close shared connections.
+ *
* @param connection the connection.
*/
void
dbus_connection_close (DBusConnection *connection)
{
- DBusDispatchStatus status;
-
_dbus_return_if_fail (connection != NULL);
_dbus_return_if_fail (connection->generation == _dbus_current_generation);
- _dbus_verbose ("Disconnecting %p\n", connection);
-
CONNECTION_LOCK (connection);
-
- _dbus_transport_disconnect (connection->transport);
- _dbus_verbose ("%s middle\n", _DBUS_FUNCTION_NAME);
- status = _dbus_connection_get_dispatch_status_unlocked (connection);
+ if (connection->shared)
+ {
+ CONNECTION_UNLOCK (connection);
- /* this calls out to user code */
- _dbus_connection_update_dispatch_status_and_unlock (connection, status);
+ _dbus_warn ("Applications can not close shared connections. Please fix this in your app. Ignoring close request and continuing.");
+ return;
+ }
+
+ _dbus_connection_close_internal_and_unlock (connection);
}
static dbus_bool_t
@@ -3823,7 +3860,7 @@ dbus_connection_dispatch (DBusConnection *connection)
DBUS_INTERFACE_LOCAL,
"Disconnected"))
{
- _dbus_bus_check_connection_and_unref (connection);
+ _dbus_bus_check_connection_and_unref_unlocked (connection);
if (connection->exit_on_disconnect)
{
generated by cgit (git 2.34.1) at 2025-07-03 12:45:46 +0000