X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=ec822c82978d78649b6641d2206f41db44ab3bd7;hp=5e13df66bce15a7e759ce1dd85347b9a176a5417;hb=24758c5f;hpb=4744d937c4160898d1fe151257606430750e580c diff --git a/command.c b/command.c index 5e13df66..ec822c82 100644 --- a/command.c +++ b/command.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2012 Andre Noll + * Copyright (C) 1997-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -8,7 +8,6 @@ #include #include -#include #include #include @@ -36,6 +35,9 @@ #include "signal.h" #include "version.h" +struct server_command afs_cmds[] = {DEFINE_AFS_CMD_ARRAY}; +struct server_command server_cmds[] = {DEFINE_SERVER_CMD_ARRAY}; + /** Commands including options must be shorter than this. */ #define MAX_COMMAND_LEN 32768 @@ -102,7 +104,8 @@ static char *vss_get_status_flags(unsigned int flags) return msg; } -static char *get_status(struct misc_meta_data *nmmd, int parser_friendly) +static unsigned get_status(struct misc_meta_data *nmmd, int parser_friendly, + char **result) { char mtime[30] = ""; char *status, *flags; /* vss status info */ @@ -120,7 +123,7 @@ static char *get_status(struct misc_meta_data *nmmd, int parser_friendly) localtime_r(&nmmd->mtime, &mtime_tm); strftime(mtime, 29, "%b %d %Y", &mtime_tm); } - gettimeofday(¤t_time, NULL); + 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 @@ -142,7 +145,8 @@ static char *get_status(struct misc_meta_data *nmmd, int parser_friendly) free(flags); free(status); free(ut); - return b.buf; + *result = b.buf; + return b.offset; } static int check_sender_args(int argc, char * const * argv, struct sender_command_data *scd) @@ -254,6 +258,22 @@ __printf_3_4 int send_sb_va(struct stream_cipher_context *scc, int band, return send_sb(scc, msg, ret, band, false); } +/** + * Send an error message to a client. + * + * \param cc Client info. + * \param err The (positive) error code. + * + * \return The return value of the underlying call to send_sb_va(). + */ +int send_strerror(struct command_context *cc, int err) +{ + return cc->use_sideband? + send_sb_va(&cc->scc, SBD_ERROR_LOG, "%s\n", para_strerror(err)) + : + sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(err)); +} + /** * Send a sideband packet through a blocking file descriptor. * @@ -304,19 +324,22 @@ fail: return ret; } -int com_sender(struct command_context *cc) +static int com_sender(struct command_context *cc) { - int i, ret; + int i, ret = 0; char *msg = NULL; struct sender_command_data scd; if (cc->argc < 2) { for (i = 0; senders[i].name; i++) { - char *tmp = make_message("%s%s\n", - msg? msg : "", senders[i].name); + char *tmp; + ret = xasprintf(&tmp, "%s%s\n", msg? msg : "", + senders[i].name); free(msg); msg = tmp; } + if (cc->use_sideband) + return send_sb(&cc->scc, msg, ret, SBD_OUTPUT, false); ret = sc_send_buffer(&cc->scc, msg); free(msg); return ret; @@ -326,6 +349,9 @@ int com_sender(struct command_context *cc) if (scd.sender_num < 0) return ret; msg = senders[scd.sender_num].help(); + if (cc->use_sideband) + return send_sb(&cc->scc, msg, strlen(msg), SBD_OUTPUT, + false); ret = sc_send_buffer(&cc->scc, msg); free(msg); return ret; @@ -355,11 +381,10 @@ int com_sender(struct command_context *cc) } /* server info */ -int com_si(struct command_context *cc) +static int com_si(struct command_context *cc) { int i, ret; - char *ut; - char *sender_info = NULL; + char *msg, *ut, *sender_info = NULL; if (cc->argc != 1) return -E_COMMAND_SYNTAX; @@ -370,7 +395,7 @@ int com_si(struct command_context *cc) free(info); } ut = get_server_uptime_str(now); - ret = sc_send_va_buffer(&cc->scc, "version: " GIT_VERSION "\n" + ret = xasprintf(&msg, "version: " GIT_VERSION "\n" "up: %s\nplayed: %u\n" "server_pid: %d\n" "afs_pid: %d\n" @@ -385,24 +410,33 @@ int com_si(struct command_context *cc) mmd->num_commands, mmd->num_connects, conf.loglevel_arg, - SERVER_AUDIO_FORMATS, + AUDIO_FORMAT_HANDLERS, sender_info ); mutex_unlock(mmd_mutex); free(ut); free(sender_info); + if (cc->use_sideband) + return send_sb(&cc->scc, msg, ret, SBD_OUTPUT, false); + ret = sc_send_bin_buffer(&cc->scc, msg, ret); + free(msg); return ret; } /* version */ -int com_version(struct command_context *cc) +static int com_version(struct command_context *cc) { + char *msg; + size_t len; + if (cc->argc != 1) return -E_COMMAND_SYNTAX; - return sc_send_buffer(&cc->scc, VERSION_TEXT("server") - "built: " BUILD_DATE "\n" - UNAME_RS ", " CC_VERSION "\n" - ); + msg = VERSION_TEXT("server") "built: " BUILD_DATE "\n" UNAME_RS + ", " CC_VERSION "\n"; + len = strlen(msg); + if (cc->use_sideband) + return send_sb(&cc->scc, msg, len, SBD_OUTPUT, true); + return sc_send_bin_buffer(&cc->scc, msg, len); } #define EMPTY_STATUS_ITEMS \ @@ -438,10 +472,16 @@ int com_version(struct command_context *cc) * * This is used by vss when currently no audio file is open. */ -static char *empty_status_items(int parser_friendly) +static unsigned empty_status_items(int parser_friendly, char **result) { + static char *esi; + static unsigned len; + + if (esi) + goto out; + if (parser_friendly) - return make_message( + len = xasprintf(&esi, #define ITEM(x) "0004 %02x:\n" EMPTY_STATUS_ITEMS #undef ITEM @@ -449,23 +489,27 @@ static char *empty_status_items(int parser_friendly) EMPTY_STATUS_ITEMS #undef ITEM ); - return make_message( - #define ITEM(x) "%s:\n" - EMPTY_STATUS_ITEMS - #undef ITEM - #define ITEM(x) ,status_item_list[SI_ ## x] - EMPTY_STATUS_ITEMS - #undef ITEM - ); + else + len = xasprintf(&esi, + #define ITEM(x) "%s:\n" + EMPTY_STATUS_ITEMS + #undef ITEM + #define ITEM(x) ,status_item_list[SI_ ## x] + EMPTY_STATUS_ITEMS + #undef ITEM + ); +out: + *result = esi; + return len; } #undef EMPTY_STATUS_ITEMS /* stat */ -int com_stat(struct command_context *cc) +static int com_stat(struct command_context *cc) { int i, ret; struct misc_meta_data tmp, *nmmd = &tmp; - char *s; + char *s, *esi = NULL; int32_t num = 0; int parser_friendly = 0; @@ -495,16 +539,22 @@ int com_stat(struct command_context *cc) return -E_COMMAND_SYNTAX; for (;;) { mmd_dup(nmmd); - s = get_status(nmmd, parser_friendly); - ret = sc_send_buffer(&cc->scc, s); - free(s); + ret = get_status(nmmd, parser_friendly, &s); + if (cc->use_sideband) + ret = send_sb(&cc->scc, s, ret, SBD_OUTPUT, false); + else { + ret = sc_send_bin_buffer(&cc->scc, s, ret); + free(s); + } if (ret < 0) goto out; if (nmmd->vss_status_flags & VSS_NEXT) { - static char *esi; - if (!esi) - esi = empty_status_items(parser_friendly); - ret = sc_send_buffer(&cc->scc, esi); + ret = empty_status_items(parser_friendly, &esi); + if (cc->use_sideband) + ret = send_sb(&cc->scc, esi, ret, SBD_OUTPUT, + true); + else + ret = sc_send_bin_buffer(&cc->scc, esi, ret); if (ret < 0) goto out; } else @@ -513,29 +563,34 @@ int com_stat(struct command_context *cc) if (num > 0 && !--num) goto out; sleep(50); + ret = -E_SERVER_CRASH; if (getppid() == 1) - return -E_SERVER_CRASH; + goto out; } out: + free(esi); return ret; } -static int send_list_of_commands(struct stream_cipher_context *scc, struct server_command *cmd, +static int send_list_of_commands(struct command_context *cc, struct server_command *cmd, const char *handler) { - int ret, i; + int ret; + char *msg = NULL; - for (i = 1; cmd->name; cmd++, i++) { - char *perms = cmd_perms_itohuman(cmd->perms); - ret = sc_send_va_buffer(scc, "%s\t%s\t%s\t%s\n", cmd->name, - handler, - perms, - cmd->description); + for (; cmd->name; cmd++) { + char *tmp, *perms = cmd_perms_itohuman(cmd->perms); + tmp = make_message("%s\t%s\t%s\t%s\n", cmd->name, handler, + perms, cmd->description); free(perms); - if (ret < 0) - return ret; + msg = para_strcat(msg, tmp); + free(tmp); } - return 1; + if (cc->use_sideband) + return send_sb(&cc->scc, msg, strlen(msg), SBD_OUTPUT, false); + ret = sc_send_buffer(&cc->scc, msg); + free(msg); + return ret; } /* returns string that must be freed by the caller */ @@ -560,25 +615,24 @@ static struct server_command *get_cmd_ptr(const char *name, char **handler) } /* help */ -int com_help(struct command_context *cc) +static int com_help(struct command_context *cc) { struct server_command *cmd; - char *perms, *handler; + char *perms, *handler, *buf; int ret; if (cc->argc < 2) { /* no argument given, print list of commands */ - if ((ret = send_list_of_commands(&cc->scc, server_cmds, "server")) < 0) + if ((ret = send_list_of_commands(cc, server_cmds, "server")) < 0) return ret; - return send_list_of_commands(&cc->scc, afs_cmds, "afs"); + return send_list_of_commands(cc, afs_cmds, "afs"); } /* argument given for help */ cmd = get_cmd_ptr(cc->argv[1], &handler); if (!cmd) return -E_BAD_CMD; perms = cmd_perms_itohuman(cmd->perms); - ret = sc_send_va_buffer(&cc->scc, - "%s - %s\n\n" + ret = xasprintf(&buf, "%s - %s\n\n" "handler: %s\n" "permissions: %s\n" "usage: %s\n\n" @@ -592,11 +646,15 @@ int com_help(struct command_context *cc) ); free(perms); free(handler); + if (cc->use_sideband) + return send_sb(&cc->scc, buf, ret, SBD_OUTPUT, false); + ret = sc_send_buffer(&cc->scc, buf); + free(buf); return ret; } /* hup */ -int com_hup(struct command_context *cc) +static int com_hup(struct command_context *cc) { if (cc->argc != 1) return -E_COMMAND_SYNTAX; @@ -605,7 +663,7 @@ int com_hup(struct command_context *cc) } /* term */ -int com_term(struct command_context *cc) +static int com_term(struct command_context *cc) { if (cc->argc != 1) return -E_COMMAND_SYNTAX; @@ -613,7 +671,7 @@ int com_term(struct command_context *cc) return 1; } -int com_play(struct command_context *cc) +static int com_play(struct command_context *cc) { if (cc->argc != 1) return -E_COMMAND_SYNTAX; @@ -625,7 +683,7 @@ int com_play(struct command_context *cc) } /* stop */ -int com_stop(struct command_context *cc) +static int com_stop(struct command_context *cc) { if (cc->argc != 1) return -E_COMMAND_SYNTAX; @@ -638,7 +696,7 @@ int com_stop(struct command_context *cc) } /* pause */ -int com_pause(struct command_context *cc) +static int com_pause(struct command_context *cc) { if (cc->argc != 1) return -E_COMMAND_SYNTAX; @@ -653,7 +711,7 @@ int com_pause(struct command_context *cc) } /* next */ -int com_next(struct command_context *cc) +static int com_next(struct command_context *cc) { if (cc->argc != 1) return -E_COMMAND_SYNTAX; @@ -665,7 +723,7 @@ int com_next(struct command_context *cc) } /* nomore */ -int com_nomore(struct command_context *cc) +static int com_nomore(struct command_context *cc) { if (cc->argc != 1) return -E_COMMAND_SYNTAX; @@ -677,7 +735,7 @@ int com_nomore(struct command_context *cc) } /* ff */ -int com_ff(struct command_context *cc) +static int com_ff(struct command_context *cc) { long promille; int ret, backwards = 0; @@ -716,7 +774,7 @@ out: } /* jmp */ -int com_jmp(struct command_context *cc) +static int com_jmp(struct command_context *cc) { long unsigned int i; int ret; @@ -856,6 +914,38 @@ out: #define HANDSHAKE_BUFSIZE 4096 +static int parse_sb_command(struct command_context *cc, struct iovec *iov) +{ + int ret, i; + char *p, *end; + + ret = -E_BAD_CMD; + if (iov->iov_base == NULL || iov->iov_len == 0) + goto out; + p = iov->iov_base; + p[iov->iov_len - 1] = '\0'; /* just to be sure */ + cc->cmd = get_cmd_ptr(p, NULL); + if (!cc->cmd) + goto out; + ret = check_perms(cc->u->perms, cc->cmd); + if (ret < 0) + goto out; + end = iov->iov_base + iov->iov_len; + for (i = 0, p = iov->iov_base; p < end; i++) + p += strlen(p) + 1; + cc->argc = i; + cc->argv = para_malloc((cc->argc + 1) * sizeof(char *)); + for (i = 0, p = iov->iov_base; p < end; i++) { + cc->argv[i] = para_strdup(p); + p += strlen(p) + 1; + } + cc->argv[cc->argc] = NULL; + ret = cc->argc; +out: + free(iov->iov_base); + return ret; +} + /** * Perform user authentication and execute a command. * @@ -901,7 +991,7 @@ __noreturn void handle_connect(int fd, const char *peername) /* send Welcome message */ ret = write_va_buffer(fd, "This is para_server, version " PACKAGE_VERSION ".\n" - "Features: sideband,foo\n" + "Features: sideband\n" ); if (ret < 0) goto net_err; @@ -975,27 +1065,41 @@ __noreturn void handle_connect(int fd, const char *peername) /* init stream cipher keys with the second part of the random buffer */ 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); - ret = sc_send_buffer(&cc->scc, PROCEED_MSG); - if (ret < 0) - goto net_err; - ret = read_command(&cc->scc, &command); - if (ret == -E_COMMAND_SYNTAX) - goto err_out; + if (cc->use_sideband) + ret = send_sb(&cc->scc, NULL, 0, SBD_PROCEED, false); + else + ret = sc_send_buffer(&cc->scc, PROCEED_MSG); if (ret < 0) goto net_err; - ret = -E_BAD_CMD; - cc->cmd = parse_cmd(command); - if (!cc->cmd) - goto err_out; - /* valid command, check permissions */ - ret = check_perms(cc->u->perms, cc->cmd); - if (ret < 0) - goto err_out; - /* valid command and sufficient perms */ - ret = create_argv(command, "\n", &cc->argv); - if (ret < 0) - goto err_out; - cc->argc = ret; + if (cc->use_sideband) { + struct iovec iov; + ret = recv_sb(&cc->scc, SBD_COMMAND, MAX_COMMAND_LEN, &iov); + if (ret < 0) + goto net_err; + ret = parse_sb_command(cc, &iov); + if (ret < 0) + goto err_out; + cc->argc = ret; + } else { + ret = read_command(&cc->scc, &command); + if (ret == -E_COMMAND_SYNTAX) + goto err_out; + if (ret < 0) + goto net_err; + ret = -E_BAD_CMD; + cc->cmd = parse_cmd(command); + if (!cc->cmd) + goto err_out; + /* valid command, check permissions */ + ret = check_perms(cc->u->perms, cc->cmd); + if (ret < 0) + goto err_out; + /* valid command and sufficient perms */ + ret = create_argv(command, "\n", &cc->argv); + if (ret < 0) + goto err_out; + cc->argc = ret; + } PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", cc->cmd->name, cc->u->name, peername); ret = cc->cmd->handler(cc); @@ -1006,18 +1110,24 @@ __noreturn void handle_connect(int fd, const char *peername) if (ret >= 0) goto out; err_out: - sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret)); + if (send_strerror(cc, -ret) >= 0 && cc->use_sideband) + send_sb(&cc->scc, NULL, 0, SBD_EXIT__FAILURE, true); net_err: PARA_NOTICE_LOG("%s\n", para_strerror(-ret)); out: free(buf); free(command); - sc_free(cc->scc.recv); - sc_free(cc->scc.send); mutex_lock(mmd_mutex); if (cc->cmd && (cc->cmd->perms & AFS_WRITE) && ret >= 0) mmd->events++; mmd->active_connections--; mutex_unlock(mmd_mutex); + if (ret >= 0 && cc->use_sideband) { + ret = send_sb(&cc->scc, NULL, 0, SBD_EXIT__SUCCESS, true); + if (ret < 0) + PARA_NOTICE_LOG("%s\n", para_strerror(-ret)); + } + sc_free(cc->scc.recv); + sc_free(cc->scc.send); exit(ret < 0? EXIT_FAILURE : EXIT_SUCCESS); }