In handle_connect() we really need a blocking fd for the client.

[paraslash.git] / command.c

diff --git a/command.c b/command.c
index 319c88a6ba5f3aa7c6da1f124eb2c247e93eb2dd..ab948b09b129546da1d62a515059deb013e6f50d 100644 (file)
--- a/command.c
+++ b/command.c
@@ -118,10 +118,9 @@ static char *get_status(struct misc_meta_data *nmmd)
                "%s: %s\n" /* status flags */
                "%s: %li\n" /* offset */
                "%s: %s\n" /* afs mode */
-               "%s: %s\n" /* server uptime */
                "%s: %lu.%lu\n" /* stream start */
                "%s: %lu.%lu\n" /* current server time */
-               "%s\n", /* afs status info */
+               "%s", /* afs status info */
                status_item_list[SI_FILE_SIZE], nmmd->size / 1024,
                status_item_list[SI_MTIME], mtime,
                status_item_list[SI_STATUS], status,
@@ -130,7 +129,6 @@ static char *get_status(struct misc_meta_data *nmmd)
                status_item_list[SI_OFFSET], offset,
                status_item_list[SI_AFS_MODE], mmd->afs_mode_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,
@@ -465,10 +463,11 @@ int com_pause(__a_unused int fd, int argc, __a_unused char * const * argv)
        if (argc != 1)
                return -E_COMMAND_SYNTAX;
        mmd_lock();
-       if (!vss_paused())
+       if (!vss_paused() && !vss_stopped()) {
                mmd->events++;
-       mmd->new_vss_status_flags &= ~VSS_PLAYING;
-       mmd->new_vss_status_flags &= ~VSS_NEXT;
+               mmd->new_vss_status_flags &= ~VSS_PLAYING;
+               mmd->new_vss_status_flags &= ~VSS_NEXT;
+       }
        mmd_unlock();
        return 1;
 }
@@ -699,6 +698,10 @@ int handle_connect(int fd, struct sockaddr_in *addr)
        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 "