/*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
* (C) 2005 Ian McDonald <imcdnzl@gmail.com>
*/
+#include <regex.h>
#include <sys/types.h>
#include <dirent.h>
#include "para.h"
#include "error.h"
-#include "dccp.h"
#include "list.h"
#include "sched.h"
+#include "ggo.h"
#include "recv.h"
#include "string.h"
#include "net.h"
#include "fd.h"
+#include "buffer_tree.h"
#include "dccp_recv.cmdline.h"
-/* needed by getaddrinfo */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-
-/** the size of the output buffer */
-#define DCCP_BUFSIZE 40960
-
/**
* data specific to the dccp receiver
*
struct private_dccp_recv_data {
/** the file descriptor for the dccp socket */
int fd;
+ struct btr_pool *btrp;
};
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;
}
{
struct private_dccp_recv_data *pdd;
struct dccp_recv_args_info *conf = rn->conf;
- int ret;
- struct addrinfo *ai;
- char *tmp;
-
- rn->buf = para_calloc(DCCP_BUFSIZE);
- rn->private_data = para_calloc(sizeof(struct private_dccp_recv_data));
- pdd = rn->private_data;
- ret = dccp_get_socket();
- if (ret < 0)
- goto err_out;
- pdd->fd = ret;
+ struct flowopts *fo = NULL;
+ uint8_t *ccids = NULL;
+ int fd, ret, i;
- tmp = make_message("%d", conf->port_arg);
- ret = getaddrinfo(conf->host_arg, tmp, NULL, &ai);
- free(tmp);
- if (ret) {
- ret = -E_ADDR_INFO;
- goto err_out;
+ /* 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);
}
- ret = dccp_set_socket(pdd->fd);
- if (ret < 0)
- goto err_out;
- PARA_NOTICE_LOG("connecting to %s:%d\n", conf->host_arg, conf->port_arg);
- ret = PARA_CONNECT(pdd->fd, ai->ai_addr);
- freeaddrinfo(ai);
- if (ret < 0) {
- ret = -E_DCCP_CONNECT;
- goto err_out;
+
+ 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
+ * internal processing costs, as the unused CCIDs (in the kernel) are
+ * then bypassed.
+ */
+ if (shutdown(fd, SHUT_WR) < 0) {
+ ret = -ERRNO_TO_PARA_ERROR(errno);
+ goto err;
}
- mark_fd_nonblock(pdd->fd);
+ ret = mark_fd_nonblocking(fd);
+ if (ret < 0)
+ goto err;
+ rn->private_data = pdd = para_calloc(sizeof(struct private_dccp_recv_data));
+ pdd->btrp = btr_pool_new("dccp_recv", 320 * 1024);
+ pdd->fd = fd;
return 1;
-err_out:
- dccp_recv_close(rn);
+err:
+ close(fd);
return ret;
}
-static void dccp_shutdown(void)
+/**
+ * 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)
{
- ; /* nothing to do */
+ 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;
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;
+ if (generic_recv_pre_select(s, t) <= 0)
+ return;
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;
+ struct btr_node *btrn = rn->btrn;
+ struct iovec iov[2];
+ int ret, iovcnt;
- t->ret = -E_DCCP_RECV_EOF;
- if (rn->output_eof && *rn->output_eof)
- goto out;
- 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,
- DCCP_BUFSIZE - rn->loaded);
- if (t->ret <= 0) {
- if (!t->ret)
- t->ret = -E_DCCP_RECV_EOF;
- goto out;
+ 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 */
+ iovcnt = btr_pool_get_buffers(pdd->btrp, iov);
+ ret = -E_DCCP_OVERRUN;
+ if (iovcnt == 0)
+ goto err;
+ ret = para_readv(pdd->fd, iov, iovcnt);
+ /* EAGAIN is possible even if FD_ISSET */
+ if (ret < 0 && is_errno(-ret, EAGAIN))
+ return;
+ if (ret == 0)
+ ret = -E_RECV_EOF;
+ if (ret < 0)
+ goto err;
+ if (ret <= iov[0].iov_len) /* only the first buffer was filled */
+ btr_add_output_pool(pdd->btrp, ret, btrn);
+ else { /* both buffers contain data */
+ btr_add_output_pool(pdd->btrp, iov[0].iov_len, btrn);
+ btr_add_output_pool(pdd->btrp, ret - iov[0].iov_len, btrn);
}
- rn->loaded += t->ret;
return;
-out:
- if (t->ret < 0)
- rn->eof = 1;
+err:
+ btr_remove_node(rn->btrn);
+ t->error = ret;
+}
+
+static void dccp_recv_free_config(void *conf)
+{
+ dccp_recv_cmdline_parser_free(conf);
+ free(conf);
}
/**
- * 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)
{
- r->shutdown = dccp_shutdown;
+ struct dccp_recv_args_info dummy;
+
+ dccp_recv_cmdline_parser_init(&dummy);
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->free_config = dccp_recv_free_config;
+ r->help = (struct ggo_help) {
+ .short_help = dccp_recv_args_info_help,
+ .detailed_help = dccp_recv_args_info_detailed_help
+ };
+ dccp_recv_cmdline_parser_free(&dummy);
}
projects / paraslash.git / blobdiff