chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: introduce UID_INVALID (and friends) as macro for (uid_t) -1
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-message.h
diff --git
a/src/libsystemd/sd-bus/bus-message.h
b/src/libsystemd/sd-bus/bus-message.h
index 5322375ef1c576eb596e13bf7d009b85fa6143d5..e54543a047b78b3b7dcb5027eeba25a69fef1f68 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-message.h
+++ b/
src/libsystemd/sd-bus/bus-message.h
@@
-84,7
+84,7
@@
struct sd_bus_message {
sd_bus *bus;
sd_bus *bus;
- uint
32
_t reply_cookie;
+ uint
64
_t reply_cookie;
const char *path;
const char *interface;
const char *path;
const char *interface;
@@
-98,6
+98,9
@@
struct sd_bus_message {
usec_t monotonic;
usec_t realtime;
usec_t monotonic;
usec_t realtime;
+ uint64_t seqnum;
+ int64_t priority;
+ uint64_t verify_destination_id;
bool sealed:1;
bool dont_send:1;
bool sealed:1;
bool dont_send:1;
@@
-141,6
+144,7
@@
struct sd_bus_message {
char sender_buffer[3 + DECIMAL_STR_MAX(uint64_t) + 1];
char destination_buffer[3 + DECIMAL_STR_MAX(uint64_t) + 1];
char sender_buffer[3 + DECIMAL_STR_MAX(uint64_t) + 1];
char destination_buffer[3 + DECIMAL_STR_MAX(uint64_t) + 1];
+ char *destination_ptr;
size_t header_offsets[_BUS_MESSAGE_HEADER_MAX];
unsigned n_header_offsets;
size_t header_offsets[_BUS_MESSAGE_HEADER_MAX];
unsigned n_header_offsets;
@@
-160,7
+164,8
@@
static inline uint64_t BUS_MESSAGE_BSWAP64(sd_bus_message *m, uint64_t u) {
return BUS_MESSAGE_NEED_BSWAP(m) ? bswap_64(u) : u;
}
return BUS_MESSAGE_NEED_BSWAP(m) ? bswap_64(u) : u;
}
-static inline uint32_t BUS_MESSAGE_COOKIE(sd_bus_message *m) {
+static inline uint64_t BUS_MESSAGE_COOKIE(sd_bus_message *m) {
+ /* Note that we return the serial converted to a 64bit value here */
return BUS_MESSAGE_BSWAP32(m, m->header->serial);
}
return BUS_MESSAGE_BSWAP32(m, m->header->serial);
}
@@
-218,7
+223,7
@@
int bus_message_from_malloc(
const char *label,
sd_bus_message **ret);
const char *label,
sd_bus_message **ret);
-
const char* bus_message_get_arg(sd_bus_message *m, unsigned i
);
+
int bus_message_get_arg(sd_bus_message *m, unsigned i, const char **str, char ***strv
);
int bus_message_append_ap(sd_bus_message *m, const char *types, va_list ap);
int bus_message_append_ap(sd_bus_message *m, const char *types, va_list ap);