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

diff --git a/src/bin/lttng-sessiond/dispatch.c b/src/bin/lttng-sessiond/dispatch.c
index 22380fcdd..e764af7f2 100644
--- a/src/bin/lttng-sessiond/dispatch.c
+++ b/src/bin/lttng-sessiond/dispatch.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  * Copyright (C) 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
@@ -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;
 		}
 
@@ -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");