X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=755473c9e1f3a556302b7e7890959d919a80b1a9;hp=f56f58cbb2932ca95c0056f96df30ec5150b7519;hb=8d7f47e8cec74e4d209cfa1f6c4c0cec3b0e5019;hpb=c9f109a9e7f2d6116b7906a852afc339c858c275

diff --git a/dccp_recv.c b/dccp_recv.c
index f56f58cb..755473c9 100644
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -1,19 +1,32 @@
+/*
+ * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ *
+ * 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>
+ */
+
+#include <sys/types.h>
+#include <dirent.h>
+
 #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"
 
-/* needed by getaddrinfo */
-#include <sys/types.h>
-#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
@@ -43,37 +56,18 @@ 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;
-	int ret;
-	struct addrinfo *ai;
-	char *tmp;
+	struct dccp_recv_args_info *conf = rn->conf;
+	int ret = makesock(AF_UNSPEC, IPPROTO_DCCP, 0, conf->host_arg, conf->port_arg);
 
-	rn->buf = para_calloc(DCCP_BUFSIZE);
-	rn->private_data = para_calloc(sizeof(struct private_dccp_recv_data));
-	pdd = rn->private_data;
-	ret = dccp_get_socket();
 	if (ret < 0)
-		goto err_out;
-	pdd->fd = ret;
+		return ret;
 
-	tmp = make_message("%d", conf->port_arg);
-	ret = getaddrinfo(conf->host_arg, tmp, NULL, &ai);
-	free(tmp);
-	if (ret) {
-		ret = -E_ADDR_INFO;
-		goto err_out;
-	}
-	ret = dccp_set_socket(pdd->fd);
-	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)
-		goto err_out;
+	rn->buf = para_calloc(DCCP_BUFSIZE);
+	rn->private_data = pdd = para_calloc(sizeof(struct private_dccp_recv_data));
+
+	pdd->fd = ret;
+	mark_fd_nonblocking(pdd->fd);
 	return 1;
-err_out:
-	dccp_recv_close(rn);
-	return ret;
 }
 
 static void dccp_shutdown(void)
@@ -83,7 +77,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;
@@ -91,32 +85,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;
 }
 
 /**