Merge branch 'maint'

[paraslash.git] / client_common.c

diff --git a/client_common.c b/client_common.c
index 934758dd8f8e5ed03ff2493fe18e0cd533fde977..197f031c476a79ee00bc2143945356a20330595c 100644 (file)
--- a/client_common.c
+++ b/client_common.c
@@ -311,8 +311,8 @@ static int client_connect(struct client_task *ct)
        int ret;
 
        ct->rc4c.fd = -1;
-       ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, ct->conf.hostname_arg,
-               ct->conf.server_port_arg);
+       ret = para_connect_simple(IPPROTO_TCP, ct->conf.hostname_arg,
+                                              ct->conf.server_port_arg);
        if (ret < 0)
                return ret;
        ct->rc4c.fd = ret;
@@ -339,6 +339,8 @@ err_out:
  * \param ct_ptr Points to dynamically allocated and initialized client task
  * struct upon successful return.
  * \param loglevel If not \p NULL, the number of the loglevel is stored here.
+ * \param parent Add the new buffer tree node as a child of this node.
+ * \param child Add the new buffer tree node as a parent of this node.
  *
  * Check the command line options given by \a argc and argv, set default values
  * for user name and rsa key file, read further option from the config file.