X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=client.c;h=45b27f59aeca3a1afe87cfdc18ec2d5849a71737;hb=d731ceace1fe263c622337872560788f05ed8750;hp=a800f7d86af32e58a5039d4e2c74068f9f6ba077;hpb=e0e5a7c1a04c6a2ee4a475e823657e06e6df2f99;p=paraslash.git

diff --git a/client.c b/client.c
index a800f7d8..45b27f59 100644
--- a/client.c
+++ b/client.c
@@ -20,19 +20,29 @@
 
 #include "para.h"
 #include "config.h"
-#include <readline/readline.h>
-#include <readline/history.h>
 #include "client.cmdline.h"
 #include "crypt.h"
 #include "rc4.h"
 #include <openssl/rc4.h>
 #include "net.h"
 #include "string.h"
+#include "error.h"
 
-/* A static variable for holding the line. */
-static char *line_read;
+#if 0
+enum {CL_CONNECTED, CL_SENT_AUTH, CL_RECEIVED_CHALLENGE, CL_SENT_CH_RESPONSE,
+	CL_RECEIVED_PROCEED, CL_SENT_COMMAND, CL_SENDING_STDIN, CL_RECV_DATA};
 
-struct gengetopt_args_info args_info;
+struct private_client_data {
+	int status;
+	int fd;
+	struct client_conf *conf;
+};
+#endif
+
+//struct gengetopt_conf conf;
+struct client_args_info conf;
+
+INIT_CLIENT_ERRLISTS;
 
 /*
  * client log function
@@ -40,44 +50,16 @@ struct gengetopt_args_info args_info;
 void para_log(int ll, const char* fmt,...)
 {
 	va_list argp;
-	FILE *outfd;
 
 	/* ignore log message if loglevel is not high enough */
-	if (ll < args_info.loglevel_arg)
+	if (ll < conf.loglevel_arg)
 		return;
-	if (ll < WARNING)
-		outfd = stdout;
-	else
-		outfd = stderr;
 	va_start(argp, fmt);
-	vfprintf(stdout, fmt, argp);
+	vfprintf(stderr, fmt, argp);
 	va_end(argp);
 }
 
