Merge commit 'meins/master'

[paraslash.git] / command.c

diff --git a/command.c b/command.c
index 458faf884d4b441313b02ced6e137aaca425e933..9abe04a341f94520a3720167e6610f1940e9fb24 100644 (file)
--- a/command.c
+++ b/command.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -26,6 +26,7 @@
 #include "net.h"
 #include "daemon.h"
 #include "fd.h"
+#include "ipc.h"
 #include "user_list.h"
 #include "server_command_list.h"
 #include "afs_command_list.h"
@@ -37,6 +38,7 @@ static RC4_KEY rc4_recv_key;
 static RC4_KEY rc4_send_key;
 static unsigned char rc4_buf[2 * RC4_KEY_LEN];
 
+extern int mmd_mutex;
 extern struct misc_meta_data *mmd;
 extern struct sender senders[];
 
@@ -53,23 +55,26 @@ static void dummy(int s)
 
 static void mmd_dup(struct misc_meta_data *new_mmd)
 {
-       mmd_lock();
+       mutex_lock(mmd_mutex);
        *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");
-       else if (flags & VSS_NEXT)
+       if (flags & VSS_NEXT)
                return para_strdup("stopped");
-       else
-               return para_strdup("paused");
+       return para_strdup("paused");
 }
 
 /*
@@ -175,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;
-       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;
-       }
-       mmd_unlock();
        switch (scd->cmd_num) {
        case SENDER_ON:
        case SENDER_OFF:
@@ -247,14 +248,14 @@ int com_sender(int fd, int argc, char * const * argv)
                return ret;
        }
        for (i = 0; i < 10; i++) {
-               mmd_lock();
+               mutex_lock(mmd_mutex);
                if (mmd->sender_cmd_data.cmd_num >= 0) {
-                       mmd_unlock();
+                       mutex_unlock(mmd_mutex);
                        usleep(100 * 1000);
                        continue;
                }
                mmd->sender_cmd_data = scd;
-               mmd_unlock();
+               mutex_unlock(mmd_mutex);
                break;
        }
        return (i < 10)? 1 : -E_LOCK;
@@ -269,7 +270,7 @@ int com_si(int fd, int argc, __a_unused char * const * argv)
 
        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);
@@ -279,14 +280,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"
-               "pid: %d\n"
+               "server_pid: %d\n"
+               "afs_pid: %d\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,
                (int)getppid(),
+               (int)mmd->afs_pid,
                mmd->active_connections,
                mmd->num_commands,
                mmd->num_connects,
@@ -295,7 +298,7 @@ int com_si(int fd, int argc, __a_unused char * const * argv)
                sender_list,
                sender_info
        );
-       mmd_unlock();
+       mutex_unlock(mmd_mutex);
        free(ut);
        free(sender_list);
        free(sender_info);
@@ -335,7 +338,7 @@ int com_stat(int fd, int argc, char * const * argv)
                if (ret < 0)
                        goto out;
                ret = 1;
-               if (num == 1)
+               if (num > 0 && !--num)
                        goto out;
                sleep(50);
                if (getppid() == 1)
@@ -444,10 +447,10 @@ int com_play(__a_unused int fd, int argc, __a_unused char * const * argv)
 {
        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_unlock();
+       mutex_unlock(mmd_mutex);
        return 1;
 
 }
@@ -457,11 +460,11 @@ int com_stop(__a_unused int fd, int argc, __a_unused char * const * argv)
 {
        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_unlock();
+       mutex_unlock(mmd_mutex);
        return 1;
 }
 
@@ -470,13 +473,13 @@ int com_pause(__a_unused int fd, int argc, __a_unused char * const * argv)
 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;
-       mmd_lock();
+       mutex_lock(mmd_mutex);
        if (!vss_paused() && !vss_stopped()) {
                mmd->events++;
                mmd->new_vss_status_flags &= ~VSS_PLAYING;
                mmd->new_vss_status_flags &= ~VSS_NEXT;
        }
-       mmd_unlock();
+       mutex_unlock(mmd_mutex);
        return 1;
 }
 
@@ -485,10 +488,10 @@ int com_next(__a_unused int fd, int argc, __a_unused char * const * argv)
 {
        if (argc != 1)
                return -E_COMMAND_SYNTAX;
-       mmd_lock();
+       mutex_lock(mmd_mutex);
        mmd->events++;
        mmd->new_vss_status_flags |= VSS_NEXT;
-       mmd_unlock();
+       mutex_unlock(mmd_mutex);
        return 1;
 }
 
@@ -497,10 +500,10 @@ int com_nomore(__a_unused int fd, int argc, __a_unused char * const * argv)
 {
        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;
-       mmd_unlock();
+       mutex_unlock(mmd_mutex);
        return 1;
 }
 
@@ -518,7 +521,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 */
-       mmd_lock();
+       mutex_lock(mmd_mutex);
        ret = -E_NO_AUDIO_FILE;
        if (!mmd->afd.afhi.chunks_total || !mmd->afd.afhi.seconds_total)
                goto out;
@@ -539,7 +542,7 @@ int com_ff(__a_unused int fd, int argc, char * const * argv)
        mmd->events++;
        ret = 1;
 out:
-       mmd_unlock();
+       mutex_unlock(mmd_mutex);
        return ret;
 }
 
@@ -553,7 +556,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;
-       mmd_lock();
+       mutex_lock(mmd_mutex);
        ret = -E_NO_AUDIO_FILE;
        if (!mmd->afd.afhi.chunks_total)
                goto out;
@@ -568,7 +571,7 @@ int com_jmp(__a_unused int fd, int argc, char * const * argv)
        ret = 1;
        mmd->events++;
 out:
-       mmd_unlock();
+       mutex_unlock(mmd_mutex);
        return ret;
 }
 
@@ -660,12 +663,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 peername  Identifies the connecting 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
@@ -688,7 +689,7 @@ out:
  *
  * \sa alarm(2), rc4(3), crypt.c, crypt.h
  */
-int handle_connect(int fd, const char *peername)
+__noreturn void handle_connect(int fd, const char *peername)
 {
        int ret, argc, use_rc4 = 0;
        char buf[4096];
@@ -793,28 +794,25 @@ int handle_connect(int fd, const char *peername)
        /* valid command and sufficient perms */
        alarm(0);
        argc = split_args(command, &argv, "\n");
-       mmd_lock();
+       mutex_lock(mmd_mutex);
        mmd->num_commands++;
-       mmd_unlock();
+       mutex_unlock(mmd_mutex);
        PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", cmd->name, u->name,
                        peername);
        ret = cmd->handler(fd, argc, argv);
-       if (ret >= 0) {
-               ret = EXIT_SUCCESS;
+       if (ret >= 0)
                goto out;
-       }
 err_out:
        send_va_buffer(fd, "%s\n", para_strerror(-ret));
 net_err:
        PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
-       ret = EXIT_FAILURE;
 out:
        free(command);
        free(argv);
-       mmd_lock();
+       mutex_lock(mmd_mutex);
        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);
 }