Commit 6629161f authored by Lennart Poettering's avatar Lennart Poettering
Browse files

bus: basic implementation of kdbus client side

parent 4cda0f21
......@@ -1700,6 +1700,8 @@ libsystemd_bus_la_SOURCES = \
src/libsystemd-bus/bus-internal.h \
src/libsystemd-bus/bus-socket.c \
src/libsystemd-bus/bus-socket.h \
src/libsystemd-bus/bus-kernel.c \
src/libsystemd-bus/bus-kernel.h \
src/libsystemd-bus/bus-message.c \
src/libsystemd-bus/bus-message.h \
src/libsystemd-bus/bus-signature.c \
......@@ -4105,6 +4107,10 @@ hwdb-update:
http://standards.ieee.org/develop/regauth/iab/iab.txt && \
./ids-update.pl )
kdbus-update:
( cd $(top_srcdir)/src/libsystemd-bus/ && \
wget -N https://d-bus.googlecode.com/git/kdbus.h )
upload: all distcheck
cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
......
......@@ -81,6 +81,7 @@ struct sd_bus {
int input_fd, output_fd;
int message_version;
bool is_kernel:1;
bool negotiate_fds:1;
bool can_fds:1;
bool bus_client:1;
......@@ -122,6 +123,8 @@ struct sd_bus {
} sockaddr;
socklen_t sockaddr_size;
char *kernel;
sd_id128_t server_id;
char *address;
......
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/***
This file is part of systemd.
Copyright 2013 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include <fcntl.h>
#include "util.h"
#include "bus-internal.h"
#include "bus-message.h"
#include "bus-kernel.h"
#define KDBUS_MSG_FOREACH_DATA(d, k) \
for ((d) = (k)->data; \
(uint8_t*) (d) < (uint8_t*) (k) + (k)->size; \
(d) = (struct kdbus_msg_data*) ((uint8_t*) (d) + ALIGN8((d)->size)))
static int parse_unique_name(const char *s, uint64_t *id) {
int r;
assert(s);
assert(id);
if (!startswith(s, ":1."))
return 0;
r = safe_atou64(s + 3, id);
if (r < 0)
return r;
return 1;
}
static void append_payload_vec(struct kdbus_msg_data **d, const void *p, size_t sz) {
assert(d);
assert(p);
assert(sz > 0);
(*d)->size = offsetof(struct kdbus_msg_data, vec) + sizeof(struct kdbus_vec);
(*d)->type = KDBUS_MSG_PAYLOAD_VEC;
(*d)->vec.address = (uint64_t) p;
(*d)->vec.size = sz;
*d = (struct kdbus_msg_data*) ((uint8_t*) *d + ALIGN8((*d)->size));
}
static void append_destination(struct kdbus_msg_data **d, const char *s, size_t length) {
assert(d);
assert(d);
(*d)->size = offsetof(struct kdbus_msg_data, data) + length + 1;
(*d)->type = KDBUS_MSG_DST_NAME;
memcpy((*d)->data, s, length + 1);
*d = (struct kdbus_msg_data*) ((uint8_t*) *d + ALIGN8((*d)->size));
}
static int bus_message_setup_kmsg(sd_bus_message *m) {
struct kdbus_msg_data *d;
bool well_known;
uint64_t unique;
size_t sz, dl;
int r;
assert(m);
assert(m->sealed);
assert(!m->kdbus);
if (m->destination) {
r = parse_unique_name(m->destination, &unique);
if (r < 0)
return r;
well_known = r == 0;
} else
well_known = false;
sz = offsetof(struct kdbus_msg, data);
/* Add in fixed header, fields header, fields header padding and payload */
sz += 4 * ALIGN8(offsetof(struct kdbus_msg_data, vec) + sizeof(struct kdbus_vec));
/* Add in well-known destination header */
if (well_known) {
dl = strlen(m->destination);
sz += ALIGN8(offsetof(struct kdbus_msg, data) + dl + 1);
}
m->kdbus = malloc0(sz);
if (!m->kdbus)
return -ENOMEM;
m->kdbus->flags =
((m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED) ? 0 : KDBUS_MSG_FLAGS_EXPECT_REPLY) |
((m->header->flags & SD_BUS_MESSAGE_NO_AUTO_START) ? KDBUS_MSG_FLAGS_NO_AUTO_START : 0);
m->kdbus->dst_id =
well_known ? 0 :
m->destination ? unique : (uint64_t) -1;
m->kdbus->payload_type = KDBUS_PAYLOAD_DBUS1;
m->kdbus->cookie = m->header->serial;
m->kdbus->timeout_ns = m->timeout * NSEC_PER_USEC;
d = m->kdbus->data;
if (well_known)
append_destination(&d, m->destination, dl);
append_payload_vec(&d, m->header, sizeof(*m->header));
if (m->fields) {
append_payload_vec(&d, m->fields, m->header->fields_size);
if (m->header->fields_size % 8 != 0) {
static const uint8_t padding[7] = {};
append_payload_vec(&d, padding, 8 - (m->header->fields_size % 8));
}
}
if (m->body)
append_payload_vec(&d, m->body, m->header->body_size);
m->kdbus->size = (uint8_t*) m - (uint8_t*) m->kdbus;
assert(m->kdbus->size <= sz);
return 0;
}
int bus_kernel_take_fd(sd_bus *b) {
struct kdbus_cmd_hello hello = {};
int r;
assert(b);
r = ioctl(b->input_fd, KDBUS_CMD_HELLO, &hello);
if (r < 0)
return -errno;
b->is_kernel = true;
r = bus_start_running(b);
if (r < 0)
return r;
return 1;
}
int bus_kernel_connect(sd_bus *b) {
assert(b);
assert(b->input_fd < 0);
assert(b->output_fd < 0);
assert(b->kernel);
b->input_fd = open(b->kernel, O_RDWR|O_NOCTTY|O_CLOEXEC);
if (b->input_fd)
return -errno;
b->output_fd = b->input_fd;
return bus_kernel_take_fd(b);
}
int bus_kernel_write_message(sd_bus *bus, sd_bus_message *m) {
int r;
assert(bus);
assert(m);
assert(bus->state == BUS_RUNNING);
r = bus_message_setup_kmsg(m);
if (r < 0)
return r;
r = ioctl(bus->output_fd, KDBUS_CMD_MSG_SEND, m->kdbus);
if (r < 0)
return errno == EAGAIN ? 0 : -errno;
return 0;
}
static void close_kdbus_msg(struct kdbus_msg *k) {
struct kdbus_msg_data *d;
KDBUS_MSG_FOREACH_DATA(d, k) {
if (d->type != KDBUS_MSG_UNIX_FDS)
continue;
close_many(d->fds, (d->size - offsetof(struct kdbus_msg_data, fds)) / sizeof(int));
}
}
static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k, sd_bus_message **ret) {
sd_bus_message *m = NULL;
struct kdbus_msg_data *d;
unsigned n_payload = 0, n_fds = 0;
_cleanup_free_ int *fds = NULL;
struct bus_header *h = NULL;
size_t total, n_bytes = 0, idx = 0;
int r;
assert(bus);
assert(k);
assert(ret);
if (k->payload_type != KDBUS_PAYLOAD_DBUS1)
return 0;
KDBUS_MSG_FOREACH_DATA(d, k) {
size_t l;
l = d->size - offsetof(struct kdbus_msg_data, data);
if (d->type == KDBUS_MSG_PAYLOAD) {
if (!h) {
if (l < sizeof(struct bus_header))
return -EBADMSG;
h = (struct bus_header*) d->data;
}
n_payload++;
n_bytes += l;
} else if (d->type == KDBUS_MSG_UNIX_FDS) {
int *f;
unsigned j;
j = l / sizeof(int);
f = realloc(fds, sizeof(int) * (n_fds + j));
if (!f)
return -ENOMEM;
fds = f;
memcpy(fds + n_fds, d->fds, j);
n_fds += j;
}
}
if (!h)
return -EBADMSG;
r = bus_header_size(h, &total);
if (r < 0)
return r;
if (n_bytes != total)
return -EBADMSG;
r = bus_message_from_header(h, sizeof(struct bus_header), fds, n_fds, NULL, NULL, 0, &m);
if (r < 0)
return r;
KDBUS_MSG_FOREACH_DATA(d, k) {
size_t l;
if (d->type != KDBUS_MSG_PAYLOAD)
continue;
l = d->size - offsetof(struct kdbus_msg_data, data);
if (idx == sizeof(struct bus_header) &&
l == BUS_MESSAGE_FIELDS_SIZE(m))
m->fields = d->data;
else if (idx == sizeof(struct bus_header) + ALIGN8(BUS_MESSAGE_FIELDS_SIZE(m)) &&
l == BUS_MESSAGE_BODY_SIZE(m))
m->body = d->data;
else {
sd_bus_message_unref(m);
return -EBADMSG;
}
idx += l;
}
r = bus_message_parse_fields(m);
if (r < 0) {
sd_bus_message_unref(m);
return r;
}
/* We take possession of the kmsg struct now */
m->kdbus = k;
m->free_kdbus = true;
m->free_fds = true;
fds = NULL;
*ret = m;
return 1;
}
int bus_kernel_read_message(sd_bus *bus, sd_bus_message **m) {
struct kdbus_msg *k;
size_t sz = 128;
int r;
assert(bus);
assert(m);
for (;;) {
void *q;
q = realloc(bus->rbuffer, sz);
if (!q)
return -errno;
k = bus->rbuffer = q;
k->size = sz;
r = ioctl(bus->input_fd, KDBUS_CMD_MSG_RECV, bus->rbuffer);
if (r >= 0)
break;
if (errno == EAGAIN)
return 0;
if (errno != -EMSGSIZE)
return -errno;
sz *= 2;
}
r = bus_kernel_make_message(bus, k, m);
if (r > 0)
bus->rbuffer = NULL;
else
close_kdbus_msg(k);
return r;
}
int bus_kernel_create(const char *name, char **s) {
struct kdbus_cmd_fname *fname;
size_t l;
int fd;
char *p;
assert(name);
assert(s);
fd = open("/dev/kdbus/control", O_RDWR|O_NOCTTY|O_CLOEXEC);
if (fd < 0)
return -errno;
l = strlen(name);
fname = alloca(offsetof(struct kdbus_cmd_fname, name) + DECIMAL_STR_MAX(uid_t) + 1 + l + 1);
sprintf(fname->name, "%lu-%s", (unsigned long) getuid(), name);
fname->size = offsetof(struct kdbus_cmd_fname, name) + strlen(fname->name) + 1;
fname->kernel_flags = KDBUS_CMD_FNAME_ACCESS_WORLD;
fname->user_flags = 0;
p = strjoin("/dev/kdbus/", fname->name, "/bus", NULL);
if (!p)
return -ENOMEM;
if (ioctl(fd, KDBUS_CMD_BUS_MAKE, &fname) < 0) {
close_nointr_nofail(fd);
free(p);
return -errno;
}
if (s)
*s = p;
return fd;
}
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
#pragma once
/***
This file is part of systemd.
Copyright 2013 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include "sd-bus.h"
int bus_kernel_connect(sd_bus *b);
int bus_kernel_take_fd(sd_bus *b);
int bus_kernel_write_message(sd_bus *bus, sd_bus_message *m);
int bus_kernel_read_message(sd_bus *bus, sd_bus_message **m);
int bus_kernel_create(const char *name, char **s);
......@@ -25,6 +25,7 @@
#include "util.h"
#include "utf8.h"
#include "strv.h"
#include "time-util.h"
#include "sd-bus.h"
#include "bus-message.h"
......@@ -32,7 +33,6 @@
#include "bus-type.h"
#include "bus-signature.h"
static int message_parse_fields(sd_bus_message *m);
static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored);
static void reset_containers(sd_bus_message *m) {
......@@ -62,6 +62,9 @@ static void message_free(sd_bus_message *m) {
if (m->free_body)
free(m->body);
if (m->free_kdbus)
free(m->kdbus);
if (m->free_fds) {
close_many(m->fds, m->n_fds);
free(m->fds);
......@@ -225,19 +228,19 @@ static int message_append_field_uint32(sd_bus_message *m, uint8_t h, uint32_t x)
return 0;
}
int bus_message_from_malloc(
int bus_message_from_header(
void *buffer,
size_t length,
int *fds,
unsigned n_fds,
const struct ucred *ucred,
const char *label,
size_t extra,
sd_bus_message **ret) {
sd_bus_message *m;
struct bus_header *h;
size_t total, fs, bs, label_sz, a;
int r;
size_t a, label_sz;
assert(buffer || length <= 0);
assert(fds || n_fds <= 0);
......@@ -256,24 +259,16 @@ int bus_message_from_malloc(
if (h->type == _SD_BUS_MESSAGE_TYPE_INVALID)
return -EBADMSG;
if (h->endian == SD_BUS_NATIVE_ENDIAN) {
fs = h->fields_size;
bs = h->body_size;
} else if (h->endian == SD_BUS_REVERSE_ENDIAN) {
fs = bswap_32(h->fields_size);
bs = bswap_32(h->body_size);
} else
if (h->endian != SD_BUS_LITTLE_ENDIAN &&
h->endian != SD_BUS_BIG_ENDIAN)
return -EBADMSG;
total = sizeof(struct bus_header) + ALIGN8(fs) + bs;
if (length != total)
return -EBADMSG;
a = ALIGN(sizeof(sd_bus_message)) + ALIGN(extra);
if (label) {
label_sz = strlen(label);
a = ALIGN(sizeof(sd_bus_message)) + label_sz + 1;
} else
a = sizeof(sd_bus_message);
a += label_sz + 1;
}
m = malloc0(a);
if (!m)
......@@ -282,8 +277,6 @@ int bus_message_from_malloc(
m->n_ref = 1;
m->sealed = true;
m->header = h;
m->fields = (uint8_t*) buffer + sizeof(struct bus_header);
m->body = (uint8_t*) buffer + sizeof(struct bus_header) + ALIGN8(fs);
m->fds = fds;
m->n_fds = n_fds;
......@@ -295,15 +288,43 @@ int bus_message_from_malloc(
}
if (label) {
m->label = (char*) m + ALIGN(sizeof(sd_bus_message));
m->label = (char*) m + ALIGN(sizeof(sd_bus_message)) + ALIGN(extra);
memcpy(m->label, label, label_sz + 1);
}
*ret = m;
return 0;
}
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;
int r;
r = bus_message_from_header(buffer, length, fds, n_fds, ucred, label, 0, &m);
if (r < 0)
return r;
if (length != BUS_MESSAGE_SIZE(m)) {
r = -EBADMSG;
goto fail;
}
m->fields = (uint8_t*) buffer + sizeof(struct bus_header);
m->body = (uint8_t*) buffer + sizeof(struct bus_header) + ALIGN8(BUS_MESSAGE_FIELDS_SIZE(m));
m->n_iovec = 1;
m->iovec[0].iov_base = buffer;
m->iovec[0].iov_len = length;
r = message_parse_fields(m);
r = bus_message_parse_fields(m);
if (r < 0)
goto fail;
......@@ -2600,7 +2621,7 @@ static int message_skip_fields(
}
}
static int message_parse_fields(sd_bus_message *m) {
int bus_message_parse_fields(sd_bus_message *m) {
size_t ri;
int r;
uint32_t unix_fds = 0;
......@@ -3041,7 +3062,7 @@ int bus_message_get_blob(sd_bus_message *m, void **buffer, size_t *sz) {
assert(buffer);
assert(sz);
total = bus_message_size(m);
total = BUS_MESSAGE_SIZE(m);
p = malloc(total);
if (!p)
......@@ -3133,12 +3154,21 @@ const char* bus_message_get_arg(sd_bus_message *m, unsigned i) {
return t;
}
size_t bus_message_size(sd_bus_message *m) {
assert(m);
assert(m->sealed);
int bus_header_size(struct bus_header *h, size_t *sum) {
size_t fs, bs;
assert(h);
assert(