client_common.c: Add a comment to client_connect().

[paraslash.git] / dccp_recv.c

diff --git a/dccp_recv.c b/dccp_recv.c
index 3be5365fe818f4b14133a87c2d561df7b9feec59..c0618602571975fbb6ab17b80f633eb8d33aaca0 100644 (file)
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -1,19 +1,7 @@
 /*
 /*

- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2007 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 */
  */
 
 /** \file dccp_recv.c paraslash's dccp receiver */


@@ -23,9 +11,11 @@
  * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
  */
 
  * (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 "list.h"
 #include "sched.h"
 #include "recv.h"


@@ -35,11 +25,6 @@
 
 #include "dccp_recv.cmdline.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
 
 /** the size of the output buffer */
 #define DCCP_BUFSIZE 40960
 


@@ -72,36 +57,24 @@ static int dccp_recv_open(struct receiver_node *rn)
 {
        struct private_dccp_recv_data *pdd;
        struct dccp_recv_args_info *conf = rn->conf;
 {
        struct private_dccp_recv_data *pdd;
        struct dccp_recv_args_info *conf = rn->conf;

-       int ret;
-       struct addrinfo *ai;
-       char *tmp;
+       int 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;
+               return 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(ret, SHUT_WR) < 0)
+               return -ERRNO_TO_PARA_ERROR(errno);

 
 

-       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;
-       }
-       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 = -E_DCCP_CONNECT;
-       if (connect(pdd->fd, ai->ai_addr, ai->ai_addrlen) < 0)
-               goto err_out;
+       rn->buf = para_calloc(DCCP_BUFSIZE);
+       rn->private_data = pdd = para_calloc(sizeof(struct private_dccp_recv_data));
+
+       pdd->fd = ret;
+       mark_fd_nonblocking(pdd->fd);

        return 1;
        return 1;

-err_out:
-       dccp_recv_close(rn);
-       return ret;

 }
 
 static void dccp_shutdown(void)
 }
 
 static void dccp_shutdown(void)


@@ -125,8 +98,6 @@ static void dccp_recv_pre_select(struct sched *s, struct task *t)
        struct private_dccp_recv_data *pdd = rn->private_data;
 
        t->ret = 1;
        struct private_dccp_recv_data *pdd = rn->private_data;
 
        t->ret = 1;

-       if (!pdd)
-               return;

        para_fd_set(pdd->fd, &s->rfds, &s->max_fileno);
 }
 
        para_fd_set(pdd->fd, &s->rfds, &s->max_fileno);
 }
 


@@ -135,26 +106,28 @@ static void dccp_recv_post_select(struct sched *s, struct task *t)
        struct receiver_node *rn = t->private_data;
        struct private_dccp_recv_data *pdd = rn->private_data;
 
        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) {
-               rn->eof = 1;
-               return;
+       if (rn->output_error && *rn->output_error) {
+               t->ret = *rn->output_error;
+               goto out;

        }
        t->ret = 1;
        }
        t->ret = 1;

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

-               return;
+               goto out;

        t->ret = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded,
                DCCP_BUFSIZE - rn->loaded);
        if (t->ret <= 0) {
        t->ret = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded,
                DCCP_BUFSIZE - rn->loaded);
        if (t->ret <= 0) {

-               rn->eof = 1;

                if (!t->ret)
                if (!t->ret)

-                       t->ret = -E_DCCP_RECV_EOF;
-               return;
+                       t->ret = -E_RECV_EOF;
+               goto out;

        }
        rn->loaded += t->ret;
        }
        rn->loaded += t->ret;

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

 }
 
 /**
 }
 
 /**