{"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}
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");
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;
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 (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))) {
+ 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);
case LTTNG_ERR_EXIST_SESS:
WARN("Session %s already exists", session_name);
break;
+ default:
+ ERR("%s", lttng_strerror(ret));
+ 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) {
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) {
}
}
- 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) {
ret = CMD_SUCCESS;
error:
- if (opt_session_name == NULL && session_name != session_name_date) {
- free(session_name);
- }
-
if (alloc_url) {
free(alloc_url);
}