X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=af8e6b1657e86777af5f6360c573c60bcc46e93c;hp=dae3bcb0cae70b429b9a84141bf6ab62a5115f70;hb=656a02453498156bab09763011ff43b81db57634;hpb=b80d97a65e7ce689d9598f2aed283f2fd14dde64

diff --git a/dccp_recv.c b/dccp_recv.c
index dae3bcb0..af8e6b16 100644
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -13,7 +13,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 
 #include "para.h"
 #include "error.h"
@@ -28,9 +27,6 @@
 
 #include "dccp_recv.cmdline.h"
 
-/** the size of the output buffer */
-#define DCCP_BUFSIZE 40960
-
 /**
  * data specific to the dccp receiver
  *
@@ -42,7 +38,6 @@ struct private_dccp_recv_data {
 	struct btr_pool *btrp;
 };
 
-
 static void dccp_recv_close(struct receiver_node *rn)
 {
 
@@ -50,23 +45,34 @@ static void dccp_recv_close(struct receiver_node *rn)
 
 	if (pdd && pdd->fd > 0)
 		close(pdd->fd);
-	free(rn->buf);
-	rn->buf = NULL;
+	btr_pool_free(pdd->btrp);
 	free(rn->private_data);
 	rn->private_data = NULL;
 }
 
-
 static int dccp_recv_open(struct receiver_node *rn)
 {
 	struct private_dccp_recv_data *pdd;
 	struct dccp_recv_args_info *conf = rn->conf;
-	int fd, ret = makesock(AF_UNSPEC, IPPROTO_DCCP, 0, conf->host_arg,
-		conf->port_arg);
+	struct flowopts *fo = NULL;
+	uint8_t *ccids = NULL;
+	int fd, ret, i;
 
-	if (ret < 0)
-		return ret;
-	fd = ret;
+	/* Copy CCID preference list (u8 array required) */
+	if (conf->ccid_given) {
+		ccids = para_malloc(conf->ccid_given);
+		fo    = flowopt_new();
+
+		for (i = 0; i < conf->ccid_given; i++)
+			ccids[i] = conf->ccid_arg[i];
+
+		OPT_ADD(fo, SOL_DCCP, DCCP_SOCKOPT_CCID, ccids, i);
+	}
+
+	fd = makesock(IPPROTO_DCCP, 0, conf->host_arg, conf->port_arg, fo);
+	free(ccids);
+	if (fd < 0)
+		return fd;
 	/*
 	 * Disable unused CCIDs: the receiver does not send any application
 	 * data to the server. By shutting down this unused path we reduce
@@ -80,7 +86,6 @@ static int dccp_recv_open(struct receiver_node *rn)
 	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->btrp = btr_pool_new("dccp_recv", 320 * 1024);
 	pdd->fd = fd;
@@ -90,11 +95,38 @@ err:
 	return ret;
 }
 
+/**
+ * Check whether the host supports the requested 'ccid' arguments.
+ * \param conf DCCP receiver arguments.
+ * \return True if all CCIDs requested in \a conf are supported.
+ */
+static bool dccp_recv_ccid_support_check(struct dccp_recv_args_info *conf)
+{
+	uint8_t *ccids;
+	int i, j, nccids;
+
+	nccids = dccp_available_ccids(&ccids);
+	if (nccids <= 0)
+		return false;
+
+	for (i = 0; i < conf->ccid_given; i++) {
+		for (j = 0; j < nccids && ccids[j] != conf->ccid_arg[i]; j++)
+			;
+		if (j == nccids) {
+			PARA_ERROR_LOG("'CCID-%d' not supported on this host.\n",
+					conf->ccid_arg[i]);
+			return false;
+		}
+	}
+	return true;
+}
+
 static void *dccp_recv_parse_config(int argc, char **argv)
 {
-	struct dccp_recv_args_info *tmp = para_calloc(sizeof(struct dccp_recv_args_info));
+	struct dccp_recv_args_info *tmp = para_calloc(sizeof(*tmp));
 
-	if (!dccp_recv_cmdline_parser(argc, argv, tmp))
+	if (!dccp_recv_cmdline_parser(argc, argv, tmp) &&
+	    dccp_recv_ccid_support_check(tmp))
 		return tmp;
 	free(tmp);
 	return NULL;
@@ -116,33 +148,29 @@ static void dccp_recv_post_select(struct sched *s, struct task *t)
 	struct receiver_node *rn = container_of(t, struct receiver_node, task);
 	struct private_dccp_recv_data *pdd = rn->private_data;
 	struct btr_node *btrn = rn->btrn;
-	int ret;
-	char *buf;
-	size_t sz;
+	struct iovec iov[2];
+	int ret, iovcnt;
+	size_t num_bytes;
 
 	ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
-	if (ret < 0)
-		goto err;
-	if (ret == 0)
-		return;
-	if (!FD_ISSET(pdd->fd, &s->rfds))
-		return; /* nothing to do */
-	if (rn->loaded >= DCCP_BUFSIZE) {
-		t->error = -E_DCCP_OVERRUN;
-		return;
-	}
+	if (ret <= 0)
+		goto out;
+	iovcnt = btr_pool_get_buffers(pdd->btrp, iov);
 	ret = -E_DCCP_OVERRUN;
-	sz = btr_pool_get_buffer(pdd->btrp, &buf);
-	if (sz == 0)
-		goto err;
-	ret = recv_bin_buffer(pdd->fd, buf, sz);
-	if (ret == 0)
-		ret = -E_RECV_EOF;
-	if (ret < 0)
-		goto err;
-	btr_add_output_pool(pdd->btrp, ret, btrn);
-	return;
-err:
+	if (iovcnt == 0)
+		goto out;
+	ret = readv_nonblock(pdd->fd, iov, iovcnt, &s->rfds, &num_bytes);
+	if (num_bytes == 0)
+		goto out;
+	if (num_bytes <= iov[0].iov_len) /* only the first buffer was filled */
+		btr_add_output_pool(pdd->btrp, num_bytes, btrn);
+	else { /* both buffers contain data */
+		btr_add_output_pool(pdd->btrp, iov[0].iov_len, btrn);
+		btr_add_output_pool(pdd->btrp, num_bytes - iov[0].iov_len, btrn);
+	}
+out:
+	if (ret >= 0)
+		return;
 	btr_remove_node(rn->btrn);
 	t->error = ret;
 }
@@ -150,6 +178,7 @@ err:
 static void dccp_recv_free_config(void *conf)
 {
 	dccp_recv_cmdline_parser_free(conf);
+	free(conf);
 }
 
 /**