chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
kdbus: parse even more kernel meta data fields
[elogind.git] / src / libsystemd-bus / test-bus-chat.c
diff --git a/src/libsystemd-bus/test-bus-chat.c b/src/libsystemd-bus/test-bus-chat.c
index 2dd30912cf46e9f99706c87b398558a30ce694b2..9f4a5597f9ff80e67c405e76b6894b84b7ea4b39 100644 (file)
--- a/src/libsystemd-bus/test-bus-chat.c
+++ b/src/libsystemd-bus/test-bus-chat.c
@@ -53,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;
@@ -85,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;
         }
 
@@ -142,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);
@@ -165,7 +159,7 @@ 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)));
+                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)));
                 /* bus_message_dump(m); */
                 /* sd_bus_message_rewind(m, true); */
 
@@ -179,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();
@@ -193,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';
@@ -242,34 +230,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); */
                 }
         }
 
@@ -287,7 +262,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 };
@@ -299,27 +274,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");
-        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);
+                        &error,
+                        &reply,
+                        "s",
+                        "HELLO");
         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 +303,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;
         }
 
@@ -384,12 +337,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 +365,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;
Unnamed repository; edit this file 'description' to name the repository.