Merge ../paraslash.fml/paraslash
[paraslash.git] / dccp_recv.c
index 6c55c4b..943b828 100644 (file)
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */
 
+/** \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 "para.h"
 #include "error.h"
 #include "dccp.h"
+#include "list.h"
+#include "sched.h"
 #include "recv.h"
 #include "string.h"
 #include "net.h"
+#include "fd.h"
 
 #include "dccp_recv.cmdline.h"
 
@@ -30,8 +40,8 @@
 #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
@@ -61,7 +71,7 @@ static void dccp_recv_close(struct receiver_node *rn)
 static int dccp_recv_open(struct receiver_node *rn)
 {
        struct private_dccp_recv_data *pdd;
-       struct gengetopt_args_info *conf = rn->conf;
+       struct dccp_recv_args_info *conf = rn->conf;
        int ret;
        struct addrinfo *ai;
        char *tmp;
@@ -88,6 +98,7 @@ static int dccp_recv_open(struct receiver_node *rn)
        ret = -E_DCCP_CONNECT;
        if (connect(pdd->fd, ai->ai_addr, ai->ai_addrlen) < 0)
                goto err_out;
+       mark_fd_nonblock(pdd->fd);
        return 1;
 err_out:
        dccp_recv_close(rn);
@@ -101,7 +112,7 @@ static void dccp_shutdown(void)
 
 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;
@@ -109,32 +120,41 @@ static void *dccp_recv_parse_config(int argc, char **argv)
        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;
 
-       if (pdd)
-               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;
 
-       if (!select_ret || !pdd || !FD_ISSET(pdd->fd, rfds))
-               return 1; /* nothing to do */
+       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)
-               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);
-       if (ret <= 0)
-               return ret;
-       rn->loaded += ret;
-       return 1;
+       if (t->ret <= 0) {
+               if (!t->ret)
+                       t->ret = -E_DCCP_RECV_EOF;
+               goto out;
+       }
+       rn->loaded += t->ret;
+       return;
+out:
+       if (t->ret < 0)
+               rn->eof = 1;
 }
 
 /**