X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=8ca37d435a40ce049b2ddfa0875325e41b4d61c9;hp=75cf0f8764e273c3286ed41224b3962f61c4dc75;hb=cf749f79f1c353cc5aac1013aeef5ed0eb0f63ee;hpb=91e54c6f425ffdb801afdd3cfbb73a835290180c

diff --git a/vss.c b/vss.c
index 75cf0f87..8ca37d43 100644
--- a/vss.c
+++ b/vss.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -25,6 +25,7 @@
 #include "net.h"
 #include "server.cmdline.h"
 #include "vss.h"
+#include "list.h"
 #include "send.h"
 #include "ipc.h"
 #include "fd.h"
@@ -84,6 +85,18 @@ unsigned int vss_paused(void)
 		&& !(mmd->new_vss_status_flags & VSS_PLAYING);
 }
 
+/**
+ * Check if the vss is currently stopped.
+ *
+ * \return Greater than zero if paused, zero otherwise.
+ *
+ */
+unsigned int vss_stopped(void)
+{
+	return (mmd->new_vss_status_flags & VSS_NEXT)
+		&& !(mmd->new_vss_status_flags & VSS_PLAYING);
+}
+
 /**
  * Initialize the virtual streaming system.
  *
@@ -184,6 +197,8 @@ static void vss_eof(void)
 			senders[i].shutdown_clients();
 		return;
 	}
+	if (mmd->new_vss_status_flags & VSS_NOMORE)
+		mmd->new_vss_status_flags = VSS_NEXT;
 	gettimeofday(&now, NULL);
 	tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier);
 	munmap(map, mmd->size);
@@ -247,9 +262,13 @@ struct timeval *vss_chunk_time(void)
 	return &mmd->afd.afhi.chunk_tv;
 }
 
+/** The possible states of the afs socket. See \ref afs_socket. */
 enum afs_socket_status {
+	/** Socket is inactive. */
 	AFS_SOCKET_READY,
+	/** Socket fd was included in the write fd set for select(). */
 	AFS_SOCKET_CHECK_FOR_WRITE,
+	/** vss wrote a request to the socket and waits for afs to reply. */
 	AFS_SOCKET_AFD_PENDING
 };
 
@@ -301,8 +320,6 @@ struct timeval *vss_preselect(fd_set *rfds, fd_set *wfds, int *max_fileno)
 				tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier);
 			if (vss_repos())
 				tv_add(&now, &announce_tv, &data_send_barrier);
-			if (mmd->new_vss_status_flags & VSS_NOMORE)
-				mmd->new_vss_status_flags = VSS_NEXT;
 		}
 		mmd->chunks_sent = 0;
 	}
@@ -333,6 +350,7 @@ static int recv_afs_msg(int *fd, uint32_t *code, uint32_t *data)
 	struct iovec iov;
 	int ret = 0;
 
+	*fd = -1;
 	iov.iov_base = buf;
 	iov.iov_len = sizeof(buf);
 	msg.msg_iov = &iov;
@@ -343,8 +361,9 @@ static int recv_afs_msg(int *fd, uint32_t *code, uint32_t *data)
 	ret = recvmsg(afs_socket, &msg, 0);
 	if (ret < 0)
 		return -ERRNO_TO_PARA_ERROR(errno);
+	afsss = AFS_SOCKET_READY;
 	if (iov.iov_len != sizeof(buf))
-		return -E_SHORT_AFS_READ;
+		return -E_AFS_SHORT_READ;
 	*code = *(uint32_t*)buf;
 	*data =  *(uint32_t*)(buf + 4);
 	for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
@@ -360,20 +379,22 @@ static int recv_afs_msg(int *fd, uint32_t *code, uint32_t *data)
 
 static void recv_afs_result(void)
 {
-	int ret, passed_fd = -1, shmid;
+	int ret, passed_fd, shmid;
 	uint32_t afs_code = 0, afs_data = 0;
 	struct stat statbuf;
 	struct timeval now;
 
+	mmd->afd.afhi.chunk_table = NULL;
 	ret = recv_afs_msg(&passed_fd, &afs_code, &afs_data);
 	if (ret < 0)
 		goto err;
-	PARA_DEBUG_LOG("got the fd: %d, code: %u, shmid: %u\n",
-		passed_fd, afs_code, afs_data);
-	ret = -E_BAD_AFS_CODE;
+	PARA_DEBUG_LOG("fd: %d, code: %u, shmid: %u\n", passed_fd, afs_code,
+		afs_data);
+	ret = -E_NOFD;
 	if (afs_code != NEXT_AUDIO_FILE)
 		goto err;
-	afsss = AFS_SOCKET_READY;
+	if (passed_fd < 0)
+		goto err;
 	shmid = afs_data;
 	ret = load_afd(shmid, &mmd->afd);
 	if (ret < 0)
@@ -400,9 +421,11 @@ static void recv_afs_result(void)
 	tv_add(&now, &announce_tv, &data_send_barrier);
 	return;
 err:
+	free(mmd->afd.afhi.chunk_table);
 	if (passed_fd >= 0)
 		close(passed_fd);
-	PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+	PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+	mmd->new_vss_status_flags = VSS_NEXT;
 }
 
 void vss_post_select(fd_set *rfds, fd_set *wfds)
@@ -478,8 +501,8 @@ void vss_send_chunk(void)
 	}
 	/*
 	 * We call the send function also in case of empty chunks as they
-  	 * might have still some data queued which can be sent in this case.
-  	 */
+	 * might have still some data queued which can be sent in this case.
+	 */
 	if (!mmd->chunks_sent) {
 		struct timeval tmp;
 		gettimeofday(&mmd->stream_start, NULL);