bus: make sure we can match well-known names

diff --git a/src/libsystemd-bus/bus-match.c b/src/libsystemd-bus/bus-match.c
index 916682aa62ba7642a1cd32ad26743ff32bd4cd12..49fc6335c23d0815b951a5aefd25fb7655e951e1 100644 (file)
--- a/src/libsystemd-bus/bus-match.c
+++ b/src/libsystemd-bus/bus-match.c
@@ -60,7 +60,7 @@
  */
 
 static inline bool BUS_MATCH_IS_COMPARE(enum bus_match_node_type t) {
  */
 
 static inline bool BUS_MATCH_IS_COMPARE(enum bus_match_node_type t) {

-        return t >= BUS_MATCH_MESSAGE_TYPE && t <= BUS_MATCH_ARG_NAMESPACE_LAST;
+        return t >= BUS_MATCH_SENDER && t <= BUS_MATCH_ARG_NAMESPACE_LAST;

 }
 
 static inline bool BUS_MATCH_CAN_HASH(enum bus_match_node_type t) {
 }
 
 static inline bool BUS_MATCH_CAN_HASH(enum bus_match_node_type t) {


@@ -142,6 +142,22 @@ static bool value_node_test(
 
         case BUS_MATCH_SENDER:
         case BUS_MATCH_DESTINATION:
 
         case BUS_MATCH_SENDER:
         case BUS_MATCH_DESTINATION:

+                if (streq_ptr(node->value.str, value_str))
+                        return true;
+
+                /* FIXME: So here's an ugliness: if the match is for a
+                 * well-known name then we cannot actually check this
+                 * correctly here. This doesn't matter much for dbus1
+                 * where no false positives exist, hence we just
+                 * ignore this case here. For kdbus the messages
+                 * should contain all well-known names of the sender,
+                 * hence we can fix things there correctly. */
+
+                if (node->value.str[0] != ':' && value_str[0] == ':')
+                        return true;
+
+                return false;
+

         case BUS_MATCH_INTERFACE:
         case BUS_MATCH_MEMBER:
         case BUS_MATCH_PATH:
         case BUS_MATCH_INTERFACE:
         case BUS_MATCH_MEMBER:
         case BUS_MATCH_PATH:

diff --git a/src/libsystemd-bus/bus-match.h b/src/libsystemd-bus/bus-match.h
index d24aeec43d6830ffc47d865961342916fec27b4e..1d381266002107960aad79b2b50c260e0233ab3d 100644 (file)
--- a/src/libsystemd-bus/bus-match.h
+++ b/src/libsystemd-bus/bus-match.h
@@ -31,8 +31,8 @@ enum bus_match_node_type {
         BUS_MATCH_LEAF,
 
         /* The following are all different kinds of compare nodes */
         BUS_MATCH_LEAF,
 
         /* The following are all different kinds of compare nodes */

-        BUS_MATCH_MESSAGE_TYPE,

         BUS_MATCH_SENDER,
         BUS_MATCH_SENDER,

+        BUS_MATCH_MESSAGE_TYPE,

         BUS_MATCH_DESTINATION,
         BUS_MATCH_INTERFACE,
         BUS_MATCH_MEMBER,
         BUS_MATCH_DESTINATION,
         BUS_MATCH_INTERFACE,
         BUS_MATCH_MEMBER,