fecdec: Minor cleanups.

[paraslash.git] / command.c

diff --git a/command.c b/command.c
index e5e8e6841e86d4b70150aef46c7d7c1e8a04ec72..b59fae7af154d5545999ae6b79757c06b7c118ee 100644 (file)
--- a/command.c
+++ b/command.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>

  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */


@@ -20,12 +20,13 @@
 #include "afs.h"
 #include "server.h"
 #include "vss.h"
 #include "afs.h"
 #include "server.h"
 #include "vss.h"

+#include "list.h"

 #include "send.h"
 #include "rc4.h"
 #include "net.h"
 #include "daemon.h"
 #include "fd.h"
 #include "send.h"
 #include "rc4.h"
 #include "net.h"
 #include "daemon.h"
 #include "fd.h"

-#include "list.h"
+#include "ipc.h"

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


@@ -37,32 +38,43 @@ static RC4_KEY rc4_recv_key;
 static RC4_KEY rc4_send_key;
 static unsigned char rc4_buf[2 * RC4_KEY_LEN];
 
 static RC4_KEY rc4_send_key;
 static unsigned char rc4_buf[2 * RC4_KEY_LEN];
 

-extern const char *status_item_list[NUM_STAT_ITEMS];
+extern int mmd_mutex;

 extern struct misc_meta_data *mmd;
 extern struct sender senders[];
 
 extern struct misc_meta_data *mmd;
 extern struct sender senders[];
 

