X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fdispatch.c;h=a767ccbdd90c4dc7a9d142a94136e65ec07ac180;hp=22380fcdd58d4f1cdc878be9096ad8bf93a05db5;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hpb=412d7227e69ec845e44c49082a417f9454d9b55d

diff --git a/src/bin/lttng-sessiond/dispatch.c b/src/bin/lttng-sessiond/dispatch.c
index 22380fcdd..a767ccbdd 100644
--- a/src/bin/lttng-sessiond/dispatch.c
+++ b/src/bin/lttng-sessiond/dispatch.c
@@ -45,7 +45,7 @@ static void update_ust_app(int app_sock)
 	}
 
 	rcu_read_lock();
-	assert(app_sock >= 0);
+	LTTNG_ASSERT(app_sock >= 0);
 	app = ust_app_find_by_sock(app_sock);
 	if (app == NULL) {
 		/*
@@ -67,7 +67,8 @@ static void update_ust_app(int app_sock)
 			continue;
 		}
 		session_lock(sess);
-		if (!sess->active || !sess->ust_session) {
+		if (!sess->active || !sess->ust_session ||
+				!sess->ust_session->active) {
 			goto unlock_session;
 		}
 
@@ -93,7 +94,7 @@ static void sanitize_wait_queue(struct ust_reg_wait_queue *wait_queue)
 	struct lttng_poll_event events;
 	struct ust_reg_wait_node *wait_node = NULL, *tmp_wait_node;
 
-	assert(wait_queue);
+	LTTNG_ASSERT(wait_queue);
 
 	lttng_poll_init(&events);
 
@@ -109,7 +110,7 @@ static void sanitize_wait_queue(struct ust_reg_wait_queue *wait_queue)
 
 	cds_list_for_each_entry_safe(wait_node, tmp_wait_node,
 			&wait_queue->head, head) {
-		assert(wait_node->app);
+		LTTNG_ASSERT(wait_node->app);
 		ret = lttng_poll_add(&events, wait_node->app->sock,
 				LPOLLHUP | LPOLLERR);
 		if (ret < 0) {
@@ -289,7 +290,7 @@ static void *thread_dispatch_ust_registration(void *data)
 					ust_cmd->sock, ust_cmd->reg_msg.name,
 					ust_cmd->reg_msg.major, ust_cmd->reg_msg.minor);
 
-			if (ust_cmd->reg_msg.type == USTCTL_SOCKET_CMD) {
+			if (ust_cmd->reg_msg.type == LTTNG_UST_CTL_SOCKET_CMD) {
 				wait_node = zmalloc(sizeof(*wait_node));
 				if (!wait_node) {
 					PERROR("zmalloc wait_node dispatch");