***/
#include <errno.h>
+#include <fcntl.h>
#include "util.h"
#include "utf8.h"
}
static void message_free(sd_bus_message *m) {
- unsigned i;
-
assert(m);
if (m->free_header)
if (m->free_body)
free(m->body);
- for (i = 0; i < m->n_fds; i++)
- close_nointr_nofail(m->fds[i]);
+ if (m->free_fds) {
+ close_many(m->fds, m->n_fds);
+ free(m->fds);
+ }
reset_containers(m);
free(m->root_container.signature);
return 0;
}
-int bus_message_from_malloc(void *buffer, size_t length, sd_bus_message **ret) {
+int bus_message_from_malloc(
+ void *buffer,
+ size_t length,
+ int *fds,
+ unsigned n_fds,
+ const struct ucred *ucred,
+ const char *label,
+ sd_bus_message **ret) {
+
sd_bus_message *m;
struct bus_header *h;
- size_t total, fs, bs;
+ size_t total, fs, bs, label_sz, a;
int r;
assert(buffer || length <= 0);
+ assert(fds || n_fds <= 0);
assert(ret);
if (length < sizeof(struct bus_header))
if (length != total)
return -EBADMSG;
- m = new0(sd_bus_message, 1);
+ if (label) {
+ label_sz = strlen(label);
+ a = ALIGN(sizeof(sd_bus_message)) + label_sz + 1;
+ } else
+ a = sizeof(sd_bus_message);
+
+ m = malloc0(a);
if (!m)
return -ENOMEM;
m->n_ref = 1;
+ m->sealed = true;
m->header = h;
- m->free_header = true;
m->fields = (uint8_t*) buffer + sizeof(struct bus_header);
m->body = (uint8_t*) buffer + sizeof(struct bus_header) + ALIGN_TO(fs, 8);
- m->sealed = true;
+ m->fds = fds;
+ m->n_fds = n_fds;
+
+ if (ucred) {
+ m->uid = ucred->uid;
+ m->pid = ucred->pid;
+ m->gid = ucred->gid;
+ m->uid_valid = m->gid_valid = true;
+ }
+
+ if (label) {
+ m->label = (char*) m + ALIGN(sizeof(sd_bus_message));
+ memcpy(m->label, label, label_sz + 1);
+ }
m->n_iovec = 1;
m->iovec[0].iov_base = buffer;
m->iovec[0].iov_len = length;
+ m->size = length;
r = message_parse_fields(m);
- if (r < 0) {
- message_free(m);
- return r;
- }
+ if (r < 0)
+ goto fail;
+
+ /* We take possession of the memory and fds now */
+ m->free_header = true;
+ m->free_fds = true;
*ret = m;
return 0;
+
+fail:
+ message_free(m);
+ return r;
}
static sd_bus_message *message_new(sd_bus *bus, uint8_t type) {
m->header->endian = SD_BUS_NATIVE_ENDIAN;
m->header->type = type;
m->header->version = bus ? bus->message_version : 1;
+ m->allow_fds = !bus || bus->can_fds || (bus->state != BUS_HELLO && bus->state != BUS_RUNNING);
return m;
}
return -EINVAL;
if (!m)
return -EINVAL;
+ if (bus && bus->state == BUS_UNSET)
+ return -ENOTCONN;
t = message_new(bus, SD_BUS_MESSAGE_TYPE_SIGNAL);
if (!t)
return -EINVAL;
if (!m)
return -EINVAL;
+ if (bus && bus->state == BUS_UNSET)
+ return -ENOTCONN;
t = message_new(bus, SD_BUS_MESSAGE_TYPE_METHOD_CALL);
if (!t)
return -EINVAL;
if (!m)
return -EINVAL;
+ if (bus && bus->state == BUS_UNSET)
+ return -ENOTCONN;
t = message_new(bus, type);
if (!t)
return 0;
}
+const char *sd_bus_message_get_label(sd_bus_message *m) {
+ if (!m)
+ return NULL;
+
+ return m->label;
+}
+
int sd_bus_message_is_signal(sd_bus_message *m, const char *interface, const char *member) {
if (!m)
return -EINVAL;
int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored) {
struct bus_container *c;
- size_t sz, align;
+ ssize_t align, sz;
uint32_t k;
void *a;
char *e = NULL;
+ int fd = -1;
+ uint32_t fdi = 0;
+ int r;
if (!m)
return -EINVAL;
+ if (!p)
+ return -EINVAL;
if (m->sealed)
return -EPERM;
if (!bus_type_is_basic(type))
case SD_BUS_TYPE_STRING:
case SD_BUS_TYPE_OBJECT_PATH:
- if (!p) {
- if (e)
- c->signature[c->index] = 0;
-
- return -EINVAL;
- }
-
align = 4;
sz = 4 + strlen(p) + 1;
break;
case SD_BUS_TYPE_SIGNATURE:
- if (!p) {
- if (e)
- c->signature[c->index] = 0;
-
- return -EINVAL;
- }
-
align = 1;
sz = 1 + strlen(p) + 1;
break;
p = &k;
break;
+ case SD_BUS_TYPE_UNIX_FD: {
+ int z, *f;
+
+ if (!m->allow_fds) {
+ r = -ENOTSUP;
+ goto fail;
+ }
+
+ align = sz = 4;
+
+ z = *(int*) p;
+ if (z < 0) {
+ r = -EINVAL;
+ goto fail;
+ }
+
+ fd = fcntl(z, F_DUPFD_CLOEXEC, 3);
+ if (fd < 0) {
+ r = -errno;
+ goto fail;
+ }
+
+ f = realloc(m->fds, sizeof(int) * (m->n_fds + 1));
+ if (!f) {
+ r = -ENOMEM;
+ goto fail;
+ }
+
+ fdi = m->n_fds;
+ f[fdi] = fd;
+ m->fds = f;
+ m->free_fds = true;
+ break;
+ }
+
default:
align = bus_type_get_alignment(type);
sz = bus_type_get_size(type);
a = message_extend_body(m, align, sz);
if (!a) {
- /* Truncate extended signature again */
- if (e)
- c->signature[c->index] = 0;
-
- return -ENOMEM;
+ r = -ENOMEM;
+ goto fail;
}
if (type == SD_BUS_TYPE_STRING || type == SD_BUS_TYPE_OBJECT_PATH) {
if (stored)
*stored = (const uint8_t*) a + 1;
+ } else if (type == SD_BUS_TYPE_UNIX_FD) {
+ *(uint32_t*) a = fdi;
+
+ if (stored)
+ *stored = a;
+
+ m->n_fds ++;
} else {
memcpy(a, p, sz);
c->index++;
return 0;
+
+fail:
+ /* Truncate extended signature again */
+ if (e)
+ c->signature[c->index] = 0;
+
+ if (fd >= 0)
+ close_nointr_nofail(fd);
+
+ return r;
}
int sd_bus_message_append_basic(sd_bus_message *m, char type, const void *p) {
return 0;
}
-static int message_append_ap(
+int bus_message_append_ap(
sd_bus_message *m,
const char *types,
va_list ap) {
int r;
assert(m);
- assert(types);
+
+ if (!types)
+ return 0;
for (t = types; *t; t++) {
switch (*t) {
n = va_arg(ap, unsigned);
for (i = 0; i < n; i++) {
- r = message_append_ap(m, s, ap);
+ r = bus_message_append_ap(m, s, ap);
if (r < 0)
return r;
}
if (r < 0)
return r;
- r = message_append_ap(m, s, ap);
+ r = bus_message_append_ap(m, s, ap);
if (r < 0)
return r;
t += k - 1;
- r = message_append_ap(m, s, ap);
+ r = bus_message_append_ap(m, s, ap);
if (r < 0)
return r;
if (m->sealed)
return -EPERM;
if (!types)
- return -EINVAL;
+ return 0;
va_start(ap, types);
- r = message_append_ap(m, types, ap);
+ r = bus_message_append_ap(m, types, ap);
va_end(ap);
return r;
return -EPERM;
if (!bus_type_is_basic(type))
return -EINVAL;
+ if (!p)
+ return -EINVAL;
c = message_get_container(m);
}
default: {
- size_t sz, align;
+ ssize_t sz, align;
+ size_t rindex;
align = bus_type_get_alignment(type);
sz = bus_type_get_size(type);
+ assert(align > 0 && sz > 0);
- r = message_peek_body(m, &m->rindex, align, sz, &q);
+ rindex = m->rindex;
+ r = message_peek_body(m, &rindex, align, sz, &q);
if (r <= 0)
return r;
*(uint64_t*) p = BUS_MESSAGE_BSWAP64(m, *(uint64_t*) q);
break;
+ case SD_BUS_TYPE_UNIX_FD: {
+ int copy;
+ uint32_t j;
+
+ j = BUS_MESSAGE_BSWAP32(m, *(uint32_t*) q);
+ if (j >= m->n_fds)
+ return -EBADMSG;
+
+ copy = fcntl(m->fds[j], F_DUPFD_CLOEXEC, 3);
+ if (copy < 0)
+ return -errno;
+
+ *(int*) p = copy;
+ break;
+ }
+
default:
assert_not_reached("Unknown basic type...");
}
+ m->rindex = rindex;
+
break;
}
}
case SD_BUS_TYPE_DOUBLE:
case SD_BUS_TYPE_STRING:
case SD_BUS_TYPE_OBJECT_PATH:
- case SD_BUS_TYPE_SIGNATURE: {
+ case SD_BUS_TYPE_SIGNATURE:
+ case SD_BUS_TYPE_UNIX_FD: {
void *p;
p = va_arg(ap, void*);
(*signature)++;
} else if (bus_type_is_basic(t)) {
- size_t align, k;
+ ssize_t align, k;
align = bus_type_get_alignment(t);
k = bus_type_get_size(t);
+ assert(align > 0 && k > 0);
r = message_peek_fields(m, ri, align, k, NULL);
if (r < 0)
static int message_parse_fields(sd_bus_message *m) {
size_t ri;
int r;
+ uint32_t unix_fds = 0;
assert(m);
return -EBADMSG;
case SD_BUS_MESSAGE_HEADER_PATH:
+
+ if (m->path)
+ return -EBADMSG;
+
if (!streq(signature, "o"))
return -EBADMSG;
break;
case SD_BUS_MESSAGE_HEADER_INTERFACE:
+
+ if (m->interface)
+ return -EBADMSG;
+
if (!streq(signature, "s"))
return -EBADMSG;
break;
case SD_BUS_MESSAGE_HEADER_MEMBER:
+
+ if (m->member)
+ return -EBADMSG;
+
if (!streq(signature, "s"))
return -EBADMSG;
break;
case SD_BUS_MESSAGE_HEADER_ERROR_NAME:
+
+ if (m->error.name)
+ return -EBADMSG;
+
if (!streq(signature, "s"))
return -EBADMSG;
break;
case SD_BUS_MESSAGE_HEADER_DESTINATION:
+
+ if (m->destination)
+ return -EBADMSG;
+
if (!streq(signature, "s"))
return -EBADMSG;
break;
case SD_BUS_MESSAGE_HEADER_SENDER:
+
+ if (m->sender)
+ return -EBADMSG;
+
if (!streq(signature, "s"))
return -EBADMSG;
const char *s;
char *c;
+ if (m->root_container.signature)
+ return -EBADMSG;
+
if (!streq(signature, "g"))
return -EBADMSG;
}
case SD_BUS_MESSAGE_HEADER_REPLY_SERIAL:
+ if (m->reply_serial != 0)
+ return -EBADMSG;
+
if (!streq(signature, "u"))
return -EBADMSG;
break;
+ case SD_BUS_MESSAGE_HEADER_UNIX_FDS:
+ if (unix_fds != 0)
+ return -EBADMSG;
+
+ if (!streq(signature, "u"))
+ return -EBADMSG;
+
+ r = message_peek_field_uint32(m, &ri, &unix_fds);
+ if (r < 0)
+ return -EBADMSG;
+
+ if (unix_fds == 0)
+ return -EBADMSG;
+
+ break;
+
default:
r = message_skip_fields(m, &ri, (uint32_t) -1, (const char **) &signature);
}
return r;
}
+ if (m->n_fds != unix_fds)
+ return -EBADMSG;
+
if (isempty(m->root_container.signature) != (BUS_MESSAGE_BODY_SIZE(m) == 0))
return -EBADMSG;
return 0;
}
+
+const char* bus_message_get_arg(sd_bus_message *m, unsigned i) {
+ int r;
+ const char *t;
+ char type;
+
+ assert(m);
+
+ r = sd_bus_message_rewind(m, true);
+ if (r < 0)
+ return NULL;
+
+ while (i > 0) {
+ r = sd_bus_message_peek_type(m, &type, NULL);
+ if (r < 0)
+ return NULL;
+
+ if (type != SD_BUS_TYPE_STRING &&
+ type != SD_BUS_TYPE_OBJECT_PATH &&
+ type != SD_BUS_TYPE_SIGNATURE)
+ return NULL;
+
+ r = sd_bus_message_read_basic(m, type, &t);
+ if (r < 0)
+ return NULL;
+
+ i--;
+ }
+
+ r = sd_bus_message_rewind(m, true);
+ if (r < 0)
+ return NULL;
+
+ return t;
+}