X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Ftest-bus-chat.c;h=533d78cc3b937c5a4b42b3d2ee10251ddbf6bd9c;hb=23e97f7d9274b90fb0e1664945dc6259fdae6d39;hp=906a7e646ce7f8ed8834e6bc7543da0d07a19a91;hpb=2181a7f558eb52a22f09f8add9ac0abb4f2ee016;p=elogind.git diff --git a/src/libsystemd-bus/test-bus-chat.c b/src/libsystemd-bus/test-bus-chat.c index 906a7e646..533d78cc3 100644 --- a/src/libsystemd-bus/test-bus-chat.c +++ b/src/libsystemd-bus/test-bus-chat.c @@ -32,6 +32,13 @@ #include "sd-bus.h" #include "bus-message.h" #include "bus-error.h" +#include "bus-match.h" +#include "bus-internal.h" + +static int match_callback(sd_bus *bus, int error, sd_bus_message *m, void *userdata) { + 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) { int r; @@ -46,13 +53,7 @@ static int object_callback(sd_bus *bus, int error, sd_bus_message *m, void *user 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; @@ -78,9 +79,9 @@ static int server_init(sd_bus **_bus) { goto fail; } - r = sd_bus_get_peer(bus, &id); + r = sd_bus_get_server_id(bus, &id); if (r < 0) { - log_error("Failed to get peer ID: %s", strerror(-r)); + log_error("Failed to get server ID: %s", strerror(-r)); goto fail; } @@ -106,6 +107,20 @@ static int server_init(sd_bus **_bus) { goto fail; } + r = sd_bus_add_match(bus, "type='signal',interface='foo.bar',member='Notify'", match_callback, NULL); + if (r < 0) { + log_error("Failed to add match: %s", strerror(-r)); + goto fail; + } + + r = sd_bus_add_match(bus, "type='signal',interface='org.freedesktop.DBus',member='NameOwnerChanged'", match_callback, NULL); + if (r < 0) { + log_error("Failed to add match: %s", strerror(-r)); + goto fail; + } + + bus_match_dump(&bus->match_callbacks, 0); + *_bus = bus; return 0; @@ -121,7 +136,7 @@ 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; r = sd_bus_process(bus, &m); @@ -158,12 +173,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(); @@ -172,39 +181,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'; @@ -223,32 +232,21 @@ static int server(sd_bus *bus) { 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); */ } } @@ -266,7 +264,7 @@ fail: static void* client1(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; const char *hello; int r; int pp[2] = { -1, -1 }; @@ -278,27 +276,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; } @@ -316,31 +305,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); + &error, + NULL, + "h", + pp[1]); if (r < 0) { - log_error("Failed to allocate method call: %s", strerror(-r)); - goto finish; - } - - r = sd_bus_message_append(m, "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; } @@ -363,12 +339,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); } @@ -392,7 +367,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; @@ -424,6 +399,26 @@ static void* client2(void*p) { sd_bus_message_unref(m); m = NULL; + r = sd_bus_message_new_signal( + bus, + "/foobar", + "foo.bar", + "Notify", + &m); + if (r < 0) { + log_error("Failed to allocate signal: %s", strerror(-r)); + goto finish; + } + + r = sd_bus_send(bus, m, NULL); + if (r < 0) { + log_error("Failed to issue signal: %s", bus_error_message(&error, -r)); + goto finish; + } + + sd_bus_message_unref(m); + m = NULL; + r = sd_bus_message_new_method_call( bus, "org.freedesktop.systemd.test",