Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash/

[paraslash.git] / dccp_recv.c

diff --git a/dccp_recv.c b/dccp_recv.c
index 335ad2e630598de4d98cafbb2257e5e07be144af..4883e4a223c5bb9073601cfe5778ed7f86bf3ae7 100644 (file)
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -95,9 +95,13 @@ static int dccp_recv_open(struct receiver_node *rn)
        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)
+       ret = connect(pdd->fd, ai->ai_addr, ai->ai_addrlen);
+       freeaddrinfo(ai);
+       if (ret < 0) {
+               ret = -E_DCCP_CONNECT;
                goto err_out;
+       }
+       mark_fd_nonblock(pdd->fd);
        return 1;
 err_out:
        dccp_recv_close(rn);