-static void dummy(__a_unused int s)
-{}
+static void dummy(int s)
+{
+       /*
+        * At least on Solaris, SIGUSR1 is one-shot, i.e. the signal action is
+        * restored to the default state once the signal handler has been
+        * called.
+        */
+       if (s == SIGUSR1)
+               signal(SIGUSR1, dummy);
+}

 
 static void mmd_dup(struct misc_meta_data *new_mmd)
 {
 
 static void mmd_dup(struct misc_meta_data *new_mmd)
 {

-       mmd_lock();
+       mutex_lock(mmd_mutex);

        *new_mmd = *mmd;
        *new_mmd = *mmd;

-       mmd_unlock();
+       mutex_unlock(mmd_mutex);

 }
 
 /*
 }
 
 /*

- * compute human readable string containing
- * vss status for given integer value
+ * Compute human readable string containing vss status for given integer value.
+ *
+ * We don't want to use vss_playing() and friends here because we take a
+ * snapshot of the mmd struct and use the copy for computing the state of the
+ * vss. If the real data were used, we would take the mmd lock for a rather
+ * long time or risk to get an inconsistent view.

  */
 static char *vss_status_tohuman(unsigned int flags)
 {
        if (flags & VSS_PLAYING)
                return para_strdup("playing");
  */
 static char *vss_status_tohuman(unsigned int flags)
 {
        if (flags & VSS_PLAYING)
                return para_strdup("playing");

-       else if (flags & VSS_NEXT)
+       if (flags & VSS_NEXT)

                return para_strdup("stopped");
                return para_strdup("stopped");

-       else
-               return para_strdup("paused");
+       return para_strdup("paused");

 }
 
 /*
 }
 
 /*


@@ -97,7 +109,7 @@ static char *vss_get_status_flags(unsigned int flags)
 
 static char *get_status(struct misc_meta_data *nmmd)
 {
 
 static char *get_status(struct misc_meta_data *nmmd)
 {

-       char *basename, *dirname, *ret, mtime[30] = "";
+       char *ret, mtime[30] = "";

        char *status, *flags; /* vss status info */
        char *ut = uptime_str();
        long offset = (nmmd->offset + 500) / 1000;
        char *status, *flags; /* vss status info */
        char *ut = uptime_str();
        long offset = (nmmd->offset + 500) / 1000;


@@ -107,37 +119,29 @@ static char *get_status(struct misc_meta_data *nmmd)
        /* report real status */
        status = vss_status_tohuman(nmmd->vss_status_flags);
        flags = vss_get_status_flags(nmmd->vss_status_flags);
        /* report real status */
        status = vss_status_tohuman(nmmd->vss_status_flags);
        flags = vss_get_status_flags(nmmd->vss_status_flags);

-       basename = para_basename(nmmd->afd.path);
-       dirname = para_dirname(nmmd->afd.path);
-       if (basename) {
+       if (nmmd->size) { /* parent currently has an audio file open */

                localtime_r(&nmmd->mtime, &mtime_tm);
                localtime_r(&nmmd->mtime, &mtime_tm);

-               strftime(mtime, 29, "%a %b %d %Y", &mtime_tm);
+               strftime(mtime, 29, "%b %d %Y", &mtime_tm);

        }
        gettimeofday(&now, NULL);
        ret = make_message(
        }
        gettimeofday(&now, NULL);
        ret = make_message(

-               "%s:%zu\n"      "%s:%s\n"               "%s:%lu\n"      "%s:%u\n"
-               "%s:%s\n"       "%s:%s\n"       "%s:%s\n"       "%s:%u\n"
-               "%s:%li\n"      "%s:%s\n"       "%s:%s\n" "%s"
-               "%s:%s\n"       "%s:%lu.%lu\n"  "%s:%lu.%lu\n"
-               "%s:%s\n"       "%s:%u\n"       "%s\n",
+               "%s: %zu\n" /* file size */
+               "%s: %s\n" /* mtime */
+               "%s: %s\n" /* status */
+               "%s: %s\n" /* status flags */
+               "%s: %li\n" /* offset */
+               "%s: %s\n" /* afs mode */
+               "%s: %lu.%lu\n" /* stream start */
+               "%s: %lu.%lu\n" /* current server time */
+               "%s", /* afs status info */

                status_item_list[SI_FILE_SIZE], nmmd->size / 1024,
                status_item_list[SI_MTIME], mtime,
                status_item_list[SI_FILE_SIZE], nmmd->size / 1024,
                status_item_list[SI_MTIME], mtime,

-               status_item_list[SI_LENGTH], nmmd->afd.afhi.seconds_total,
-               status_item_list[SI_NUM_PLAYED], nmmd->num_played,
-
-               status_item_list[SI_BASENAME], basename ? basename : "(none)",

                status_item_list[SI_STATUS], status,
                status_item_list[SI_STATUS_FLAGS], flags,
                status_item_list[SI_STATUS], status,
                status_item_list[SI_STATUS_FLAGS], flags,

-               status_item_list[SI_IMAGE_ID], nmmd->afd.afsi.image_id,

 
                status_item_list[SI_OFFSET], offset,
 
                status_item_list[SI_OFFSET], offset,

-               status_item_list[SI_FORMAT], basename?
-                       audio_format_name(nmmd->afd.afsi.audio_format_id)
-                       : "",

                status_item_list[SI_AFS_MODE], mmd->afs_mode_string,
                status_item_list[SI_AFS_MODE], mmd->afs_mode_string,

-               nmmd->afd.afhi.info_string,

 
 

-               status_item_list[SI_UPTIME], ut,

                status_item_list[SI_STREAM_START],
                        (long unsigned)nmmd->stream_start.tv_sec,
                        (long unsigned)nmmd->stream_start.tv_usec,
                status_item_list[SI_STREAM_START],
                        (long unsigned)nmmd->stream_start.tv_sec,
                        (long unsigned)nmmd->stream_start.tv_usec,


@@ -145,13 +149,9 @@ static char *get_status(struct misc_meta_data *nmmd)
                        (long unsigned)now.tv_sec,
                        (long unsigned)now.tv_usec,
 
                        (long unsigned)now.tv_sec,
                        (long unsigned)now.tv_usec,
 

-               status_item_list[SI_DIRECTORY], dirname? dirname : "(none)",
-               status_item_list[SI_LYRICS_ID], nmmd->afd.afsi.lyrics_id,
-               nmmd->afd.afs_status_info
+               nmmd->afd.verbose_ls_output

 
        );
 
        );

-       free(basename);
-       free(dirname);

        free(flags);
        free(status);
        free(ut);
        free(flags);
        free(status);
        free(ut);


@@ -180,12 +180,8 @@ static int check_sender_args(int argc, char * const * argv, struct sender_comman
        if (!subcmds[i])
                return -E_COMMAND_SYNTAX;
        scd->cmd_num = i;
        if (!subcmds[i])
                return -E_COMMAND_SYNTAX;
        scd->cmd_num = i;

-       mmd_lock();
-       if (!senders[scd->sender_num].client_cmds[scd->cmd_num]) {
-               mmd_unlock();
+       if (!senders[scd->sender_num].client_cmds[scd->cmd_num])

                return -E_SENDER_CMD;
                return -E_SENDER_CMD;

-       }
-       mmd_unlock();

        switch (scd->cmd_num) {
        case SENDER_ON:
        case SENDER_OFF:
        switch (scd->cmd_num) {
        case SENDER_ON:
        case SENDER_OFF:


@@ -196,7 +192,7 @@ static int check_sender_args(int argc, char * const * argv, struct sender_comman
        case SENDER_ALLOW:
                if (argc != 4 && argc != 5)
                        return -E_COMMAND_SYNTAX;
        case SENDER_ALLOW:
                if (argc != 4 && argc != 5)
                        return -E_COMMAND_SYNTAX;

-               if (!inet_pton(AF_INET, argv[3], &scd->addr))
+               if (!is_valid_ipv4_address(argv[3]))

                        return -E_COMMAND_SYNTAX;
                scd->netmask = 32;
                if (argc == 5) {
                        return -E_COMMAND_SYNTAX;
                scd->netmask = 32;
                if (argc == 5) {


@@ -204,20 +200,13 @@ static int check_sender_args(int argc, char * const * argv, struct sender_comman
                        if (scd->netmask < 0 || scd->netmask > 32)
                                return -E_COMMAND_SYNTAX;
                }
                        if (scd->netmask < 0 || scd->netmask > 32)
                                return -E_COMMAND_SYNTAX;
                }

+               strncpy(scd->host, argv[3], sizeof(scd->host));

                break;
        case SENDER_ADD:
        case SENDER_DELETE:
                break;
        case SENDER_ADD:
        case SENDER_DELETE:

-               if (argc != 4 && argc != 5)
-                       return -E_COMMAND_SYNTAX;
-               if (!inet_pton(AF_INET, argv[3], &scd->addr))
+               if (argc != 4)

                        return -E_COMMAND_SYNTAX;
                        return -E_COMMAND_SYNTAX;

-               scd->port = -1;
-               if (argc == 5) {
-                       scd->port = atoi(argv[4]);
-                       if (scd->port < 0 || scd->port > 65535)
-                               return -E_COMMAND_SYNTAX;
-               }
-               break;
+               return parse_fec_url(argv[3], scd);

        default:
                return -E_COMMAND_SYNTAX;
        }
        default:
                return -E_COMMAND_SYNTAX;
        }


@@ -247,19 +236,19 @@ int com_sender(int fd, int argc, char * const * argv)
                if (scd.sender_num < 0)
                        return ret;
                msg = senders[scd.sender_num].help();
                if (scd.sender_num < 0)
                        return ret;
                msg = senders[scd.sender_num].help();

-               send_buffer(fd, msg);
+               ret = send_buffer(fd, msg);

                free(msg);
                free(msg);

-               return 1;
+               return ret;

        }
        for (i = 0; i < 10; i++) {
        }
        for (i = 0; i < 10; i++) {

-               mmd_lock();
+               mutex_lock(mmd_mutex);

                if (mmd->sender_cmd_data.cmd_num >= 0) {
                if (mmd->sender_cmd_data.cmd_num >= 0) {

-                       mmd_unlock();
+                       mutex_unlock(mmd_mutex);

                        usleep(100 * 1000);
                        continue;
                }
                        usleep(100 * 1000);
                        continue;
                }

-               mmd->sender_cmd_data = scd;
-               mmd_unlock();
+               memcpy(&mmd->sender_cmd_data, &scd, sizeof(scd));
+               mutex_unlock(mmd_mutex);

                break;
        }
        return (i < 10)? 1 : -E_LOCK;
                break;
        }
        return (i < 10)? 1 : -E_LOCK;


@@ -274,7 +263,7 @@ int com_si(int fd, int argc, __a_unused char * const * argv)
 
        if (argc != 1)
                return -E_COMMAND_SYNTAX;
 
        if (argc != 1)
                return -E_COMMAND_SYNTAX;

-       mmd_lock();
+       mutex_lock(mmd_mutex);

        for (i = 0; senders[i].name; i++) {
                char *info = senders[i].info();
                sender_info = para_strcat(sender_info, info);
        for (i = 0; senders[i].name; i++) {
                char *info = senders[i].info();
                sender_info = para_strcat(sender_info, info);


@@ -284,14 +273,16 @@ int com_si(int fd, int argc, __a_unused char * const * argv)
        }
        ut = uptime_str();
        ret = send_va_buffer(fd, "up: %s\nplayed: %u\n"
        }
        ut = uptime_str();
        ret = send_va_buffer(fd, "up: %s\nplayed: %u\n"

-               "pid: %d\n"
+               "server_pid: %d\n"
+               "afs_pid: %d\n"

                "connections (active/accepted/total): %u/%u/%u\n"
                "connections (active/accepted/total): %u/%u/%u\n"

-               "current loglevel: %i\n"
+               "current loglevel: %s\n"

                "supported audio formats: %s\n"
                "supported senders: %s\n"
                "%s",
                ut, mmd->num_played,
                "supported audio formats: %s\n"
                "supported senders: %s\n"
                "%s",
                ut, mmd->num_played,

-               getppid(),
+               (int)getppid(),
+               (int)mmd->afs_pid,

                mmd->active_connections,
                mmd->num_commands,
                mmd->num_connects,
                mmd->active_connections,
                mmd->num_commands,
                mmd->num_connects,


@@ -300,7 +291,7 @@ int com_si(int fd, int argc, __a_unused char * const * argv)
                sender_list,
                sender_info
        );
                sender_list,
                sender_info
        );

-       mmd_unlock();
+       mutex_unlock(mmd_mutex);

        free(ut);
        free(sender_list);
        free(sender_info);
        free(ut);
        free(sender_list);
        free(sender_info);


@@ -314,7 +305,7 @@ int com_version(int fd, int argc, __a_unused char * const * argv)
                return -E_COMMAND_SYNTAX;
        return send_buffer(fd, VERSION_TEXT("server")
                "built: " BUILD_DATE "\n"
                return -E_COMMAND_SYNTAX;
        return send_buffer(fd, VERSION_TEXT("server")
                "built: " BUILD_DATE "\n"

-               SYSTEM ", " CC_VERSION "\n"
+               UNAME_RS ", " CC_VERSION "\n"

        );
 }
 
        );
 }
 


@@ -340,7 +331,7 @@ int com_stat(int fd, int argc, char * const * argv)
                if (ret < 0)
                        goto out;
                ret = 1;
                if (ret < 0)
                        goto out;
                ret = 1;

-               if (num == 1)
+               if (num > 0 && !--num)

                        goto out;
                sleep(50);
                if (getppid() == 1)
                        goto out;
                sleep(50);
                if (getppid() == 1)


@@ -449,10 +440,10 @@ 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;

-       mmd_lock();
+       mutex_lock(mmd_mutex);

        mmd->new_vss_status_flags |= VSS_PLAYING;
        mmd->new_vss_status_flags &= ~VSS_NOMORE;
        mmd->new_vss_status_flags |= VSS_PLAYING;
        mmd->new_vss_status_flags &= ~VSS_NOMORE;

-       mmd_unlock();
+       mutex_unlock(mmd_mutex);

        return 1;
 
 }
        return 1;
 
 }


