X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fcreate.c;h=805cdb1d27157e73c674a93d6c13195b5d27fe36;hb=0c7bcad5eaa11b368460759fc87f949e8c56b98f;hp=5588d4267bae2d304facb6ea73866f175f46e2e8;hpb=785d2d0dc3aec3a4e44fcf677155dd07e8e4cc1f;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c
index 5588d4267..805cdb1d2 100644
--- a/src/bin/lttng/commands/create.c
+++ b/src/bin/lttng/commands/create.c
@@ -52,9 +52,9 @@ static struct poptOption long_options[] = {
 	{"help", 'h', POPT_ARG_NONE, NULL, OPT_HELP, NULL, NULL},
 	{"output", 'o', POPT_ARG_STRING, &opt_output_path, 0, NULL, NULL},
 	{"list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL},
-	{"set-uri",        'U', POPT_ARG_STRING, &opt_url, 0, 0, 0},
-	{"ctrl-uri",       'C', POPT_ARG_STRING, &opt_ctrl_url, 0, 0, 0},
-	{"data-uri",       'D', POPT_ARG_STRING, &opt_data_url, 0, 0, 0},
+	{"set-url",        'U', POPT_ARG_STRING, &opt_url, 0, 0, 0},
+	{"ctrl-url",       'C', POPT_ARG_STRING, &opt_ctrl_url, 0, 0, 0},
+	{"data-url",       'D', POPT_ARG_STRING, &opt_data_url, 0, 0, 0},
 	{"no-consumer",      0, POPT_ARG_VAL, &opt_no_consumer, 1, 0, 0},
 	{"disable-consumer", 0, POPT_ARG_VAL, &opt_disable_consumer, 1, 0, 0},
 	{0, 0, 0, 0, 0, 0, 0}
@@ -91,11 +91,6 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "                       You can change it with the enable-consumer cmd\n");
 	fprintf(ofp, "  -C, --ctrl-url=URL   Set control path URL. (Must use -D also)\n");
 	fprintf(ofp, "  -D, --data-url=URL   Set data path URL. (Must use -C also)\n");
-	fprintf(ofp, "      --no-consumer    Don't activate a consumer for this session.\n");
-	fprintf(ofp, "                       OBSELETE\n");
-	fprintf(ofp, "      --disable-consumer\n");
-	fprintf(ofp, "                       Disable consumer for this session.\n");
-	fprintf(ofp, "                       OBSELETE\n");
 	fprintf(ofp, "\n");
 	fprintf(ofp, "Please refer to the man page (lttng(1)) for more information on network\n");
 	fprintf(ofp, "streaming mechanisms and explanation of the control and data port\n");
@@ -183,7 +178,7 @@ static int create_session(void)
 	int ret;
 	char *session_name = NULL, *traces_path = NULL, *alloc_path = NULL;
 	char *alloc_url = NULL, *url = NULL, datetime[16];
-	char session_name_date[NAME_MAX], *print_str_url = NULL;
+	char session_name_date[NAME_MAX + 17], *print_str_url = NULL;
 	time_t rawtime;
 	struct tm *timeinfo;
 
@@ -203,9 +198,22 @@ static int create_session(void)
 		session_name = session_name_date;
 		DBG("Auto session name set to %s", session_name_date);
 	} else {
-		if (strncmp(opt_session_name, DEFAULT_SESSION_NAME,
+		if (strlen(opt_session_name) > NAME_MAX) {
+			ERR("Session name too long. Length must be lower or equal to %d",
+					NAME_MAX);
+			ret = LTTNG_ERR_SESSION_FAIL;
+			goto error;
+		}
+		/*
+		 * Check if the session name begins with "auto-" or is exactly "auto".
+		 * Both are reserved for the default session name. See bug #449 to
+		 * understand why we need to check both here.
+		 */
+		if ((strncmp(opt_session_name, DEFAULT_SESSION_NAME "-",
+					strlen(DEFAULT_SESSION_NAME) + 1) == 0) ||
+				(strncmp(opt_session_name, DEFAULT_SESSION_NAME,
 					strlen(DEFAULT_SESSION_NAME)) == 0 &&
-				strlen(opt_session_name) == strlen(DEFAULT_SESSION_NAME)) {
+				strlen(opt_session_name) == strlen(DEFAULT_SESSION_NAME))) {
 			ERR("%s is a reserved keyword for default session(s)",
 					DEFAULT_SESSION_NAME);
 			ret = CMD_ERROR;
@@ -240,7 +248,7 @@ static int create_session(void)
 	} else if (opt_url) { /* Handling URL (-U opt) */
 		url = opt_url;
 		print_str_url = url;
-	} else if (opt_ctrl_url == NULL && opt_data_url == NULL) {
+	} else {
 		/* Auto output path */
 		alloc_path = config_get_default_path();
 		if (alloc_path == NULL) {
@@ -261,10 +269,16 @@ static int create_session(void)
 		}
 
 		url = alloc_url;
-		print_str_url = alloc_url + strlen("file://");
+		if (!opt_data_url && !opt_ctrl_url) {
+			print_str_url = alloc_url + strlen("file://");
+		}
 	}
 
-	assert(url);
+	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;
+	}
 
 	ret = _lttng_create_session_ext(session_name, url, datetime);
 	if (ret < 0) {
@@ -273,26 +287,25 @@ static int create_session(void)
 		case LTTNG_ERR_EXIST_SESS:
 			WARN("Session %s already exists", session_name);
 			break;
+		default:
+			break;
 		}
 		goto error;
 	}
 
-	MSG("Session %s created.", session_name);
-	if (print_str_url) {
-		MSG("Traces will be written in %s", print_str_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) {
+			/* Destroy created session because the URL are not valid. */
+			lttng_destroy_session(session_name);
 			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;
+	}
+
+	MSG("Session %s created.", session_name);
+	if (print_str_url) {
+		MSG("Traces will be written in %s", print_str_url);
 	}
 
 	/* Init lttng session config */
@@ -302,7 +315,6 @@ static int create_session(void)
 		goto error;
 	}
 
-
 	ret = CMD_SUCCESS;
 
 error: