summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-11-28 21:12:03 +0100
committerLennart Poettering <lennart@poettering.net>2014-11-28 21:12:03 +0100
commit22d097a6bbeac0d45c42e1b246403a97e9a16c30 (patch)
tree76d0cc0a65c72ca54fe143288f6b5a074b8871b4
parent46bcf49291874c5a6b5b34ad6413c5a0f7725f4c (diff)
sd-bus: move packet header definition to bus-protocol.h
-rw-r--r--src/libsystemd/sd-bus/bus-message.h14
-rw-r--r--src/libsystemd/sd-bus/bus-protocol.h16
2 files changed, 16 insertions, 14 deletions
diff --git a/src/libsystemd/sd-bus/bus-message.h b/src/libsystemd/sd-bus/bus-message.h
index e54543a047..571d42255c 100644
--- a/src/libsystemd/sd-bus/bus-message.h
+++ b/src/libsystemd/sd-bus/bus-message.h
@@ -52,20 +52,6 @@ struct bus_container {
char *peeked_signature;
};
-struct bus_header {
- uint8_t endian;
- uint8_t type;
- uint8_t flags;
- uint8_t version;
- uint32_t body_size;
-
- /* Note that what the bus spec calls "serial" we'll call
- "cookie" instead, because we don't want to imply that the
- cookie was in any way monotonically increasing. */
- uint32_t serial;
- uint32_t fields_size;
-} _packed_;
-
struct bus_body_part {
struct bus_body_part *next;
void *data;
diff --git a/src/libsystemd/sd-bus/bus-protocol.h b/src/libsystemd/sd-bus/bus-protocol.h
index 75c6ded728..6431dfbff8 100644
--- a/src/libsystemd/sd-bus/bus-protocol.h
+++ b/src/libsystemd/sd-bus/bus-protocol.h
@@ -23,6 +23,22 @@
#include <endian.h>
+/* Packet header */
+
+struct bus_header {
+ uint8_t endian;
+ uint8_t type;
+ uint8_t flags;
+ uint8_t version;
+ uint32_t body_size;
+
+ /* Note that what the bus spec calls "serial" we'll call
+ "cookie" instead, because we don't want to imply that the
+ cookie was in any way monotonically increasing. */
+ uint32_t serial;
+ uint32_t fields_size;
+} _packed_;
+
/* Endianness */
enum {