@@ -462,11 +453,11 @@ 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;

-       mmd_lock();
+       mutex_lock(mmd_mutex);

        mmd->new_vss_status_flags &= ~VSS_PLAYING;
        mmd->new_vss_status_flags &= ~VSS_REPOS;
        mmd->new_vss_status_flags |= VSS_NEXT;
        mmd->new_vss_status_flags &= ~VSS_PLAYING;
        mmd->new_vss_status_flags &= ~VSS_REPOS;
        mmd->new_vss_status_flags |= VSS_NEXT;

-       mmd_unlock();
+       mutex_unlock(mmd_mutex);

        return 1;
 }
 
        return 1;
 }
 


@@ -475,12 +466,13 @@ 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;

-       mmd_lock();
-       if (!vss_paused())
+       mutex_lock(mmd_mutex);
+       if (!vss_paused() && !vss_stopped()) {

                mmd->events++;
                mmd->events++;

-       mmd->new_vss_status_flags &= ~VSS_PLAYING;
-       mmd->new_vss_status_flags &= ~VSS_NEXT;
-       mmd_unlock();
+               mmd->new_vss_status_flags &= ~VSS_PLAYING;
+               mmd->new_vss_status_flags &= ~VSS_NEXT;
+       }
+       mutex_unlock(mmd_mutex);

        return 1;
 }
 
        return 1;
 }
 


