/*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
#include "para.h"
#include "error.h"
-#include "dccp.h"
#include "list.h"
#include "sched.h"
#include "recv.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
{
struct private_dccp_recv_data *pdd;
struct dccp_recv_args_info *conf = rn->conf;
- int ret;
- struct addrinfo *ai;
- char *tmp;
+ int fd, ret = makesock(AF_UNSPEC, IPPROTO_DCCP, 0, conf->host_arg,
+ conf->port_arg);
- 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;
-
- 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;
+ 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 = PARA_CONNECT(pdd->fd, ai->ai_addr);
- freeaddrinfo(ai);
- if (ret < 0) {
- ret = -E_DCCP_CONNECT;
- goto err_out;
- }
- mark_fd_nonblock(pdd->fd);
+ goto err;
+ rn->buf = para_calloc(DCCP_BUFSIZE);
+ rn->private_data = pdd = para_calloc(sizeof(struct private_dccp_recv_data));
+ pdd->fd = fd;
return 1;
-err_out:
- dccp_recv_close(rn);
+err:
+ close(fd);
return ret;
}
struct receiver_node *rn = t->private_data;
struct private_dccp_recv_data *pdd = rn->private_data;
- t->ret = -E_DCCP_RECV_EOF;
- if (rn->output_eof && *rn->output_eof)
+ if (rn->output_error && *rn->output_error) {
+ t->ret = *rn->output_error;
goto out;
+ }
t->ret = 1;
if (!s->select_ret || !FD_ISSET(pdd->fd, &s->rfds))
goto out; /* nothing to do */
DCCP_BUFSIZE - rn->loaded);
if (t->ret <= 0) {
if (!t->ret)
- t->ret = -E_DCCP_RECV_EOF;
+ t->ret = -E_RECV_EOF;
goto out;
}
rn->loaded += t->ret;
return;
out:
if (t->ret < 0)
- rn->eof = 1;
+ rn->error = t->ret;
}
/**