X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Flibsystemd-bus%2Fbus-kernel.h;h=92d3888ed5241525a788b0a750900120e6e9399e;hb=626851be97b4332fc0401d754c81ae7bbc0f5dc4;hp=9515e8f05fd7b44fa3c56a817a3b4e212146ef0b;hpb=832d16a616597f8b29645445f8be4284ee7ae1c0;p=elogind.git diff --git a/src/libsystemd-bus/bus-kernel.h b/src/libsystemd-bus/bus-kernel.h index 9515e8f05..92d3888ed 100644 --- a/src/libsystemd-bus/bus-kernel.h +++ b/src/libsystemd-bus/bus-kernel.h @@ -23,16 +23,16 @@ #include "sd-bus.h" -#define KDBUS_ITEM_NEXT(item) \ +#define KDBUS_PART_NEXT(item) \ (typeof(item))(((uint8_t *)item) + ALIGN8((item)->size)) -#define KDBUS_ITEM_FOREACH(item, head) \ - for (item = (head)->items; \ - (uint8_t *)(item) < (uint8_t *)(head) + (head)->size; \ - item = KDBUS_ITEM_NEXT(item)) +#define KDBUS_PART_FOREACH(part, head, first) \ + for (part = (head)->first; \ + (uint8_t *)(part) < (uint8_t *)(head) + (head)->size; \ + part = KDBUS_PART_NEXT(part)) -#define KDBUS_ITEM_HEADER_SIZE offsetof(struct kdbus_item, data) -#define KDBUS_ITEM_SIZE(s) ALIGN8((s) + KDBUS_ITEM_HEADER_SIZE) +#define KDBUS_PART_HEADER_SIZE offsetof(struct kdbus_item, data) +#define KDBUS_ITEM_SIZE(s) ALIGN8((s) + KDBUS_PART_HEADER_SIZE) #define MEMFD_CACHE_MAX 32 @@ -42,7 +42,7 @@ /* This determines at which minimum size we prefer sending memfds over * sending vectors */ -#define MEMFD_MIN_SIZE (96*1024) +#define MEMFD_MIN_SIZE (128*1024) /* The size of the per-connection memory pool that we set up and where * the kernel places our incoming messages */ @@ -58,9 +58,10 @@ 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_read_message(sd_bus *bus); -int bus_kernel_create(const char *name, char **s); +int bus_kernel_create_bus(const char *name, char **s); +int bus_kernel_create_namespace(const char *name, char **s); int bus_kernel_pop_memfd(sd_bus *bus, void **address, size_t *size); void bus_kernel_push_memfd(sd_bus *bus, int fd, void *address, size_t size); @@ -68,3 +69,6 @@ void bus_kernel_push_memfd(sd_bus *bus, int fd, void *address, size_t size); void bus_kernel_flush_memfd(sd_bus *bus); int bus_kernel_parse_unique_name(const char *s, uint64_t *id); + +int kdbus_translate_request_name_flags(uint64_t sd_bus_flags, uint64_t *kdbus_flags); +int kdbus_translate_attach_flags(uint64_t sd_bus_flags, uint64_t *kdbus_flags);