X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=2b66b92c07d5e4b41043256c9a2695d0080f6746;hb=8b703175f140287205a8dba654f0201b9947761d;hp=46799dc63982e0a4729c7030abdb408074baf547;hpb=727d5404ea9a553a2ba569b00c4cd2fa69139bce;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 46799dc63..2b66b92c0 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -1275,6 +1275,13 @@ int ust_app_register(struct ust_register_msg *msg, int sock)
 		close(sock);
 		return -EINVAL;
 	}
+	if (msg->major != LTTNG_UST_COMM_MAJOR) {
+		ERR("Registration failed: application \"%s\" (pid: %d) has "
+			"communication protocol version %u.%u, but sessiond supports 2.x.\n",
+			msg->name, msg->pid, msg->major, msg->minor);
+		close(sock);
+		return -EINVAL;
+	}
 	lta = zmalloc(sizeof(struct ust_app));
 	if (lta == NULL) {
 		PERROR("malloc");
@@ -1420,8 +1427,7 @@ int ust_app_list_events(struct lttng_event **events)
 				}
 			}
 			memcpy(tmp[count].name, uiter.name, LTTNG_UST_SYM_NAME_LEN);
-			memcpy(tmp[count].loglevel, uiter.loglevel, LTTNG_UST_SYM_NAME_LEN);
-			tmp[count].loglevel_value = uiter.loglevel_value;
+			tmp[count].loglevel = uiter.loglevel;
 			tmp[count].type = LTTNG_UST_TRACEPOINT;
 			tmp[count].pid = app->key.pid;
 			tmp[count].enabled = -1;
@@ -2202,7 +2208,7 @@ int ust_app_destroy_trace_all(struct ltt_ust_session *usess)
  */
 void ust_app_global_update(struct ltt_ust_session *usess, int sock)
 {
-	int ret = 0, ctx_on_chan = 0;
+	int ret = 0;
 	struct lttng_ht_iter iter, uiter, iter_ctx;
 	struct ust_app *app;
 	struct ust_app_session *ua_sess;
@@ -2277,9 +2283,6 @@ void ust_app_global_update(struct ltt_ust_session *usess, int sock)
 				}
 			}
 		}
-
-		/* Reset flag */
-		ctx_on_chan = 0;
 	}
 
 	if (usess->start_trace) {