X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Flttng-sessiond.h;h=79e7fcb4383b1765a870a44c2c6576f5c6c7b92c;hb=1d76b9222464f9e10128ae867cd56a9317da5d65;hp=6a7006c0b8b90c37151e32610e532e63edb52ab2;hpb=10a8a2237343699e3923d87e24dbf2d7fe225377;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/lttng-sessiond.h b/src/bin/lttng-sessiond/lttng-sessiond.h
index 6a7006c0b..79e7fcb43 100644
--- a/src/bin/lttng-sessiond/lttng-sessiond.h
+++ b/src/bin/lttng-sessiond/lttng-sessiond.h
@@ -24,43 +24,12 @@
 #include <urcu/wfqueue.h>
 
 #include <common/sessiond-comm/sessiond-comm.h>
+#include <common/compat/socket.h>
 
 #include "session.h"
 #include "ust-app.h"
 
-#define DEFAULT_HOME_DIR            "/tmp"
-#define DEFAULT_UST_SOCK_DIR        DEFAULT_HOME_DIR "/ust-app-socks"
-#define DEFAULT_GLOBAL_APPS_PIPE    DEFAULT_UST_SOCK_DIR "/global"
-#define DEFAULT_TRACE_OUTPUT        DEFAULT_HOME_DIR "/lttng"
-
-#define DEFAULT_GLOBAL_APPS_WAIT_SHM_PATH   "/lttng-ust-apps-wait"
-#define DEFAULT_HOME_APPS_WAIT_SHM_PATH     "/lttng-ust-apps-wait-%u"
-
-struct module_param {
-	const char *name;
-	int required;
-};
-
-/* LTTng kernel tracer modules list */
-const struct module_param kernel_modules_list[] = {
-	{ "lttng-ftrace", 0 },
-	{ "lttng-kprobes", 0 },
-	{ "lttng-kretprobes", 0 },
-	{ "lib-ring-buffer", 1 },
-	{ "ltt-relay", 1 },
-	{ "ltt-ring-buffer-client-discard", 1 },
-	{ "ltt-ring-buffer-client-overwrite", 1 },
-	{ "ltt-ring-buffer-metadata-client", 1 },
-	{ "ltt-ring-buffer-client-mmap-discard", 1 },
-	{ "ltt-ring-buffer-client-mmap-overwrite", 1 },
-	{ "ltt-ring-buffer-metadata-mmap-client", 1 },
-	{ "lttng-probe-lttng", 1 },
-	{ "lttng-types", 0 },
-	{ "lttng-probe-block", 0 },
-	{ "lttng-probe-irq", 0 },
-	{ "lttng-probe-kvm", 0 },
-	{ "lttng-probe-sched", 0 },
-};
+const char *module_proc_lttng = "/proc/lttng";
 
 extern const char default_home_dir[],
 	default_tracing_group[],
@@ -74,10 +43,10 @@ extern const char default_home_dir[],
 struct command_ctx {
 	int ust_sock;
 	unsigned int lttng_msg_size;
-	struct ucred creds;
 	struct ltt_session *session;
 	struct lttcomm_lttng_msg *llm;
 	struct lttcomm_session_msg *lsm;
+	lttng_sock_cred creds;
 };
 
 struct ust_command {