command.c: Fix om_help().

[paraslash.git] / command.c

diff --git a/command.c b/command.c
index ffd660d63c0cdd94cd73d952a8785007873f1a97..516a62fe520887e1b015ff8e159b8027dd86b232 100644 (file)
--- a/command.c
+++ b/command.c
@@ -1,26 +1,17 @@
 /*
  * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
  *
 /*
  * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
  *

- *     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 */
 
 #include <sys/time.h> /* gettimeofday */
  */
 
 /** \file command.c does client authentication and executes server commands */
 
 #include <sys/time.h> /* gettimeofday */

+#include "para.h" /* gettimeofday */
+

 #include "server.cmdline.h"
 #include "server.cmdline.h"

-#include "db.h"
+#include "afs_common.h"
+#include "afh.h"

 #include "server.h"
 #include "vss.h"
 #include "send.h"
 #include "server.h"
 #include "vss.h"
 #include "send.h"


@@ -31,11 +22,13 @@
 #include "daemon.h"
 #include "string.h"
 #include "fd.h"
 #include "daemon.h"
 #include "string.h"
 #include "fd.h"

+#include "list.h"

 #include "user_list.h"
 #include "server_command_list.h"
 #include "user_list.h"
 #include "server_command_list.h"

+#include "afs_command_list.h"

 
 /** commands including options must be shorter than this */
 
 /** commands including options must be shorter than this */

-#define MAX_COMMAND_LEN 4096
+#define MAX_COMMAND_LEN 32768

 
 static RC4_KEY rc4_recv_key;
 static RC4_KEY rc4_send_key;
 
 static RC4_KEY rc4_recv_key;
 static RC4_KEY rc4_send_key;


@@ -45,7 +38,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 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)
 {}
 
 static void dummy(__a_unused int s)
 {}


@@ -78,8 +70,8 @@ static char *cmd_perms_itohuman(unsigned int perms)
 {
        char *msg = para_malloc(5 * sizeof(char));
 
 {
        char *msg = para_malloc(5 * sizeof(char));
 

-       msg[0] = perms & DB_READ? 'a' : '-';
-       msg[1] = perms & DB_WRITE? 'A' : '-';
+       msg[0] = perms & AFS_READ? 'a' : '-';
+       msg[1] = perms & AFS_WRITE? 'A' : '-';

        msg[2] = perms & VSS_READ? 'v' : '-';
        msg[3] = perms & VSS_WRITE? 'V' : '-';
        msg[4] = '\0';
        msg[2] = perms & VSS_READ? 'v' : '-';
        msg[3] = perms & VSS_WRITE? 'V' : '-';
        msg[4] = '\0';


@@ -114,14 +106,14 @@ static char *get_sb_string(struct misc_meta_data *nmmd)
                return para_strdup("");
        if (!base[0])
                return base;
                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)
                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,
        }
        ret = make_message("%llu:%02llu [%llu:%02llu] (%llu%%) %s",
                secs / 60, secs % 60,


@@ -152,13 +144,13 @@ static char *get_status(struct misc_meta_data *nmmd)
        bar = para_basename(nmmd->filename);
        gettimeofday(&now, NULL);
        ret = make_message(
        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,
                "%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)",
                status_item_list[SI_NUM_PLAYED], nmmd->num_played,
 
                status_item_list[SI_STATUS_BAR], bar ? bar : "(none)",


@@ -169,7 +161,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,
                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],
 
                status_item_list[SI_UPTIME], ut,
                status_item_list[SI_STREAM_START],


@@ -187,7 +179,7 @@ static char *get_status(struct misc_meta_data *nmmd)
        return ret;
 }
 
        return ret;
 }
 

