/** \file client_common.c common functions of para_client and para_audiod */
+#include <sys/types.h>
+#include <dirent.h>
+
#include "para.h"
+#include "error.h"
#include "list.h"
#include "sched.h"
#include "client.cmdline.h"
#include "string.h"
#include "client.cmdline.h"
#include "client.h"
-#include "error.h"
/*
* rc4 encrypt data before sending
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_socket();
+ 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_nonblock(pcd->fd);
+ ret = mark_fd_nonblocking(pcd->fd);
if (ret < 0)
goto err_out;
pcd->task.pre_select = client_pre_select;
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, ¶ms);
+ }
ret = 1;
PARA_INFO_LOG("loglevel: %d\n", pcd->conf.loglevel_arg);
PARA_INFO_LOG("config_file: %s\n", pcd->config_file);
* \param t pointer to the task struct for this command
*
* Depending on the current state of the connection and the status of the read
- * and write fd sets of \a s, this function performs the neccessary steps to
- * authenticate the connection, to send the commmand given by \a
+ * and write fd sets of \a s, this function performs the necessary steps to
+ * authenticate the connection, to send the command given by \a
* t->private_data and to receive para_server's output, if any.
*
* \sa struct sched, struct task