#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) {
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) {
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")) {
- _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;
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) {
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); */
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();
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';
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)) {
- r = sd_bus_message_new_method_error(
+ r = sd_bus_reply_method_error(
bus, m,
- &SD_BUS_ERROR_MAKE("org.freedesktop.DBus.Error.UnknownMethod", "Unknown method."),
- &reply);
- if (r < 0) {
- log_error("Failed to allocate return: %s", strerror(-r));
- goto fail;
- }
- }
-
- if (reply) {
- r = sd_bus_send(bus, reply, NULL);
+ &SD_BUS_ERROR_MAKE(SD_BUS_ERROR_UNKNOWN_METHOD, "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); */
}
}
}
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_NULL;
const char *hello;
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;
}
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;
}
"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);
}
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) {
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;
~ianmdlvl / elogind.git / blobdiff