X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=aba21a6db1d2e92aa997a964a053d8000df9b2f1;hp=55548620c7a67996b74aac62f2c3cb862ee575b4;hb=8a8cd0f5bb40dcfad68608193e8c57decd90b25e;hpb=e0e5a7c1a04c6a2ee4a475e823657e06e6df2f99

diff --git a/dccp_send.c b/dccp_send.c
index 55548620..aba21a6d 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -31,8 +31,10 @@
 #include "dccp.h"
 #include "error.h"
 #include "string.h"
+#include "fd.h"
+#include "close_on_fork.h"
 #include "server.cmdline.h"
-extern struct gengetopt_args_info conf;
+
 /** the list of connected clients **/
 static struct list_head clients;
 static int listen_fd = -1;
@@ -50,17 +52,16 @@ struct dccp_client {
 	int header_sent;
 };
 
-static void dccp_pre_select(__a_unused struct audio_format *af, int *max_fileno, fd_set *rfds,
+static void dccp_pre_select( 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(__a_unused struct audio_format *af, fd_set *rfds,
-		__a_unused fd_set *wfds)
+static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 {
 	struct dccp_client *dc;
 	int ret;
@@ -76,6 +77,8 @@ static void dccp_post_select(__a_unused struct audio_format *af, fd_set *rfds,
 	PARA_NOTICE_LOG("connection from %s\n", inet_ntoa(dc->addr.sin_addr));
 	dc->fd = ret;
 	list_add(&dc->node, &clients);
+	add_close_on_fork_list(dc->fd);
+	mark_fd_nonblock(dc->fd);
 }
 
 static int dccp_open(void)
@@ -102,6 +105,8 @@ static int dccp_open(void)
 	if (ret < 0)
 		return -E_DCCP_LISTEN;
 	PARA_DEBUG_LOG("listening on fd %d\n", listen_fd);
+	add_close_on_fork_list(listen_fd);
+	mark_fd_nonblock(listen_fd);
 	return 1;
 }
 
@@ -110,17 +115,18 @@ 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);
+	del_close_on_fork_list(dc->fd);
 	list_del(&dc->node);
 	free(dc);
 }
 
 static int dccp_write(int fd, const char *buf, size_t len)
 {
-	size_t send, written = 0;
+	size_t size, written = 0;
 	int ret;
 again:
-	send = MIN(1024, len - written);
-	ret = write(fd, buf + written, send);
+	size = PARA_MIN(1024, len - written);
+	ret = write(fd, buf + written, size);
 	if (ret < 0)
 		goto err_out;
 	written += ret;
@@ -133,8 +139,7 @@ err_out:
 	return -E_DCCP_WRITE;
 }
 
-static void dccp_send(__a_unused struct audio_format *af,
-		long unsigned current_chunk,
+static void dccp_send(long unsigned current_chunk,
 		__a_unused long unsigned chunks_sent, const char *buf, size_t len)
 {
 	struct dccp_client *dc, *tmp;
@@ -152,27 +157,27 @@ static void dccp_send(__a_unused struct audio_format *af,
 		}
 		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 = 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;
-			}
-			dc->header_sent = 1;
-			ret = write_ok(dc->fd);
-			if (ret < 0) {
-				dccp_shutdown_client(dc);
-				continue;
+		if (!dc->header_sent && current_chunk) {
+			header_buf = afs_get_header(&header_len);
+			if (header_buf && header_len > 0) {
+				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;
+				}
+				dc->header_sent = 1;
+				ret = write_ok(dc->fd);
+				if (ret < 0) {
+					dccp_shutdown_client(dc);
+					continue;
+				}
+				if (!ret)
+					continue;
 			}
-			if (!ret)
-				continue;
 		}
 //		PARA_DEBUG_LOG("writing %d bytes to fd %d\n", len, dc->fd);
 		ret = dccp_write(dc->fd, buf, len);
@@ -234,8 +239,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;
 }