Add missing files for para_afh.

[paraslash.git] / dccp_recv.c

diff --git a/dccp_recv.c b/dccp_recv.c
index 168ddf4f18ba3e91ebdd290eeddbdb51b08930d2..07f616657a7db4ca0dfe5b9d318f542c215a18c6 100644 (file)
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -1,42 +1,32 @@
 /*
 /*

- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2008 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>
  */
 
 /*
  * based on client.c of dccp-cs-0.01.tar.bz2,
  * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
  */
 

+#include <sys/types.h>
+#include <dirent.h>
+

 #include "para.h"
 #include "error.h"
 #include "para.h"
 #include "error.h"

-#include "dccp.h"
+#include "list.h"
+#include "sched.h"

 #include "recv.h"
 #include "string.h"
 #include "net.h"
 #include "recv.h"
 #include "string.h"
 #include "net.h"

+#include "fd.h"

 
 #include "dccp_recv.cmdline.h"
 
 
 #include "dccp_recv.cmdline.h"
 

-/* needed by getaddrinfo */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-
-
-#define DCCP_BUFSIZE 4096
+/** the size of the output buffer */
+#define DCCP_BUFSIZE 40960

 
 /**
  * data specific to the dccp receiver
 
 /**
  * data specific to the dccp receiver


@@ -66,36 +56,32 @@ static void dccp_recv_close(struct receiver_node *rn)
 static int dccp_recv_open(struct receiver_node *rn)
 {
        struct private_dccp_recv_data *pdd;
 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;
+       struct dccp_recv_args_info *conf = rn->conf;
+       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)
        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)
        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->buf = para_calloc(DCCP_BUFSIZE);
+       rn->private_data = pdd = para_calloc(sizeof(struct private_dccp_recv_data));
+       pdd->fd = fd;

        return 1;
        return 1;

-err_out:
-       dccp_recv_close(rn);
+err:
+       close(fd);

        return ret;
 }
 
        return ret;
 }
 


@@ -106,7 +92,7 @@ static void dccp_shutdown(void)
 
 static void *dccp_recv_parse_config(int argc, char **argv)
 {
 
 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;
 
        if (!dccp_recv_cmdline_parser(argc, argv, tmp))
                return tmp;


@@ -114,35 +100,42 @@ static void *dccp_recv_parse_config(int argc, char **argv)
        return NULL;
 }
 
        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 = t->private_data;

        struct private_dccp_recv_data *pdd = rn->private_data;
 
        struct private_dccp_recv_data *pdd = rn->private_data;
 

-       if (!pdd)
-               return -1;
-       FD_SET(pdd->fd, rfds);
-       return pdd->fd;
+       t->ret = 1;
+       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 = t->private_data;

        struct private_dccp_recv_data *pdd = rn->private_data;
 
        struct private_dccp_recv_data *pdd = rn->private_data;
 

-       if (!select_ret || !pdd || !FD_ISSET(pdd->fd, rfds))
-               return 1; /* nothing to do */
+       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 */
+       t->ret = -E_DCCP_OVERRUN;

        if (rn->loaded >= DCCP_BUFSIZE)
        if (rn->loaded >= DCCP_BUFSIZE)

-               return -E_DCCP_OVERRUN;
-       ret = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded,
+               goto out;
+       t->ret = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded,

                DCCP_BUFSIZE - rn->loaded);
                DCCP_BUFSIZE - rn->loaded);

-       if (ret <= 0) {
-               PARA_INFO_LOG("%s\n", ret? PARA_STRERROR(-ret) : "eof");
-               return ret;
+       if (t->ret <= 0) {
+               if (!t->ret)
+                       t->ret = -E_RECV_EOF;
+               goto out;

        }
        }

-       rn->loaded += ret;
-       return 1;
+       rn->loaded += t->ret;
+       return;
+out:
+       if (t->ret < 0)
+               rn->error = t->ret;

 }
 
 /**
 }
 
 /**