From d6e1b2adb3d8e51ce1bb47295cef12d9fe1a15a8 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Thu, 16 Oct 2003 06:34:51 +0000 Subject: 2003-10-16 Havoc Pennington * bus/connection.c (bus_pending_reply_expired): either cancel or execute, not both (bus_connections_check_reply): use unlink, not remove_link, as we don't want to free the link; fixes double free mess * dbus/dbus-pending-call.c (dbus_pending_call_block): fix in case where no reply was received * dbus/dbus-connection.c (_dbus_pending_call_complete_and_unlock): fix a refcount leak * bus/signals.c (match_rule_matches): add special cases for the bus driver, so you can match on sender/destination for it. * dbus/dbus-sysdeps.c (_dbus_abort): print backtrace if DBUS_PRINT_BACKTRACE is set * dbus/dbus-internals.c: add pid to assertion failure messages * dbus/dbus-connection.c: add message type code to the debug spew * glib/dbus-gproxy.c (gproxy_get_match_rule): match rules want sender=foo not service=foo * dbus/dbus-bus.c (dbus_bus_get): if the activation bus is the session bus but DBUS_SESSION_BUS_ADDRESS isn't set, use DBUS_ACTIVATION_ADDRESS instead * bus/activation.c: set DBUS_SESSION_BUS_ADDRESS, DBUS_SYSTEM_BUS_ADDRESS if appropriate * bus/bus.c (bus_context_new): handle OOM copying bus type into context struct * dbus/dbus-message.c (dbus_message_iter_get_object_path): new function (dbus_message_iter_get_object_path_array): new function (half finished, disabled for the moment) * glib/dbus-gproxy.c (dbus_gproxy_end_call): properly handle DBUS_MESSAGE_TYPE_ERROR * tools/dbus-launch.c (babysit): support DBUS_DEBUG_OUTPUT to avoid redirecting stderr to /dev/null (babysit): close stdin if not doing the "exit_with_session" thing * dbus/dbus-sysdeps.c (_dbus_become_daemon): delete some leftover debug code; change DBUS_DEBUG_OUTPUT to only enable stderr, not stdout/stdin, so things don't get confused * bus/system.conf.in: fix to allow replies, I modified .conf instead of .conf.in again. --- bus/signals.c | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) (limited to 'bus/signals.c') diff --git a/bus/signals.c b/bus/signals.c index 0fd4b514..9c0d31e2 100644 --- a/bus/signals.c +++ b/bus/signals.c @@ -1006,6 +1006,8 @@ connection_is_primary_owner (DBusConnection *connection, DBusString str; BusRegistry *registry; + _dbus_assert (connection != NULL); + registry = bus_connection_get_registry (connection); _dbus_string_init_const (&str, service_name); @@ -1028,6 +1030,11 @@ match_rule_matches (BusMatchRule *rule, * so FALSE if any of them don't match. */ + /* sender/addressed_recipient of #NULL may mean bus driver, + * or for addressed_recipient may mean a message with no + * specific recipient (i.e. a signal) + */ + if (rule->flags & BUS_MATCH_MESSAGE_TYPE) { _dbus_assert (rule->message_type != DBUS_MESSAGE_TYPE_INVALID); @@ -1068,8 +1075,17 @@ match_rule_matches (BusMatchRule *rule, { _dbus_assert (rule->sender != NULL); - if (!connection_is_primary_owner (sender, rule->sender)) - return FALSE; + if (sender == NULL) + { + if (strcmp (rule->sender, + DBUS_SERVICE_ORG_FREEDESKTOP_DBUS) != 0) + return FALSE; + } + else + { + if (!connection_is_primary_owner (sender, rule->sender)) + return FALSE; + } } if (rule->flags & BUS_MATCH_DESTINATION) @@ -1078,15 +1094,21 @@ match_rule_matches (BusMatchRule *rule, _dbus_assert (rule->destination != NULL); - if (addressed_recipient == NULL) - return FALSE; - destination = dbus_message_get_destination (message); if (destination == NULL) return FALSE; - if (!connection_is_primary_owner (addressed_recipient, rule->destination)) - return FALSE; + if (addressed_recipient == NULL) + { + if (strcmp (rule->destination, + DBUS_SERVICE_ORG_FREEDESKTOP_DBUS) != 0) + return FALSE; + } + else + { + if (!connection_is_primary_owner (addressed_recipient, rule->destination)) + return FALSE; + } } if (rule->flags & BUS_MATCH_PATH) -- cgit