X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=69564336c6f8228a072f699ad83dbbe19d154338;hp=d55d1e6e8a60d958ce2ffbf16e2f0d75e2065570;hb=fe3d9cd155b5eac8706015854c343440823e12da;hpb=db8b6df30d17d9f93c60758e156699067121cbb5 diff --git a/command.c b/command.c index d55d1e6e..69564336 100644 --- a/command.c +++ b/command.c @@ -17,12 +17,12 @@ #include #include +#include "server.lsg.h" #include "para.h" #include "error.h" #include "crypt.h" #include "sideband.h" #include "command.h" -#include "server.cmdline.h" #include "string.h" #include "afh.h" #include "afs.h" @@ -37,7 +37,6 @@ #include "ipc.h" #include "server_cmd.lsg.h" #include "user_list.h" -#include "afs.command_list.h" #include "signal.h" #include "version.h" @@ -48,27 +47,6 @@ static const unsigned server_command_perms[] = {LSG_SERVER_CMD_AUX_INFOS}; static const char * const server_command_perms_txt[] = {LSG_SERVER_CMD_AUX_INFOS}; #undef SERVER_CMD_AUX_INFO -typedef int server_command_handler_t(struct command_context *); -server_command_handler_t AFS_COMMAND_HANDLERS; - -/* Defines one command of para_server. */ -struct server_command { - /* The name of the command. */ - const char *name; - /* Pointer to the function that handles the command. */ - server_command_handler_t *handler; - /* The privileges a user must have to execute this command. */ - unsigned int perms; - /* One-line description of the command. */ - const char *description; - /* Summary of the command line options. */ - const char *usage; - /* The long help text. */ - const char *help; -}; - -static struct server_command afs_cmds[] = {DEFINE_AFS_CMD_ARRAY}; - /** Commands including options must be shorter than this. */ #define MAX_COMMAND_LEN 32768 @@ -129,18 +107,18 @@ static unsigned get_status(struct misc_meta_data *nmmd, bool parser_friendly, clock_get_realtime(¤t_time); /* * The calls to WRITE_STATUS_ITEM() below never fail because - * b->max_size is zero (unlimited), see para_printf(). However, clang - * is not smart enough to prove this and complains nevertheless. + * b->max_size is zero (unlimited), see \ref para_printf(). However, + * clang is not smart enough to prove this and complains nevertheless. * Casting the return value to void silences clang. */ - (void)WRITE_STATUS_ITEM(&b, SI_STATUS, "%s\n", status); - (void)WRITE_STATUS_ITEM(&b, SI_STATUS_FLAGS, "%s\n", flags); - (void)WRITE_STATUS_ITEM(&b, SI_OFFSET, "%li\n", offset); - (void)WRITE_STATUS_ITEM(&b, SI_AFS_MODE, "%s\n", mmd->afs_mode_string); - (void)WRITE_STATUS_ITEM(&b, SI_STREAM_START, "%lu.%lu\n", + (void)WRITE_STATUS_ITEM(&b, SI_status, "%s\n", status); + (void)WRITE_STATUS_ITEM(&b, SI_status_flags, "%s\n", flags); + (void)WRITE_STATUS_ITEM(&b, SI_offset, "%li\n", offset); + (void)WRITE_STATUS_ITEM(&b, SI_afs_mode, "%s\n", mmd->afs_mode_string); + (void)WRITE_STATUS_ITEM(&b, SI_stream_start, "%lu.%lu\n", (long unsigned)nmmd->stream_start.tv_sec, (long unsigned)nmmd->stream_start.tv_usec); - (void)WRITE_STATUS_ITEM(&b, SI_CURRENT_TIME, "%lu.%lu\n", + (void)WRITE_STATUS_ITEM(&b, SI_current_time, "%lu.%lu\n", (long unsigned)current_time.tv_sec, (long unsigned)current_time.tv_usec); free(flags); @@ -249,7 +227,7 @@ static int check_sender_args(struct command_context *cc, struct lls_parse_result *lpr, struct sender_command_data *scd) { int i, ret; - const char *subcmds[] = {SENDER_SUBCOMMANDS}; + const char * const subcmds[] = {SENDER_SUBCOMMANDS}; const char *arg; char *errctx; unsigned num_inputs = lls_num_inputs(lpr); @@ -268,10 +246,10 @@ static int check_sender_args(struct command_context *cc, return -E_COMMAND_SYNTAX; scd->sender_num = i; arg = lls_input(1, lpr); - for (i = 0; subcmds[i]; i++) + for (i = 0; i < NUM_SENDER_CMDS; i++) if (!strcmp(subcmds[i], arg)) break; - if (!subcmds[i]) + if (i == NUM_SENDER_CMDS) return -E_COMMAND_SYNTAX; scd->cmd_num = i; if (!senders[scd->sender_num].client_cmds[scd->cmd_num]) @@ -424,7 +402,7 @@ static int com_si(struct command_context *cc, mmd->active_connections, mmd->num_commands, mmd->num_connects, - conf.loglevel_arg, + ENUM_STRING_VAL(LOGLEVEL), AUDIO_FORMAT_HANDLERS ); mutex_unlock(mmd_mutex); @@ -448,41 +426,40 @@ EXPORT_SERVER_CMD_HANDLER(version); /** These status items are cleared if no audio file is currently open. */ #define EMPTY_STATUS_ITEMS \ - ITEM(PATH) \ - ITEM(DIRECTORY) \ - ITEM(BASENAME) \ - ITEM(SCORE) \ - ITEM(ATTRIBUTES_BITMAP) \ - ITEM(ATTRIBUTES_TXT) \ - ITEM(HASH) \ - ITEM(IMAGE_ID) \ - ITEM(IMAGE_NAME) \ - ITEM(LYRICS_ID) \ - ITEM(LYRICS_NAME) \ - ITEM(BITRATE) \ - ITEM(FORMAT) \ - ITEM(FREQUENCY) \ - ITEM(CHANNELS) \ - ITEM(DURATION) \ - ITEM(SECONDS_TOTAL) \ - ITEM(NUM_PLAYED) \ - ITEM(LAST_PLAYED) \ - ITEM(TECHINFO) \ - ITEM(ARTIST) \ - ITEM(TITLE) \ - ITEM(YEAR) \ - ITEM(ALBUM) \ - ITEM(COMMENT) \ - ITEM(MTIME) \ - ITEM(FILE_SIZE) \ - ITEM(CHUNK_TIME) \ - ITEM(NUM_CHUNKS) \ - ITEM(AMPLIFICATION) \ + ITEM(path) \ + ITEM(directory) \ + ITEM(basename) \ + ITEM(score) \ + ITEM(attributes_bitmap) \ + ITEM(attributes_txt) \ + ITEM(hash) \ + ITEM(image_id) \ + ITEM(image_name) \ + ITEM(lyrics_id) \ + ITEM(lyrics_name) \ + ITEM(bitrate) \ + ITEM(format) \ + ITEM(frequency) \ + ITEM(channels) \ + ITEM(duration) \ + ITEM(seconds_total) \ + ITEM(num_played) \ + ITEM(last_played) \ + ITEM(techinfo) \ + ITEM(artist) \ + ITEM(title) \ + ITEM(year) \ + ITEM(album) \ + ITEM(comment) \ + ITEM(mtime) \ + ITEM(file_size) \ + ITEM(chunk_time) \ + ITEM(num_chunks) \ + ITEM(amplification) \ -/** - * Write a list of audio-file related status items with empty values. - * - * This is used by vss when currently no audio file is open. +/* + * Create a set of audio-file related status items with empty values. These are + * written to stat clients when no audio file is open. */ static unsigned empty_status_items(bool parser_friendly, char **result) { @@ -584,21 +561,6 @@ static int send_list_of_commands(struct command_context *cc) return send_sb(&cc->scc, msg, strlen(msg), SBD_OUTPUT, false); } -/* returns string that must be freed by the caller */ -static struct server_command *get_cmd_ptr(const char *name, char **handler) -{ - struct server_command *cmd; - - /* not found, look for commands supported by afs */ - for (cmd = afs_cmds; cmd->name; cmd++) - if (!strcmp(cmd->name, name)) { - if (handler) - *handler = para_strdup("afs"); - return cmd; - } - return NULL; -} - static int com_help(struct command_context *cc, struct lls_parse_result *lpr) { const char *perms; @@ -791,16 +753,6 @@ static int com_tasks(struct command_context *cc, } EXPORT_SERVER_CMD_HANDLER(tasks); -/* - * check if perms are sufficient to exec a command having perms cmd_perms. - * Returns 0 if perms are sufficient, -E_PERM otherwise. - */ -static int check_perms(unsigned int perms, const struct server_command *cmd_ptr) -{ - PARA_DEBUG_LOG("checking permissions\n"); - return (cmd_ptr->perms & perms) < cmd_ptr->perms ? -E_PERM : 0; -} - static void reset_signals(void) { para_sigaction(SIGCHLD, SIG_IGN); @@ -810,7 +762,7 @@ static void reset_signals(void) } struct connection_features { - bool aes_ctr128_requested; + int dummy; /* none at the moment */ }; static int parse_auth_request(char *buf, int len, struct user **u, @@ -839,7 +791,7 @@ static int parse_auth_request(char *buf, int len, struct user **u, if (strcmp(features[i], "sideband") == 0) continue; if (strcmp(features[i], "aes_ctr128") == 0) - cf->aes_ctr128_requested = true; + continue; else { ret = -E_BAD_FEATURE; goto out; @@ -859,9 +811,8 @@ out: static int run_command(struct command_context *cc, struct iovec *iov, const char *peername) { - int ret, i; - char *p, *end; - struct server_command *cmd = NULL; + int ret, i, argc; + char *p, *end, **argv; const struct lls_command *lcmd = NULL; unsigned perms; struct lls_parse_result *lpr; @@ -873,47 +824,34 @@ static int run_command(struct command_context *cc, struct iovec *iov, p[iov->iov_len - 1] = '\0'; /* just to be sure */ ret = lls(lls_lookup_subcmd(p, server_cmd_suite, &errctx)); - if (ret >= 0 && !strcmp(p, lls_command_name(lls_cmd(ret, - server_cmd_suite)))) { - perms = server_command_perms[ret]; - if ((perms & cc->u->perms) != perms) - return -E_PERM; - lcmd = lls_cmd(ret, server_cmd_suite); - } else { - cmd = get_cmd_ptr(p, NULL); - if (!cmd) { - send_errctx(cc, errctx); - return ret; - } - perms = cmd->perms; - ret = check_perms(cc->u->perms, cmd); - if (ret < 0) - return ret; + if (ret < 0) { + send_errctx(cc, errctx); + return ret; } + perms = server_command_perms[ret]; + if ((perms & cc->u->perms) != perms) + return -E_PERM; + lcmd = lls_cmd(ret, server_cmd_suite); end = iov->iov_base + iov->iov_len; for (i = 0; p < end; i++) p += strlen(p) + 1; - cc->argc = i; - cc->argv = para_malloc((cc->argc + 1) * sizeof(char *)); + argc = i; + argv = para_malloc((argc + 1) * sizeof(char *)); for (i = 0, p = iov->iov_base; p < end; i++) { - cc->argv[i] = para_strdup(p); + argv[i] = para_strdup(p); p += strlen(p) + 1; } - cc->argv[cc->argc] = NULL; - PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", lcmd? - lls_command_name(lcmd) : cmd->name, cc->u->name, peername); - if (lcmd) { - ret = lls(lls_parse(cc->argc, cc->argv, lcmd, &lpr, &errctx)); - if (ret >= 0) { - const struct server_cmd_user_data *ud = lls_user_data(lcmd); - ret = ud->handler(cc, lpr); - lls_free_parse_result(lpr, lcmd); - } else - send_errctx(cc, errctx); - } else { - ret = cmd->handler(cc); - } - free_argv(cc->argv); + argv[argc] = NULL; + PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", lls_command_name(lcmd), + cc->u->name, peername); + ret = lls(lls_parse(argc, argv, lcmd, &lpr, &errctx)); + if (ret >= 0) { + const struct server_cmd_user_data *ud = lls_user_data(lcmd); + ret = ud->handler(cc, lpr); + lls_free_parse_result(lpr, lcmd); + } else + send_errctx(cc, errctx); + free_argv(argv); mutex_lock(mmd_mutex); mmd->num_commands++; if (ret >= 0 && (perms & AFS_WRITE)) @@ -945,7 +883,7 @@ static int run_command(struct command_context *cc, struct iovec *iov, * the function if the connection was not authenticated when the timeout * expires. * - * \sa alarm(2), crypt.c, crypt.h + * \sa alarm(2), \ref crypt.c, \ref crypt.h. */ __noreturn void handle_connect(int fd, const char *peername) { @@ -954,7 +892,7 @@ __noreturn void handle_connect(int fd, const char *peername) unsigned char challenge_hash[HASH_SIZE]; char *command = NULL, *buf = para_malloc(HANDSHAKE_BUFSIZE) /* must be on the heap */; size_t numbytes; - struct command_context cc_struct = {.peer = peername}, *cc = &cc_struct; + struct command_context cc_struct = {.u = NULL}, *cc = &cc_struct; struct iovec iov; struct connection_features cf; @@ -1024,10 +962,9 @@ __noreturn void handle_connect(int fd, const char *peername) alarm(0); PARA_INFO_LOG("good auth for %s\n", cc->u->name); /* init stream cipher keys with the second part of the random buffer */ - cc->scc.recv = sc_new(rand_buf + CHALLENGE_SIZE, SESSION_KEY_LEN, - cf.aes_ctr128_requested); + cc->scc.recv = sc_new(rand_buf + CHALLENGE_SIZE, SESSION_KEY_LEN); cc->scc.send = sc_new(rand_buf + CHALLENGE_SIZE + SESSION_KEY_LEN, - SESSION_KEY_LEN, cf.aes_ctr128_requested); + SESSION_KEY_LEN); ret = send_sb(&cc->scc, NULL, 0, SBD_PROCEED, false); if (ret < 0) goto net_err;