-static int check_sender_args(int argc, char **argv, struct sender_command_data *scd)
+static int check_sender_args(int argc, char * const * argv, struct sender_command_data *scd)

 {
        int i;
        /* this has to match sender.h */
 {
        int i;
        /* this has to match sender.h */


@@ -253,7 +245,7 @@ static int check_sender_args(int argc, char **argv, struct sender_command_data *
        return 1;
 }
 
        return 1;
 }
 

-int com_sender(int fd, int argc, char **argv)
+int com_sender(int fd, int argc, char * const * argv)

 {
        int i, ret;
        struct sender_command_data scd;
 {
        int i, ret;
        struct sender_command_data scd;


@@ -295,7 +287,7 @@ int com_sender(int fd, int argc, char **argv)
 }
 
 /* server info */
 }
 
 /* server info */

-int com_si(int fd, int argc, __a_unused char **argv)
+int com_si(int fd, int argc, __a_unused char * const * argv)

 {
        int i, ret;
        char *ut;
 {
        int i, ret;
        char *ut;


@@ -344,7 +336,7 @@ int com_si(int fd, int argc, __a_unused char **argv)
 }
 
 /* version */
 }
 
 /* version */

-int com_version(int fd, int argc, __a_unused char **argv)
+int com_version(int fd, int argc, __a_unused char * const * argv)

 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;
 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;


@@ -355,7 +347,7 @@ int com_version(int fd, int argc, __a_unused char **argv)
 }
 
 /* sc */
 }
 
 /* sc */

-int com_sc(int fd, int argc, char **argv)
+int com_sc(int fd, int argc, char * const * argv)

 {
        char *name = NULL;
        int ret, old = 0, count = -1; /* print af change forever */
 {
        char *name = NULL;
        int ret, old = 0, count = -1; /* print af change forever */


@@ -383,7 +375,7 @@ repeat:
 }
 
 /* sb */
 }
 
 /* sb */

-int com_sb(int fd, int argc, char **argv)
+int com_sb(int fd, int argc, char * const * argv)

 {
        char *sb;
        int ret, nr = -1;       /* status bar will be printed that many
 {
        char *sb;
        int ret, nr = -1;       /* status bar will be printed that many


@@ -410,7 +402,7 @@ int com_sb(int fd, int argc, char **argv)
 }
 
 /* stat */
 }
 
 /* stat */

-int com_stat(int fd, int argc, char **argv)
+int com_stat(int fd, int argc, char * const * argv)

 {
        int ret, num = 0;/* status will be printed that many
                          * times. num <= 0 means: print forever
 {
        int ret, num = 0;/* status will be printed that many
                          * times. num <= 0 means: print forever


@@ -460,7 +452,7 @@ static int send_list_of_commands(int fd, struct server_command *cmd,
 }
 
 /* always returns string that must be freed by the caller in handler */
 }
 
 /* always returns string that must be freed by the caller in handler */

-static struct server_command *get_cmd_ptr(char *name, char **handler)
+static struct server_command *get_cmd_ptr(const char *name, char **handler)

 {
        struct server_command *cmd;
 
 {
        struct server_command *cmd;
 


@@ -480,11 +472,15 @@ static struct server_command *get_cmd_ptr(char *name, char **handler)
        for (; cmd->name; cmd++)
                if (!strcmp(cmd->name, name))
                        return cmd;
        for (; cmd->name; cmd++)
                if (!strcmp(cmd->name, name))
                        return cmd;

+       /* not found, look for commands supported by afs */
+       for (cmd = afs_cmds; cmd; cmd++)
+               if (!strcmp(cmd->name, name))
+                       return cmd;

        return NULL;
 }
 
 /* help */
        return NULL;
 }
 
 /* help */

-int com_help(int fd, int argc, char **argv)
+int com_help(int fd, int argc, char * const * argv)

 {
        struct server_command *cmd;
        char *perms, *handler;
 {
        struct server_command *cmd;
        char *perms, *handler;


@@ -500,7 +496,10 @@ int com_help(int fd, int argc, char **argv)
                mmd_unlock();
                ret = send_list_of_commands(fd, cmd, handler);
                free(handler);
                mmd_unlock();
                ret = send_list_of_commands(fd, cmd, handler);
                free(handler);

-               return ret;
+               if (ret < 0)
+                       return ret;
+               cmd = afs_cmds;
+               return send_list_of_commands(fd, cmd, "afs");

        }
        /* argument given for help */
        cmd = get_cmd_ptr(argv[1], &handler);
        }
        /* argument given for help */
        cmd = get_cmd_ptr(argv[1], &handler);


