X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=12c8365661e6c8f7e0608c66cd7d65a659e219cb;hp=330c9f7028b9b67fbddaad39ec4dd843a8ec4d8d;hb=1b46ae4193cddb7d589b0f2f7d8158b84f7e9f6d;hpb=1b0f42a95aa6447dcbb4ea801f67e6b63530291b diff --git a/client_common.c b/client_common.c index 330c9f70..12c83656 100644 --- a/client_common.c +++ b/client_common.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2006 Andre Noll + * Copyright (C) 1997-2007 Andre Noll * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,6 +27,7 @@ #include "net.h" #include "fd.h" #include "string.h" +#include "client.cmdline.h" #include "client.h" #include "error.h" @@ -47,18 +48,55 @@ void rc4_recv(unsigned long len, const unsigned char *indata, void client_close(struct private_client_data *pcd) { - if (pcd) + if (!pcd) return; - if (pcd->fd >= 0) + if (pcd->fd >= 0) { + disable_crypt(pcd->fd); close(pcd->fd); + } free(pcd->user); free(pcd->config_file); free(pcd->key_file); free(pcd); } -int client_parse_config(int argc, char *argv[], - struct private_client_data **pcd_ptr) +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(); + 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); + if (ret < 0) + goto err_out; + pcd->task.pre_select = client_pre_select; + pcd->task.post_select = client_post_select; + pcd->task.private_data = pcd; + sprintf(pcd->task.status, "client"); + register_task(&pcd->task); + return 1; +err_out: + close(pcd->fd); + pcd->fd = -1; + return ret; +} + +int client_open(int argc, char *argv[], struct private_client_data **pcd_ptr) { char *home = para_homedir(); struct stat statbuf; @@ -66,9 +104,10 @@ int client_parse_config(int argc, char *argv[], struct private_client_data *pcd = para_calloc(sizeof(struct private_client_data)); + *pcd_ptr = pcd; pcd->fd = -1; - cmdline_parser(argc, argv, &pcd->conf); - ret = - E_CLIENT_SYNTAX; + ret = client_cmdline_parser(argc, argv, &pcd->conf); + ret = -E_CLIENT_SYNTAX; if (!pcd->conf.inputs_num) goto out; pcd->user = pcd->conf.user_given? @@ -87,23 +126,21 @@ int client_parse_config(int argc, char *argv[], 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( - "current loglevel: %d\n" - "using config_file: %s\n" - "using key_file: %s\n" - "connecting to %s:%d\n" , - pcd->conf.loglevel_arg, - pcd->config_file, - pcd->key_file, - pcd->conf.hostname_arg, pcd->conf.server_port_arg - ); + PARA_INFO_LOG("loglevel: %d\n", pcd->conf.loglevel_arg); + PARA_INFO_LOG("config_file: %s\n", pcd->config_file); + PARA_INFO_LOG("key_file: %s\n", pcd->key_file); + PARA_NOTICE_LOG("connecting %s:%d\n", pcd->conf.hostname_arg, + pcd->conf.server_port_arg); + ret = client_connect(pcd); out: free(home); - if (ret < 0) + if (ret < 0) { + PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); client_close(pcd); + } return ret; } @@ -111,7 +148,6 @@ void client_pre_select(struct sched *s, struct task *t) { 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; @@ -133,13 +169,13 @@ void client_pre_select(struct sched *s, struct task *t) pcd->check_w = 1; return; - case CL_RECEIVING_SERVER_OUTPUT: + case CL_RECEIVING: if (pcd->loaded < CLIENT_BUFSIZE - 1) { para_fd_set(pcd->fd, &s->rfds, &s->max_fileno); pcd->check_r = 1; } return; - case CL_SENDING_STDIN: + case CL_SENDING: if (*pcd->in_loaded) { PARA_INFO_LOG("loaded: %zd\n", *pcd->in_loaded); para_fd_set(pcd->fd, &s->wfds, &s->max_fileno); @@ -171,7 +207,7 @@ void client_post_select(struct sched *s, struct task *t) { 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; @@ -228,7 +264,7 @@ void client_post_select(struct sched *s, struct task *t) 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; @@ -259,7 +295,7 @@ void client_post_select(struct sched *s, struct task *t) 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) @@ -273,58 +309,20 @@ void client_post_select(struct sched *s, struct task *t) return; t->ret = -E_HANDSHAKE_COMPLETE; if (strstr(pcd->buf, AWAITING_DATA_MSG)) - pcd->status = CL_SENDING_STDIN; + pcd->status = CL_SENDING; else - pcd->status = CL_RECEIVING_SERVER_OUTPUT; + pcd->status = CL_RECEIVING; return; - case CL_SENDING_STDIN: /* FIXME: might block */ + case CL_SENDING: /* FIXME: might block */ 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) - t->ret = 1; + if (t->ret < 0) return; - } *pcd->in_loaded = 0; /* FIXME: short writes */ return; - case CL_RECEIVING_SERVER_OUTPUT: + case CL_RECEIVING: t->ret = client_recv_buffer(pcd); return; } } - -int client_open(struct private_client_data *pcd) -{ - int ret; - struct hostent *he; - struct sockaddr_in their_addr; - - /* get the host info */ - PARA_NOTICE_LOG("getting host info of %s\n", - pcd->conf.hostname_arg); - ret = get_host_info(pcd->conf.hostname_arg, &he); - if (ret < 0) - goto out; - /* get new socket */ - ret = get_socket(); - if (ret < 0) - goto out; - pcd->fd = ret; - /* init their_addr */ - init_sockaddr(&their_addr, pcd->conf.server_port_arg, he); - /* connect */ - PARA_NOTICE_LOG("connecting to %s\n", pcd->conf.hostname_arg); - ret = para_connect(pcd->fd, &their_addr); - if (ret < 0) - goto out; - pcd->status = CL_CONNECTED; - pcd->task.pre_select = client_pre_select; - pcd->task.post_select = client_post_select; - pcd->task.private_data = pcd; - sprintf(pcd->task.status, "client"); - register_task(&pcd->task); - ret = 1; -out: - return ret; -}