bus: implicitly handle peer commands Ping() and GetMachineId()

[elogind.git] / src / libsystemd-bus / bus-internal.h

diff --git a/src/libsystemd-bus/bus-internal.h b/src/libsystemd-bus/bus-internal.h
index d8cdc48ce0441972ae4979c102cf6e2fefb890e0..636e998c302e89fe5985d4d191299595d9909a7c 100644 (file)
--- a/src/libsystemd-bus/bus-internal.h
+++ b/src/libsystemd-bus/bus-internal.h
@@ -26,6 +26,7 @@
 #include <netinet/in.h>
 
 #include "hashmap.h"
+#include "prioq.h"
 #include "list.h"
 #include "util.h"
 
@@ -37,6 +38,7 @@ struct reply_callback {
         void *userdata;
         usec_t timeout;
         uint64_t serial;
+        unsigned prioq_idx;
 };
 
 struct filter_callback {
@@ -50,8 +52,7 @@ enum bus_state {
         BUS_OPENING,
         BUS_AUTHENTICATING,
         BUS_HELLO,
-        BUS_RUNNING,
-        BUS_CLOSED
+        BUS_RUNNING
 };
 
 struct sd_bus {
@@ -60,7 +61,7 @@ struct sd_bus {
         int fd;
         int message_version;
         bool can_fds:1;
-        bool send_hello:1;
+        bool sent_hello:1;
 
         void *rbuffer;
         size_t rbuffer_size;
@@ -76,6 +77,7 @@ struct sd_bus {
 
         char *unique_name;
 
+        Prioq *reply_callbacks_prioq;
         Hashmap *reply_callbacks;
         LIST_HEAD(struct filter_callback, filter_callbacks);
 
@@ -98,4 +100,20 @@ struct sd_bus {
         unsigned auth_index;
         size_t auth_size;
         char *auth_uid;
+        usec_t auth_timeout;
 };
+
+static inline void bus_unrefp(sd_bus **b) {
+        sd_bus_unref(*b);
+}
+
+#define _cleanup_bus_unref_ __attribute__((cleanup(bus_unrefp)))
+#define _cleanup_bus_error_free_ __attribute__((cleanup(sd_bus_error_free)))
+
+#define BUS_DEFAULT_TIMEOUT ((usec_t) (25 * USEC_PER_SEC))
+
+#define BUS_WQUEUE_MAX 128
+#define BUS_RQUEUE_MAX 128
+
+#define BUS_MESSAGE_SIZE_MAX (64*1024*1024)
+#define BUS_AUTH_SIZE_MAX (64*1024)