X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=c19b71218b59f62f1e6a75c1eee43ee332a65900;hp=d3a9ede1f0e1d5b7238a387f0f3aa03650deed55;hb=9bb2e6ed4206247fdee844c0a1f3326e85a7ab59;hpb=32e646780461f96682d1191d31e08e4602ab125e

diff --git a/client_common.c b/client_common.c
index d3a9ede1..c19b7121 100644
--- a/client_common.c
+++ b/client_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -13,38 +13,65 @@
 #include "error.h"
 #include "list.h"
 #include "sched.h"
-#include "client.cmdline.h"
 #include "crypt.h"
 #include "net.h"
 #include "fd.h"
+#include "sideband.h"
 #include "string.h"
 #include "client.cmdline.h"
 #include "client.h"
 #include "buffer_tree.h"
 #include "version.h"
+#include "ggo.h"
 
 /** The size of the receiving buffer. */
 #define CLIENT_BUFSIZE 4000
 
 /**
- * Close the connection to para_server and free all resources.
+ * Close the connection to para_server and deallocate per-command resources.
  *
- * \param ct Pointer to the client data.
+ * \param ct The client task.
  *
- * \sa client_open.
+ * This frees all resources of the current command but keeps the configuration
+ * in \p ct->conf.
+ *
+ * \sa \ref client_close().
  */
-void client_close(struct client_task *ct)
+void client_disconnect(struct client_task *ct)
 {
 	if (!ct)
 		return;
 	if (ct->scc.fd >= 0)
 		close(ct->scc.fd);
+	free_argv(ct->features);
+	ct->features = NULL;
 	sc_free(ct->scc.recv);
+	ct->scc.recv = NULL;
 	sc_free(ct->scc.send);
+	ct->scc.send = NULL;
+	btr_remove_node(&ct->btrn[0]);
+	btr_remove_node(&ct->btrn[1]);
+}
+
+/**
+ * Close the connection to para_server and free all resources.
+ *
+ * \param ct Pointer to the client data.
+ *
+ * \sa \ref client_open(), \ref client_disconnect().
+ */
+void client_close(struct client_task *ct)
+{
+	if (!ct)
+		return;
+	client_disconnect(ct);
 	free(ct->user);
 	free(ct->config_file);
 	free(ct->key_file);
 	client_cmdline_parser_free(&ct->conf);
+	free(ct->challenge_hash);
+	sb_free(ct->sbc[0]);
+	sb_free(ct->sbc[1]);
 	free(ct);
 }
 
