X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=e838b3d87f23a64faa7eb4829f38c2dbcac7cf1c;hp=08b3069fcdbc0f554a5e0ca655930ddd109ab360;hb=9230155e692c3a2303a267759183dd1ad264dda1;hpb=1f556ae88bd8c85d4452f689f532f5a6abeabe92

diff --git a/dccp_send.c b/dccp_send.c
index 08b3069f..e838b3d8 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -16,6 +16,8 @@
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */
 
+/** \file dccp_send.c paraslash's dccp sender */
+
 /*
  * based on server.c of dccp-cs-0.01.tar.bz2,
  * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
@@ -44,34 +46,34 @@ struct dccp_client {
 	struct sockaddr_in addr;
 	/** the position of this client in the client list */
 	struct list_head node;
-	int header_sent; /* non-zero if audio file header has been sent */
+	/** non-zero if audio file header has been sent */
+	int header_sent;
 };
 
-static void dccp_pre_select(__unused struct audio_format *af, int *max_fileno, fd_set *rfds,
-		__unused fd_set *wfds)
+static void dccp_pre_select(__a_unused struct audio_format *af, int *max_fileno, fd_set *rfds,
+		__a_unused fd_set *wfds)
 {
 	if (listen_fd < 0)
 		return;
 	FD_SET(listen_fd, rfds);
-	*max_fileno = MAX(*max_fileno, listen_fd);
+	*max_fileno = PARA_MAX(*max_fileno, listen_fd);
 }
 
-static void dccp_post_select(__unused struct audio_format *af, fd_set *rfds,
-		__unused fd_set *wfds)
+static void dccp_post_select(__a_unused struct audio_format *af, fd_set *rfds,
+		__a_unused fd_set *wfds)
 {
 	struct dccp_client *dc;
 	int ret;
 
 	if (!FD_ISSET(listen_fd, rfds))
 		return;
-	PARA_NOTICE_LOG("%s", "accepting...\n");
 	dc = para_calloc(sizeof(struct dccp_client));
 	ret = para_accept(listen_fd, &dc->addr, sizeof(struct sockaddr_in));
 	if (ret < 0) {
 		PARA_ERROR_LOG("%s", PARA_STRERROR(-ret));
 		return;
 	}
-	PARA_NOTICE_LOG("%s", "connection\n");
+	PARA_NOTICE_LOG("connection from %s\n", inet_ntoa(dc->addr.sin_addr));
 	dc->fd = ret;
 	list_add(&dc->node, &clients);
 }
@@ -105,14 +107,35 @@ static int dccp_open(void)
 
 static void dccp_shutdown_client(struct dccp_client *dc)
 {
+	PARA_DEBUG_LOG("shutting down %s (fd %d)\n", inet_ntoa(dc->addr.sin_addr),
+		dc->fd);
 	close(dc->fd);
 	list_del(&dc->node);
 	free(dc);
 }
 
-static void dccp_send(__unused struct audio_format *af,
+static int dccp_write(int fd, const char *buf, size_t len)
+{
+	size_t send, written = 0;
+	int ret;
+again:
+	send = PARA_MIN(1024, len - written);
+	ret = write(fd, buf + written, send);
+	if (ret < 0)
+		goto err_out;
+	written += ret;
+	if (written >= len)
+		return written;
+	ret = write_ok(fd);
+	if (ret > 0)
+		goto again;
+err_out:
+	return -E_DCCP_WRITE;
+}
+
+static void dccp_send(__a_unused struct audio_format *af,
 		long unsigned current_chunk,
-		__unused long unsigned chunks_sent, const char *buf, size_t len)
+		__a_unused long unsigned chunks_sent, const char *buf, size_t len)
 {
 	struct dccp_client *dc, *tmp;
 	int ret, header_len;
@@ -122,22 +145,37 @@ static void dccp_send(__unused struct audio_format *af,
 		return;
 
 	list_for_each_entry_safe(dc, tmp, &clients, node) {
-		if (!_write_ok(dc->fd))
+		ret = write_ok(dc->fd);
+		if (ret < 0) {
+			dccp_shutdown_client(dc);
+			continue;
+		}
+		if (!ret)
 			continue;
 		if (!dc->header_sent && af->get_header_info && current_chunk) {
 			header_buf = af->get_header_info(&header_len);
 			if (!header_buf || header_len <= 0)
 				continue; /* header not yet available */
-			ret = write(dc->fd, header_buf, header_len);
+			ret = dccp_write(dc->fd, header_buf, header_len);
 			if (ret != header_len) {
+				int err = errno;
+				PARA_ERROR_LOG("header write: %d/%d (%s)\n",
+					ret, header_len, ret < 0?
+					strerror(err) : "");
 				dccp_shutdown_client(dc);
 				continue;
 			}
-			if (!_write_ok(dc->fd))
+			dc->header_sent = 1;
+			ret = write_ok(dc->fd);
+			if (ret < 0) {
+				dccp_shutdown_client(dc);
+				continue;
+			}
+			if (!ret)
 				continue;
 		}
-		PARA_DEBUG_LOG("writing %d bytes to fd %d\n", len, dc->fd);
-		ret = write(dc->fd, buf, len);
+//		PARA_DEBUG_LOG("writing %d bytes to fd %d\n", len, dc->fd);
+		ret = dccp_write(dc->fd, buf, len);
 		if (ret != len)
 			dccp_shutdown_client(dc);
 	}
@@ -160,7 +198,7 @@ static char *dccp_info(void)
 	free(buf);
 	list_for_each_entry_safe(dc, tmp, &clients, node)
 		num_clients++;
-	buf = make_message("%d connected clients\n", num_clients);
+	buf = make_message("dccp connected clients: %d\n", num_clients);
 	return buf;
 }
 
@@ -169,6 +207,14 @@ static char *dccp_help(void)
 	return make_message("no help available\n");
 }
 
+/**
+ * the init function of the dccp sender
+ *
+ * \param s pointer to the dccp sender struct
+ *
+ * It initializes all function pointers of \a s and starts
+ * listening on the given port.
+ */
 void dccp_send_init(struct sender *s)
 {
 	int ret;
@@ -188,8 +234,9 @@ void dccp_send_init(struct sender *s)
 	s->client_cmds[SENDER_DELETE] = NULL;
 	self = s;
 	ret = dccp_open();
-	if (ret < 0)
+	if (ret < 0) {
 		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
-	else
+		s->status = SENDER_OFF;
+	} else
 		s->status = SENDER_ON;
 }