#include "bus-message.h"
#include "bus-type.h"
+static int ensure_running(sd_bus *bus);
static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec);
static void bus_free(sd_bus *b) {
assert(reply);
- bus->state = BUS_RUNNING;
-
r = sd_bus_message_read(reply, "s", &s);
if (r < 0)
return r;
+ if (!service_name_is_valid(s) || s[0] != ':')
+ return -EBADMSG;
+
bus->unique_name = strdup(s);
if (!bus->unique_name)
return -ENOMEM;
+ bus->state = BUS_RUNNING;
+
return 1;
}
return bus->fd >= 0;
}
-int sd_bus_is_running(sd_bus *bus) {
+int sd_bus_can_send(sd_bus *bus, char type) {
+ int r;
+
if (!bus)
return -EINVAL;
- if (bus->fd < 0)
- return -ENOTCONN;
+ if (type == SD_BUS_TYPE_UNIX_FD) {
+ r = ensure_running(bus);
+ if (r < 0)
+ return r;
- return bus->state == BUS_RUNNING;
+ return bus->can_fds;
+ }
+
+ return bus_type_is_valid(type);
}
-int sd_bus_can_send(sd_bus *bus, char type) {
+int sd_bus_get_peer(sd_bus *bus, sd_id128_t *peer) {
+ int r;
if (!bus)
return -EINVAL;
- if (bus->state != BUS_RUNNING && bus->state != BUS_HELLO)
- return -EAGAIN;
+ if (!peer)
+ return -EINVAL;
- if (type == SD_BUS_TYPE_UNIX_FD)
- return bus->can_fds;
+ r = ensure_running(bus);
+ if (r < 0)
+ return r;
- return bus_type_is_valid(type);
+ *peer = bus->peer;
+ return 0;
}
static int bus_seal_message(sd_bus *b, sd_bus_message *m) {
}
static int dispatch_rqueue(sd_bus *bus, sd_bus_message **m) {
- sd_bus_message *z;
+ sd_bus_message *z = NULL;
int r, ret = 0;
assert(bus);
assert(bus);
- r = sd_bus_is_running(bus);
- if (r != 0)
- return r;
+ if (bus->state == BUS_RUNNING)
+ return 1;
for (;;) {
- int k;
-
r = sd_bus_process(bus, NULL);
-
if (r < 0)
return r;
-
- k = sd_bus_is_running(bus);
- if (k != 0)
- return k;
-
+ if (bus->state == BUS_RUNNING)
+ return 1;
if (r > 0)
continue;
return r < 0 ? r : 1;
}
+static int process_builtin(sd_bus *bus, sd_bus_message *m) {
+ _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+ int r;
+
+ assert(bus);
+ assert(m);
+
+ if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL)
+ return 0;
+
+ if (!streq_ptr(m->interface, "org.freedesktop.DBus.Peer"))
+ return 0;
+
+ if (m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
+ return 1;
+
+ if (streq_ptr(m->member, "Ping"))
+ r = sd_bus_message_new_method_return(bus, m, &reply);
+ else if (streq_ptr(m->member, "GetMachineId")) {
+ sd_id128_t id;
+ char sid[33];
+
+ r = sd_id128_get_machine(&id);
+ if (r < 0)
+ return r;
+
+ r = sd_bus_message_new_method_return(bus, m, &reply);
+ if (r < 0)
+ return r;
+
+ r = sd_bus_message_append(reply, "s", sd_id128_to_string(id, sid));
+ } else {
+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_INIT;
+
+ sd_bus_error_set(&error,
+ "org.freedesktop.DBus.Error.UnknownMethod",
+ "Unknown method '%s' on interface '%s'.", m->member, m->interface);
+
+ r = sd_bus_message_new_method_error(bus, m, &error, &reply);
+ }
+
+ if (r < 0)
+ return r;
+
+ r = sd_bus_send(bus, reply, NULL);
+ if (r < 0)
+ return r;
+
+ return 1;
+}
+
static int process_message(sd_bus *bus, sd_bus_message *m) {
struct filter_callback *l;
int r;
assert(bus);
assert(m);
- if (m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_CALL || m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_RETURN) {
+ if (m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_RETURN || m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_ERROR) {
struct reply_callback *c;
c = hashmap_remove(bus->reply_callbacks, &m->reply_serial);
return r;
}
- return 0;
+ return process_builtin(bus, m);
}
int sd_bus_process(sd_bus *bus, sd_bus_message **ret) {
return 1;
}
- if (sd_bus_message_is_method_call(m, NULL, NULL)) {
- const sd_bus_error e = SD_BUS_ERROR_INIT_CONST("org.freedesktop.DBus.Error.UnknownObject", "Unknown object.");
+ if (m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_CALL) {
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_INIT;
+
+ sd_bus_error_set(&error, "org.freedesktop.DBus.Error.UnknownObject", "Unknown object '%s'.", m->path);
- r = sd_bus_message_new_method_error(bus, m, &e, &reply);
+ r = sd_bus_message_new_method_error(bus, m, &error, &reply);
if (r < 0)
return r;