@@ -66,7 +93,6 @@ static void client_pre_select(struct sched *s, struct task *t)
 {
 	int ret;
 	struct client_task *ct = container_of(t, struct client_task, task);
-	struct btr_node *btrn = ct->btrn;
 
 	if (ct->scc.fd < 0)
 		return;
@@ -74,61 +100,194 @@ static void client_pre_select(struct sched *s, struct task *t)
 	case CL_CONNECTED:
 	case CL_SENT_AUTH:
 	case CL_SENT_CH_RESPONSE:
-	case CL_SENT_COMMAND:
 		para_fd_set(ct->scc.fd, &s->rfds, &s->max_fileno);
 		return;
 
 	case CL_RECEIVED_WELCOME:
 	case CL_RECEIVED_PROCEED:
+	case CL_RECEIVED_CHALLENGE:
 		para_fd_set(ct->scc.fd, &s->wfds, &s->max_fileno);
 		return;
 
-	case CL_RECEIVING:
-		ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
-		if (ret != 0) {
+	case CL_SENDING:
+		if (ct->btrn[1]) {
+			ret = btr_node_status(ct->btrn[1], 0, BTR_NT_LEAF);
 			if (ret < 0)
 				sched_min_delay(s);
-			else
-				para_fd_set(ct->scc.fd, &s->rfds,
-					&s->max_fileno);
+			else if (ret > 0)
+				para_fd_set(ct->scc.fd, &s->wfds, &s->max_fileno);
 		}
-		return;
-	case CL_SENDING:
-		ret = btr_node_status(btrn, 0, BTR_NT_LEAF);
-		if (ret != 0) {
+		/* fall though */
+	case CL_EXECUTING:
+		if (ct->btrn[0]) {
+			ret = btr_node_status(ct->btrn[0], 0, BTR_NT_ROOT);
 			if (ret < 0)
 				sched_min_delay(s);
-			else
-				para_fd_set(ct->scc.fd, &s->wfds,
-					&s->max_fileno);
+			else if (ret > 0)
+				para_fd_set(ct->scc.fd, &s->rfds, &s->max_fileno);
 		}
 		return;
 	}
 }
 
-static int client_recv_buffer(struct client_task *ct, fd_set *rfds,
-		char *buf, size_t sz, size_t *n)
+static int send_sb(struct client_task *ct, int channel, void *buf, size_t numbytes,
+		enum sb_designator band, bool dont_free)
+{
+	int ret, fd = ct->scc.fd;
+	struct iovec iov[2];
+
+	if (!ct->sbc[channel]) {
+		struct sb_buffer sbb;
+		sb_transformation trafo = ct->status < CL_RECEIVED_PROCEED?
+			NULL : sc_trafo;
+		sbb = (typeof(sbb))SBB_INIT(band, buf, numbytes);
+		ct->sbc[channel] = sb_new_send(&sbb, dont_free, trafo, ct->scc.send);
+	}
+	ret = sb_get_send_buffers(ct->sbc[channel], iov);
+	ret = xwritev(fd, iov, ret);
+	if (ret < 0) {
+		sb_free(ct->sbc[channel]);
+		ct->sbc[channel] = NULL;
+		return ret;
+	}
+	if (sb_sent(ct->sbc[channel], ret)) {
+		ct->sbc[channel] = NULL;
+		return 1;
+	}
+	return 0;
+}
+
+static int recv_sb(struct client_task *ct, fd_set *rfds,
+		struct sb_buffer *result)
 {
 	int ret;
+	size_t n;
+	sb_transformation trafo;
+	void *trafo_context;
+	struct iovec iov;
 
-	if (ct->status < CL_SENT_CH_RESPONSE)
-		return read_nonblock(ct->scc.fd, buf, sz, rfds, n);
-
-	*n = 0;
-	ret = sc_recv_buffer(&ct->scc, buf, sz);
-	/*
-	 * sc_recv_buffer is used with blocking fds elsewhere, so it
-	 * does not use the nonblock-API. Therefore we need to
-	 * check for EOF and EAGAIN.
-	 */
-	if (ret == 0)
-		return -E_SERVER_EOF;
-	if (ret == -ERRNO_TO_PARA_ERROR(EAGAIN))
+	if (!FD_ISSET(ct->scc.fd, rfds))
 		return 0;
-	if (ret < 0)
+	if (ct->status < CL_SENT_CH_RESPONSE)
+		trafo = trafo_context = NULL;
+	else {
+		trafo = sc_trafo;
+		trafo_context = ct->scc.recv;
+	}
+	if (!ct->sbc[0])
+		ct->sbc[0] = sb_new_recv(0, trafo, trafo_context);
+again:
+	sb_get_recv_buffer(ct->sbc[0], &iov);
+	ret = read_nonblock(ct->scc.fd, iov.iov_base, iov.iov_len, rfds, &n);
+	if (ret < 0) {
+		sb_free(ct->sbc[0]);
+		ct->sbc[0] = NULL;
 		return ret;
-	*n = ret;
-	return 0;
+	}
+	if (n == 0)
+		return 0;
+	if (!sb_received(ct->sbc[0], n, result))
+		goto again;
+	ct->sbc[0] = NULL;
+	return 1;
+}
+
+
+static char **parse_features(char *buf)
+{
+	int i;
+	const char id[] = "\nFeatures: ";
+	char *p, *q, **features;
+
+	p = strstr(buf, id);
+	if (!p)
+		return NULL;
+	p += strlen(id);
+	q = strchr(p, '\n');
+	if (!q)
+		return NULL;
+	*q = '\0';
+	create_argv(p, ",", &features);
+	for (i = 0; features[i]; i++)
+		PARA_INFO_LOG("server feature: %s\n", features[i]);
+	return features;
+}
+
+static int dispatch_sbb(struct client_task *ct, struct sb_buffer *sbb)
+{
+	int ret;
+	const char *designator[] = {SB_DESIGNATORS_ARRAY};
+
+	if (!sbb)
+		return 0;
+	if (sbb->band < NUM_SB_DESIGNATORS)
+		PARA_DEBUG_LOG("band: %s\n", designator[sbb->band]);
+
+	switch (sbb->band) {
+	case SBD_AWAITING_DATA:
+		ct->status = CL_SENDING;
+		ret = 1;
+		goto out;
+	case SBD_OUTPUT:
+		if (iov_valid(&sbb->iov))
+			btr_add_output(sbb->iov.iov_base, sbb->iov.iov_len,
+				ct->btrn[0]);
+		ret = 1;
+		goto out;
+	case SBD_DEBUG_LOG:
+	case SBD_INFO_LOG:
+	case SBD_NOTICE_LOG:
+	case SBD_WARNING_LOG:
+	case SBD_ERROR_LOG:
+	case SBD_CRIT_LOG:
+	case SBD_EMERG_LOG:
+		if (iov_valid(&sbb->iov)) {
+			int ll = sbb->band - SBD_DEBUG_LOG;
+			para_log(ll, "remote: %s", (char *)sbb->iov.iov_base);
+		}
+		ret = 1;
+		goto deallocate;
+	case SBD_EXIT__SUCCESS:
+		ret = -E_SERVER_CMD_SUCCESS;
+		goto deallocate;
+	case SBD_EXIT__FAILURE:
+		ret = -E_SERVER_CMD_FAILURE;
+		goto deallocate;
+	default:
+		PARA_ERROR_LOG("invalid band %d\n", sbb->band);
+		ret = -E_BAD_BAND;
+		goto deallocate;
+	}
+deallocate:
+	free(sbb->iov.iov_base);
+out:
+	sbb->iov.iov_base = NULL;
+	return ret;
+}
+
+static bool has_feature(const char *feature, struct client_task *ct)
+{
+	return find_arg(feature, ct->features) >= 0? true : false;
+}
+
+static int send_sb_command(struct client_task *ct)
+{
+	int i;
+	char *command, *p;
+	size_t len = 0;
+
+	if (ct->sbc[1])
+		return send_sb(ct, 0, NULL, 0, 0, false);
+
+	for (i = 0; i < ct->conf.inputs_num; i++)
+		len += strlen(ct->conf.inputs[i]) + 1;
+	p = command = para_malloc(len);
+	for (i = 0; i < ct->conf.inputs_num; i++) {
+		strcpy(p, ct->conf.inputs[i]);
+		p += strlen(ct->conf.inputs[i]) + 1;
+	}
+	PARA_DEBUG_LOG("--> %s\n", command);
+	return send_sb(ct, 0, command, len, SBD_COMMAND, false);
 }
 
 /**
@@ -144,34 +303,41 @@ static int client_recv_buffer(struct client_task *ct, fd_set *rfds,
  *
  * \sa struct sched, struct task.
  */
-static void client_post_select(struct sched *s, struct task *t)
+static int client_post_select(struct sched *s, struct task *t)
 {
 	struct client_task *ct = container_of(t, struct client_task, task);
-	struct btr_node *btrn = ct->btrn;
 	int ret = 0;
 	size_t n;
 	char buf[CLIENT_BUFSIZE];
 
-	t->error = 0;
+	ret = task_get_notification(t);
+	if (ret < 0)
+		goto out;
 	if (ct->scc.fd < 0)
-		return;
+		return 0;
 	switch (ct->status) {
 	case CL_CONNECTED: /* receive welcome message */
-		ret = client_recv_buffer(ct, &s->rfds, buf, sizeof(buf), &n);
+		ret = read_nonblock(ct->scc.fd, buf, sizeof(buf), &s->rfds, &n);
 		if (ret < 0 || n == 0)
 			goto out;
+		ct->features = parse_features(buf);
+		if (!has_feature("sideband", ct)) {
+			PARA_ERROR_LOG("server has no sideband support\n");
+			ret = -E_INCOMPAT_FEAT;
+			goto out;
+		}
 		ct->status = CL_RECEIVED_WELCOME;
-		return;
+		return 0;
 	case CL_RECEIVED_WELCOME: /* send auth command */
-		sprintf(buf, AUTH_REQUEST_MSG "%s", ct->user);
-		PARA_INFO_LOG("--> %s\n", buf);
 		if (!FD_ISSET(ct->scc.fd, &s->wfds))
-			return;
-		ret = send_buffer(ct->scc.fd, buf);
+			return 0;
+		sprintf(buf, AUTH_REQUEST_MSG "%s sideband", ct->user);
+		PARA_INFO_LOG("--> %s\n", buf);
+		ret = write_buffer(ct->scc.fd, buf);
 		if (ret < 0)
 			goto out;
 		ct->status = CL_SENT_AUTH;
-		return;
+		return 0;
 	case CL_SENT_AUTH:
 		/*
 		 * Receive challenge and session keys, decrypt the challenge and
@@ -180,153 +346,170 @@ static void client_post_select(struct sched *s, struct task *t)
 		{
 		/* decrypted challenge/session key buffer */
 		unsigned char crypt_buf[1024];
-		/* the SHA1 of the decrypted challenge */
-		unsigned char challenge_hash[HASH_SIZE];
+		struct sb_buffer sbb;
 
-		ret = client_recv_buffer(ct, &s->rfds, buf, sizeof(buf), &n);
-		if (ret < 0 || n == 0)
+		ret = recv_sb(ct, &s->rfds, &sbb);
+		if (ret <= 0)
 			goto out;
+		if (sbb.band != SBD_CHALLENGE) {
+			ret = -E_BAD_BAND;
+			free(sbb.iov.iov_base);
+				goto out;
+		}
+		n = sbb.iov.iov_len;
 		PARA_INFO_LOG("<-- [challenge] (%zu bytes)\n", n);
 		ret = priv_decrypt(ct->key_file, crypt_buf,
-			(unsigned char *)buf, n);
+			sbb.iov.iov_base, n);
+		free(sbb.iov.iov_base);
 		if (ret < 0)
 			goto out;
-		hash_function((char *)crypt_buf, CHALLENGE_SIZE, challenge_hash);
+		ct->challenge_hash = para_malloc(HASH_SIZE);
+		hash_function((char *)crypt_buf, CHALLENGE_SIZE, ct->challenge_hash);
 		ct->scc.send = sc_new(crypt_buf + CHALLENGE_SIZE, SESSION_KEY_LEN);
 		ct->scc.recv = sc_new(crypt_buf + CHALLENGE_SIZE + SESSION_KEY_LEN,
 			SESSION_KEY_LEN);
-		hash_to_asc(challenge_hash, buf);
+		hash_to_asc(ct->challenge_hash, buf);
 		PARA_INFO_LOG("--> %s\n", buf);
-		ret = send_bin_buffer(ct->scc.fd, (char *)challenge_hash,
-			HASH_SIZE);
-		if (ret < 0)
+		ct->status = CL_RECEIVED_CHALLENGE;
+		return 0;
+		}
+	case CL_RECEIVED_CHALLENGE:
+		ret = send_sb(ct, 0, ct->challenge_hash, HASH_SIZE,
+			SBD_CHALLENGE_RESPONSE, false);
+		if (ret != 0)
+			ct->challenge_hash = NULL;
+		if (ret <= 0)
 			goto out;
 		ct->status = CL_SENT_CH_RESPONSE;
-		return;
-		}
+		goto out;
 	case CL_SENT_CH_RESPONSE: /* read server response */
 		{
-		ret = client_recv_buffer(ct, &s->rfds, buf, sizeof(buf), &n);
-		if (ret < 0 || n == 0)
+		struct sb_buffer sbb;
+		ret = recv_sb(ct, &s->rfds, &sbb);
+		if (ret <= 0)
 			goto out;
-		/* check if server has sent "Proceed" message */
-		ret = -E_CLIENT_AUTH;
-		if (n < PROCEED_MSG_LEN)
-			goto out;
-		if (!strstr(buf, PROCEED_MSG))
-			goto out;
-		ct->status = CL_RECEIVED_PROCEED;
-		return;
+		free(sbb.iov.iov_base);
+		if (sbb.band != SBD_PROCEED)
+			ret = -E_BAD_BAND;
+		else
+			ct->status = CL_RECEIVED_PROCEED;
+		goto out;
 		}
 	case CL_RECEIVED_PROCEED: /* concat args and send command */
 		{
-		int i;
-		char *command = NULL;
 		if (!FD_ISSET(ct->scc.fd, &s->wfds))
-			return;
-		for (i = 0; i < ct->conf.inputs_num; i++) {
-			char *tmp = command;
-			command = make_message("%s\n%s", command?
-				command : "", ct->conf.inputs[i]);
-			free(tmp);
-		}
-		command = para_strcat(command, EOC_MSG "\n");
-		PARA_DEBUG_LOG("--> %s\n", command);
-		ret = sc_send_buffer(&ct->scc, command);
-		free(command);
-		if (ret < 0)
+			return 0;
+		ret = send_sb_command(ct);
+		if (ret <= 0)
 			goto out;
-		ct->status = CL_SENT_COMMAND;
-		return;
+		ct->status = CL_EXECUTING;
+		return 0;
 		}
