X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=17cb51915555393a96f924c2fd47a2afa6afeb5a;hp=2e927955594c286ecd4bbd7ca2bae0137b3874a1;hb=ca2eb7f43cf00d12f563905d741a6789c3d130ee;hpb=394016d17dedc581b892f2ca7889f715c77a08fd

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index 2e9279555..17cb51915 100644
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -28,7 +28,7 @@
 #define _GNU_SOURCE
 #include <limits.h>
 #include <lttng/lttng.h>
-#include <sys/socket.h>
+#include <common/compat/socket.h>
 
 /* Queue size of listen(2) */
 #define LTTNG_SESSIOND_COMM_MAX_LISTEN 64
@@ -75,7 +75,7 @@ enum lttcomm_return_code {
 	LTTCOMM_UNKNOWN_DOMAIN,         /* Tracing domain not known */
 	LTTCOMM_ALLOC_FAIL,				/* Trace allocation fail */
 	LTTCOMM_NO_SESSION,				/* No session found */
-	LTTCOMM_CREATE_FAIL,			/* Create trace fail */
+	LTTCOMM_CREATE_DIR_FAIL,        /* Create directory fail */
 	LTTCOMM_SESSION_FAIL,			/* Create session fail */
 	LTTCOMM_START_FAIL,				/* Start tracing fail */
 	LTTCOMM_STOP_FAIL,				/* Stop tracing fail */
@@ -111,6 +111,8 @@ enum lttcomm_return_code {
 	LTTCOMM_KERN_DIR_EXIST,			/* Kernel trace directory exist */
 	LTTCOMM_KERN_NO_SESSION,		/* No kernel session found */
 	LTTCOMM_KERN_LIST_FAIL,			/* Kernel listing events failed */
+	LTTCOMM_UST_CALIBRATE_FAIL,     /* UST calibration failed */
+	LTTCOMM_UST_VERSION,            /* UST tracer version is not compatible */
 	LTTCOMM_UST_SESS_FAIL,			/* UST create session failed */
 	LTTCOMM_UST_CHAN_EXIST,         /* UST channel already exist */
 	LTTCOMM_UST_CHAN_FAIL,			/* UST create channel failed */
@@ -133,6 +135,7 @@ enum lttcomm_return_code {
 	LTTCOMM_UST_EVENT_EXIST,        /* UST event exist */
 	LTTCOMM_UST_EVENT_NOT_FOUND,    /* UST event not found */
 	LTTCOMM_UST_CONTEXT_EXIST,      /* UST context exist */
+	LTTCOMM_UST_CONTEXT_INVAL,      /* UST context invalid */
 
 	CONSUMERD_COMMAND_SOCK_READY,		/* when consumerd command socket ready */
 	CONSUMERD_SUCCESS_RECV_FD,		/* success on receiving fds */
@@ -148,6 +151,7 @@ enum lttcomm_return_code {
 	CONSUMERD_SPLICE_EINVAL,		/* EINVAL from splice(2) */
 	CONSUMERD_SPLICE_ENOMEM,		/* ENOMEM from splice(2) */
 	CONSUMERD_SPLICE_ESPIPE,		/* ESPIPE from splice(2) */
+	LTTCOMM_NEED_ROOT_SESSIOND,		/* root sessiond is needed */
 	/* MUST be last element */
 	LTTCOMM_NR,						/* Last element */
 };
@@ -288,7 +292,7 @@ extern ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len);
 
 extern ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len);
 extern ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
-		struct ucred *creds);
+		lttng_sock_cred *creds);
 
 extern const char *lttcomm_get_readable_code(enum lttcomm_return_code code);
 extern int lttcomm_setsockopt_creds_unix_sock(int sock);