timedated: use libsystemd-bus instead of libdbus for bus communication

[elogind.git] / src / libsystemd-bus / test-bus-kernel.c

diff --git a/src/libsystemd-bus/test-bus-kernel.c b/src/libsystemd-bus/test-bus-kernel.c
index 1095e57e42fad1fffe418d7b5c0bed293b4e9365..075903c2f4ac161103bd582f9e8d1ead430ed314 100644 (file)
--- a/src/libsystemd-bus/test-bus-kernel.c
+++ b/src/libsystemd-bus/test-bus-kernel.c
@@ -22,11 +22,13 @@
 #include <fcntl.h>
 
 #include "util.h"
 #include <fcntl.h>
 
 #include "util.h"

+#include "log.h"

 
 #include "sd-bus.h"
 #include "bus-message.h"
 #include "bus-error.h"
 #include "bus-kernel.h"
 
 #include "sd-bus.h"
 #include "bus-message.h"
 #include "bus-error.h"
 #include "bus-kernel.h"

+#include "bus-util.h"

 
 int main(int argc, char *argv[]) {
         _cleanup_close_ int bus_ref = -1;
 
 int main(int argc, char *argv[]) {
         _cleanup_close_ int bus_ref = -1;


@@ -36,6 +38,8 @@ int main(int argc, char *argv[]) {
         sd_bus *a, *b;
         int r, pipe_fds[2];
 
         sd_bus *a, *b;
         int r, pipe_fds[2];
 

+        log_set_max_level(LOG_DEBUG);
+

         bus_ref = bus_kernel_create("deine-mutter", &bus_name);
         if (bus_ref == -ENOENT)
                 return EXIT_TEST_SKIP;
         bus_ref = bus_kernel_create("deine-mutter", &bus_name);
         if (bus_ref == -ENOENT)
                 return EXIT_TEST_SKIP;


@@ -57,6 +61,22 @@ int main(int argc, char *argv[]) {
         r = sd_bus_set_address(b, address);
         assert_se(r >= 0);
 
         r = sd_bus_set_address(b, address);
         assert_se(r >= 0);
 

+        assert_se(sd_bus_negotiate_attach_comm(a, 1) >= 0);
+        assert_se(sd_bus_negotiate_attach_exe(a, 1) >= 0);
+        assert_se(sd_bus_negotiate_attach_cmdline(a, 1) >= 0);
+        assert_se(sd_bus_negotiate_attach_cgroup(a, 1) >= 0);
+        assert_se(sd_bus_negotiate_attach_caps(a, 1) >= 0);
+        assert_se(sd_bus_negotiate_attach_selinux_context(a, 1) >= 0);
+        assert_se(sd_bus_negotiate_attach_audit(a, 1) >= 0);
+
+        assert_se(sd_bus_negotiate_attach_comm(b, 1) >= 0);
+        assert_se(sd_bus_negotiate_attach_exe(b, 1) >= 0);
+        assert_se(sd_bus_negotiate_attach_cmdline(b, 1) >= 0);
+        assert_se(sd_bus_negotiate_attach_cgroup(b, 1) >= 0);
+        assert_se(sd_bus_negotiate_attach_caps(b, 1) >= 0);
+        assert_se(sd_bus_negotiate_attach_selinux_context(b, 1) >= 0);
+        assert_se(sd_bus_negotiate_attach_audit(b, 1) >= 0);
+

         r = sd_bus_start(a);
         assert_se(r >= 0);
 
         r = sd_bus_start(a);
         assert_se(r >= 0);
 


@@ -73,19 +93,8 @@ int main(int argc, char *argv[]) {
 
         printf("unique b: %s\n", ub);
 
 
         printf("unique b: %s\n", ub);
 

-        {
-                //FIXME:
-                struct kdbus_cmd_match cmd_match;
-
-                cmd_match.size = sizeof(cmd_match);
-                cmd_match.src_id = KDBUS_MATCH_SRC_ID_ANY;
-
-                r = ioctl(sd_bus_get_fd(a), KDBUS_CMD_MATCH_ADD, &cmd_match);
-                assert_se(r >= 0);
-
-                r = ioctl(sd_bus_get_fd(b), KDBUS_CMD_MATCH_ADD, &cmd_match);
-                assert_se(r >= 0);
-        }
+        r = sd_bus_add_match(b, "interface='waldo.com',member='Piep'", NULL, NULL);
+        assert_se(r >= 0);

 
         r = sd_bus_emit_signal(a, "/foo/bar/waldo", "waldo.com", "Piep", "sss", "I am a string", "/this/is/a/path", "and.this.a.domain.name");
         assert_se(r >= 0);
 
         r = sd_bus_emit_signal(a, "/foo/bar/waldo", "waldo.com", "Piep", "sss", "I am a string", "/this/is/a/path", "and.this.a.domain.name");
         assert_se(r >= 0);