/*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
*/
+/** \file dccp_recv.c paraslash's dccp receiver */
+
/*
* based on client.c of dccp-cs-0.01.tar.bz2,
* (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>
-
-
-#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;
}
static int dccp_recv_open(struct receiver_node *rn)
{
struct private_dccp_recv_data *pdd;
- struct gengetopt_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 dccp_recv_args_info *conf = rn->conf;
+ int fd, ret = makesock(AF_UNSPEC, IPPROTO_DCCP, 0, conf->host_arg,
+ conf->port_arg);
- 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;
+ if (ret < 0)
+ return ret;
+ fd = ret;
+ /*
+ * 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;
}
- ret = dccp_set_socket(pdd->fd);
+ ret = mark_fd_nonblocking(fd);
if (ret < 0)
- goto err_out;
- PARA_NOTICE_LOG("connecting to %s:%d\n", conf->host_arg, conf->port_arg);
- ret = -E_DCCP_CONNECT;
- if (connect(pdd->fd, ai->ai_addr, ai->ai_addrlen) < 0)
- goto err_out;
+ 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)
-{
- ; /* nothing to do */
-}
-
static void *dccp_recv_parse_config(int argc, char **argv)
{
- struct gengetopt_args_info *tmp = para_calloc(sizeof(struct gengetopt_args_info));
+ struct dccp_recv_args_info *tmp = para_calloc(sizeof(struct dccp_recv_args_info));
if (!dccp_recv_cmdline_parser(argc, argv, tmp))
return tmp;
return NULL;
}
-static int dccp_recv_pre_select(struct receiver_node *rn, fd_set *rfds,
- __unused fd_set *wfds, __unused struct timeval *timeout)
+static void dccp_recv_pre_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;
- if (!pdd)
- return -1;
- FD_SET(pdd->fd, rfds);
- return pdd->fd;
+ t->error = 0;
+ if (generic_recv_pre_select(s, t) <= 0)
+ return;
+ para_fd_set(pdd->fd, &s->rfds, &s->max_fileno);
}
-static int dccp_recv_post_select(struct receiver_node *rn, int select_ret,
- fd_set *rfds, __unused fd_set *wfds)
+static void dccp_recv_post_select(struct sched *s, struct task *t)
{
- int ret;
+ 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;
- if (!select_ret || !pdd || !FD_ISSET(pdd->fd, rfds))
- return 1; /* nothing to do */
- if (rn->loaded >= DCCP_BUFSIZE)
- return -E_DCCP_OVERRUN;
- ret = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded,
- DCCP_BUFSIZE - rn->loaded);
- if (ret <= 0) {
- PARA_INFO_LOG("%s\n", ret? PARA_STRERROR(-ret) : "eof");
- return ret;
+ 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);
+ 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 += ret;
- return 1;
+ return;
+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