-	case CL_SENT_COMMAND:
-		{
-		char *buf2;
-		/* can not use "buf" here because we need a malloced buffer */
-		buf2 = para_malloc(CLIENT_BUFSIZE);
-		ret = client_recv_buffer(ct, &s->rfds, buf2, CLIENT_BUFSIZE, &n);
-		if (n > 0) {
-			if (strstr(buf2, AWAITING_DATA_MSG)) {
-				free(buf2);
-				ct->status = CL_SENDING;
-				return;
+	case CL_SENDING:
+		if (ct->btrn[1]) {
+			char *buf2;
+			size_t sz;
+			ret = btr_node_status(ct->btrn[1], 0, BTR_NT_LEAF);
+			if (ret == -E_BTR_EOF) {
+				/* empty blob data packet indicates EOF */
+				PARA_INFO_LOG("blob sent\n");
+				ret = send_sb(ct, 1, NULL, 0, SBD_BLOB_DATA, true);
+				if (ret >= 0)
+					ret = -E_BTR_EOF;
+			}
+			if (ret < 0)
+				goto close1;
+			if (ret > 0 && FD_ISSET(ct->scc.fd, &s->wfds)) {
+				sz = btr_next_buffer(ct->btrn[1], &buf2);
+				assert(sz);
+				ret = send_sb(ct, 1, buf2, sz, SBD_BLOB_DATA, true);
+				if (ret < 0)
+					goto close1;
+				if (ret > 0)
+					btr_consume(ct->btrn[1], sz);
 			}
-			ct->status = CL_RECEIVING;
-			btr_add_output(buf2, n, btrn);
-		} else
-			free(buf2);
-		goto out;
 		}
-	case CL_SENDING:
-		{
-		char *buf2;
-		size_t sz;
-		ret = btr_node_status(btrn, 0, BTR_NT_LEAF);
-		if (ret < 0)
-			goto out;
-		if (ret == 0)
-			return;
-		if (!FD_ISSET(ct->scc.fd, &s->wfds))
-			return;
-		sz = btr_next_buffer(btrn, &buf2);
-		ret = sc_send_bin_buffer(&ct->scc, buf2, sz);
-		if (ret < 0)
-			goto out;
-		btr_consume(btrn, sz);
-		return;
+		/* fall though */
+	case CL_EXECUTING:
+		if (ct->btrn[0]) {
+			ret = btr_node_status(ct->btrn[0], 0, BTR_NT_ROOT);
+			if (ret < 0)
+				goto close0;
+			if (ret > 0 && FD_ISSET(ct->scc.fd, &s->rfds)) {
+				struct sb_buffer sbb;
+				ret = recv_sb(ct, &s->rfds, &sbb);
+				if (ret < 0)
+					goto close0;
+				if (ret > 0) {
+					ret = dispatch_sbb(ct, &sbb);
+					if (ret < 0)
+						goto close0;
+				}
+			}
 		}
-	case CL_RECEIVING:
-		{
-		char *buf2;
-		ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
-		if (ret < 0)
-			goto out;
-		if (ret == 0)
-			return;
-		/*
-		 * The FD_ISSET() is not strictly necessary, but is allows us
-		 * to skip the malloc below if there is nothing to read anyway.
-		 */
-		if (!FD_ISSET(ct->scc.fd, &s->rfds))
-			return;
-		buf2 = para_malloc(CLIENT_BUFSIZE);
-		ret = client_recv_buffer(ct, &s->rfds, buf2, CLIENT_BUFSIZE, &n);
-		if (n > 0) {
-			buf2 = para_realloc(buf2, n);
-			btr_add_output(buf2, n, btrn);
-		} else
-			free(buf2);
+		ret = 0;
 		goto out;
-		}
 	}
+close1:
+	PARA_INFO_LOG("channel 1: %s\n", para_strerror(-ret));
+	btr_remove_node(&ct->btrn[1]);
+	if (ct->btrn[0])
+		return 0;
+	goto out;
+close0:
+	PARA_INFO_LOG("channel 0: %s\n", para_strerror(-ret));
+	btr_remove_node(&ct->btrn[0]);
+	if (ct->btrn[1] && ct->status == CL_SENDING)
+		return 0;
 out:
-	t->error = ret;
-	if (ret < 0) {
-		if (ret != -E_SERVER_EOF && ret != -E_BTR_EOF)
-			PARA_ERROR_LOG("%s\n", para_strerror(-t->error));
-		btr_remove_node(btrn);
-	}
+	if (ret >= 0)
+		return 0;
+	btr_remove_node(&ct->btrn[0]);
+	btr_remove_node(&ct->btrn[1]);
+	if (ret != -E_SERVER_CMD_SUCCESS && ret != -E_SERVER_CMD_FAILURE)
+		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+	return ret;
 }
 
-/* connect to para_server and register the client task */
-static int client_connect(struct client_task *ct)
+/**
+ * Connect to para_server and register the client task.
+ *
+ * \param ct The initialized client task structure.
+ * \param s The scheduler instance to register the client task to.
+ * \param parent The parent node of the client btr node.
+ * \param child The child node of the client node.
+ *
+ * The client task structure given by \a ct  must be allocated and initialized
+ * by \ref client_parse_config() before this function is called.
+ *
+ * \return Standard.
+ */
+int client_connect(struct client_task *ct, struct sched *s,
+		struct btr_node *parent, struct btr_node *child)
 {
 	int ret;
 
+	PARA_NOTICE_LOG("connecting %s:%d\n", ct->conf.hostname_arg,
+		ct->conf.server_port_arg);
 	ct->scc.fd = -1;
 	ret = para_connect_simple(IPPROTO_TCP, ct->conf.hostname_arg,
 					       ct->conf.server_port_arg);
 	if (ret < 0)
 		return ret;
 	ct->scc.fd = ret;
-	ct->status = CL_CONNECTED;
 	ret = mark_fd_nonblocking(ct->scc.fd);
 	if (ret < 0)
 		goto err_out;
+	ct->status = CL_CONNECTED;
+	ct->btrn[0] = btr_new_node(&(struct btr_node_description)
+		EMBRACE(.name = "client recv", .parent = NULL, .child = child));
+	ct->btrn[1] = btr_new_node(&(struct btr_node_description)
+		EMBRACE(.name = "client send", .parent = parent, .child = NULL));
 	ct->task.pre_select = client_pre_select;
 	ct->task.post_select = client_post_select;
+	ct->task.error = 0;
 	sprintf(ct->task.status, "client");
-	register_task(&ct->task);
+	register_task(s, &ct->task);
 	return 1;
 err_out:
 	close(ct->scc.fd);
@@ -334,41 +517,48 @@ err_out:
 	return ret;
 }
 
+__noreturn static void print_help_and_die(struct client_task *ct)
+{
+	struct ggo_help h = DEFINE_GGO_HELP(client);
+	bool d = ct->conf.detailed_help_given;
+
+	ggo_print_help(&h, d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS);
+	exit(0);
+}
+
 /**
- * Open connection to para_server.
+ * Parse a client configuration.
  *
  * \param argc Usual argument count.
  * \param argv Usual argument vector.
- * \param ct_ptr Points to dynamically allocated and initialized client task
- * struct upon successful return.
+ * \param ct_ptr Filled in by this function.
  * \param loglevel If not \p NULL, the number of the loglevel is stored here.
- * \param parent Add the new buffer tree node as a child of this node.
- * \param child Add the new buffer tree node as a parent of this node.
  *
- * Check the command line options given by \a argc and argv, set default values
- * for user name and rsa key file, read further option from the config file.
- * Finally, establish a connection to para_server.
+ * This checks the command line options given by \a argc and \a argv, sets
+ * default values for the user name and the name of the rsa key file and reads
+ * further options from the config file.
  *
- * \return Standard.
+ * Upon successful return, \a ct_ptr points to a dynamically allocated and
+ * initialized client task struct.
+ *
+ * \return The number of non-option arguments in \a argc/argv on success,
+ * negative on errors.
  */
-int client_open(int argc, char *argv[], struct client_task **ct_ptr,
-		int *loglevel, struct btr_node *parent, struct btr_node *child)
+int client_parse_config(int argc, char *argv[], struct client_task **ct_ptr,
+		int *loglevel)
 {
 	char *home = para_homedir();
 	int ret;
 	struct client_task *ct = para_calloc(sizeof(struct client_task));
 
-	ct->btrn = btr_new_node(&(struct btr_node_description)
-		EMBRACE(.name = "client", .parent = parent, .child = child));
 	*ct_ptr = ct;
 	ct->scc.fd = -1;
 	ret = -E_CLIENT_SYNTAX;
 	if (client_cmdline_parser(argc, argv, &ct->conf))
 		goto out;
-	HANDLE_VERSION_FLAG("client", ct->conf);
-	ret = -E_CLIENT_SYNTAX;
-	if (!ct->conf.inputs_num)
-		goto out;
+	version_handle_flag("client", ct->conf.version_given);
+	if (ct->conf.help_given || ct->conf.detailed_help_given)
+		print_help_and_die(ct);
 
 	ct->config_file = ct->conf.config_file_given?
 		para_strdup(ct->conf.config_file_arg) :
@@ -394,26 +584,68 @@ int client_open(int argc, char *argv[], struct client_task **ct_ptr,
 	ct->user = ct->conf.user_given?
 		para_strdup(ct->conf.user_arg) : para_logname();
 
-	ct->key_file = ct->conf.key_file_given?
-		para_strdup(ct->conf.key_file_arg) :
-		make_message("%s/.paraslash/key.%s", home, ct->user);
+	if (ct->conf.key_file_given)
+		ct->key_file = para_strdup(ct->conf.key_file_arg);
+	else {
+		ct->key_file = make_message("%s/.paraslash/key.%s",
+			home, ct->user);
+		if (!file_exists(ct->key_file)) {
+			free(ct->key_file);
+			ct->key_file = make_message("%s/.ssh/id_rsa", home);
+		}
+	}
 
 	if (loglevel)
 		*loglevel = get_loglevel_by_name(ct->conf.loglevel_arg);
 	PARA_INFO_LOG("loglevel: %s\n", ct->conf.loglevel_arg);
 	PARA_INFO_LOG("config_file: %s\n", ct->config_file);
 	PARA_INFO_LOG("key_file: %s\n", ct->key_file);
-	PARA_NOTICE_LOG("connecting %s:%d\n", ct->conf.hostname_arg,
-		ct->conf.server_port_arg);
-	ret = client_connect(ct);
+	ret = ct->conf.inputs_num;
 out:
 	free(home);
 	if (ret < 0) {
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
-		btr_remove_node(ct->btrn);
-		btr_free_node(ct->btrn);
 		client_close(ct);
 		*ct_ptr = NULL;
 	}
 	return ret;
 }
+
+/**
+ * Parse the client configuration and open a connection to para_server.
+ *
+ * \param argc See \ref client_parse_config.
+ * \param argv See \ref client_parse_config.
+ * \param ct_ptr See \ref client_parse_config.
+ * \param loglevel See \ref client_parse_config.
+ * \param parent See \ref client_connect().
+ * \param child See \ref client_connect().
+ * \param sched See \ref client_connect().
+ *
+ * This function combines client_parse_config() and client_connect(). It is
+ * considered a syntax error if no command was given, i.e. if the number
+ * of non-option arguments is zero.
+ *
+ * \return Standard.
+ */
+int client_open(int argc, char *argv[], struct client_task **ct_ptr,
+		int *loglevel, struct btr_node *parent, struct btr_node *child,
+		struct sched *sched)
+{
+	int ret = client_parse_config(argc, argv, ct_ptr, loglevel);
+
+	if (ret < 0)
+		return ret;
+	if (ret == 0) {
+		ret = -E_CLIENT_SYNTAX;
+		goto fail;
+	}
+	ret = client_connect(*ct_ptr, sched, parent, child);
+	if (ret < 0)
+		goto fail;
+	return 1;
+fail:
+	client_close(*ct_ptr);
+	*ct_ptr = NULL;
+	return ret;
+}