chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: sync with kdbus
[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 0e473082382c1c3cc6683308dd4c65ff94232cdf..5be91d46468fbb29d9f62ce379abc452ac54fcd1 100644
(file)
--- a/
src/libsystemd-bus/bus-kernel.c
+++ b/
src/libsystemd-bus/bus-kernel.c
@@
-1066,7
+1066,7
@@
int kdbus_translate_attach_flags(uint64_t mask, uint64_t *kdbus_mask) {
}
int bus_kernel_create_bus(const char *name, char **s) {
}
int bus_kernel_create_bus(const char *name, char **s) {
- struct kdbus_cmd_
bus_
make *make;
+ struct kdbus_cmd_make *make;
struct kdbus_item *n;
int fd;
struct kdbus_item *n;
int fd;
@@
-1077,19
+1077,27
@@
int bus_kernel_create_bus(const char *name, char **s) {
if (fd < 0)
return -errno;
if (fd < 0)
return -errno;
- make = alloca0(ALIGN8(offsetof(struct kdbus_cmd_bus_make, items) +
+ make = alloca0(ALIGN8(offsetof(struct kdbus_cmd_make, items) +
+ offsetof(struct kdbus_item, data64) + sizeof(uint64_t) +
offsetof(struct kdbus_item, str) +
DECIMAL_STR_MAX(uid_t) + 1 + strlen(name) + 1));
offsetof(struct kdbus_item, str) +
DECIMAL_STR_MAX(uid_t) + 1 + strlen(name) + 1));
+ make->size = offsetof(struct kdbus_cmd_make, items);
+
n = make->items;
n = make->items;
+ n->size = offsetof(struct kdbus_item, data64) + sizeof(uint64_t);
+ n->type = KDBUS_ITEM_BLOOM_SIZE;
+ n->data64[0] = BLOOM_SIZE;
+ assert_cc(BLOOM_SIZE % 8 == 0);
+ make->size += ALIGN8(n->size);
+
+ n = KDBUS_ITEM_NEXT(n);
sprintf(n->str, "%lu-%s", (unsigned long) getuid(), name);
n->size = offsetof(struct kdbus_item, str) + strlen(n->str) + 1;
n->type = KDBUS_ITEM_MAKE_NAME;
sprintf(n->str, "%lu-%s", (unsigned long) getuid(), name);
n->size = offsetof(struct kdbus_item, str) + strlen(n->str) + 1;
n->type = KDBUS_ITEM_MAKE_NAME;
+ make->size += ALIGN8(n->size);
- make->size = ALIGN8(offsetof(struct kdbus_cmd_bus_make, items) + n->size);
make->flags = KDBUS_MAKE_POLICY_OPEN;
make->flags = KDBUS_MAKE_POLICY_OPEN;
- make->bloom_size = BLOOM_SIZE;
- assert_cc(BLOOM_SIZE % 8 == 0);
if (ioctl(fd, KDBUS_CMD_BUS_MAKE, make) < 0) {
close_nointr_nofail(fd);
if (ioctl(fd, KDBUS_CMD_BUS_MAKE, make) < 0) {
close_nointr_nofail(fd);
@@
-1141,7
+1149,7
@@
int bus_kernel_create_starter(const char *bus, const char *name) {
n = hello->items;
strcpy(n->str, name);
n->size = offsetof(struct kdbus_item, str) + strlen(n->str) + 1;
n = hello->items;
strcpy(n->str, name);
n->size = offsetof(struct kdbus_item, str) + strlen(n->str) + 1;
- n->type = KDBUS_ITEM_
ACTIVATOR_
NAME;
+ n->type = KDBUS_ITEM_NAME;
hello->size = ALIGN8(offsetof(struct kdbus_cmd_hello, items) + n->size);
hello->conn_flags = KDBUS_HELLO_ACTIVATOR;
hello->size = ALIGN8(offsetof(struct kdbus_cmd_hello, items) + n->size);
hello->conn_flags = KDBUS_HELLO_ACTIVATOR;
@@
-1169,7
+1177,7
@@
int bus_kernel_create_starter(const char *bus, const char *name) {
}
int bus_kernel_create_namespace(const char *name, char **s) {
}
int bus_kernel_create_namespace(const char *name, char **s) {
- struct kdbus_cmd_
ns_
make *make;
+ struct kdbus_cmd_make *make;
struct kdbus_item *n;
int fd;
struct kdbus_item *n;
int fd;
@@
-1180,7
+1188,7
@@
int bus_kernel_create_namespace(const char *name, char **s) {
if (fd < 0)
return -errno;
if (fd < 0)
return -errno;
- make = alloca0(ALIGN8(offsetof(struct kdbus_cmd_
ns_
make, items) +
+ make = alloca0(ALIGN8(offsetof(struct kdbus_cmd_make, items) +
offsetof(struct kdbus_item, str) +
strlen(name) + 1));
offsetof(struct kdbus_item, str) +
strlen(name) + 1));
@@
-1189,7
+1197,7
@@
int bus_kernel_create_namespace(const char *name, char **s) {
n->size = offsetof(struct kdbus_item, str) + strlen(n->str) + 1;
n->type = KDBUS_ITEM_MAKE_NAME;
n->size = offsetof(struct kdbus_item, str) + strlen(n->str) + 1;
n->type = KDBUS_ITEM_MAKE_NAME;
- make->size = ALIGN8(offsetof(struct kdbus_cmd_
ns_
make, items) + n->size);
+ make->size = ALIGN8(offsetof(struct kdbus_cmd_make, items) + n->size);
make->flags = KDBUS_MAKE_POLICY_OPEN | KDBUS_MAKE_ACCESS_WORLD;
if (ioctl(fd, KDBUS_CMD_NS_MAKE, make) < 0) {
make->flags = KDBUS_MAKE_POLICY_OPEN | KDBUS_MAKE_ACCESS_WORLD;
if (ioctl(fd, KDBUS_CMD_NS_MAKE, make) < 0) {