#include "save.h"
#include "load-session-thread.h"
#include "syscall.h"
+#include "agent.h"
#define CONSUMERD_FILE "lttng-consumerd"
/* Load session thread information to operate. */
struct load_session_thread_data *load_info;
+/* Global hash tables */
+struct lttng_ht *agent_apps_ht_by_sock = NULL;
+
/*
* Whether sessiond is ready for commands/health check requests.
* NR_LTTNG_SESSIOND_READY must match the number of calls to
}
case LTTNG_DATA_PENDING:
{
- ret = cmd_data_pending(cmd_ctx->session);
+ int pending_ret;
+
+ /* 1 byte to return whether or not data is pending */
+ ret = setup_lttng_msg(cmd_ctx, 1);
+ if (ret < 0) {
+ goto setup_error;
+ }
+
+ pending_ret = cmd_data_pending(cmd_ctx->session);
+ /*
+ * FIXME
+ *
+ * This function may returns 0 or 1 to indicate whether or not
+ * there is data pending. In case of error, it should return an
+ * LTTNG_ERR code. However, some code paths may still return
+ * a nondescript error code, which we handle by returning an
+ * "unknown" error.
+ */
+ if (pending_ret == 0 || pending_ret == 1) {
+ ret = LTTNG_OK;
+ } else if (pending_ret < 0) {
+ ret = LTTNG_ERR_UNK;
+ goto setup_error;
+ } else {
+ ret = pending_ret;
+ goto setup_error;
+ }
+
+ *cmd_ctx->llm->payload = (uint8_t) pending_ret;
break;
}
case LTTNG_SNAPSHOT_ADD_OUTPUT:
health_code_update();
- DBG("Sending response (size: %d, retcode: %s)",
+ DBG("Sending response (size: %d, retcode: %s (%d))",
cmd_ctx->lttng_msg_size,
- lttng_strerror(-cmd_ctx->llm->ret_code));
+ lttng_strerror(-cmd_ctx->llm->ret_code),
+ cmd_ctx->llm->ret_code);
ret = send_unix_sock(sock, cmd_ctx->llm, cmd_ctx->lttng_msg_size);
if (ret < 0) {
ERR("Failed to send data back to client");
fprintf(stderr, " --extra-kmod-probes Specify extra kernel module probes to load\n");
}
+static int string_match(const char *str1, const char *str2)
+{
+ return (str1 && str2) && !strcmp(str1, str2);
+}
+
/*
* Take an option from the getopt output and set it in the right variable to be
* used later.
goto end;
}
- switch (opt) {
- case 0:
- fprintf(stderr, "option %s", optname);
- if (arg) {
- fprintf(stderr, " with arg %s\n", arg);
- }
- break;
- case 'c':
+ if (string_match(optname, "client-sock") || opt == 'c') {
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"-c, --client-sock");
} else {
snprintf(client_unix_sock_path, PATH_MAX, "%s", arg);
}
- break;
- case 'a':
+ } else if (string_match(optname, "apps-sock") || opt == 'a') {
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"-a, --apps-sock");
} else {
snprintf(apps_unix_sock_path, PATH_MAX, "%s", arg);
}
- break;
- case 'd':
+ } else if (string_match(optname, "daemonize") || opt == 'd') {
opt_daemon = 1;
- break;
- case 'b':
+ } else if (string_match(optname, "background") || opt == 'b') {
opt_background = 1;
- break;
- case 'g':
+ } else if (string_match(optname, "group") || opt == 'g') {
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"-g, --group");
}
tracing_group_name_override = 1;
}
- break;
- case 'h':
+ } else if (string_match(optname, "help") || opt == 'h') {
usage();
exit(EXIT_SUCCESS);
- case 'V':
+ } else if (string_match(optname, "version") || opt == 'V') {
fprintf(stdout, "%s\n", VERSION);
exit(EXIT_SUCCESS);
- case 'S':
+ } else if (string_match(optname, "sig-parent") || opt == 'S') {
opt_sig_parent = 1;
- break;
- case 'E':
+ } else if (string_match(optname, "kconsumerd-err-sock")) {
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--kconsumerd-err-sock");
} else {
snprintf(kconsumer_data.err_unix_sock_path, PATH_MAX, "%s", arg);
}
- break;
- case 'C':
+ } else if (string_match(optname, "kconsumerd-cmd-sock")) {
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--kconsumerd-cmd-sock");
} else {
snprintf(kconsumer_data.cmd_unix_sock_path, PATH_MAX, "%s", arg);
}
- break;
- case 'F':
+ } else if (string_match(optname, "ustconsumerd64-err-sock")) {
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--ustconsumerd64-err-sock");
} else {
snprintf(ustconsumer64_data.err_unix_sock_path, PATH_MAX, "%s", arg);
}
- break;
- case 'D':
+ } else if (string_match(optname, "ustconsumerd64-cmd-sock")) {
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--ustconsumerd64-cmd-sock");
} else {
snprintf(ustconsumer64_data.cmd_unix_sock_path, PATH_MAX, "%s", arg);
}
- break;
- case 'H':
+ } else if (string_match(optname, "ustconsumerd32-err-sock")) {
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--ustconsumerd32-err-sock");
} else {
snprintf(ustconsumer32_data.err_unix_sock_path, PATH_MAX, "%s", arg);
}
- break;
- case 'G':
+ } else if (string_match(optname, "ustconsumerd32-cmd-sock")) {
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--ustconsumerd32-cmd-sock");
} else {
snprintf(ustconsumer32_data.cmd_unix_sock_path, PATH_MAX, "%s", arg);
}
- break;
- case 'N':
+ } else if (string_match(optname, "no-kernel")) {
opt_no_kernel = 1;
- break;
- case 'q':
+ } else if (string_match(optname, "quiet") || opt == 'q') {
lttng_opt_quiet = 1;
- break;
- case 'v':
+ } else if (string_match(optname, "verbose") || opt == 'v') {
/* Verbose level can increase using multiple -v */
if (arg) {
/* Value obtained from config file */
/* Clamp value to [0, 3] */
lttng_opt_verbose = lttng_opt_verbose < 0 ? 0 :
(lttng_opt_verbose <= 3 ? lttng_opt_verbose : 3);
- break;
- case 'Z':
+ } else if (string_match(optname, "verbose-consumer")) {
if (arg) {
opt_verbose_consumer = config_parse_value(arg);
} else {
opt_verbose_consumer += 1;
}
- break;
- case 'u':
+ } else if (string_match(optname, "consumerd32-path")) {
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--consumerd32-path");
}
consumerd32_bin_override = 1;
}
- break;
- case 'U':
+ } else if (string_match(optname, "consumerd32-libdir")) {
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--consumerd32-libdir");
}
consumerd32_libdir_override = 1;
}
- break;
- case 't':
+ } else if (string_match(optname, "consumerd64-path")) {
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--consumerd64-path");
}
consumerd64_bin_override = 1;
}
- break;
- case 'T':
+ } else if (string_match(optname, "consumerd64-libdir")) {
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--consumerd64-libdir");
}
consumerd64_libdir_override = 1;
}
- break;
- case 'p':
+ } else if (string_match(optname, "pidfile") || opt == 'p') {
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"-p, --pidfile");
ret = -ENOMEM;
}
}
- break;
- case 'J': /* Agent TCP port. */
- {
+ } else if (string_match(optname, "agent-tcp-port")) {
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--agent-tcp-port");
agent_tcp_port = (uint32_t) v;
DBG3("Agent TCP port set to non default: %u", agent_tcp_port);
}
- break;
- }
- case 'l':
+ } else if (string_match(optname, "load") || opt == 'l') {
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"-l, --load");
ret = -ENOMEM;
}
}
- break;
- case 'P': /* probe modules list */
+ } else if (string_match(optname, "kmod-probes")) {
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--kmod-probes");
ret = -ENOMEM;
}
}
- break;
- case 'e':
+ } else if (string_match(optname, "extra-kmod-probes")) {
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
"--extra-kmod-probes");
ret = -ENOMEM;
}
}
- break;
- case 'f':
- /* This is handled in set_options() thus silent break. */
- break;
- default:
+ } else if (string_match(optname, "config") || opt == 'f') {
+ /* This is handled in set_options() thus silent skip. */
+ goto end;
+ } else {
/* Unknown option or other error.
* Error is printed by getopt, just return */
ret = -1;
optopt = orig_optopt;
optind = orig_optind;
while (1) {
- c = getopt_long(argc, argv, optstring, long_options, &option_index);
+ option_index = -1;
+ /*
+ * getopt_long() will not set option_index if it encounters a
+ * short option.
+ */
+ c = getopt_long(argc, argv, optstring, long_options,
+ &option_index);
if (c == -1) {
break;
}
- ret = set_option(c, optarg, long_options[option_index].name);
+ /*
+ * Pass NULL as the long option name if popt left the index
+ * unset.
+ */
+ ret = set_option(c, optarg,
+ option_index < 0 ? NULL :
+ long_options[option_index].name);
if (ret < 0) {
break;
}
projects / lttng-tools.git / blobdiff