X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=056df57de6046d5c5f3ccd13edd6fb6c2672864d;hp=77d3ef7f0ddd223b0408285f1df18e61b45ddd6f;hb=34ac5d7569ecf504bd869c0c14cb6abf2c028b13;hpb=47fedd501291bf9b0ca2204e2af3d1617b6f18a8 diff --git a/command.c b/command.c index 77d3ef7f..056df57d 100644 --- a/command.c +++ b/command.c @@ -1,19 +1,7 @@ /* * Copyright (C) 1997-2007 Andre Noll * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file command.c does client authentication and executes server commands */ @@ -45,7 +33,6 @@ extern const char *status_item_list[NUM_STAT_ITEMS]; extern struct misc_meta_data *mmd; extern struct audio_file_selector selectors[]; extern struct sender senders[]; -extern char *user_list; static void dummy(__a_unused int s) {} @@ -114,14 +101,14 @@ static char *get_sb_string(struct misc_meta_data *nmmd) return para_strdup(""); if (!base[0]) return base; - if (nmmd->chunks_total) { - secs = (long long) nmmd->seconds_total * nmmd->chunks_sent - / nmmd->chunks_total; - rsecs = (long long) nmmd->seconds_total * - (nmmd->chunks_total - nmmd->chunks_sent) - / nmmd->chunks_total; + if (nmmd->afi.chunks_total) { + secs = (long long) nmmd->afi.seconds_total * nmmd->chunks_sent + / nmmd->afi.chunks_total; + rsecs = (long long) nmmd->afi.seconds_total * + (nmmd->afi.chunks_total - nmmd->chunks_sent) + / nmmd->afi.chunks_total; percent = 100 * ((nmmd->chunks_sent + 5) / 10) - / ((nmmd->chunks_total + 5) / 10); + / ((nmmd->afi.chunks_total + 5) / 10); } ret = make_message("%llu:%02llu [%llu:%02llu] (%llu%%) %s", secs / 60, secs % 60, @@ -152,13 +139,13 @@ static char *get_status(struct misc_meta_data *nmmd) bar = para_basename(nmmd->filename); gettimeofday(&now, NULL); ret = make_message( - "%s:%lu\n" "%s:%s\n" "%s:%i\n" "%s:%u\n" + "%s:%zu\n" "%s:%s\n" "%s:%lu\n" "%s:%u\n" "%s:%s\n" "%s:%s\n" "%s:%s\n" "%s:%s\n" "%s:%li\n" "%s:%s\n" "%s" "%s" "%s:%s\n" "%s:%lu.%lu\n" "%s:%lu.%lu\n", status_item_list[SI_FILE_SIZE], nmmd->size / 1024, status_item_list[SI_MTIME], mtime, - status_item_list[SI_LENGTH], nmmd->seconds_total, + status_item_list[SI_LENGTH], nmmd->afi.seconds_total, status_item_list[SI_NUM_PLAYED], nmmd->num_played, status_item_list[SI_STATUS_BAR], bar ? bar : "(none)", @@ -169,7 +156,7 @@ static char *get_status(struct misc_meta_data *nmmd) status_item_list[SI_OFFSET], offset, status_item_list[SI_FORMAT], audio_format_name(nmmd->audio_format), nmmd->selector_info, - nmmd->audio_file_info, + nmmd->afi.info_string, status_item_list[SI_UPTIME], ut, status_item_list[SI_STREAM_START], @@ -649,20 +636,20 @@ int com_ff(__a_unused int fd, int argc, char **argv) backwards = 1; /* jmp backwards */ mmd_lock(); ret = -E_NO_AUDIO_FILE; - if (!mmd->chunks_total || !mmd->seconds_total) + if (!mmd->afi.chunks_total || !mmd->afi.seconds_total) goto out; - promille = (1000 * mmd->current_chunk) / mmd->chunks_total; + promille = (1000 * mmd->current_chunk) / mmd->afi.chunks_total; if (backwards) - promille -= 1000 * i / mmd->seconds_total; + promille -= 1000 * i / mmd->afi.seconds_total; else - promille += 1000 * i / mmd->seconds_total; + promille += 1000 * i / mmd->afi.seconds_total; if (promille < 0) promille = 0; if (promille > 1000) { mmd->new_vss_status_flags |= VSS_NEXT; goto out; } - mmd->repos_request = (mmd->chunks_total * promille) / 1000; + mmd->repos_request = (mmd->afi.chunks_total * promille) / 1000; mmd->new_vss_status_flags |= VSS_REPOS; mmd->new_vss_status_flags &= ~VSS_NEXT; mmd->events++; @@ -684,12 +671,12 @@ int com_jmp(__a_unused int fd, int argc, char **argv) return -E_COMMAND_SYNTAX; mmd_lock(); ret = -E_NO_AUDIO_FILE; - if (!mmd->chunks_total) + if (!mmd->afi.chunks_total) goto out; if (i > 100) i = 100; PARA_INFO_LOG("jumping to %lu%%\n", i); - mmd->repos_request = (mmd->chunks_total * i + 50)/ 100; + mmd->repos_request = (mmd->afi.chunks_total * i + 50)/ 100; PARA_INFO_LOG("sent: %lu, offset before jmp: %lu\n", mmd->chunks_sent, mmd->offset); mmd->new_vss_status_flags |= VSS_REPOS; @@ -757,6 +744,42 @@ static void rc4_send(unsigned long len, const unsigned char *indata, RC4(&rc4_send_key, len, indata, outdata); } +static int read_command(int fd, char **result) +{ + int ret; + char buf[4096]; + char *command = NULL; + + for (;;) { + size_t numbytes; + char *p; + + ret = recv_buffer(fd, buf, sizeof(buf)); + if (ret < 0) + goto out; + if (!ret) + break; + numbytes = ret; + ret = -E_COMMAND_SYNTAX; + if (command && numbytes + strlen(command) > MAX_COMMAND_LEN) /* DOS */ + goto out; + command = para_strcat(command, buf); + p = strstr(command, EOC_MSG); + if (p) { + *p = '\0'; + break; + } + } + ret = command? 1 : -E_COMMAND_SYNTAX; +out: + if (ret < 0) + free(command); + else + *result = command; + return ret; + +} + /** * perform user authentication and execute a command * @@ -790,7 +813,7 @@ static void rc4_send(unsigned long len, const unsigned char *indata, */ int handle_connect(int fd, struct sockaddr_in *addr) { - int numbytes, ret, argc, use_rc4 = 0; + int ret, argc, use_rc4 = 0; char buf[4096]; unsigned char crypt_buf[MAXLINE]; struct user *u; @@ -798,6 +821,7 @@ int handle_connect(int fd, struct sockaddr_in *addr) long unsigned challenge_nr, chall_response; char **argv = NULL; char *p, *command = NULL; + size_t numbytes; signal(SIGCHLD, SIG_IGN); signal(SIGINT, SIG_DFL); @@ -840,23 +864,23 @@ int handle_connect(int fd, struct sockaddr_in *addr) if (ret <= 0) goto err_out; numbytes = ret; - PARA_DEBUG_LOG("sending %d byte challenge\n", numbytes); + PARA_DEBUG_LOG("sending %zu byte challenge\n", numbytes); /* We can't use send_buffer here since buf may contain null bytes */ ret = send_bin_buffer(fd,(char *) crypt_buf, numbytes); if (ret < 0) goto err_out; /* recv decrypted number */ - numbytes = recv_buffer(fd, buf, sizeof(buf)); - ret = numbytes; + ret = recv_buffer(fd, buf, sizeof(buf)); if (ret < 0) goto err_out; + numbytes = ret; ret = -E_AUTH; if (!numbytes) goto err_out; if (sscanf(buf, CHALLENGE_RESPONSE_MSG "%lu", &chall_response) < 1 || chall_response != challenge_nr) goto err_out; - /* auth successful. Send 'Proceed' message */ + /* auth successful, send 'Proceed' message */ PARA_INFO_LOG("good auth for %s (%lu)\n", u->name, challenge_nr); sprintf(buf, "%s", PROCEED_MSG); if (use_rc4) { @@ -873,24 +897,12 @@ int handle_connect(int fd, struct sockaddr_in *addr) goto err_out; if (use_rc4) enable_crypt(fd, rc4_recv, rc4_send, NULL); - /* read command */ - while ((numbytes = recv_buffer(fd, buf, sizeof(buf))) > 0) { -// PARA_INFO_LOG("recvd: %s (%d)\n", buf, numbytes); - ret = -E_COMMAND_SYNTAX; - if (command && numbytes + strlen(command) > MAX_COMMAND_LEN) /* DOS */ - goto err_out; - command = para_strcat(command, buf); - if ((p = strstr(command, EOC_MSG))) { - *p = '\0'; - break; - } - } - ret = numbytes; + ret = read_command(fd, &command); if (ret < 0) goto err_out; ret = -E_BAD_CMD; - /* parse command */ - if (!(cmd = parse_cmd(command))) + cmd = parse_cmd(command); + if (!cmd) goto err_out; /* valid command, check permissions */ ret = check_perms(u->perms, cmd); @@ -910,10 +922,9 @@ int handle_connect(int fd, struct sockaddr_in *addr) goto out; } err_out: - if (ret != -E_SEND && ret != -E_RECV) { - PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-ret)); + PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-ret)); + if (ret != -E_SEND && ret != -E_RECV) send_va_buffer(fd, "%s\n", PARA_STRERROR(-ret)); - } ret = EXIT_FAILURE; out: free(command);