X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=253586e1f7ee4f90867a157757a34a227458047a;hp=73d9999d0408617099086e7b25248af5277839db;hb=213b3181e7f8ebd07ec37e256188ea9094722cef;hpb=1cccf6fa93c251f8f2805aa5fb163741d851c051

diff --git a/dccp_recv.c b/dccp_recv.c
index 73d9999d..253586e1 100644
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -58,6 +58,7 @@ static int dccp_recv_open(struct receiver_node *rn)
 	}
 
 	fd = makesock(IPPROTO_DCCP, 0, conf->host_arg, conf->port_arg, fo);
+	flowopt_cleanup(fo);
 	free(ccids);
 	if (fd < 0)
 		return fd;
@@ -118,25 +119,24 @@ static void *dccp_recv_parse_config(int argc, char **argv)
 	return tmp;
 }
 
-static void dccp_recv_pre_select(struct sched *s, struct task *t)
+static void dccp_recv_pre_select(struct sched *s, void *context)
 {
-	struct receiver_node *rn = container_of(t, struct receiver_node, task);
+	struct receiver_node *rn = context;
 
-	t->error = 0;
-	if (generic_recv_pre_select(s, t) <= 0)
+	if (generic_recv_pre_select(s, rn) <= 0)
 		return;
 	para_fd_set(rn->fd, &s->rfds, &s->max_fileno);
 }
 
-static int dccp_recv_post_select(struct sched *s, struct task *t)
+static int dccp_recv_post_select(struct sched *s, void *context)
 {
-	struct receiver_node *rn = container_of(t, struct receiver_node, task);
+	struct receiver_node *rn = context;
 	struct btr_node *btrn = rn->btrn;
 	struct iovec iov[2];
 	int ret, iovcnt;
 	size_t num_bytes;
 
-	ret = task_get_notification(t);
+	ret = task_get_notification(rn->task);
 	if (ret < 0)
 		goto out;
 	ret = btr_node_status(btrn, 0, BTR_NT_ROOT);