X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=93dea809d88009b717e1338c4d32cfddd06bea05;hp=64506737195de991134df0e692e897375c832e85;hb=ca659e6bf0d7f783849244105a077e79fcf741ad;hpb=f03f1a8115c0b4dcb0a705d8a686ccf511648f60

diff --git a/dccp_recv.c b/dccp_recv.c
index 64506737..93dea809 100644
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -18,6 +18,7 @@
 #include "error.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "recv.h"
 #include "string.h"
 #include "net.h"
@@ -73,12 +74,12 @@ static int dccp_recv_open(struct receiver_node *rn)
 		ret = -ERRNO_TO_PARA_ERROR(errno);
 		goto err;
 	}
-
+	ret = mark_fd_nonblocking(fd);
+	if (ret < 0)
+		goto err;
 	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);
+	pdd->fd = fd;
 	return 1;
 err:
 	close(fd);
@@ -102,55 +103,58 @@ static void *dccp_recv_parse_config(int argc, char **argv)
 
 static void dccp_recv_pre_select(struct sched *s, struct task *t)
 {
-	struct receiver_node *rn = t->private_data;
+	struct receiver_node *rn = container_of(t, struct receiver_node, task);
 	struct private_dccp_recv_data *pdd = rn->private_data;
 
-	t->ret = 1;
+	t->error = 0;
 	para_fd_set(pdd->fd, &s->rfds, &s->max_fileno);
 }
 
 static void dccp_recv_post_select(struct sched *s, struct task *t)
 {
-	struct receiver_node *rn = t->private_data;
+	struct receiver_node *rn = container_of(t, struct receiver_node, task);
 	struct private_dccp_recv_data *pdd = rn->private_data;
 
-	if (rn->output_error && *rn->output_error) {
-		t->ret = *rn->output_error;
-		goto out;
+	if (rn->output_error && *rn->output_error < 0) {
+		t->error = *rn->output_error;
+		return;
+	}
+	if (!FD_ISSET(pdd->fd, &s->rfds))
+		return; /* nothing to do */
+	if (rn->loaded >= DCCP_BUFSIZE) {
+		t->error = -E_DCCP_OVERRUN;
+		return;
 	}
-	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)
-		goto out;
-	t->ret = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded,
+	t->error = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded,
 		DCCP_BUFSIZE - rn->loaded);
-	if (t->ret <= 0) {
-		if (!t->ret)
-			t->ret = -E_RECV_EOF;
-		goto out;
+	if (t->error > 0) {
+		rn->loaded += t->error;
+		return;
 	}
-	rn->loaded += t->ret;
-	return;
-out:
-	if (t->ret < 0)
-		rn->error = t->ret;
+	if (!t->error)
+		t->error = -E_RECV_EOF;
 }
 
 /**
- * the init function of the dccp receiver
+ * The init function of the dccp receiver.
  *
- * \param r pointer to the receiver struct to initialize
+ * \param r Pointer to the receiver struct to initialize.
  *
- * Initialize all function pointers of \a r
+ * Initialize all function pointers of \a r.
  */
 void dccp_recv_init(struct receiver *r)
 {
+	struct dccp_recv_args_info dummy;
+
+	dccp_recv_cmdline_parser_init(&dummy);
 	r->shutdown = dccp_shutdown;
 	r->open = dccp_recv_open;
 	r->close = dccp_recv_close;
 	r->pre_select = dccp_recv_pre_select;
 	r->post_select = dccp_recv_post_select;
 	r->parse_config = dccp_recv_parse_config;
+	r->help = (struct ggo_help) {
+		.short_help = dccp_recv_args_info_help,
+		.detailed_help = dccp_recv_args_info_detailed_help
+	};
 }