Merge commit 'remotes/fml/master'

[paraslash.git] / client_common.c

diff --git a/client_common.c b/client_common.c
index 4266ddb2af101999fcd885efbd32e4d7db663d14..7c31fcddf7a4f6756fff834ea5d13776a2f95c47 100644 (file)
--- a/client_common.c
+++ b/client_common.c
@@ -79,23 +79,13 @@ void client_close(struct private_client_data *pcd)
 static int client_connect(struct private_client_data *pcd)
 {
        int ret;
-       struct hostent *he;
-       struct sockaddr_in their_addr;
 
        pcd->fd = -1;
-       ret = get_host_info(pcd->conf.hostname_arg, &he);
-       if (ret < 0)
-               return ret;
-       /* get new socket */
-       ret = get_stream_socket(AF_INET);
+       ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, pcd->conf.hostname_arg,
+                                                 pcd->conf.server_port_arg);
        if (ret < 0)
                return ret;
        pcd->fd = ret;
-       /* init their_addr */
-       init_sockaddr(&their_addr, pcd->conf.server_port_arg, he);
-       ret = PARA_CONNECT(pcd->fd, &their_addr);
-       if (ret < 0)
-               goto err_out;
        pcd->status = CL_CONNECTED;
        ret = mark_fd_nonblocking(pcd->fd);
        if (ret < 0)