X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=f113968346e19c136fad2d764e8a1a1b31422c7d;hp=95d2ba8a8a2447a2cfaa1dc8a003b081538628f5;hb=d330cf697501c14bb696256cb27c9e69b9edf3f4;hpb=1f556ae88bd8c85d4452f689f532f5a6abeabe92;ds=sidebyside

diff --git a/dccp_recv.c b/dccp_recv.c
index 95d2ba8a..f1139683 100644
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -1,21 +1,11 @@
 /*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
+/** \file dccp_recv.c paraslash's dccp receiver */
+
 /*
  * based on client.c of dccp-cs-0.01.tar.bz2,
  * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
@@ -24,9 +14,12 @@
 #include "para.h"
 #include "error.h"
 #include "dccp.h"
+#include "list.h"
+#include "sched.h"
 #include "recv.h"
 #include "string.h"
 #include "net.h"
+#include "fd.h"
 
 #include "dccp_recv.cmdline.h"
 
@@ -35,8 +28,8 @@
 #include <sys/socket.h>
 #include <netdb.h>
 
-
-#define DCCP_BUFSIZE 4096
+/** the size of the output buffer */
+#define DCCP_BUFSIZE 40960
 
 /**
  * data specific to the dccp receiver
@@ -66,7 +59,7 @@ static void dccp_recv_close(struct receiver_node *rn)
 static int dccp_recv_open(struct receiver_node *rn)
 {
 	struct private_dccp_recv_data *pdd;
-	struct gengetopt_args_info *conf = rn->conf;
+	struct dccp_recv_args_info *conf = rn->conf;
 	int ret;
 	struct addrinfo *ai;
 	char *tmp;
@@ -90,9 +83,13 @@ static int dccp_recv_open(struct receiver_node *rn)
 	if (ret < 0)
 		goto err_out;
 	PARA_NOTICE_LOG("connecting to %s:%d\n", conf->host_arg, conf->port_arg);
-	ret = -E_DCCP_CONNECT;
-	if (connect(pdd->fd, ai->ai_addr, ai->ai_addrlen) < 0)
+	ret = connect(pdd->fd, ai->ai_addr, ai->ai_addrlen);
+	freeaddrinfo(ai);
+	if (ret < 0) {
+		ret = -E_DCCP_CONNECT;
 		goto err_out;
+	}
+	mark_fd_nonblock(pdd->fd);
 	return 1;
 err_out:
 	dccp_recv_close(rn);
@@ -106,7 +103,7 @@ static void dccp_shutdown(void)
 
 static void *dccp_recv_parse_config(int argc, char **argv)
 {
-	struct gengetopt_args_info *tmp = para_calloc(sizeof(struct gengetopt_args_info));
+	struct dccp_recv_args_info *tmp = para_calloc(sizeof(struct dccp_recv_args_info));
 
 	if (!dccp_recv_cmdline_parser(argc, argv, tmp))
 		return tmp;
@@ -114,32 +111,41 @@ static void *dccp_recv_parse_config(int argc, char **argv)
 	return NULL;
 }
 
-static int dccp_recv_pre_select(struct receiver_node *rn, fd_set *rfds,
-		__unused fd_set *wfds, __unused struct timeval *timeout)
+static void dccp_recv_pre_select(struct sched *s, struct task *t)
 {
+	struct receiver_node *rn = t->private_data;
 	struct private_dccp_recv_data *pdd = rn->private_data;
 
-	if (pdd)
-		FD_SET(pdd->fd, rfds);
-	return pdd->fd;
+	t->ret = 1;
+	para_fd_set(pdd->fd, &s->rfds, &s->max_fileno);
 }
 
-static int dccp_recv_post_select(struct receiver_node *rn, int select_ret,
-		fd_set *rfds, __unused fd_set *wfds)
+static void dccp_recv_post_select(struct sched *s, struct task *t)
 {
-	int ret;
+	struct receiver_node *rn = t->private_data;
 	struct private_dccp_recv_data *pdd = rn->private_data;
 
-	if (!select_ret || !pdd || !FD_ISSET(pdd->fd, rfds))
-		return 1; /* nothing to do */
+	t->ret = -E_DCCP_RECV_EOF;
+	if (rn->output_eof && *rn->output_eof)
+		goto out;
+	t->ret = 1;
+	if (!s->select_ret || !FD_ISSET(pdd->fd, &s->rfds))
+		goto out; /* nothing to do */
+	t->ret = -E_DCCP_OVERRUN;
 	if (rn->loaded >= DCCP_BUFSIZE)
-		return -E_DCCP_OVERRUN;
-	ret = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded,
+		goto out;
+	t->ret = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded,
 		DCCP_BUFSIZE - rn->loaded);
-	if (ret <= 0)
-		return ret;
-	rn->loaded += ret;
-	return 1;
+	if (t->ret <= 0) {
+		if (!t->ret)
+			t->ret = -E_DCCP_RECV_EOF;
+		goto out;
+	}
+	rn->loaded += t->ret;
+	return;
+out:
+	if (t->ret < 0)
+		rn->eof = 1;
 }
 
 /**