replace para_connect() by PARA_CONNECT.

[paraslash.git] / client_common.c

diff --git a/client_common.c b/client_common.c
index 88cbf51ec43757aad074468494f096d62b3c0b59..d950d2d744801c721b132cc13b45b10422faf289 100644 (file)
--- a/client_common.c
+++ b/client_common.c
@@ -7,6 +7,7 @@
 /** \file client_common.c common functions of para_client and para_audiod */
 
 #include "para.h"
+#include "error.h"
 #include "list.h"
 #include "sched.h"
 #include "client.cmdline.h"
@@ -17,7 +18,6 @@
 #include "string.h"
 #include "client.cmdline.h"
 #include "client.h"
-#include "error.h"
 
 /*
  * rc4 encrypt data before sending
@@ -84,13 +84,13 @@ static int client_connect(struct private_client_data *pcd)
        if (ret < 0)
                return ret;
        /* get new socket */
-       ret = get_socket();
+       ret = get_stream_socket(AF_INET);
        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);
+       ret = PARA_CONNECT(pcd->fd, &their_addr);
        if (ret < 0)
                goto err_out;
        pcd->status = CL_CONNECTED;
@@ -153,9 +153,16 @@ int client_open(int argc, char *argv[], struct private_client_data **pcd_ptr)
                ret = -E_NO_CONFIG;
                goto out;
        }
-       if (!ret)
-               client_cmdline_parser_configfile(pcd->config_file,
-                       &pcd->conf, 0, 0, 0);
+       if (!ret) {
+               struct client_cmdline_parser_params params = {
+                       .override = 0,
+                       .initialize = 0,
+                       .check_required = 0,
+                       .check_ambiguity = 0
+               };
+               client_cmdline_parser_config_file(pcd->config_file,
+                       &pcd->conf, &params);
+       }
        ret = 1;
        PARA_INFO_LOG("loglevel: %d\n", pcd->conf.loglevel_arg);
        PARA_INFO_LOG("config_file: %s\n", pcd->config_file);