chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-rtnl: recv_message - drop message when peeking fails
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-kernel.h
diff --git
a/src/libsystemd/sd-bus/bus-kernel.h
b/src/libsystemd/sd-bus/bus-kernel.h
index b5163964e7fdcb2ff2ef50e5b3c73545bd8a97b6..7b1e9ef981fb87efd8cb10e2ca24c9b6928be3cb 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-kernel.h
+++ b/
src/libsystemd/sd-bus/bus-kernel.h
@@
-30,7
+30,8
@@
#define KDBUS_ITEM_FOREACH(part, head, first) \
for (part = (head)->first; \
#define KDBUS_ITEM_FOREACH(part, head, first) \
for (part = (head)->first; \
- (uint8_t *)(part) < (uint8_t *)(head) + (head)->size; \
+ ((uint8_t *)(part) < (uint8_t *)(head) + (head)->size) && \
+ ((uint8_t *) part >= (uint8_t *) head); \
part = KDBUS_ITEM_NEXT(part))
#define KDBUS_ITEM_HEADER_SIZE offsetof(struct kdbus_item, data)
part = KDBUS_ITEM_NEXT(part))
#define KDBUS_ITEM_HEADER_SIZE offsetof(struct kdbus_item, data)
@@
-44,7
+45,7
@@
/* This determines at which minimum size we prefer sending memfds over
* sending vectors */
/* This determines at which minimum size we prefer sending memfds over
* sending vectors */
-#define MEMFD_MIN_SIZE (
128
*1024)
+#define MEMFD_MIN_SIZE (
512
*1024)
/* The size of the per-connection memory pool that we set up and where
* the kernel places our incoming messages */
/* The size of the per-connection memory pool that we set up and where
* the kernel places our incoming messages */
@@
-61,12
+62,12
@@
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, bool hint_sync_call);
int bus_kernel_take_fd(sd_bus *b);
int bus_kernel_write_message(sd_bus *bus, sd_bus_message *m, bool hint_sync_call);
-int bus_kernel_read_message(sd_bus *bus);
+int bus_kernel_read_message(sd_bus *bus, bool hint_priority, int64_t priority);
+
+int bus_kernel_open_bus_fd(const char *bus, char **path);
int bus_kernel_create_bus(const char *name, bool world, char **s);
int bus_kernel_create_bus(const char *name, bool world, char **s);
-int bus_kernel_create_namespace(const char *name, char **s);
-int bus_kernel_create_starter(const char *bus, const char *name);
-int bus_kernel_create_monitor(const char *bus);
+int bus_kernel_create_endpoint(const char *bus_name, const char *ep_name, char **path);
int bus_kernel_pop_memfd(sd_bus *bus, void **address, size_t *mapped, size_t *allocated);
void bus_kernel_push_memfd(sd_bus *bus, int fd, void *address, size_t mapped, size_t allocated);
int bus_kernel_pop_memfd(sd_bus *bus, void **address, size_t *mapped, size_t *allocated);
void bus_kernel_push_memfd(sd_bus *bus, int fd, void *address, size_t mapped, size_t allocated);
@@
-75,7
+76,17
@@
void bus_kernel_flush_memfd(sd_bus *bus);
int bus_kernel_parse_unique_name(const char *s, uint64_t *id);
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 *kd
bus_flags);
-
int kdbus_translate_attach_flags(uint64_t sd_bus_flags, uint64_t *kd
bus_flags);
+
uint64_t request_name_flags_to_kdbus(uint64_t sd_
bus_flags);
+
uint64_t attach_flags_to_kdbus(uint64_t sd_
bus_flags);
int bus_kernel_try_close(sd_bus *bus);
int bus_kernel_try_close(sd_bus *bus);
+
+int bus_kernel_drop_one(int fd);
+
+int bus_kernel_realize_attach_flags(sd_bus *bus);
+
+int bus_kernel_fix_attach_mask(void);
+
+int bus_kernel_get_bus_name(sd_bus *bus, char **name);
+
+int bus_kernel_cmd_free(sd_bus *bus, uint64_t offset);