X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Ftest-bus-chat.c;h=f457c8f88a2c0a6b59c75589b5a11836bfafc332;hb=4a875b6133c9ef0e984547f7ce3b09356be4f7bc;hp=459d39fdee5070664fc6f1103b621c2d6a9debff;hpb=98178d3947d951ca001eaf400b5f362f458dceb5;p=elogind.git diff --git a/src/libsystemd-bus/test-bus-chat.c b/src/libsystemd-bus/test-bus-chat.c index 459d39fde..f457c8f88 100644 --- a/src/libsystemd-bus/test-bus-chat.c +++ b/src/libsystemd-bus/test-bus-chat.c @@ -49,17 +49,9 @@ static int object_callback(sd_bus *bus, int error, sd_bus_message *m, void *user return 0; if (sd_bus_message_is_method_call(m, "org.object.test", "Foobar")) { - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - log_info("Invoked Foobar() on %s", sd_bus_message_get_path(m)); - r = sd_bus_message_new_method_return(bus, m, &reply); - if (r < 0) { - log_error("Failed to allocate return: %s", strerror(-r)); - return r; - } - - r = sd_bus_send(bus, reply, NULL); + r = sd_bus_reply_method_return(bus, m, NULL); if (r < 0) { log_error("Failed to send reply: %s", strerror(-r)); return r; @@ -142,8 +134,9 @@ static int server(sd_bus *bus) { bool client1_gone = false, client2_gone = false; while (!client1_gone || !client2_gone) { - _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL; + _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) { @@ -165,7 +158,11 @@ static int server(sd_bus *bus) { 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_label(m))); + sd_bus_message_get_selinux_context(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,12 +176,6 @@ static int server(sd_bus *bus) { goto fail; } - r = sd_bus_message_new_method_return(bus, m, &reply); - if (r < 0) { - log_error("Failed to allocate return: %s", strerror(-r)); - goto fail; - } - lowercase = strdup(hello); if (!lowercase) { r = log_oom(); @@ -193,39 +184,39 @@ static int server(sd_bus *bus) { ascii_strlower(lowercase); - r = sd_bus_message_append(reply, "s", lowercase); + r = sd_bus_reply_method_return(bus, m, "s", lowercase); if (r < 0) { - log_error("Failed to append message: %s", strerror(-r)); + 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_message_new_method_return(bus, m, &reply); + r = sd_bus_reply_method_return(bus, m, NULL); if (r < 0) { - log_error("Failed to allocate return: %s", strerror(-r)); + log_error("Failed to send reply: %s", strerror(-r)); goto fail; } client1_gone = true; } else if (sd_bus_message_is_method_call(m, "org.freedesktop.systemd.test", "ExitClient2")) { - r = sd_bus_message_new_method_return(bus, m, &reply); + r = sd_bus_reply_method_return(bus, m, NULL); if (r < 0) { - log_error("Failed to allocate return: %s", strerror(-r)); + log_error("Failed to send reply: %s", strerror(-r)); goto fail; } client2_gone = true; } else if (sd_bus_message_is_method_call(m, "org.freedesktop.systemd.test", "Slow")) { - r = sd_bus_message_new_method_return(bus, m, &reply); + sleep(1); + + r = sd_bus_reply_method_return(bus, m, NULL); if (r < 0) { - log_error("Failed to allocate return: %s", strerror(-r)); + log_error("Failed to send reply: %s", strerror(-r)); goto fail; } - sleep(1); - } else if (sd_bus_message_is_method_call(m, "org.freedesktop.systemd.test", "FileDescriptor")) { int fd; static const char x = 'X'; @@ -242,34 +233,21 @@ static int server(sd_bus *bus) { goto fail; } - close_nointr_nofail(fd); - - r = sd_bus_message_new_method_return(bus, m, &reply); + r = sd_bus_reply_method_return(bus, m, NULL); if (r < 0) { - log_error("Failed to allocate return: %s", strerror(-r)); + log_error("Failed to send reply: %s", strerror(-r)); goto fail; } } else if (sd_bus_message_is_method_call(m, NULL, NULL)) { - const sd_bus_error e = SD_BUS_ERROR_INIT_CONST("org.freedesktop.DBus.Error.UnknownMethod", "Unknown method."); - r = sd_bus_message_new_method_error(bus, m, &e, &reply); - if (r < 0) { - log_error("Failed to allocate return: %s", strerror(-r)); - goto fail; - } - } - - if (reply) { - r = sd_bus_send(bus, reply, NULL); + r = sd_bus_reply_method_error( + bus, m, + &SD_BUS_ERROR_MAKE("org.freedesktop.DBus.Error.UnknownMethod", "Unknown method.")); if (r < 0) { log_error("Failed to send reply: %s", strerror(-r)); goto fail; } - - /* log_info("Sent"); */ - /* bus_message_dump(reply); */ - /* sd_bus_message_rewind(reply, true); */ } } @@ -285,9 +263,9 @@ fail: } static void* client1(void*p) { - _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL; + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; sd_bus *bus = NULL; - sd_bus_error error = SD_BUS_ERROR_INIT; + sd_bus_error error = SD_BUS_ERROR_NULL; const char *hello; int r; int pp[2] = { -1, -1 }; @@ -299,27 +277,18 @@ static void* client1(void*p) { goto finish; } - r = sd_bus_message_new_method_call( + r = sd_bus_call_method( bus, "org.freedesktop.systemd.test", "/", "org.freedesktop.systemd.test", "LowerCase", - &m); - if (r < 0) { - log_error("Failed to allocate method call: %s", strerror(-r)); - goto finish; - } - - r = sd_bus_message_append(m, "s", "HELLO"); + &error, + &reply, + "s", + "HELLO"); if (r < 0) { - log_error("Failed to append string: %s", strerror(-r)); - goto finish; - } - - r = sd_bus_send_with_reply_and_block(bus, m, 0, &error, &reply); - if (r < 0) { - log_error("Failed to issue method call: %s", bus_error_message(&error, -r)); + log_error("Failed to issue method call: %s", strerror(-r)); goto finish; } @@ -337,31 +306,18 @@ static void* client1(void*p) { goto finish; } - sd_bus_message_unref(m); - m = NULL; - r = sd_bus_message_new_method_call( + r = sd_bus_call_method( bus, "org.freedesktop.systemd.test", "/", "org.freedesktop.systemd.test", "FileDescriptor", - &m); - if (r < 0) { - log_error("Failed to allocate method call: %s", strerror(-r)); - goto finish; - } - - r = sd_bus_message_append(m, "h", pp[1]); + &error, + NULL, + "h", + pp[1]); if (r < 0) { - log_error("Failed to append string: %s", strerror(-r)); - goto finish; - } - - sd_bus_message_unref(reply); - reply = NULL; - r = sd_bus_send_with_reply_and_block(bus, m, 0, &error, &reply); - if (r < 0) { - log_error("Failed to issue method call: %s", bus_error_message(&error, -r)); + log_error("Failed to issue method call: %s", strerror(-r)); goto finish; } @@ -384,12 +340,11 @@ finish: "org.freedesktop.systemd.test", "ExitClient1", &q); - if (r < 0) { + if (r < 0) log_error("Failed to allocate method call: %s", strerror(-r)); - goto finish; - } + else + sd_bus_send(bus, q, NULL); - sd_bus_send(bus, q, NULL); sd_bus_flush(bus); sd_bus_unref(bus); } @@ -413,7 +368,7 @@ static int quit_callback(sd_bus *b, int ret, sd_bus_message *m, void *userdata) static void* client2(void*p) { _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL; sd_bus *bus = NULL; - sd_bus_error error = SD_BUS_ERROR_INIT; + sd_bus_error error = SD_BUS_ERROR_NULL; bool quit = false; const char *mid; int r;