bus: validate the entire header more closely

[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 9a12d661e17ec277afdc2f83e7e828985f86c0ac..3c2478e8fd0216cbefbd767c2ed1a1647e9c146f 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 {
@@ -75,6 +77,7 @@ struct sd_bus {
 
         char *unique_name;
 
+        Prioq *reply_callbacks_prioq;
         Hashmap *reply_callbacks;
         LIST_HEAD(struct filter_callback, filter_callbacks);
 
@@ -97,6 +100,7 @@ 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) {
@@ -104,3 +108,23 @@ static inline void bus_unrefp(sd_bus **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)
+
+/* Defined by the specification as maximum size of an array in
+ * bytes */
+#define BUS_ARRAY_MAX_SIZE 67108864
+
+bool object_path_is_valid(const char *p);
+bool interface_name_is_valid(const char *p);
+bool service_name_is_valid(const char *p);
+bool member_name_is_valid(const char *p);
+
+#define error_name_is_valid interface_name_is_valid