X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=639c93fcbf99bc93ddc054ad43d03f30811270ac;hp=318969afe3c123c611638e3954c4556d29c82e14;hb=HEAD;hpb=bd28ec9a64884d70917c4fdea1a3a70c91758f83

diff --git a/dccp_recv.c b/dccp_recv.c
index 318969af..0b20bcc8 100644
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file dccp_recv.c paraslash's dccp receiver */
 
@@ -31,6 +27,10 @@
 #include "net.h"
 #include "fd.h"
 
+#ifndef DCCP_SOCKOPT_CCID
+#define DCCP_SOCKOPT_CCID 13 /**< Sets both TX/RX CCID. */
+#endif
+
 static void dccp_recv_close(struct receiver_node *rn)
 {
 	if (rn->fd > 0)
@@ -63,6 +63,9 @@ static int dccp_recv_ccid_support_check(const struct lls_parse_result *lpr)
 	return 1;
 }
 
+/** Flowopt shortcut */
+#define OPT_ADD(fo, lev, opt, val, len) flowopt_add(fo, lev, opt, #opt, val, len)
+
 static int dccp_recv_open(struct receiver_node *rn)
 {
 	struct lls_parse_result *lpr = rn->lpr;
@@ -80,14 +83,14 @@ static int dccp_recv_open(struct receiver_node *rn)
 	/* Copy CCID preference list (u8 array required) */
 	given = lls_opt_given(r_c);
 	if (given) {
-		ccids = para_malloc(given);
+		ccids = alloc(given);
 		fo = flowopt_new();
 		for (i = 0; i < given; i++)
 			ccids[i] = lls_int32_val(i, r_c);
 		OPT_ADD(fo, SOL_DCCP, DCCP_SOCKOPT_CCID, ccids, i);
 	}
 
-	fd = makesock(IPPROTO_DCCP, 0, host, port, fo);
+	fd = makesock(IPPROTO_DCCP, false, host, port, fo);
 	flowopt_cleanup(fo);
 	free(ccids);
 	if (fd < 0)
@@ -113,16 +116,16 @@ err:
 	return ret;
 }
 
-static void dccp_recv_pre_select(struct sched *s, void *context)
+static void dccp_recv_pre_monitor(struct sched *s, void *context)
 {
 	struct receiver_node *rn = context;
 
-	if (generic_recv_pre_select(s, rn) <= 0)
+	if (generic_recv_pre_monitor(s, rn) <= 0)
 		return;
-	para_fd_set(rn->fd, &s->rfds, &s->max_fileno);
+	sched_monitor_readfd(rn->fd, s);
 }
 
-static int dccp_recv_post_select(struct sched *s, void *context)
+static int dccp_recv_post_monitor(__a_unused struct sched *s, void *context)
 {
 	struct receiver_node *rn = context;
 	struct btr_node *btrn = rn->btrn;
@@ -140,7 +143,7 @@ static int dccp_recv_post_select(struct sched *s, void *context)
 	ret = -E_DCCP_OVERRUN;
 	if (iovcnt == 0)
 		goto out;
-	ret = readv_nonblock(rn->fd, iov, iovcnt, &s->rfds, &num_bytes);
+	ret = readv_nonblock(rn->fd, iov, iovcnt, &num_bytes);
 	if (num_bytes == 0)
 		goto out;
 	if (num_bytes <= iov[0].iov_len) /* only the first buffer was filled */
@@ -158,6 +161,6 @@ out:
 const struct receiver lsg_recv_cmd_com_dccp_user_data = {
 	.open = dccp_recv_open,
 	.close = dccp_recv_close,
-	.pre_select = dccp_recv_pre_select,
-	.post_select = dccp_recv_post_select,
+	.pre_monitor = dccp_recv_pre_monitor,
+	.post_monitor = dccp_recv_post_monitor,
 };