X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=bb012b5d84fc0e8b92ace19dde174c2dcb633fef;hb=d32fb0935e594470f6a7e9ff0797ef101c500797;hp=8e329a29f08adb661b2c053b3c361b616aa64027;hpb=dad47fc4c65ec0acbfedc676895833b465d25cd6;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 8e329a29f..bb012b5d8 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -865,6 +865,8 @@ static struct ust_app_session *create_ust_app_session(
 		ret = ustctl_create_session(app->key.sock);
 		if (ret < 0) {
 			ERR("Creating session for app pid %d", app->key.pid);
+			/* This means that the tracer is gone... */
+			ua_sess = (void*) -1UL;
 			goto error;
 		}
 
@@ -1275,6 +1277,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,9 +1429,8 @@ 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 = uiter.loglevel;
 			tmp[count].type = LTTNG_UST_TRACEPOINT;
-			tmp[count].loglevel_value = uiter.loglevel_value;
 			tmp[count].pid = app->key.pid;
 			tmp[count].enabled = -1;
 			count++;
@@ -1751,8 +1759,11 @@ int ust_app_create_channel_glb(struct ltt_ust_session *usess,
 		 */
 		ua_sess = create_ust_app_session(usess, app);
 		if (ua_sess == NULL) {
-			/* Major problem here and it's maybe the tracer or malloc() */
+			/* The malloc() failed. */
 			goto error;
+		} else if (ua_sess == (void *) -1UL) {
+			/* The application's socket is not valid. Contiuing */
+			continue;
 		}
 
 		/* Create channel onto application */