@@ -528,7 +527,7 @@ int com_help(int fd, int argc, char **argv)
 }
 
 /* hup */
 }
 
 /* hup */

-int com_hup(__a_unused int fd, int argc, __a_unused char **argv)
+int com_hup(__a_unused int fd, int argc, __a_unused char * const * argv)

 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;
 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;


@@ -537,7 +536,7 @@ int com_hup(__a_unused int fd, int argc, __a_unused char **argv)
 }
 
 /* term */
 }
 
 /* term */

-int com_term(__a_unused int fd, int argc, __a_unused char **argv)
+int com_term(__a_unused int fd, int argc, __a_unused char * const * argv)

 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;
 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;


@@ -545,7 +544,7 @@ int com_term(__a_unused int fd, int argc, __a_unused char **argv)
        return 1;
 }
 
        return 1;
 }
 

-int com_play(__a_unused int fd, int argc, __a_unused char **argv)
+int com_play(__a_unused int fd, int argc, __a_unused char * const * argv)

 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;
 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;


@@ -558,7 +557,7 @@ int com_play(__a_unused int fd, int argc, __a_unused char **argv)
 }
 
 /* stop */
 }
 
 /* stop */

-int com_stop(__a_unused int fd, int argc, __a_unused char **argv)
+int com_stop(__a_unused int fd, int argc, __a_unused char * const * argv)

 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;
 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;


@@ -571,7 +570,7 @@ int com_stop(__a_unused int fd, int argc, __a_unused char **argv)
 }
 
 /* pause */
 }
 
 /* pause */

-int com_pause(__a_unused int fd, int argc, __a_unused char **argv)
+int com_pause(__a_unused int fd, int argc, __a_unused char * const * argv)

 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;
 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;


@@ -584,7 +583,7 @@ int com_pause(__a_unused int fd, int argc, __a_unused char **argv)
        return 1;
 }
 
        return 1;
 }
 

-int com_chs(int fd, int argc, char **argv)
+int com_chs(int fd, int argc, char * const * argv)

 {
        int i, ret;
 
 {
        int i, ret;
 


@@ -610,7 +609,7 @@ int com_chs(int fd, int argc, char **argv)
 }
 
 /* next */
 }
 
 /* next */

-int com_next(__a_unused int fd, int argc, __a_unused char **argv)
+int com_next(__a_unused int fd, int argc, __a_unused char * const * argv)

 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;
 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;


@@ -622,7 +621,7 @@ int com_next(__a_unused int fd, int argc, __a_unused char **argv)
 }
 
 /* nomore */
 }
 
 /* nomore */

-int com_nomore(__a_unused int fd, int argc, __a_unused char **argv)
+int com_nomore(__a_unused int fd, int argc, __a_unused char * const * argv)

 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;
 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;


@@ -634,7 +633,7 @@ int com_nomore(__a_unused int fd, int argc, __a_unused char **argv)
 }
 
 /* ff */
 }
 
 /* ff */

