sd-resolve: rename get_next() and get_n_queries() + cleanup

[elogind.git] / src / shared / def.h

diff --git a/src/shared/def.h b/src/shared/def.h
index 825db9507f7ff35bbc35d6f34b2bd5ddca88888c..ac325bf8f96028d005ade948b0d55dde85e48840 100644 (file)
--- a/src/shared/def.h
+++ b/src/shared/def.h
@@ -30,7 +30,10 @@
 #define DEFAULT_START_LIMIT_INTERVAL (10*USEC_PER_SEC)
 #define DEFAULT_START_LIMIT_BURST 5
 
-#define DEFAULT_EXIT_USEC (5*USEC_PER_MINUTE)
+/* The default time after which exit-on-idle services exit. This
+ * should be kept lower than the watchdog timeout, because otherwise
+ * the watchdog pings will keep the loop busy. */
+#define DEFAULT_EXIT_USEC (30*USEC_PER_SEC)
 
 #define SYSTEMD_CGROUP_CONTROLLER "name=systemd"
 
@@ -56,3 +59,15 @@
         "/usr/share/kbd/keymaps/\0"             \
         "/usr/lib/kbd/keymaps/\0"
 #endif
+
+#define UNIX_SYSTEM_BUS_PATH "unix:path=/run/dbus/system_bus_socket"
+#define KERNEL_SYSTEM_BUS_PATH "kernel:path=/dev/kdbus/0-system/bus"
+
+#ifdef ENABLE_KDBUS
+#  define DEFAULT_SYSTEM_BUS_PATH KERNEL_SYSTEM_BUS_PATH ";" UNIX_SYSTEM_BUS_PATH
+#else
+#  define DEFAULT_SYSTEM_BUS_PATH UNIX_SYSTEM_BUS_PATH
+#endif
+
+#define UNIX_USER_BUS_FMT "unix:path=%s/bus"
+#define KERNEL_USER_BUS_FMT "kernel:path=/dev/kdbus/%lu-user/bus"