@@ -489,10 +481,10 @@ 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;

-       mmd_lock();
+       mutex_lock(mmd_mutex);

        mmd->events++;
        mmd->new_vss_status_flags |= VSS_NEXT;
        mmd->events++;
        mmd->new_vss_status_flags |= VSS_NEXT;

-       mmd_unlock();
+       mutex_unlock(mmd_mutex);

        return 1;
 }
 
        return 1;
 }
 


@@ -501,10 +493,10 @@ 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;

-       mmd_lock();
+       mutex_lock(mmd_mutex);

        if (vss_playing() || vss_paused())
                mmd->new_vss_status_flags |= VSS_NOMORE;
        if (vss_playing() || vss_paused())
                mmd->new_vss_status_flags |= VSS_NOMORE;

-       mmd_unlock();
+       mutex_unlock(mmd_mutex);

        return 1;
 }
 
        return 1;
 }
 


@@ -522,7 +514,7 @@ int com_ff(__a_unused int fd, int argc, char * const * argv)
                return -E_COMMAND_SYNTAX;
        if (ret > 1 && c == '-')
                backwards = 1; /* jmp backwards */
                return -E_COMMAND_SYNTAX;
        if (ret > 1 && c == '-')
                backwards = 1; /* jmp backwards */

-       mmd_lock();
+       mutex_lock(mmd_mutex);

        ret = -E_NO_AUDIO_FILE;
        if (!mmd->afd.afhi.chunks_total || !mmd->afd.afhi.seconds_total)
                goto out;
        ret = -E_NO_AUDIO_FILE;
        if (!mmd->afd.afhi.chunks_total || !mmd->afd.afhi.seconds_total)
                goto out;


