X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-bus%2Ftest-bus-chat.c;h=021379f0b0dadb54fa8842e3c36160a4ce867910;hp=5f9a7ba8b3f2696cd9bc9609a553fa8aedefed72;hb=6203e07a83214a55bb1f88508fcda2005c601dea;hpb=e9b807c1685568d8ed989c2d4c3dcd525ab5549d diff --git a/src/libsystemd-bus/test-bus-chat.c b/src/libsystemd-bus/test-bus-chat.c index 5f9a7ba8b..021379f0b 100644 --- a/src/libsystemd-bus/test-bus-chat.c +++ b/src/libsystemd-bus/test-bus-chat.c @@ -34,24 +34,25 @@ #include "bus-error.h" #include "bus-match.h" #include "bus-internal.h" +#include "bus-util.h" -static int match_callback(sd_bus *bus, int error, sd_bus_message *m, void *userdata) { +static int match_callback(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { log_info("Match triggered! interface=%s member=%s", strna(sd_bus_message_get_interface(m)), strna(sd_bus_message_get_member(m))); return 0; } -static int object_callback(sd_bus *bus, int error, sd_bus_message *m, void *userdata) { +static int object_callback(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { int r; assert(bus); - if (error != 0) + if (sd_bus_message_is_method_error(m, NULL)) return 0; if (sd_bus_message_is_method_call(m, "org.object.test", "Foobar")) { log_info("Invoked Foobar() on %s", sd_bus_message_get_path(m)); - r = sd_bus_reply_method_return(bus, m, NULL); + r = sd_bus_reply_method_return(m, NULL); if (r < 0) { log_error("Failed to send reply: %s", strerror(-r)); return r; @@ -136,6 +137,7 @@ static int server(sd_bus *bus) { while (!client1_gone || !client2_gone) { _cleanup_bus_message_unref_ sd_bus_message *m = NULL; pid_t pid = 0; + const char *label = NULL; r = sd_bus_process(bus, &m); if (r < 0) { @@ -156,8 +158,12 @@ static int server(sd_bus *bus) { if (!m) continue; - sd_bus_message_get_pid(m, &pid); - log_info("Got message! member=%s pid=%lu label=%s", strna(sd_bus_message_get_member(m)), (unsigned long) pid, strna(sd_bus_message_get_selinux_context(m))); + sd_bus_creds_get_pid(sd_bus_message_get_creds(m), &pid); + sd_bus_creds_get_selinux_context(sd_bus_message_get_creds(m), &label); + log_info("Got message! member=%s pid=%lu label=%s", + strna(sd_bus_message_get_member(m)), + (unsigned long) pid, + strna(label)); /* bus_message_dump(m); */ /* sd_bus_message_rewind(m, true); */ @@ -179,14 +185,14 @@ static int server(sd_bus *bus) { ascii_strlower(lowercase); - r = sd_bus_reply_method_return(bus, m, "s", lowercase); + r = sd_bus_reply_method_return(m, "s", lowercase); if (r < 0) { log_error("Failed to send reply: %s", strerror(-r)); goto fail; } } else if (sd_bus_message_is_method_call(m, "org.freedesktop.systemd.test", "ExitClient1")) { - r = sd_bus_reply_method_return(bus, m, NULL); + r = sd_bus_reply_method_return(m, NULL); if (r < 0) { log_error("Failed to send reply: %s", strerror(-r)); goto fail; @@ -195,7 +201,7 @@ static int server(sd_bus *bus) { client1_gone = true; } else if (sd_bus_message_is_method_call(m, "org.freedesktop.systemd.test", "ExitClient2")) { - r = sd_bus_reply_method_return(bus, m, NULL); + r = sd_bus_reply_method_return(m, NULL); if (r < 0) { log_error("Failed to send reply: %s", strerror(-r)); goto fail; @@ -206,7 +212,7 @@ static int server(sd_bus *bus) { sleep(1); - r = sd_bus_reply_method_return(bus, m, NULL); + r = sd_bus_reply_method_return(m, NULL); if (r < 0) { log_error("Failed to send reply: %s", strerror(-r)); goto fail; @@ -222,13 +228,15 @@ static int server(sd_bus *bus) { goto fail; } + log_info("Received fd=%d", fd); + if (write(fd, &x, 1) < 0) { log_error("Failed to write to fd: %m"); close_nointr_nofail(fd); goto fail; } - r = sd_bus_reply_method_return(bus, m, NULL); + r = sd_bus_reply_method_return(m, NULL); if (r < 0) { log_error("Failed to send reply: %s", strerror(-r)); goto fail; @@ -237,8 +245,8 @@ static int server(sd_bus *bus) { } else if (sd_bus_message_is_method_call(m, NULL, NULL)) { r = sd_bus_reply_method_error( - bus, m, - &SD_BUS_ERROR_MAKE("org.freedesktop.DBus.Error.UnknownMethod", "Unknown method.")); + m, + &SD_BUS_ERROR_MAKE_CONST(SD_BUS_ERROR_UNKNOWN_METHOD, "Unknown method.")); if (r < 0) { log_error("Failed to send reply: %s", strerror(-r)); goto fail; @@ -301,6 +309,8 @@ static void* client1(void*p) { goto finish; } + log_info("Sending fd=%d", pp[1]); + r = sd_bus_call_method( bus, "org.freedesktop.systemd.test", @@ -351,10 +361,10 @@ finish: return INT_TO_PTR(r); } -static int quit_callback(sd_bus *b, int ret, sd_bus_message *m, void *userdata) { +static int quit_callback(sd_bus *b, sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { bool *x = userdata; - log_error("Quit callback: %s", strerror(ret)); + log_error("Quit callback: %s", strerror(sd_bus_message_get_errno(m))); *x = 1; return 1; @@ -427,7 +437,7 @@ static void* client2(void*p) { goto finish; } - r = sd_bus_send_with_reply_and_block(bus, m, 0, &error, &reply); + r = sd_bus_call(bus, m, 0, &error, &reply); if (r < 0) { log_error("Failed to issue method call: %s", bus_error_message(&error, -r)); goto finish; @@ -459,7 +469,7 @@ static void* client2(void*p) { sd_bus_message_unref(reply); reply = NULL; - r = sd_bus_send_with_reply_and_block(bus, m, 200 * USEC_PER_MSEC, &error, &reply); + r = sd_bus_call(bus, m, 200 * USEC_PER_MSEC, &error, &reply); if (r < 0) log_info("Failed to issue method call: %s", bus_error_message(&error, -r)); else @@ -480,7 +490,7 @@ static void* client2(void*p) { goto finish; } - r = sd_bus_send_with_reply(bus, m, quit_callback, &quit, 200 * USEC_PER_MSEC, NULL); + r = sd_bus_call_async(bus, m, quit_callback, &quit, 200 * USEC_PER_MSEC, NULL); if (r < 0) { log_info("Failed to issue method call: %s", bus_error_message(&error, -r)); goto finish;