-int com_ff(__a_unused int fd, int argc, char **argv)
+int com_ff(__a_unused int fd, int argc, char * const * argv)

 {
        long promille;
        int ret, backwards = 0;
 {
        long promille;
        int ret, backwards = 0;


@@ -649,20 +648,20 @@ int com_ff(__a_unused int fd, int argc, char **argv)
                backwards = 1; /* jmp backwards */
        mmd_lock();
        ret = -E_NO_AUDIO_FILE;
                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;
                goto out;

-       promille = (1000 * mmd->current_chunk) / mmd->chunks_total;
+       promille = (1000 * mmd->current_chunk) / mmd->afi.chunks_total;

        if (backwards)
        if (backwards)

-               promille -= 1000 * i / mmd->seconds_total;
+               promille -= 1000 * i / mmd->afi.seconds_total;

        else
        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;
        }
        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++;
        mmd->new_vss_status_flags |= VSS_REPOS;
        mmd->new_vss_status_flags &= ~VSS_NEXT;
        mmd->events++;


@@ -673,7 +672,7 @@ out:
 }
 
 /* jmp */
 }
 
 /* jmp */

-int com_jmp(__a_unused int fd, int argc, char **argv)
+int com_jmp(__a_unused int fd, int argc, char * const * argv)

 {
        long unsigned int i;
        int ret;
 {
        long unsigned int i;
        int ret;


@@ -684,12 +683,12 @@ int com_jmp(__a_unused int fd, int argc, char **argv)
                return -E_COMMAND_SYNTAX;
        mmd_lock();
        ret = -E_NO_AUDIO_FILE;
                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);
                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;
        PARA_INFO_LOG("sent: %lu,  offset before jmp: %lu\n",
                mmd->chunks_sent, mmd->offset);
        mmd->new_vss_status_flags |= VSS_REPOS;


@@ -757,6 +756,42 @@ static void rc4_send(unsigned long len, const unsigned char *indata,
        RC4(&rc4_send_key, len, indata, outdata);
 }
 
        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
  *
 /**
  * perform user authentication and execute a command
  *


@@ -790,7 +825,7 @@ static void rc4_send(unsigned long len, const unsigned char *indata,
  */
 int handle_connect(int fd, struct sockaddr_in *addr)
 {
  */
 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;
        char buf[4096];
        unsigned char crypt_buf[MAXLINE];
        struct user *u;


@@ -798,6 +833,7 @@ int handle_connect(int fd, struct sockaddr_in *addr)
        long unsigned challenge_nr, chall_response;
        char **argv = NULL;
        char *p, *command = NULL;
        long unsigned challenge_nr, chall_response;
        char **argv = NULL;
        char *p, *command = NULL;

+       size_t numbytes;

 
        signal(SIGCHLD, SIG_IGN);
        signal(SIGINT, SIG_DFL);
 
        signal(SIGCHLD, SIG_IGN);
        signal(SIGINT, SIG_DFL);


@@ -840,23 +876,23 @@ int handle_connect(int fd, struct sockaddr_in *addr)
        if (ret <= 0)
                goto err_out;
        numbytes = ret;
        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 */
        /* 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;
        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;
        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) {
        PARA_INFO_LOG("good auth for %s (%lu)\n", u->name, challenge_nr);
        sprintf(buf, "%s", PROCEED_MSG);
        if (use_rc4) {


@@ -873,24 +909,12 @@ int handle_connect(int fd, struct sockaddr_in *addr)
                goto err_out;
        if (use_rc4)
                enable_crypt(fd, rc4_recv, rc4_send, NULL);
                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;
        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);
                goto err_out;
        /* valid command, check permissions */
        ret = check_perms(u->perms, cmd);


@@ -910,16 +934,15 @@ int handle_connect(int fd, struct sockaddr_in *addr)
                goto out;
        }
 err_out:
                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));
                send_va_buffer(fd, "%s\n", PARA_STRERROR(-ret));

-       }

        ret = EXIT_FAILURE;
 out:
        free(command);
        free(argv);
        mmd_lock();
        ret = EXIT_FAILURE;
 out:
        free(command);
        free(argv);
        mmd_lock();

-       if (cmd && (cmd->perms & DB_WRITE) && ret >= 0)
+       if (cmd && (cmd->perms & AFS_WRITE) && ret >= 0)

                mmd->events++;
        mmd->active_connections--;
        mmd_unlock();
                mmd->events++;
        mmd->active_connections--;
        mmd_unlock();