X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Ftest-bus-kernel.c;h=72514a3deee6a8d99b1adad209dd951138b46c6d;hb=d5a2b9a6f455468a0f29483303657ab4fd7013d8;hp=5a5d9fc252798bda6dc87c63daa251439506dce5;hpb=a56f19c4f9c8ed5f916d7edbe1f73b7b49e68e83;p=elogind.git

diff --git a/src/libsystemd-bus/test-bus-kernel.c b/src/libsystemd-bus/test-bus-kernel.c
index 5a5d9fc25..72514a3de 100644
--- a/src/libsystemd-bus/test-bus-kernel.c
+++ b/src/libsystemd-bus/test-bus-kernel.c
@@ -19,7 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <fcntl.h>
+
 #include "util.h"
+#include "log.h"
 
 #include "sd-bus.h"
 #include "bus-message.h"
@@ -32,7 +35,9 @@ int main(int argc, char *argv[]) {
         _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
         const char *ua = NULL, *ub = NULL, *the_string = NULL;
         sd_bus *a, *b;
-        int r;
+        int r, pipe_fds[2];
+
+        log_set_max_level(LOG_DEBUG);
 
         bus_ref = bus_kernel_create("deine-mutter", &bus_name);
         if (bus_ref == -ENOENT)
@@ -71,6 +76,20 @@ int main(int argc, char *argv[]) {
 
         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_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);
 
@@ -94,6 +113,19 @@ int main(int argc, char *argv[]) {
         r = sd_bus_message_new_method_call(b, "net.x0pointer.foobar", "/a/path", "an.inter.face", "AMethod", &m);
         assert_se(r >= 0);
 
+        assert_se(pipe2(pipe_fds, O_CLOEXEC) >= 0);
+
+        assert_se(write(pipe_fds[1], "x", 1) == 1);
+
+        close_nointr_nofail(pipe_fds[1]);
+        pipe_fds[1] = -1;
+
+        r = sd_bus_message_append(m, "h", pipe_fds[0]);
+        assert_se(r >= 0);
+
+        close_nointr_nofail(pipe_fds[0]);
+        pipe_fds[0] = -1;
+
         r = sd_bus_send(b, m, NULL);
         assert_se(r >= 0);
 
@@ -107,8 +139,17 @@ int main(int argc, char *argv[]) {
                 bus_message_dump(m);
                 assert_se(sd_bus_message_rewind(m, true) >= 0);
 
-                if (sd_bus_message_is_method_call(m, "an.inter.face", "AMethod"))
+                if (sd_bus_message_is_method_call(m, "an.inter.face", "AMethod")) {
+                        int fd;
+                        char x;
+
+                        r = sd_bus_message_read(m, "h", &fd);
+                        assert_se(r >= 0);
+
+                        assert_se(read(fd, &x, 1) == 1);
+                        assert_se(x == 'x');
                         break;
+                }
         }
 
         r = sd_bus_release_name(a, "net.x0pointer.foobar");