@@ -543,7 +535,7 @@ int com_ff(__a_unused int fd, int argc, char * const * argv)
        mmd->events++;
        ret = 1;
 out:
        mmd->events++;
        ret = 1;
 out:

-       mmd_unlock();
+       mutex_unlock(mmd_mutex);

        return ret;
 }
 
        return ret;
 }
 


@@ -557,7 +549,7 @@ int com_jmp(__a_unused int fd, int argc, char * const * argv)
                return -E_COMMAND_SYNTAX;
        if (sscanf(argv[1], "%lu", &i) <= 0)
                return -E_COMMAND_SYNTAX;
                return -E_COMMAND_SYNTAX;
        if (sscanf(argv[1], "%lu", &i) <= 0)
                return -E_COMMAND_SYNTAX;

-       mmd_lock();
+       mutex_lock(mmd_mutex);

        ret = -E_NO_AUDIO_FILE;
        if (!mmd->afd.afhi.chunks_total)
                goto out;
        ret = -E_NO_AUDIO_FILE;
        if (!mmd->afd.afhi.chunks_total)
                goto out;


@@ -572,7 +564,7 @@ int com_jmp(__a_unused int fd, int argc, char * const * argv)
        ret = 1;
        mmd->events++;
 out:
        ret = 1;
        mmd->events++;
 out:

-       mmd_unlock();
+       mutex_unlock(mmd_mutex);

        return ret;
 }
 
        return ret;
 }
 


@@ -582,7 +574,7 @@ out:
  */
 static int check_perms(unsigned int perms, struct server_command *cmd_ptr)
 {
  */
 static int check_perms(unsigned int perms, struct server_command *cmd_ptr)
 {

-       PARA_DEBUG_LOG("%s", "checking permissions\n");
+       PARA_DEBUG_LOG("checking permissions\n");

        return (cmd_ptr->perms & perms) < cmd_ptr->perms ? -E_PERM : 0;
 }
 
        return (cmd_ptr->perms & perms) < cmd_ptr->perms ? -E_PERM : 0;
 }
 


@@ -664,12 +656,10 @@ out:
 }
 
 /**
 }
 
 /**

- * perform user authentication and execute a command
+ * Perform user authentication and execute a command.

  *
  *

- * \param fd the file descriptor to send output to
- * \param addr socket address info of peer
- *
- * \return EXIT_SUCCESS or EXIT_FAILURE
+ * \param fd The file descriptor to send output to.
+ * \param peername Identifies the connecting peer.

  *
  * Whenever para_server accepts an incoming tcp connection on
  * the port it listens on, it forks and the resulting child
  *
  * Whenever para_server accepts an incoming tcp connection on
  * the port it listens on, it forks and the resulting child


@@ -692,7 +682,7 @@ out:
  *
  * \sa alarm(2), rc4(3), crypt.c, crypt.h
  */
  *
  * \sa alarm(2), rc4(3), crypt.c, crypt.h
  */

