X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Ftest-bus-kernel.c;h=785e2450bfdb6d08eea49f81fead346958544491;hb=5f7e8903b275f14d0f41f0542871d09deccb1741;hp=ffabdcbd14a2ae673666778cea936c851d528036;hpb=b030d1f86443ba535dd257cb30826b813f291138;p=elogind.git

diff --git a/src/libsystemd-bus/test-bus-kernel.c b/src/libsystemd-bus/test-bus-kernel.c
index ffabdcbd1..785e2450b 100644
--- a/src/libsystemd-bus/test-bus-kernel.c
+++ b/src/libsystemd-bus/test-bus-kernel.c
@@ -19,22 +19,30 @@
   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"
 #include "bus-error.h"
 #include "bus-kernel.h"
+#include "bus-util.h"
+#include "bus-dump.h"
 
 int main(int argc, char *argv[]) {
         _cleanup_close_ int bus_ref = -1;
         _cleanup_free_ char *bus_name = NULL, *address = NULL;
         _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_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);
+        bus_ref = bus_kernel_create_bus("deine-mutter", &bus_name);
         if (bus_ref == -ENOENT)
                 return EXIT_TEST_SKIP;
 
@@ -55,6 +63,12 @@ int main(int argc, char *argv[]) {
         r = sd_bus_set_address(b, address);
         assert_se(r >= 0);
 
+        assert_se(sd_bus_negotiate_attach_timestamp(a, 1) >= 0);
+        assert_se(sd_bus_negotiate_attach_creds(a, _SD_BUS_CREDS_ALL) >= 0);
+
+        assert_se(sd_bus_negotiate_attach_timestamp(b, 1) >= 0);
+        assert_se(sd_bus_negotiate_attach_creds(b, _SD_BUS_CREDS_ALL) >= 0);
+
         r = sd_bus_start(a);
         assert_se(r >= 0);
 
@@ -71,19 +85,12 @@ int main(int argc, char *argv[]) {
 
         printf("unique b: %s\n", ub);
 
-        {
-                //FIXME:
-                struct kdbus_cmd_match cmd_match;
+        r = sd_bus_call_method(a, "this.doesnt.exist", "/foo", "meh.mah", "muh", &error, NULL, "s", "yayayay");
+        assert_se(sd_bus_error_has_name(&error, SD_BUS_ERROR_SERVICE_UNKNOWN));
+        assert_se(r == -EHOSTUNREACH);
 
-                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);
@@ -92,7 +99,7 @@ int main(int argc, char *argv[]) {
         assert_se(r > 0);
         assert_se(m);
 
-        bus_message_dump(m);
+        bus_message_dump(m, stdout, true);
         assert_se(sd_bus_message_rewind(m, true) >= 0);
 
         r = sd_bus_message_read(m, "s", &the_string);
@@ -108,6 +115,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);
 
@@ -118,11 +138,20 @@ int main(int argc, char *argv[]) {
                 assert_se(r > 0);
                 assert_se(m);
 
-                bus_message_dump(m);
+                bus_message_dump(m, stdout, true);
                 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");