#include "net.h"
#include "fd.h"
#include "string.h"
+#include "client.cmdline.h"
#include "client.h"
#include "error.h"
para_calloc(sizeof(struct private_client_data));
pcd->fd = -1;
- cmdline_parser(argc, argv, &pcd->conf);
+ client_cmdline_parser(argc, argv, &pcd->conf);
ret = - E_CLIENT_SYNTAX;
if (!pcd->conf.inputs_num)
goto out;
goto out;
}
if (!ret)
- cmdline_parser_configfile(pcd->config_file, &pcd->conf, 0, 0, 0);
+ client_cmdline_parser_configfile(pcd->config_file,
+ &pcd->conf, 0, 0, 0);
ret = 1;
*pcd_ptr = pcd;
PARA_INFO_LOG(
{
struct private_client_data *pcd = t->private_data;
- PARA_INFO_LOG("status %d\n", pcd->status);
t->ret = 1;
pcd->check_r = 0;
pcd->check_w = 0;
return;
case CL_SENDING_STDIN:
if (*pcd->in_loaded) {
- PARA_INFO_LOG("loaded: %d\n", *pcd->in_loaded);
+ PARA_INFO_LOG("loaded: %zd\n", *pcd->in_loaded);
para_fd_set(pcd->fd, &s->wfds, &s->max_fileno);
pcd->check_w = 1;
} else {
{
struct private_client_data *pcd = t->private_data;
- PARA_INFO_LOG("status %d\n", pcd->status);
+// PARA_INFO_LOG("status %d\n", pcd->status);
t->ret = 1;
if (pcd->fd < 0)
return;
if (t->ret < 0)
return;
bytes_received = t->ret;
- PARA_INFO_LOG("++++ server info ++++\n%s\n++++ end of server "
+ PARA_DEBUG_LOG("++++ server info ++++\n%s\n++++ end of server "
"info ++++\n", pcd->buf);
/* check if server has sent "Proceed" message */
t->ret = -E_CLIENT_AUTH;
free(tmp);
}
command = para_strcat(command, EOC_MSG "\n");
- PARA_INFO_LOG("--> %s\n", command);
+ PARA_DEBUG_LOG("--> %s\n", command);
t->ret = send_buffer(pcd->fd, command);
free(command);
if (t->ret > 0)
pcd->status = CL_RECEIVING_SERVER_OUTPUT;
return;
case CL_SENDING_STDIN: /* FIXME: might block */
- PARA_INFO_LOG("loaded: %d\n", *pcd->in_loaded);
+ PARA_INFO_LOG("loaded: %zd\n", *pcd->in_loaded);
t->ret = send_bin_buffer(pcd->fd, pcd->inbuf, *pcd->in_loaded);
if (t->ret <= 0) {
if (!t->ret)
if (ret < 0)
goto out;
pcd->status = CL_CONNECTED;
+ ret = mark_fd_nonblock(pcd->fd);
+ if (ret < 0)
+ goto out;
pcd->task.pre_select = client_pre_select;
pcd->task.post_select = client_post_select;
pcd->task.private_data = pcd;