-int handle_connect(int fd, struct sockaddr_in *addr)
+__noreturn void handle_connect(int fd, const char *peername)

 {
        int ret, argc, use_rc4 = 0;
        char buf[4096];
 {
        int ret, argc, use_rc4 = 0;
        char buf[4096];


@@ -708,8 +698,11 @@ int handle_connect(int fd, struct sockaddr_in *addr)
        signal(SIGINT, SIG_DFL);
        signal(SIGTERM, SIG_DFL);
        signal(SIGHUP, SIG_DFL);
        signal(SIGINT, SIG_DFL);
        signal(SIGTERM, SIG_DFL);
        signal(SIGHUP, SIG_DFL);

-       signal(SIGUSR1, SIG_IGN);

 
 

+       /* we need a blocking fd here as recv() might return EAGAIN otherwise. */
+       ret = mark_fd_blocking(fd);
+       if (ret < 0)
+               goto err_out;

        challenge_nr = random();
        /* send Welcome message */
        ret = send_va_buffer(fd, "This is para_server, version "
        challenge_nr = random();
        /* send Welcome message */
        ret = send_va_buffer(fd, "This is para_server, version "


@@ -749,15 +742,15 @@ int handle_connect(int fd, struct sockaddr_in *addr)
        /* 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)
        /* 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;
+               goto net_err;

        /* recv decrypted number */
        ret = recv_buffer(fd, buf, sizeof(buf));
        if (ret < 0)
        /* recv decrypted number */
        ret = recv_buffer(fd, buf, sizeof(buf));
        if (ret < 0)

-               goto err_out;
+               goto net_err;

        numbytes = ret;
        ret = -E_AUTH;
        if (!numbytes)
        numbytes = ret;
        ret = -E_AUTH;
        if (!numbytes)

-               goto err_out;
+               goto net_err;

        if (sscanf(buf, CHALLENGE_RESPONSE_MSG "%lu", &chall_response) < 1
                        || chall_response != challenge_nr)
                goto err_out;
        if (sscanf(buf, CHALLENGE_RESPONSE_MSG "%lu", &chall_response) < 1
                        || chall_response != challenge_nr)
                goto err_out;


@@ -775,12 +768,14 @@ int handle_connect(int fd, struct sockaddr_in *addr)
                numbytes = strlen(buf);
        ret = send_bin_buffer(fd, buf, numbytes);
        if (ret < 0)
                numbytes = strlen(buf);
        ret = send_bin_buffer(fd, buf, numbytes);
        if (ret < 0)

-               goto err_out;
+               goto net_err;

        if (use_rc4)
                enable_crypt(fd, rc4_recv, rc4_send, NULL);
        ret = read_command(fd, &command);
        if (use_rc4)
                enable_crypt(fd, rc4_recv, rc4_send, NULL);
        ret = read_command(fd, &command);

-       if (ret < 0)
+       if (ret == -E_COMMAND_SYNTAX)

                goto err_out;
                goto err_out;

+       if (ret < 0)
+               goto net_err;

        ret = -E_BAD_CMD;
        cmd = parse_cmd(command);
        if (!cmd)
        ret = -E_BAD_CMD;
        cmd = parse_cmd(command);
        if (!cmd)


@@ -792,28 +787,25 @@ int handle_connect(int fd, struct sockaddr_in *addr)
        /* valid command and sufficient perms */
        alarm(0);
        argc = split_args(command, &argv, "\n");
        /* valid command and sufficient perms */
        alarm(0);
        argc = split_args(command, &argv, "\n");

-       mmd_lock();
+       mutex_lock(mmd_mutex);

        mmd->num_commands++;
        mmd->num_commands++;

-       mmd_unlock();
+       mutex_unlock(mmd_mutex);

        PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", cmd->name, u->name,
        PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", cmd->name, u->name,

-               inet_ntoa(addr->sin_addr));
+                       peername);

        ret = cmd->handler(fd, argc, argv);
        ret = cmd->handler(fd, argc, argv);

-       if (ret >= 0) {
-               ret = EXIT_SUCCESS;
+       if (ret >= 0)

                goto out;
                goto out;

-       }

 err_out:
 err_out:

-       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;
+       send_va_buffer(fd, "%s\n", para_strerror(-ret));
+net_err:
+       PARA_NOTICE_LOG("%s\n", para_strerror(-ret));

 out:
        free(command);
        free(argv);
 out:
        free(command);
        free(argv);

-       mmd_lock();
+       mutex_lock(mmd_mutex);

        if (cmd && (cmd->perms & AFS_WRITE) && ret >= 0)
                mmd->events++;
        mmd->active_connections--;
        if (cmd && (cmd->perms & AFS_WRITE) && ret >= 0)
                mmd->events++;
        mmd->active_connections--;

-       mmd_unlock();
-       return ret;
+       mutex_unlock(mmd_mutex);
+       exit(ret < 0? EXIT_FAILURE : EXIT_SUCCESS);

 }
 }