X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=dccp_recv.c;h=fe2f7abf2af5fdb9abb27dcfb41c9da705ebf91a;hb=a07746d8f55d0655510cad2448ef552288338c69;hp=9a17269d7084f89c064d764571e1a78ba9452e7d;hpb=bb899fb1a0c279a2890ff30d11bf7aec50fb92ed;p=paraslash.git

diff --git a/dccp_recv.c b/dccp_recv.c
index 9a17269d..fe2f7abf 100644
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -76,7 +76,7 @@ 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);
@@ -109,16 +109,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;
 	sched_monitor_readfd(rn->fd, s);
 }
 
-static int dccp_recv_post_select(__a_unused 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;
@@ -154,6 +154,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,
 };