X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.c;h=fec88a6f3f459b1f84f12790481c7a4411ae80de;hp=97d5274666013968347d28d345e0af809f580559;hb=94fa6ad6ec3068227d322cb83186ff8780100107;hpb=72a56476909e759085b8f1675575f36c9ffcf2bb

diff --git a/client.c b/client.c
index 97d52746..fec88a6f 100644
--- a/client.c
+++ b/client.c
@@ -1,19 +1,7 @@
 /*
- * Copyright (C) 1997-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
  *
- *     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
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file client.c the client program used to connect to para_server */
@@ -21,54 +9,13 @@
 #include "para.h"
 #include "list.h"
 #include "sched.h"
-#include "config.h"
 #include "client.cmdline.h"
-#include "crypt.h"
-#include "rc4.h"
-#include <openssl/rc4.h>
-#include "net.h"
-#include "fd.h"
 #include "string.h"
 #include "stdin.h"
 #include "stdout.h"
+#include "client.h"
 #include "error.h"
 
-enum {
-	CL_CONNECTED,
-	CL_RECEIVED_WELCOME,
-	CL_SENT_AUTH,
-	CL_RECEIVED_CHALLENGE,
-	CL_SENT_CH_RESPONSE,
-	CL_RECEIVED_PROCEED,
-	CL_SENT_COMMAND,
-	CL_SENDING_STDIN,
-	CL_RECEIVING_SERVER_OUTPUT
-};
-
-#define CLIENT_BUFSIZE 8192
-
-struct private_client_data {
-	int status;
-	int fd;
-	struct client_args_info conf;
-	char *config_file;
-	char *key_file;
-	char *user;
-	RC4_KEY rc4_recv_key;
-	RC4_KEY rc4_send_key;
-	struct task task;
-	int eof;
-	char buf[CLIENT_BUFSIZE];
-	size_t loaded;
-	int check_r;
-	int check_w;
-	long unsigned challenge_nr;
-	/* only used if stdin gets sent to para_server */
-	char *inbuf;
-	size_t *in_loaded;
-	int *in_eof;
-};
-
 INIT_CLIENT_ERRLISTS;
 
 static struct private_client_data *pcd;
@@ -76,345 +23,47 @@ static struct stdin_task sit;
 static struct stdout_task sot;
 
 
