#include "bus-internal.h"
#include "bus-message.h"
#include "bus-signature.h"
+#include "bus-util.h"
+#include "bus-type.h"
-int sd_bus_emit_signal(
+_public_ int sd_bus_emit_signal(
sd_bus *bus,
const char *path,
const char *interface,
return sd_bus_send(bus, m, NULL);
}
-int sd_bus_call_method(
+_public_ int sd_bus_call_method(
sd_bus *bus,
const char *destination,
const char *path,
return sd_bus_send_with_reply_and_block(bus, m, 0, error, reply);
}
-int sd_bus_reply_method_return(
+_public_ int sd_bus_reply_method_return(
sd_bus *bus,
sd_bus_message *call,
const char *types, ...) {
assert_return(bus, -EINVAL);
assert_return(call, -EINVAL);
assert_return(call->sealed, -EPERM);
- assert_return(call->header->type == SD_BUS_MESSAGE_TYPE_METHOD_CALL, -EINVAL);
+ assert_return(call->header->type == SD_BUS_MESSAGE_METHOD_CALL, -EINVAL);
assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
assert_return(!bus_pid_changed(bus), -ECHILD);
return sd_bus_send(bus, m, NULL);
}
-int sd_bus_reply_method_error(
+_public_ int sd_bus_reply_method_error(
sd_bus *bus,
sd_bus_message *call,
const sd_bus_error *e) {
assert_return(bus, -EINVAL);
assert_return(call, -EINVAL);
assert_return(call->sealed, -EPERM);
- assert_return(call->header->type == SD_BUS_MESSAGE_TYPE_METHOD_CALL, -EINVAL);
+ assert_return(call->header->type == SD_BUS_MESSAGE_METHOD_CALL, -EINVAL);
assert_return(sd_bus_error_is_set(e), -EINVAL);
assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
assert_return(!bus_pid_changed(bus), -ECHILD);
return sd_bus_send(bus, m, NULL);
}
-int sd_bus_reply_method_errorf(
+_public_ int sd_bus_reply_method_errorf(
sd_bus *bus,
sd_bus_message *call,
const char *name,
assert_return(bus, -EINVAL);
assert_return(call, -EINVAL);
assert_return(call->sealed, -EPERM);
- assert_return(call->header->type == SD_BUS_MESSAGE_TYPE_METHOD_CALL, -EINVAL);
+ assert_return(call->header->type == SD_BUS_MESSAGE_METHOD_CALL, -EINVAL);
assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
assert_return(!bus_pid_changed(bus), -ECHILD);
if (call->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
return 0;
- error.name = strdup(name);
- if (!error.name)
- return -ENOMEM;
+ va_start(ap, format);
+ r = bus_error_setfv(&error, name, format, ap);
+ va_end(ap);
- error.need_free = true;
+ if (r < 0)
+ return r;
- if (format) {
- va_start(ap, format);
- r = vasprintf((char**) &error.message, format, ap);
- va_end(ap);
+ return sd_bus_reply_method_error(bus, call, &error);
+}
- if (r < 0)
- return -ENOMEM;
- }
+_public_ int sd_bus_reply_method_errno(
+ sd_bus *bus,
+ sd_bus_message *call,
+ int error,
+ const sd_bus_error *p) {
- return sd_bus_reply_method_error(bus, call, &error);
+ _cleanup_bus_error_free_ sd_bus_error berror = SD_BUS_ERROR_NULL;
+
+ assert_return(bus, -EINVAL);
+ assert_return(call, -EINVAL);
+ assert_return(call->sealed, -EPERM);
+ assert_return(call->header->type == SD_BUS_MESSAGE_METHOD_CALL, -EINVAL);
+ assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
+
+ if (call->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
+ return 0;
+
+ if (sd_bus_error_is_set(p))
+ return sd_bus_reply_method_error(bus, call, p);
+
+ sd_bus_error_set_errno(&berror, error);
+
+ return sd_bus_reply_method_error(bus, call, &berror);
+}
+
+_public_ int sd_bus_reply_method_errnof(
+ sd_bus *bus,
+ sd_bus_message *call,
+ int error,
+ const char *format,
+ ...) {
+
+ _cleanup_bus_error_free_ sd_bus_error berror = SD_BUS_ERROR_NULL;
+ va_list ap;
+
+ assert_return(bus, -EINVAL);
+ assert_return(call, -EINVAL);
+ assert_return(call->sealed, -EPERM);
+ assert_return(call->header->type == SD_BUS_MESSAGE_METHOD_CALL, -EINVAL);
+ assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
+
+ if (call->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
+ return 0;
+
+ va_start(ap, format);
+ bus_error_set_errnofv(&berror, error, format, ap);
+ va_end(ap);
+
+ return sd_bus_reply_method_error(bus, call, &berror);
}
-int sd_bus_get_property(
+_public_ int sd_bus_get_property(
sd_bus *bus,
const char *destination,
const char *path,
return 0;
}
-int sd_bus_set_property(
+_public_ int sd_bus_get_property_trivial(
+ sd_bus *bus,
+ const char *destination,
+ const char *path,
+ const char *interface,
+ const char *member,
+ sd_bus_error *error,
+ char type, void *ptr) {
+
+ _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+ int r;
+
+ assert_return(bus, -EINVAL);
+ assert_return(isempty(interface) || interface_name_is_valid(interface), -EINVAL);
+ assert_return(member_name_is_valid(member), -EINVAL);
+ assert_return(bus_type_is_trivial(type), -EINVAL);
+ assert_return(ptr, -EINVAL);
+ assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN);
+ assert_return(!bus_pid_changed(bus), -ECHILD);
+
+ r = sd_bus_call_method(bus, destination, path, "org.freedesktop.DBus.Properties", "Get", error, &reply, "ss", strempty(interface), member);
+ if (r < 0)
+ return r;
+
+ r = sd_bus_message_enter_container(reply, 'v', CHAR_TO_STR(type));
+ if (r < 0)
+ return r;
+
+ r = sd_bus_message_read_basic(reply, type, ptr);
+ if (r < 0)
+ return r;
+
+ return 0;
+}
+
+_public_ int sd_bus_set_property(
sd_bus *bus,
const char *destination,
const char *path,