chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: epoll and signalfd has been moved into sd event loop
[elogind.git]
/
src
/
libsystemd-bus
/
bus-kernel.c
diff --git
a/src/libsystemd-bus/bus-kernel.c
b/src/libsystemd-bus/bus-kernel.c
index 2c87f22fd7f5e7509d9d27f52055f4e946746e61..f66cf04e1640c759705fa942741ccdc0ff830b82 100644
(file)
--- a/
src/libsystemd-bus/bus-kernel.c
+++ b/
src/libsystemd-bus/bus-kernel.c
@@
-254,7
+254,7
@@
static int bus_message_setup_kmsg(sd_bus *b, sd_bus_message *m) {
m->kdbus->dst_id =
well_known ? 0 :
m->destination ? unique : KDBUS_DST_ID_BROADCAST;
m->kdbus->dst_id =
well_known ? 0 :
m->destination ? unique : KDBUS_DST_ID_BROADCAST;
- m->kdbus->payload_type = KDBUS_PAYLOAD_DBUS
1
;
+ m->kdbus->payload_type = KDBUS_PAYLOAD_DBUS;
m->kdbus->cookie = m->header->serial;
m->kdbus->timeout_ns = m->timeout * NSEC_PER_USEC;
m->kdbus->cookie = m->header->serial;
m->kdbus->timeout_ns = m->timeout * NSEC_PER_USEC;
@@
-362,6
+362,7
@@
int bus_kernel_take_fd(sd_bus *b) {
b->is_kernel = true;
b->bus_client = true;
b->can_fds = !!(hello.conn_flags & KDBUS_HELLO_ACCEPT_FD);
b->is_kernel = true;
b->bus_client = true;
b->can_fds = !!(hello.conn_flags & KDBUS_HELLO_ACCEPT_FD);
+ b->message_version = 2;
/* the kernel told us the UUID of the underlying bus */
memcpy(b->server_id.bytes, hello.id128, sizeof(b->server_id.bytes));
/* the kernel told us the UUID of the underlying bus */
memcpy(b->server_id.bytes, hello.id128, sizeof(b->server_id.bytes));
@@
-417,8
+418,10
@@
int bus_kernel_write_message(sd_bus *bus, sd_bus_message *m) {
if (m->header->type == SD_BUS_MESSAGE_METHOD_CALL)
sd_bus_error_setf(&error, SD_BUS_ERROR_SERVICE_UNKNOWN, "Destination %s not known", m->destination);
if (m->header->type == SD_BUS_MESSAGE_METHOD_CALL)
sd_bus_error_setf(&error, SD_BUS_ERROR_SERVICE_UNKNOWN, "Destination %s not known", m->destination);
- else
+ else {
+ log_debug("Could not deliver message to %s as destination is not known. Ignoring.", m->destination);
return 0;
return 0;
+ }
} else if (errno == EADDRNOTAVAIL) {
} else if (errno == EADDRNOTAVAIL) {
@@
-426,8
+429,10
@@
int bus_kernel_write_message(sd_bus *bus, sd_bus_message *m) {
if (m->header->type == SD_BUS_MESSAGE_METHOD_CALL)
sd_bus_error_setf(&error, SD_BUS_ERROR_SERVICE_UNKNOWN, "Activation of %s not requested", m->destination);
if (m->header->type == SD_BUS_MESSAGE_METHOD_CALL)
sd_bus_error_setf(&error, SD_BUS_ERROR_SERVICE_UNKNOWN, "Activation of %s not requested", m->destination);
- else
+ else {
+ log_debug("Could not deliver message to %s as destination is not activated. Ignoring.", m->destination);
return 0;
return 0;
+ }
} else
return -errno;
} else
return -errno;
@@
-462,7
+467,7
@@
static void close_kdbus_msg(sd_bus *bus, struct kdbus_msg *k) {
off = (uint8_t *)k - (uint8_t *)bus->kdbus_buffer;
ioctl(bus->input_fd, KDBUS_CMD_FREE, &off);
off = (uint8_t *)k - (uint8_t *)bus->kdbus_buffer;
ioctl(bus->input_fd, KDBUS_CMD_FREE, &off);
- KDBUS_
PART
_FOREACH(d, k, items) {
+ KDBUS_
ITEM
_FOREACH(d, k, items) {
if (d->type == KDBUS_ITEM_FDS)
close_many(d->fds, (d->size - offsetof(struct kdbus_item, fds)) / sizeof(int));
if (d->type == KDBUS_ITEM_FDS)
close_many(d->fds, (d->size - offsetof(struct kdbus_item, fds)) / sizeof(int));
@@
-589,7
+594,7
@@
static int bus_kernel_translate_message(sd_bus *bus, struct kdbus_msg *k) {
assert(k);
assert(k->payload_type == KDBUS_PAYLOAD_KERNEL);
assert(k);
assert(k->payload_type == KDBUS_PAYLOAD_KERNEL);
- KDBUS_
PART
_FOREACH(d, k, items) {
+ KDBUS_
ITEM
_FOREACH(d, k, items) {
if (d->type >= _KDBUS_ITEM_KERNEL_BASE && d->type < _KDBUS_ITEM_KERNEL_BASE + ELEMENTSOF(translate)) {
if (found)
return -EBADMSG;
if (d->type >= _KDBUS_ITEM_KERNEL_BASE && d->type < _KDBUS_ITEM_KERNEL_BASE + ELEMENTSOF(translate)) {
if (found)
return -EBADMSG;
@@
-618,9
+623,9
@@
static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) {
assert(bus);
assert(k);
assert(bus);
assert(k);
- assert(k->payload_type == KDBUS_PAYLOAD_DBUS
1
);
+ assert(k->payload_type == KDBUS_PAYLOAD_DBUS);
- KDBUS_
PART
_FOREACH(d, k, items) {
+ KDBUS_
ITEM
_FOREACH(d, k, items) {
size_t l;
l = d->size - offsetof(struct kdbus_item, data);
size_t l;
l = d->size - offsetof(struct kdbus_item, data);
@@
-676,11
+681,17
@@
static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) {
if (n_bytes != total)
return -EBADMSG;
if (n_bytes != total)
return -EBADMSG;
+ /* on kdbus we only speak native endian gvariant, never dbus1
+ * marshalling or reverse endian */
+ if (h->version != 2 ||
+ h->endian != BUS_NATIVE_ENDIAN)
+ return -EPROTOTYPE;
+
r = bus_message_from_header(bus, h, sizeof(struct bus_header), fds, n_fds, NULL, seclabel, 0, &m);
if (r < 0)
return r;
r = bus_message_from_header(bus, h, sizeof(struct bus_header), fds, n_fds, NULL, seclabel, 0, &m);
if (r < 0)
return r;
- KDBUS_
PART
_FOREACH(d, k, items) {
+ KDBUS_
ITEM
_FOREACH(d, k, items) {
size_t l;
l = d->size - offsetof(struct kdbus_item, data);
size_t l;
l = d->size - offsetof(struct kdbus_item, data);
@@
-885,9
+896,16
@@
int bus_kernel_read_message(sd_bus *bus) {
}
k = (struct kdbus_msg *)((uint8_t *)bus->kdbus_buffer + off);
}
k = (struct kdbus_msg *)((uint8_t *)bus->kdbus_buffer + off);
- if (k->payload_type == KDBUS_PAYLOAD_DBUS
1)
+ if (k->payload_type == KDBUS_PAYLOAD_DBUS
) {
r = bus_kernel_make_message(bus, k);
r = bus_kernel_make_message(bus, k);
- else if (k->payload_type == KDBUS_PAYLOAD_KERNEL)
+
+ /* Anybody can send us invalid messages, let's just drop them. */
+ if (r == -EBADMSG || r == -EPROTOTYPE) {
+ log_debug("Ignoring invalid message: %s", strerror(-r));
+ r = 0;
+ }
+
+ } else if (k->payload_type == KDBUS_PAYLOAD_KERNEL)
r = bus_kernel_translate_message(bus, k);
else
r = 0;
r = bus_kernel_translate_message(bus, k);
else
r = 0;
@@
-1063,11
+1081,10
@@
int bus_kernel_create_bus(const char *name, char **s) {
n = make->items;
sprintf(n->str, "%lu-%s", (unsigned long) getuid(), name);
n->size = offsetof(struct kdbus_item, str) + strlen(n->str) + 1;
n = make->items;
sprintf(n->str, "%lu-%s", (unsigned long) getuid(), name);
n->size = offsetof(struct kdbus_item, str) + strlen(n->str) + 1;
- n->type = KDBUS_MAKE_NAME;
+ n->type = KDBUS_
ITEM_
MAKE_NAME;
make->size = ALIGN8(offsetof(struct kdbus_cmd_bus_make, items) + n->size);
make->flags = KDBUS_MAKE_POLICY_OPEN;
make->size = ALIGN8(offsetof(struct kdbus_cmd_bus_make, items) + n->size);
make->flags = KDBUS_MAKE_POLICY_OPEN;
- make->bus_flags = 0;
make->bloom_size = BLOOM_SIZE;
assert_cc(BLOOM_SIZE % 8 == 0);
make->bloom_size = BLOOM_SIZE;
assert_cc(BLOOM_SIZE % 8 == 0);
@@
-1167,7
+1184,7
@@
int bus_kernel_create_namespace(const char *name, char **s) {
n = make->items;
strcpy(n->str, name);
n->size = offsetof(struct kdbus_item, str) + strlen(n->str) + 1;
n = make->items;
strcpy(n->str, name);
n->size = offsetof(struct kdbus_item, str) + strlen(n->str) + 1;
- n->type = KDBUS_MAKE_NAME;
+ n->type = KDBUS_
ITEM_
MAKE_NAME;
make->size = ALIGN8(offsetof(struct kdbus_cmd_ns_make, items) + n->size);
make->flags = KDBUS_MAKE_POLICY_OPEN | KDBUS_MAKE_ACCESS_WORLD;
make->size = ALIGN8(offsetof(struct kdbus_cmd_ns_make, items) + n->size);
make->flags = KDBUS_MAKE_POLICY_OPEN | KDBUS_MAKE_ACCESS_WORLD;
@@
-1198,3
+1215,19
@@
int bus_kernel_create_namespace(const char *name, char **s) {
return fd;
}
return fd;
}
+
+int bus_kernel_monitor(sd_bus *bus) {
+ struct kdbus_cmd_monitor cmd_monitor;
+ int r;
+
+ assert(bus);
+
+ cmd_monitor.id = 0;
+ cmd_monitor.flags = KDBUS_MONITOR_ENABLE;
+
+ r = ioctl(bus->input_fd, KDBUS_CMD_MONITOR, &cmd_monitor);
+ if (r < 0)
+ return -errno;
+
+ return 1;
+}