-/*
- * Read a string, and return a pointer to it. Returns NULL on EOF.
- */
-static char *rl_gets(void)
-{
-	free(line_read);
-	/* Get a line from the user. */
-	line_read = readline("para_client> ");
-	/* If the line has any text in it, save it on the history. */
-	if (line_read && *line_read)
-		add_history(line_read);
-	return line_read;
-}
-
-/*
- * do several cleanups on sigint
- */
-static void sigint_handler(__a_unused int i)
-{
-	rl_cleanup_after_signal();
-	rl_reset_after_signal();
-}
-
-void get_options(int argc, char *argv[],
+static int get_options(int argc, char *argv[],
 	char **config_file, char **key_file)
 {
 	char *home;
@@ -86,37 +68,35 @@ void get_options(int argc, char *argv[],
 	struct stat statbuf;
 	int ret;
 
-	cmdline_parser(argc, argv, &args_info);
-	if (!args_info.user_given)
-		args_info.user_arg = para_logname();
-	if (!args_info.key_file_given) {
+	cmdline_parser(argc, argv, &conf);
+	if (!conf.user_given)
+		conf.user_arg = para_logname();
+	if (!conf.key_file_given) {
 		home = para_homedir();
 		sprintf(default_key_file, "%s/.paraslash/key.%s", home,
-			args_info.user_arg);
+			conf.user_arg);
 		free(home);
 	}
-	if (!args_info.config_file_given) {
+	if (!conf.config_file_given) {
 		home = para_homedir();
 		sprintf(default_config_file, "%s/.paraslash/client.conf",
 			home);
 		free(home);
 	}
-	if (!args_info.config_file_given)
+	if (!conf.config_file_given)
 		*config_file = default_config_file;
 	else
-		*config_file = args_info.config_file_arg;
+		*config_file = conf.config_file_arg;
 	ret = stat(*config_file, &statbuf);
-	if (ret && args_info.config_file_given) {
-		fprintf(stderr, "can not stat config file %s\n",
-			args_info.config_file_arg);
-		exit(EXIT_FAILURE);
-	}
+	if (ret && conf.config_file_given)
+		return -E_NO_CONFIG;
 	if (!ret)
-		cmdline_parser_configfile(*config_file, &args_info, 0, 0, 0);
-	if (!args_info.key_file_given)
+		cmdline_parser_configfile(*config_file, &conf, 0, 0, 0);
+	if (!conf.key_file_given)
 		*key_file = default_key_file;
 	else
-		*key_file = args_info.key_file_arg;
+		*key_file = conf.key_file_arg;
+	return 1;
 }
 
 static RC4_KEY rc4_recv_key;
@@ -146,13 +126,31 @@ static void append_str(char **data, const char* append)
 		*data = para_strdup(append);
 }
 
+
+static int send_stdin(int fd)
+{
+	char buf[8192];
+	int ret;
+
+	PARA_NOTICE_LOG("%s", "sending stdin\n");
+	for (;;) {
+		ret = read(STDIN_FILENO, buf, sizeof(buf));
+		if (ret <= 0)
+			return ret;
+		ret = send_bin_buffer(fd, buf, ret);
+		if (ret < 0)
+			return ret;
+	}
+	return 1;
+}
+
 /*
  * MAIN
  */
 int main(int argc, char *argv[])
 {
 
-	int sockfd, numbytes, i, interactive, received, ret;
+	int sockfd = -1, numbytes, i, received, ret;
 	struct hostent *he;
 	struct sockaddr_in their_addr;
 	char *command = NULL;
@@ -160,119 +158,98 @@ int main(int argc, char *argv[])
 	char *auth_str;
 	char *key_file, *config_file;
 	long unsigned challenge_nr;
-	char *line;
 
-	get_options(argc, argv, &config_file, &key_file);
-	if (args_info.loglevel_arg <= NOTICE)
+	ret = get_options(argc, argv, &config_file, &key_file);
+	if (ret < 0)
+		goto out;
+	if (conf.loglevel_arg <= NOTICE)
 		cmdline_parser_print_version();
 	PARA_INFO_LOG(
 		"current loglevel: %d\n"
 		"using config_file: %s\n"
 		"using key_file: %s\n"
 		"connecting to %s:%d\n",
-		args_info.loglevel_arg,
+		conf.loglevel_arg,
 		config_file,
 		key_file,
-		args_info.hostname_arg,
-		args_info.server_port_arg
+		conf.hostname_arg,
+		conf.server_port_arg
 	);
-	interactive = args_info.inputs_num == 0? 1 : 0;
-	if (interactive) {
-		PARA_NOTICE_LOG("%s", "no command, entering interactive mode\n");
-		signal(SIGINT, sigint_handler);
-	} else {
-		/* not interactive, concat args */
-		for (i = 0; i < args_info.inputs_num; i++)
-			append_str(&command, args_info.inputs[i]);
-	}
-interactive_loop:
+	ret = - E_CLIENT_SYNTAX;
+	if (!conf.inputs_num)
+		goto out;
+	/* concat args */
+	for (i = 0; i < conf.inputs_num; i++)
+		append_str(&command, conf.inputs[i]);
 	crypt_function_recv = NULL;
 	crypt_function_send = NULL;
-	if (interactive) {
-		int i = 0;
-		char *p;
-
-		rl_save_prompt();
-		rl_message("\n");
-		rl_kill_full_line(0, 0);
-		rl_free_line_state();
-		/* read a line via readline */
-		line = rl_gets();
-		if (!line)
-			return 0;
-		if (!line[0])
-			goto interactive_loop;
-		p = line;
-		while (sscanf(p, "%200s%n", buf, &i) == 1) {
-			append_str(&command, buf);
-			p += i;
-		}
-	}
 	/* get the host info */
 	PARA_NOTICE_LOG("getting host info of %s\n",
-		args_info.hostname_arg);
-	if (!(he = get_host_info(args_info.hostname_arg)))
-		exit(EXIT_FAILURE);
+		conf.hostname_arg);
+	ret = get_host_info(conf.hostname_arg, &he);
+	if (ret < 0)
+		goto out;
 	/* get new socket */
-	if ((sockfd = get_socket()) < 0)
-		exit(EXIT_FAILURE);
+	ret = get_socket();
+	if (ret < 0)
+		goto out;
+	sockfd = ret;
 	/* init their_addr */
-	init_sockaddr(&their_addr, args_info.server_port_arg, he);
-	/* Connect */
-	PARA_NOTICE_LOG("connecting to %s...\n",
-		args_info.hostname_arg);
-	if (para_connect(sockfd, &their_addr) < 0)
-		exit(EXIT_FAILURE);
-	/* Receive Welcome message */
-	if ((numbytes = recv_buffer(sockfd, buf, sizeof(buf))) < 0)
-		exit(EXIT_FAILURE);
+	init_sockaddr(&their_addr, conf.server_port_arg, he);
+	/* connect */
+	PARA_NOTICE_LOG("connecting to %s\n", conf.hostname_arg);
+	ret = para_connect(sockfd, &their_addr);
+	if (ret < 0)
+		goto out;
+	/* receive welcome message */
+	ret = recv_buffer(sockfd, buf, sizeof(buf));
+	if (ret < 0)
+		goto out;
 	/* send auth command */
-	auth_str = make_message("auth %s%s", args_info.plain_given?  "" : "rc4 ",
-		args_info.user_arg);
+	auth_str = make_message("auth %s%s", conf.plain_given?  "" : "rc4 ",
+		conf.user_arg);
 	PARA_INFO_LOG("<-- %s--> %s\n", buf, auth_str);
-	if (send_buffer(sockfd, auth_str) < 0)
-		exit(EXIT_FAILURE);
+	ret = send_buffer(sockfd, auth_str);
+	if (ret < 0)
+		goto out;
 	/* receive challenge number */
-	if ((numbytes = recv_buffer(sockfd, buf, sizeof(buf))) < 0)
-		exit(EXIT_FAILURE);
-	if (numbytes != 64) {
-		PARA_EMERG_LOG("did not receive valid challenge (got %i bytes)\n",
-			numbytes);
-		buf[numbytes] = '\0';
-		PARA_ERROR_LOG("received the following instead: %s\n", buf);
-		exit(EXIT_FAILURE);
+	ret = recv_buffer(sockfd, buf, sizeof(buf));
+	if (ret < 0)
+		goto out;
+	if (ret != 64) {
+		ret = -E_INVALID_CHALLENGE;
+		PARA_ERROR_LOG("received the following: %s\n", buf);
+		goto out;
 	}
-	PARA_INFO_LOG("<-- [challenge (%i bytes)]\n", numbytes);
+	PARA_INFO_LOG("%s", "<-- [challenge]\n");
 	/* decrypt challenge number */
-	ret = para_decrypt_challenge(key_file, &challenge_nr, (unsigned char *) buf,
-		numbytes);
-	if (ret < 0) {
-		PARA_EMERG_LOG("decrypt error (%d). Bad secret key?\n", ret);
-		exit(EXIT_FAILURE);
-	}
+	ret = para_decrypt_challenge(key_file, &challenge_nr, (unsigned char *) buf, 64);
+	if (ret < 0)
+		goto out;
 	/* send decrypted challenge */
 	PARA_INFO_LOG("--> %lu\n", challenge_nr);
-	if (send_va_buffer(sockfd, "%s%lu", CHALLENGE_RESPONSE_MSG, challenge_nr) < 0)
-		exit(EXIT_FAILURE);
-	/* Wait for approval */
+	ret = send_va_buffer(sockfd, "%s%lu", CHALLENGE_RESPONSE_MSG, challenge_nr);
+	if (ret < 0)
+		goto out;
+	/* wait for approval */
 	PARA_NOTICE_LOG("%s", "waiting for approval from server\n");
-	if ((numbytes = recv_buffer(sockfd, buf, sizeof(buf))) < 0)
-		exit(EXIT_FAILURE);
+	ret = recv_buffer(sockfd, buf, sizeof(buf));
+	if (ret < 0)
+		goto out;
+	numbytes = ret;
 	PARA_INFO_LOG("++++ server info ++++\n%s\n++++ end of server "
 		"info ++++\n", buf);
-	/* Check if server has sent "Proceed" message */
-	if (!strstr(buf, PROCEED_MSG)) {
-		PARA_EMERG_LOG("%s", "authentication failed\n");
-		exit(EXIT_FAILURE);
-	}
+	/* check if server has sent "Proceed" message */
+	ret = -E_CLIENT_AUTH;
+	if (!strstr(buf, PROCEED_MSG))
+		goto out;
 	if (numbytes >= PROCEED_MSG_LEN + 32) {
 		PARA_INFO_LOG("%s", "decrypting session key\n");
-		if (para_decrypt_buffer(key_file, rc4_buf,
-				(unsigned char *)buf + PROCEED_MSG_LEN + 1,
-				numbytes - PROCEED_MSG_LEN - 1) < 0) {
-			PARA_EMERG_LOG("%s", "error receiving rc4 key\n");
-			exit(EXIT_FAILURE);
-		}
+		ret = para_decrypt_buffer(key_file, rc4_buf,
+			(unsigned char *)buf + PROCEED_MSG_LEN + 1,
+			numbytes - PROCEED_MSG_LEN - 1);
+		if (ret < 0)
+			goto out;
 		RC4_set_key(&rc4_send_key, RC4_KEY_LEN, rc4_buf);
 		RC4_set_key(&rc4_recv_key, RC4_KEY_LEN, rc4_buf + RC4_KEY_LEN);
 		PARA_INFO_LOG("rc4 encrytion activated: %x:%x:%x:%x\n",
@@ -282,35 +259,40 @@ interactive_loop:
 	}
 	/* send command */
 	PARA_INFO_LOG("--> %s\n", command);
-	if (send_buffer(sockfd, command) < 0)
-		exit(EXIT_FAILURE);
+	ret = send_buffer(sockfd, command);
+	if (ret < 0)
+		goto out;
 	free(command);
 	command = NULL;
-	if (send_buffer(sockfd, EOC_MSG "\n") < 0)
-		exit(EXIT_FAILURE);
+	ret = send_buffer(sockfd, EOC_MSG "\n");
+	if (ret < 0)
+		goto out;
 	PARA_NOTICE_LOG("%s", "command sent.\n");
 	received = 0;
-	while ((numbytes = recv_bin_buffer(sockfd, buf, sizeof(buf) - 1)) > 0) {
-		buf[numbytes] = '\0';
+	for (;;) {
+		ret = recv_bin_buffer(sockfd, buf, sizeof(buf) - 1);
+		if (ret <= 0) {
+			if (!ret)
+				PARA_NOTICE_LOG("%s", "connection closed by peer\n");
+			goto out;
+		}
+		buf[ret] = '\0';
+		numbytes = ret;
 		if (!received && strstr(buf, AWAITING_DATA_MSG)) {
-			PARA_NOTICE_LOG("%s", "sending stdin\n");
-			while ((ret = read(STDIN_FILENO, buf,
-					sizeof(buf))) > 0) {
-				if (send_bin_buffer(sockfd, buf, ret) < 0)
-					break;
-			}
-			PARA_NOTICE_LOG("%s", "closing connection\n");
-			numbytes = 1;
-			break;
+			ret = send_stdin(sockfd);
+			goto out;
 		}
 		received = 1;
-		if (write(STDOUT_FILENO, buf, numbytes) != numbytes)
-			break;
+		ret = write(STDOUT_FILENO, buf, numbytes);
+		if (ret != numbytes) {
+			ret = -E_SHORT_CLIENT_WRITE;
+			goto out;
+		}
 	}
-	if (!numbytes)
-		PARA_NOTICE_LOG("%s", "connection closed by peer\n");
-	close(sockfd);
-	if (interactive)
-		goto interactive_loop;
-	return ret >= 0? 0: 1;
+out:
+	if (sockfd >= 0)
+		close(sockfd);
+	if (ret < 0)
+		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+	return ret >= 0? EXIT_SUCCESS: EXIT_FAILURE;
 }