-static void rc4_send(unsigned long len, const unsigned char *indata,
-		unsigned char *outdata)
-{
-	RC4(&pcd->rc4_send_key, len, indata, outdata);
-}
-
-static void rc4_recv(unsigned long len, const unsigned char *indata,
-		unsigned char *outdata)
-{
-	RC4(&pcd->rc4_recv_key, len, indata, outdata);
-}
-
-
-/*
- * client log function
- */
-void para_log(int ll, const char* fmt,...)
-{
-	va_list argp;
-
-	/* ignore log message if loglevel is not high enough */
-	if (pcd && ll < pcd->conf.loglevel_arg)
-		return;
-	va_start(argp, fmt);
-	vfprintf(stderr, fmt, argp);
-	va_end(argp);
-}
-
-static void client_close(struct private_client_data *pcd)
-{
-	if (pcd)
-		return;
-	if (pcd->fd >= 0)
-		close(pcd->fd);
-	free(pcd->user);
-	free(pcd->config_file);
-	free(pcd->key_file);
-	free(pcd);
-}
-
-static int client_parse_config(int argc, char *argv[],
-		struct private_client_data **pcd_ptr)
-{
-	char *home = para_homedir();
-	struct stat statbuf;
-	int ret;
-	struct private_client_data *p =
-		para_calloc(sizeof(struct private_client_data));
-
-	p->fd = -1;
-	cmdline_parser(argc, argv, &p->conf);
-	ret = - E_CLIENT_SYNTAX;
-	if (!p->conf.inputs_num)
-		goto out;
-	p->user = p->conf.user_given?
-		para_strdup(p->conf.user_arg) : para_logname();
-
-	p->key_file = p->conf.key_file_given?
-		para_strdup(p->conf.key_file_arg) :
-		make_message("%s/.paraslash/key.%s", home, p->user);
-
-	p->config_file = p->conf.config_file_given?
-		para_strdup(p->conf.config_file_arg) :
-		make_message("%s/.paraslash/client.conf", home);
-	ret = stat(p->config_file, &statbuf);
-	if (ret && p->conf.config_file_given) {
-		ret = -E_NO_CONFIG;
-		goto out;
-	}
-	if (!ret)
-		cmdline_parser_configfile(p->config_file, &p->conf, 0, 0, 0);
-	ret = 1;
-	*pcd_ptr = p;
-	PARA_INFO_LOG(
-		"current loglevel: %d\n"
-		"using config_file: %s\n"
-		"using key_file: %s\n"
-		"connecting to %s:%d\n" ,
-		p->conf.loglevel_arg,
-		p->config_file,
-		p->key_file,
-		p->conf.hostname_arg, p->conf.server_port_arg
-	);
-out:
-	free(home);
-	if (ret < 0)
-		client_close(p);
-	return ret;
-}
-
-static void client_pre_select(struct sched *s, struct task *t)
-{
-	struct private_client_data *p = t->private_data;
-
-	PARA_INFO_LOG("status %d\n", p->status);
-	t->ret = 1;
-	pcd->check_r = 0;
-	pcd->check_w = 0;
-	if (p->fd < 0)
-		return;
-	switch (pcd->status) {
-	case CL_CONNECTED:
-	case CL_SENT_AUTH:
-	case CL_SENT_CH_RESPONSE:
-	case CL_SENT_COMMAND:
-		para_fd_set(pcd->fd, &s->rfds, &s->max_fileno);
-		pcd->check_r = 1;
-		return;
-
-	case CL_RECEIVED_WELCOME:
-	case CL_RECEIVED_CHALLENGE:
-	case CL_RECEIVED_PROCEED:
-		para_fd_set(pcd->fd, &s->wfds, &s->max_fileno);
-		pcd->check_w = 1;
-		return;
-
-	case CL_RECEIVING_SERVER_OUTPUT:
-		if (pcd->loaded < CLIENT_BUFSIZE - 1) {
-			para_fd_set(pcd->fd, &s->rfds, &s->max_fileno);
-			p->check_r = 1;
-		}
-		return;
-	case CL_SENDING_STDIN:
-		if (*p->in_loaded) {
-			PARA_INFO_LOG("loaded: %d\n", *p->in_loaded);
-			para_fd_set(p->fd, &s->wfds, &s->max_fileno);
-			p->check_w = 1;
-		} else {
-			if (*p->in_eof) {
-				t->ret = -E_INPUT_EOF;
-				s->timeout.tv_sec = 0;
-				s->timeout.tv_usec = 1;
-			}
-		}
-		return;
-	}
-}
-
-static ssize_t client_recv_buffer(struct private_client_data *p)
-{
-	ssize_t ret = recv_buffer(p->fd, p->buf + p->loaded,
-		CLIENT_BUFSIZE - p->loaded);
-	if (!ret)
-		return -E_SERVER_EOF;
-	if (ret > 0)
-		p->loaded += ret;
-	return ret;
-
-}
-
-static void client_post_select(struct sched *s, struct task *t)
-{
-	struct private_client_data *p = t->private_data;
-
-	PARA_INFO_LOG("status %d\n", p->status);
-	t->ret = 1;
-	if (p->fd < 0)
-		return;
-	if (!p->check_r && !p->check_w)
-		return;
-	if (p->check_r && !FD_ISSET(p->fd, &s->rfds))
-		return;
-	if (p->check_w && !FD_ISSET(p->fd, &s->wfds))
-		return;
-	switch (p->status) {
-	case CL_CONNECTED: /* receive welcome message */
-		t->ret = client_recv_buffer(p);
-		if (t->ret > 0)
-			p->status = CL_RECEIVED_WELCOME;
-		return;
-	case CL_RECEIVED_WELCOME: /* send auth command */
-		sprintf(p->buf, "auth %s%s", p->conf.plain_given?
-			"" : "rc4 ", p->user);
-		PARA_INFO_LOG("--> %s\n", p->buf);
-		t->ret = send_buffer(p->fd, p->buf);
-		if (t->ret >= 0)
-			p->status = CL_SENT_AUTH;
-		return;
-	case CL_SENT_AUTH: /* receive challenge number */
-		p->loaded = 0;
-		t->ret = client_recv_buffer(p);
-		if (t->ret < 0)
-			return;
-		if (t->ret != 64) {
-			t->ret = -E_INVALID_CHALLENGE;
-			PARA_ERROR_LOG("received the following: %s\n", p->buf);
-			return;
-		}
-		PARA_INFO_LOG("%s", "<-- [challenge]\n");
-		/* decrypt challenge number */
-		t->ret = para_decrypt_challenge(p->key_file, &p->challenge_nr,
-			(unsigned char *) p->buf, 64);
-		if (t->ret > 0)
-			p->status = CL_RECEIVED_CHALLENGE;
-		return;
-	case CL_RECEIVED_CHALLENGE: /* send decrypted challenge */
-		PARA_INFO_LOG("--> %lu\n", p->challenge_nr);
-		t->ret = send_va_buffer(p->fd, "%s%lu", CHALLENGE_RESPONSE_MSG,
-			p->challenge_nr);
-		if (t->ret > 0)
-			p->status = CL_SENT_CH_RESPONSE;
-		return;
-	case CL_SENT_CH_RESPONSE: /* read server response */
-		{
-		size_t bytes_received;
-		unsigned char rc4_buf[2 * RC4_KEY_LEN] = "";
-		p->loaded = 0;
-		t->ret = client_recv_buffer(p);
-		if (t->ret < 0)
-			return;
-		bytes_received = t->ret;
-		PARA_INFO_LOG("++++ server info ++++\n%s\n++++ end of server "
-			"info ++++\n", p->buf);
-		/* check if server has sent "Proceed" message */
-		t->ret = -E_CLIENT_AUTH;
-		if (!strstr(p->buf, PROCEED_MSG))
-			return;
-		t->ret = 1;
-		p->status = CL_RECEIVED_PROCEED;
-		if (bytes_received < PROCEED_MSG_LEN + 32)
-			return;
-		PARA_INFO_LOG("%s", "decrypting session key\n");
-		t->ret = para_decrypt_buffer(p->key_file, rc4_buf,
-			(unsigned char *)p->buf + PROCEED_MSG_LEN + 1,
-			bytes_received - PROCEED_MSG_LEN - 1);
-		if (t->ret < 0)
-			return;
-		RC4_set_key(&p->rc4_send_key, RC4_KEY_LEN, rc4_buf);
-		RC4_set_key(&p->rc4_recv_key, RC4_KEY_LEN, rc4_buf + RC4_KEY_LEN);
-		enable_crypt(p->fd, rc4_recv, rc4_send);
-		}
-	case CL_RECEIVED_PROCEED: /* concat args and send command */
-		{
-		int i;
-		char *command = NULL;
-		for (i = 0; i < p->conf.inputs_num; i++) {
-			char *tmp = command;
-			command = make_message("%s\n%s", command?
-				command : "", p->conf.inputs[i]);
-			free(tmp);
-		}
-		command = para_strcat(command, EOC_MSG "\n");
-		PARA_INFO_LOG("--> %s\n", command);
-		t->ret = send_buffer(p->fd, command);
-		free(command);
-		if (t->ret > 0)
-			p->status = CL_SENT_COMMAND;
-		return;
-		}
-	case CL_SENT_COMMAND:
-		p->loaded = 0;
-		t->ret = client_recv_buffer(p);
-		if (t->ret < 0)
-			return;
-		t->ret = -E_HANDSHAKE_COMPLETE;
-		if (strstr(p->buf, AWAITING_DATA_MSG))
-			p->status = CL_SENDING_STDIN;
-		else
-			p->status = CL_RECEIVING_SERVER_OUTPUT;
-		return;
-	case CL_SENDING_STDIN: /* FIXME: might block */
-		PARA_INFO_LOG("loaded: %d\n", *p->in_loaded);
-		t->ret = send_bin_buffer(p->fd, p->inbuf, *p->in_loaded);
-		if (t->ret <= 0) {
-			if (!t->ret)
-				t->ret = 1;
-			return;
-		}
-		*p->in_loaded = 0; /* FIXME: short writes */
-		return;
-	case CL_RECEIVING_SERVER_OUTPUT:
-		t->ret = client_recv_buffer(p);
-		return;
-	}
-
-}
-static 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;
-}
+INIT_STDERR_LOGGING(pcd->conf.loglevel_arg);
 
 static void client_event_handler(struct task *t)
 {
 	struct private_client_data *p = t->private_data;
 
-	PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
+	PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
 	if (t->ret != -E_HANDSHAKE_COMPLETE) {
 		unregister_task(t);
-		p->eof = 1;
+		p->error = t->ret;
 		return;
 	}
-	if (p->status == CL_SENDING_STDIN) {
+	if (p->status == CL_SENDING) {
 		stdin_set_defaults(&sit);
 		sit.buf = para_malloc(sit.bufsize),
 		register_task(&sit.task);
 		p->inbuf = sit.buf;
 		p->in_loaded = &sit.loaded;
-		p->in_eof = &sit.eof;
+		p->in_error = &sit.error;
 		return;
 	}
 	stdout_set_defaults(&sot);
 	sot.buf = p->buf;
 	sot.loaded = &p->loaded;
-	sot.input_eof = &p->eof;
+	sot.input_error = &p->error;
 	register_task(&sot.task);
 }
 
-/*
- * MAIN
+/**
+ * the client program to connect to para_server
+ *
+ * \param argc usual argument count
+ * \param argv usual argument vector
+ *
+ * It registers two tasks: The client task that communicates with para_server
+ * and the standard out task that writes any output produced by the client task
+ * to standard out.
+ *
+ * \return EXIT_SUCCESS or EXIT_FAILURE
+ *
+ * \sa client_open(), stdout.c, stdout.h, para_client(1), para_server(1)
  */
 int main(int argc, char *argv[])
 {
@@ -422,20 +71,15 @@ int main(int argc, char *argv[])
 	int ret;
 	struct sched s;
 
-	init_sched();
 	s.default_timeout.tv_sec = 1;
 	s.default_timeout.tv_usec = 0;
-	ret = client_parse_config(argc, argv, &pcd);
-	if (ret < 0)
-		goto out;
+	ret = client_open(argc, argv, &pcd);
+	if (ret < 0) /* can not use PARA_LOG here */
+		exit(EXIT_FAILURE);
 	pcd->task.event_handler = client_event_handler;
-	ret = client_open(pcd);
+	ret = schedule(&s);
 	if (ret < 0)
-		goto out;
-	ret = sched(&s);
+		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	client_close(pcd);
-out:
-	if (ret < 0)
-		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
 	return ret >= 0? EXIT_SUCCESS: EXIT_FAILURE;
 }