X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fcreate.c;h=d66f0309e28de3613468fdd4f3ba06d4ccf51040;hb=9d035200e9006c4d4cf6951c54641e06c0bdf2bc;hp=95a0a6ab37d541944bb3d29ad5ad4d945a2ab241;hpb=40b03f52807cb22b37d0522084d407cfad5f12c2;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c
index 95a0a6ab3..d66f0309e 100644
--- a/src/bin/lttng/commands/create.c
+++ b/src/bin/lttng/commands/create.c
@@ -112,7 +112,7 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "    TCP for both control (PORT1) and data port (PORT2).\n");
 	fprintf(ofp, "    The default ports are respectively 5342 and 5343.\n");
 	fprintf(ofp, "\n");
-	fprintf(ofp, "  > tcp[4|6]://...\n");
+	fprintf(ofp, "  > tcp[6]://...\n");
 	fprintf(ofp, "    Can only be used with -C and -D together\n");
 	fprintf(ofp, "\n");
 	fprintf(ofp, "NOTE: IPv6 address MUST be enclosed in brackets '[]' (rfc2732)\n");
@@ -271,13 +271,17 @@ static int create_session(void)
 			PERROR("snprintf session name");
 			goto error;
 		}
-		session_name = strdup(DEFAULT_SESSION_NAME);
-		if (session_name == NULL) {
-			PERROR("strdup session name");
-			goto error;
-		}
+		session_name = session_name_date;
 		DBG("Auto session name set to %s", session_name_date);
 	} else {
+		if (strncmp(opt_session_name, DEFAULT_SESSION_NAME,
+					strlen(DEFAULT_SESSION_NAME)) == 0 &&
+				strlen(opt_session_name) == strlen(DEFAULT_SESSION_NAME)) {
+			ERR("%s is a reserved keyword for default session(s)",
+					DEFAULT_SESSION_NAME);
+			ret = CMD_ERROR;
+			goto error;
+		}
 		session_name = opt_session_name;
 		ret = snprintf(session_name_date, sizeof(session_name_date),
 				"%s-%s", session_name, datetime);
@@ -338,21 +342,19 @@ static int create_session(void)
 	if (ret < 0) {
 		/* Don't set ret so lttng can interpret the sessiond error. */
 		switch (-ret) {
-		case LTTCOMM_EXIST_SESS:
+		case LTTNG_ERR_EXIST_SESS:
 			WARN("Session %s already exists", session_name);
 			break;
 		}
 		goto error;
 	}
 
-	if (opt_session_name == NULL) {
-		MSG("Session %s created.", session_name_date);
-	} else {
-		MSG("Session %s created.", session_name);
+	MSG("Session %s created.", session_name);
+	if (print_str_url) {
+		MSG("Traces will be written in %s", print_str_url);
 	}
-	MSG("Traces will be written in %s", print_str_url);
 
-	if (opt_ctrl_url || opt_data_url) {
+	if (opt_ctrl_url && opt_data_url) {
 		/* Setting up control URI (-C or/and -D opt) */
 		ret = set_consumer_url(session_name, opt_ctrl_url, opt_data_url);
 		if (ret < 0) {
@@ -363,6 +365,11 @@ static int create_session(void)
 		if (ret < 0) {
 			goto error;
 		}
+	} else if ((!opt_ctrl_url && opt_data_url) ||
+			(opt_ctrl_url && !opt_data_url)) {
+		ERR("You need both control and data URL.");
+		ret = CMD_ERROR;
+		goto error;
 	}
 
 	if (opt_disable_consumer && !opt_no_consumer) {
@@ -372,11 +379,6 @@ static int create_session(void)
 		}
 	}
 
-	if (opt_session_name == NULL) {
-		free(session_name);
-		session_name = session_name_date;
-	}
-
 	/* Init lttng session config */
 	ret = config_init(session_name);
 	if (ret < 0) {
@@ -388,10 +390,6 @@ static int create_session(void)
 	ret = CMD_SUCCESS;
 
 error:
-	if (opt_session_name == NULL && session_name != session_name_date) {
-		free(session_name);
-	}
-
 	if (alloc_url) {
 		free(alloc_url);
 	}
@@ -399,6 +397,7 @@ error:
 	if (traces_path) {
 		free(traces_path);
 	}
+	free(alloc_path);
 
 	if (ret < 0) {
 		ERR("%s", lttng_strerror(ret));