X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=b275874e7bc98dc3062b27c7529479326ef1b9bc;hb=80e327fa80045f6b470ac76963fc4b5d396a80a9;hp=2ef18ae09f5a9291073c6763c863a1e5a610048d;hpb=e71aad1fa4b06a5f91ddceace42366f3d79bd77e;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 2ef18ae09..b275874e7 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -100,16 +100,22 @@ static struct consumer_data kconsumer_data = {
 	.type = LTTNG_CONSUMER_KERNEL,
 	.err_unix_sock_path = DEFAULT_KCONSUMERD_ERR_SOCK_PATH,
 	.cmd_unix_sock_path = DEFAULT_KCONSUMERD_CMD_SOCK_PATH,
+	.err_sock = -1,
+	.cmd_sock = -1,
 };
 static struct consumer_data ustconsumer64_data = {
 	.type = LTTNG_CONSUMER64_UST,
 	.err_unix_sock_path = DEFAULT_USTCONSUMERD64_ERR_SOCK_PATH,
 	.cmd_unix_sock_path = DEFAULT_USTCONSUMERD64_CMD_SOCK_PATH,
+	.err_sock = -1,
+	.cmd_sock = -1,
 };
 static struct consumer_data ustconsumer32_data = {
 	.type = LTTNG_CONSUMER32_UST,
 	.err_unix_sock_path = DEFAULT_USTCONSUMERD32_ERR_SOCK_PATH,
 	.cmd_unix_sock_path = DEFAULT_USTCONSUMERD32_CMD_SOCK_PATH,
+	.err_sock = -1,
+	.cmd_sock = -1,
 };
 
 static int dispatch_thread_exit;
@@ -332,7 +338,8 @@ static void teardown_kernel_session(struct ltt_session *session)
 	 * If a custom kernel consumer was registered, close the socket before
 	 * tearing down the complete kernel session structure
 	 */
-	if (session->kernel_session->consumer_fd != kconsumer_data.cmd_sock) {
+	if (kconsumer_data.cmd_sock >= 0 &&
+			session->kernel_session->consumer_fd != kconsumer_data.cmd_sock) {
 		lttcomm_close_unix_sock(session->kernel_session->consumer_fd);
 	}
 
@@ -581,12 +588,12 @@ static int send_kconsumer_session_streams(struct consumer_data *consumer_data,
 
 	DBG("Sending metadata stream fd");
 
-	/* Extra protection. It's NOT supposed to be set to 0 at this point */
-	if (session->consumer_fd == 0) {
+	/* Extra protection. It's NOT supposed to be set to -1 at this point */
+	if (session->consumer_fd < 0) {
 		session->consumer_fd = consumer_data->cmd_sock;
 	}
 
-	if (session->metadata_stream_fd != 0) {
+	if (session->metadata_stream_fd >= 0) {
 		/* Send metadata channel fd */
 		lkm.cmd_type = LTTNG_CONSUMER_ADD_CHANNEL;
 		lkm.u.channel.channel_key = session->metadata->fd;
@@ -760,8 +767,8 @@ static int update_kernel_stream(struct consumer_data *consumer_data, int fd)
 			continue;
 		}
 
-		/* This is not suppose to be 0 but this is an extra security check */
-		if (session->kernel_session->consumer_fd == 0) {
+		/* This is not suppose to be -1 but this is an extra security check */
+		if (session->kernel_session->consumer_fd < 0) {
 			session->kernel_session->consumer_fd = consumer_data->cmd_sock;
 		}
 
@@ -1439,6 +1446,7 @@ static void *thread_registration_apps(void *data)
 					}
 
 					ust_cmd->sock = sock;
+					sock = -1;
 
 					DBG("UST registration received with pid:%d ppid:%d uid:%d"
 							" gid:%d sock:%d name:%s (version %d.%d)",
@@ -1473,7 +1481,7 @@ error:
 			PERROR("close");
 		}
 	}
-	if (clock >= 0) {
+	if (sock >= 0) {
 		ret = close(sock);
 		if (ret) {
 			PERROR("close");
@@ -1845,7 +1853,11 @@ error_open:
 error:
 	WARN("No kernel tracer available");
 	kernel_tracer_fd = -1;
-	return LTTCOMM_KERN_NA;
+	if (!is_root) {
+		return LTTCOMM_NEED_ROOT_SESSIOND;
+	} else {
+		return LTTCOMM_KERN_NA;
+	}
 }
 
 /*
@@ -1858,10 +1870,10 @@ static int init_kernel_tracing(struct ltt_kernel_session *session)
 	if (session->consumer_fds_sent == 0) {
 		/*
 		 * Assign default kernel consumer socket if no consumer assigned to the
-		 * kernel session. At this point, it's NOT suppose to be 0 but this is
+		 * kernel session. At this point, it's NOT supposed to be -1 but this is
 		 * an extra security check.
 		 */
-		if (session->consumer_fd == 0) {
+		if (session->consumer_fd < 0) {
 			session->consumer_fd = kconsumer_data.cmd_sock;
 		}
 
@@ -1949,7 +1961,7 @@ static int create_kernel_session(struct ltt_session *session)
 	}
 
 	/* Set kernel consumer socket fd */
-	if (kconsumer_data.cmd_sock) {
+	if (kconsumer_data.cmd_sock >= 0) {
 		session->kernel_session->consumer_fd = kconsumer_data.cmd_sock;
 	}
 
@@ -2838,7 +2850,8 @@ static int cmd_start_trace(struct ltt_session *session)
 	usess = session->ust_session;
 
 	if (session->enabled) {
-		ret = LTTCOMM_UST_START_FAIL;
+		/* Already started. */
+		ret = LTTCOMM_TRACE_ALREADY_STARTED;
 		goto error;
 	}
 
@@ -2858,7 +2871,7 @@ static int cmd_start_trace(struct ltt_session *session)
 		}
 
 		/* Open kernel metadata stream */
-		if (ksession->metadata_stream_fd == 0) {
+		if (ksession->metadata_stream_fd < 0) {
 			ret = kernel_open_metadata_stream(ksession);
 			if (ret < 0) {
 				ERR("Kernel create metadata stream failed");
@@ -2930,7 +2943,7 @@ static int cmd_stop_trace(struct ltt_session *session)
 	usess = session->ust_session;
 
 	if (!session->enabled) {
-		ret = LTTCOMM_UST_STOP_FAIL;
+		ret = LTTCOMM_TRACE_ALREADY_STOPPED;
 		goto error;
 	}
 
@@ -3255,7 +3268,11 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 
 	if (opt_no_kernel && need_domain
 			&& cmd_ctx->lsm->domain.type == LTTNG_DOMAIN_KERNEL) {
-		ret = LTTCOMM_KERN_NA;
+		if (!is_root) {
+			ret = LTTCOMM_NEED_ROOT_SESSIOND;
+		} else {
+			ret = LTTCOMM_KERN_NA;
+		}
 		goto error;
 	}
 
@@ -3317,7 +3334,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 	switch (cmd_ctx->lsm->domain.type) {
 	case LTTNG_DOMAIN_KERNEL:
 		if (!is_root) {
-			ret = LTTCOMM_KERN_NA;
+			ret = LTTCOMM_NEED_ROOT_SESSIOND;
 			goto error;
 		}