bus: Clarify names of methods that query owned names

It wasn't immediately clear from the names of these method whether they
should return TRUE or FALSE for queued owners other than the primary
owner. Renaming them makes it obvious that the answer should be TRUE.

While I'm there, make the corresponding _dbus_verbose() messages more
precise.

Signed-off-by: Simon McVittie <smcv@collabora.com>
Resolves: https://gitlab.freedesktop.org/dbus/dbus/issues/270

diff --git a/bus/connection.c b/bus/connection.c
index 5943841d8db6ac2c955fec5db7b61b073fd1eb13..b1b6bdd5b2bdc4049818f60a8a0eb2b04467500b 100644 (file)
--- a/bus/connection.c
+++ b/bus/connection.c
@@ -1460,8 +1460,8 @@ bus_connection_get_n_match_rules (DBusConnection *connection)
  * regardless of the type of ownership
  */
 dbus_bool_t
-bus_connection_is_name_owner_by_prefix (DBusConnection *connection,
-                                        const char *name_prefix)
+bus_connection_is_queued_owner_by_prefix (DBusConnection *connection,
+                                          const char *name_prefix)
 {
   BusConnectionData *d;
   DBusList *link;

diff --git a/bus/connection.h b/bus/connection.h
index 912638c0edb574319dc51f16e55b2c149c2e5454..a48ab46bbfcea46b294d82ea9f6db8fb3f7a1f49 100644 (file)
--- a/bus/connection.h
+++ b/bus/connection.h
@@ -83,8 +83,8 @@ void        bus_connection_request_headers       (DBusConnection  *connection,
                                                   BusExtraHeaders  headers);
 
 /* called by policy.c */
-dbus_bool_t bus_connection_is_name_owner_by_prefix (DBusConnection *connection,
-                                                    const char *name_prefix);
+dbus_bool_t bus_connection_is_queued_owner_by_prefix (DBusConnection *connection,
+                                                      const char *name_prefix);
 
 /* called by signals.c */
 dbus_bool_t bus_connection_add_match_rule      (DBusConnection *connection,

diff --git a/bus/policy.c b/bus/policy.c
index feb1156e887b7c8c9649501c81bce2dff4912a09..0e67e64cda449087b7a2789e1e29eb2e55c36963 100644 (file)
--- a/bus/policy.c
+++ b/bus/policy.c
@@ -1055,9 +1055,9 @@ bus_client_policy_check_can_send (BusClientPolicy *policy,
                   continue;
                 }
 
-              if (!bus_service_has_owner (service, receiver))
+              if (!bus_service_owner_in_queue (service, receiver))
                 {
-                  _dbus_verbose ("  (policy) skipping rule because dest %s isn't owned by receiver\n",
+                  _dbus_verbose ("  (policy) skipping rule because receiver isn't primary or queued owner of name %s\n",
                                  rule->d.send.destination);
                   continue;
                 }
@@ -1084,17 +1084,17 @@ bus_client_policy_check_can_send (BusClientPolicy *policy,
                                                          rule->d.send.destination,
                                                          '.'))
                 {
-                  _dbus_verbose ("  (policy) skipping rule because message dest doesn't start with %s\n",
+                  _dbus_verbose ("  (policy) skipping rule because message dest doesn't have prefix %s\n",
                                  rule->d.send.destination);
                   continue;
                 }
             }
           else
             {
-              if (!bus_connection_is_name_owner_by_prefix (receiver,
-                                                           rule->d.send.destination))
+              if (!bus_connection_is_queued_owner_by_prefix (receiver,
+                                                             rule->d.send.destination))
                 {
-                  _dbus_verbose ("  (policy) skipping rule because no dest with prefix %s is owned by receiver\n",
+                  _dbus_verbose ("  (policy) skipping rule because recipient isn't primary or queued owner of any name below %s\n",
                                  rule->d.send.destination);
                   continue;
                 }
@@ -1307,9 +1307,9 @@ bus_client_policy_check_can_receive (BusClientPolicy *policy,
                   continue;
                 }
 
-              if (!bus_service_has_owner (service, sender))
+              if (!bus_service_owner_in_queue (service, sender))
                 {
-                  _dbus_verbose ("  (policy) skipping rule because origin %s isn't owned by sender\n",
+                  _dbus_verbose ("  (policy) skipping rule because sender isn't primary or queued owner of %s\n",
                                  rule->d.receive.origin);
                   continue;
                 }

diff --git a/bus/services.c b/bus/services.c
index b255573738fdb0796f0e2f8147b987db2d4496c3..6f642a438c6afceeb6a350bdc67619205f01c5a1 100644 (file)
--- a/bus/services.c
+++ b/bus/services.c
@@ -670,7 +670,7 @@ bus_registry_release_service (BusRegistry      *registry,
     {
       *result = DBUS_RELEASE_NAME_REPLY_NON_EXISTENT;
     }
-  else if (!bus_service_has_owner (service, connection))
+  else if (!bus_service_owner_in_queue (service, connection))
     {
       *result = DBUS_RELEASE_NAME_REPLY_NOT_OWNER;
     }
@@ -680,7 +680,7 @@ bus_registry_release_service (BusRegistry      *registry,
                                      transaction, error))
         goto out;
 
-      _dbus_assert (!bus_service_has_owner (service, connection));
+      _dbus_assert (!bus_service_owner_in_queue (service, connection));
       *result = DBUS_RELEASE_NAME_REPLY_RELEASED;
     }
 
@@ -1274,8 +1274,8 @@ bus_service_get_allow_replacement (BusService *service)
 }
 
 dbus_bool_t
-bus_service_has_owner (BusService     *service,
-                      DBusConnection *connection)
+bus_service_owner_in_queue (BusService     *service,
+                            DBusConnection *connection)
 {
   DBusList *link;
 

diff --git a/bus/services.h b/bus/services.h
index 09f6a9e53461874ee7bee2d28e9bbd48ed1bdaa3..962db904d2266e26405bde94d362c67f98d19e8b 100644 (file)
--- a/bus/services.h
+++ b/bus/services.h
@@ -81,7 +81,7 @@ dbus_bool_t     bus_service_remove_owner              (BusService     *service,
                                                        DBusConnection *connection,
                                                        BusTransaction *transaction,
                                                        DBusError      *error);
-dbus_bool_t     bus_service_has_owner                 (BusService     *service,
+dbus_bool_t     bus_service_owner_in_queue            (BusService     *service,
                                                        DBusConnection *connection);
 BusOwner*       bus_service_get_primary_owner         (BusService     *service);
 dbus_bool_t     bus_service_get_allow_replacement     (BusService     *service);