Minor documentation improvements.

[paraslash.git] / dccp_recv.c

diff --git a/dccp_recv.c b/dccp_recv.c
index f0d7d66e2b7563e766efeea4211b09c843efd427..eeb7c57a71a52ea26cdeb1ee8751939a6b2518f7 100644 (file)
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -16,7 +16,6 @@
 
 #include "para.h"
 #include "error.h"
-#include "dccp.h"
 #include "list.h"
 #include "sched.h"
 #include "recv.h"
@@ -26,11 +25,6 @@
 
 #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
 
@@ -63,40 +57,17 @@ static int dccp_recv_open(struct receiver_node *rn)
 {
        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)
-               goto err_out;
-       pdd->fd = ret;
+               return 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;
-       }
-       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 = PARA_CONNECT(pdd->fd, ai->ai_addr);
-       freeaddrinfo(ai);
-       if (ret < 0) {
-               ret = -E_DCCP_CONNECT;
-               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;
-err_out:
-       dccp_recv_close(rn);
-       return ret;
 }
 
 static void dccp_shutdown(void)
@@ -128,9 +99,10 @@ 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;
 
-       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 */
@@ -141,14 +113,14 @@ static void dccp_recv_post_select(struct sched *s, struct task *t)
                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;
 }
 
 /**