X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Ftest-bus-kernel.c;h=44d2fa7247fa1b9f6df8934dffaec9ae19dc3f64;hb=cc3f2093f622c04d12d287689d37d861ded41360;hp=af82466b369341b83b4214c2a516e1e9d287df01;hpb=2da833ac2d91abc6b4e3fa613b7eebbaba76144a;p=elogind.git
diff --git a/src/libsystemd-bus/test-bus-kernel.c b/src/libsystemd-bus/test-bus-kernel.c
index af82466b3..44d2fa724 100644
--- a/src/libsystemd-bus/test-bus-kernel.c
+++ b/src/libsystemd-bus/test-bus-kernel.c
@@ -19,12 +19,17 @@
along with systemd; If not, see .
***/
+#include
+
#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;
@@ -32,7 +37,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)
@@ -55,6 +62,26 @@ 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, 1) >= 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_timestamp(b, 1) >= 0);
+ assert_se(sd_bus_negotiate_attach_creds(b, 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);
@@ -71,14 +98,17 @@ int main(int argc, char *argv[]) {
printf("unique b: %s\n", ub);
- r = sd_bus_emit_signal(a, "/foo", "waldo.com", "Piep", "s", "I am a string");
+ 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_process(b, &m);
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);
@@ -94,6 +124,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);
@@ -104,18 +147,27 @@ 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");
assert_se(r >= 0);
r = sd_bus_release_name(a, "net.x0pointer.foobar");
- assert_se(r == -ENXIO);
+ assert_se(r == -ESRCH);
sd_bus_unref(a);
sd_bus_unref(b);