X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=client_common.c;h=a7eee85d3cc0d5cf94073ca39c6223a7c4a639d4;hb=e7f035b3ad7ecc64ec87d9ce890f89365dec1411;hp=fdc9a5345a8358fc55c9641b7a123c59b22237dd;hpb=c8862b9e246b4ef6ff1fe103946e18cf2537ecde;p=paraslash.git

diff --git a/client_common.c b/client_common.c
index fdc9a534..a7eee85d 100644
--- a/client_common.c
+++ b/client_common.c
@@ -1,380 +1,620 @@
-/*
- * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file client_common.c Common functions of para_client and para_audiod. */
 
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
+#include <lopsub.h>
 
+#include "client.lsg.h"
 #include "para.h"
 #include "error.h"
 #include "list.h"
+#include "lsu.h"
 #include "sched.h"
-#include "client.cmdline.h"
 #include "crypt.h"
-#include "rc4.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"
 
-/*
- * Rc4-encrypt data before sending.
- *
- * \param len The number of bytes to encrypt.
- * \param indata Pointer to the input data of length \a len to be encrypted.
- * \param outdata Result-pointer that holds the encrypted data.
- * \param private_data Contains the rc4 key.
- */
-static void rc4_send(unsigned long len, const unsigned char *indata,
-		unsigned char *outdata, void *private_data)
-{
-	struct private_client_data *pcd = private_data;
-	RC4(&pcd->rc4_send_key, len, indata, outdata);
-}
-
-/*
- * Rc4-decrypt received data.
- *
- * Parameters are identical to those of rc4_send.
- */
-static void rc4_recv(unsigned long len, const unsigned char *indata,
-		unsigned char *outdata, void *private_data)
-{
-	struct private_client_data *pcd = private_data;
-	RC4(&pcd->rc4_recv_key, len, indata, outdata);
-}
+/** The size of the receiving buffer. */
+#define CLIENT_BUFSIZE 4000
 
 /**
  * Close the connection to para_server and free all resources.
  *
- * \param pcd Pointer to the client data.
+ * \param ct Pointer to the client data.
  *
- * \sa client_open.
+ * \sa \ref client_open().
  */
-void client_close(struct private_client_data *pcd)
+void client_close(struct client_task *ct)
 {
-	if (!pcd)
+	if (!ct)
 		return;
-	if (pcd->fd >= 0) {
-		disable_crypt(pcd->fd);
-		close(pcd->fd);
-	}
-	free(pcd->user);
-	free(pcd->config_file);
-	free(pcd->key_file);
-	client_cmdline_parser_free(&pcd->conf);
-	free(pcd);
+	free(ct->user);
+	free(ct->key_file);
+	lls_free_parse_result(ct->lpr, CLIENT_CMD_PTR);
+	free(ct->challenge_hash);
+	sb_free(ct->sbc[0]);
+	sb_free(ct->sbc[1]);
+	free(ct);
 }
 
-/**
+/*
  * The preselect hook for server commands.
  *
- * \param s Pointer to the scheduler.
- * \param t Pointer to the task struct for this command.
- *
  * The task pointer must contain a pointer to the initialized client data
  * structure as it is returned by client_open().
  *
  * This function checks the state of the connection and adds the file descriptor
- * of the connection to the read or write fd set of \a s accordingly.
- *
- * \sa register_task() client_open(), struct sched, struct task.
+ * of the connection to the read or write fd set of s accordingly.
  */
-static void client_pre_select(struct sched *s, struct task *t)
+static void client_pre_select(struct sched *s, void *context)
 {
-	struct private_client_data *pcd = t->private_data;
+	int ret;
+	struct client_task *ct = context;
 
-	t->ret = 1;
-	pcd->check_r = 0;
-	pcd->check_w = 0;
-	if (pcd->fd < 0)
+	if (ct->scc.fd < 0)
 		return;
-	switch (pcd->status) {
+	switch (ct->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;
+		para_fd_set(ct->scc.fd, &s->rfds, &s->max_fileno);
 		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;
+	case CL_RECEIVED_CHALLENGE:
+		para_fd_set(ct->scc.fd, &s->wfds, &s->max_fileno);
 		return;
 
-	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:
-		if (*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 {
-			if (*pcd->in_error) {
-				t->ret = *pcd->in_error;
-				s->timeout.tv_sec = 0;
-				s->timeout.tv_usec = 1;
-			}
+		if (ct->btrn[1]) {
+			ret = btr_node_status(ct->btrn[1], 0, BTR_NT_LEAF);
+			if (ret < 0)
+				sched_min_delay(s);
+			else if (ret > 0)
+				para_fd_set(ct->scc.fd, &s->wfds, &s->max_fileno);
+		}
+		/* fallthrough */
+	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 if (ret > 0)
+				para_fd_set(ct->scc.fd, &s->rfds, &s->max_fileno);
 		}
 		return;
 	}
 }
 
-static ssize_t client_recv_buffer(struct private_client_data *pcd)
+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)
 {
-	ssize_t ret = recv_buffer(pcd->fd, pcd->buf + pcd->loaded,
-		CLIENT_BUFSIZE - pcd->loaded);
-	if (!ret)
-		return -E_SERVER_EOF;
-	if (ret > 0)
-		pcd->loaded += ret;
+	int ret;
+	size_t n;
+	sb_transformation trafo;
+	void *trafo_context;
+	struct iovec iov;
+
+	if (!FD_ISSET(ct->scc.fd, rfds))
+		return 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;
+	}
+	if (n == 0)
+		return 0;
+	ret = sb_received(ct->sbc[0], n, result);
+	if (ret < 0)
+		return ret;
+	if (ret == 0)
+		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 int send_sb_command(struct client_task *ct)
+{
+	int i;
+	char *command, *p;
+	size_t len = 0;
+	unsigned num_inputs = lls_num_inputs(ct->lpr);
+
+	if (ct->sbc[1])
+		return send_sb(ct, 0, NULL, 0, 0, false);
+
+	for (i = 0; i < num_inputs; i++)
+		len += strlen(lls_input(i, ct->lpr)) + 1;
+	p = command = para_malloc(len);
+	for (i = 0; i < num_inputs; i++) {
+		const char *str = lls_input(i, ct->lpr);
+		strcpy(p, str);
+		p += strlen(str) + 1;
+	}
+	PARA_DEBUG_LOG("--> %s\n", command);
+	return send_sb(ct, 0, command, len, SBD_COMMAND, false);
 }
 
-/**
+/*
  * The post select hook for client commands.
  *
- * \param s Pointer to the scheduler.
- * \param t Pointer to the task struct for this command.
- *
  * Depending on the current state of the connection and the status of the read
- * and write fd sets of \a s, this function performs the necessary steps to
- * authenticate the connection, to send the command given by \a t->private_data
+ * and write fd sets of s, this function performs the necessary steps to
+ * authenticate the connection, to send the command given by t->private_data
  * and to receive para_server's output, if any.
- *
- * \sa struct sched, struct task.
  */
-static void client_post_select(struct sched *s, struct task *t)
+static int client_post_select(struct sched *s, void *context)
 {
-	struct private_client_data *pcd = t->private_data;
+	struct client_task *ct = context;
+	int ret = 0;
+	size_t n;
+	char buf[CLIENT_BUFSIZE];
 
-//	PARA_INFO_LOG("status %d\n", pcd->status);
-	t->ret = 1;
-	if (pcd->fd < 0)
-		return;
-	if (!pcd->check_r && !pcd->check_w)
-		return;
-	if (pcd->check_r && !FD_ISSET(pcd->fd, &s->rfds))
-		return;
-	if (pcd->check_w && !FD_ISSET(pcd->fd, &s->wfds))
-		return;
-	switch (pcd->status) {
+	ret = task_get_notification(ct->task);
+	if (ret < 0)
+		goto out;
+	if (ct->scc.fd < 0)
+		return 0;
+	switch (ct->status) {
 	case CL_CONNECTED: /* receive welcome message */
-		t->ret = client_recv_buffer(pcd);
-		if (t->ret > 0)
-			pcd->status = CL_RECEIVED_WELCOME;
-		return;
+		ret = read_nonblock(ct->scc.fd, buf, sizeof(buf), &s->rfds, &n);
+		if (ret < 0 || n == 0)
+			goto out;
+		ct->features = parse_features(buf);
+		ct->status = CL_RECEIVED_WELCOME;
+		return 0;
 	case CL_RECEIVED_WELCOME: /* send auth command */
-		sprintf(pcd->buf, "auth %s%s", pcd->conf.plain_given?
-			"" : "rc4 ", pcd->user);
-		PARA_INFO_LOG("--> %s\n", pcd->buf);
-		t->ret = send_buffer(pcd->fd, pcd->buf);
-		if (t->ret >= 0)
-			pcd->status = CL_SENT_AUTH;
-		return;
-	case CL_SENT_AUTH: /* receive challenge number */
-		pcd->loaded = 0;
-		t->ret = client_recv_buffer(pcd);
-		if (t->ret < 0)
-			return;
-		if (t->ret != 64) {
-			t->ret = -E_INVALID_CHALLENGE;
-			PARA_ERROR_LOG("received the following: %s\n", pcd->buf);
-			return;
+		if (!FD_ISSET(ct->scc.fd, &s->wfds))
+			return 0;
+		sprintf(buf, AUTH_REQUEST_MSG "%s sideband,aes_ctr128",
+			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 0;
+	case CL_SENT_AUTH:
+		/*
+		 * Receive challenge and session keys, decrypt the challenge and
+		 * send back the hash of the decrypted challenge.
+		 */
+		{
+		/* decrypted challenge/session key buffer */
+		unsigned char crypt_buf[1024];
+		struct sb_buffer sbb;
+
+		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;
 		}
-		PARA_INFO_LOG("%s", "<-- [challenge]\n");
-		/* decrypt challenge number */
-		t->ret = para_decrypt_challenge(pcd->key_file, &pcd->challenge_nr,
-			(unsigned char *) pcd->buf, 64);
-		if (t->ret > 0)
-			pcd->status = CL_RECEIVED_CHALLENGE;
-		return;
-	case CL_RECEIVED_CHALLENGE: /* send decrypted challenge */
-		PARA_INFO_LOG("--> %lu\n", pcd->challenge_nr);
-		t->ret = send_va_buffer(pcd->fd, "%s%lu", CHALLENGE_RESPONSE_MSG,
-			pcd->challenge_nr);
-		if (t->ret > 0)
-			pcd->status = CL_SENT_CH_RESPONSE;
-		return;
+		n = sbb.iov.iov_len;
+		PARA_INFO_LOG("<-- [challenge] (%zu bytes)\n", n);
+		ret = apc_priv_decrypt(ct->key_file, crypt_buf,
+			sbb.iov.iov_base, n);
+		free(sbb.iov.iov_base);
+		if (ret < 0)
+			goto out;
+		ct->challenge_hash = para_malloc(HASH_SIZE);
+		hash_function((char *)crypt_buf, APC_CHALLENGE_SIZE, ct->challenge_hash);
+		ct->scc.send = sc_new(crypt_buf + APC_CHALLENGE_SIZE, SESSION_KEY_LEN);
+		ct->scc.recv = sc_new(crypt_buf + APC_CHALLENGE_SIZE + SESSION_KEY_LEN,
+			SESSION_KEY_LEN);
+		hash_to_asc(ct->challenge_hash, buf);
+		PARA_INFO_LOG("--> %s\n", buf);
+		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;
+		goto out;
 	case CL_SENT_CH_RESPONSE: /* read server response */
 		{
-		size_t bytes_received;
-		unsigned char rc4_buf[2 * RC4_KEY_LEN] = "";
-		pcd->loaded = 0;
-		t->ret = client_recv_buffer(pcd);
-		if (t->ret < 0)
-			return;
-		bytes_received = t->ret;
-		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;
-		if (!strstr(pcd->buf, PROCEED_MSG))
-			return;
-		t->ret = 1;
-		pcd->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(pcd->key_file, rc4_buf,
-			(unsigned char *)pcd->buf + PROCEED_MSG_LEN + 1,
-			bytes_received - PROCEED_MSG_LEN - 1);
-		if (t->ret < 0)
-			return;
-		RC4_set_key(&pcd->rc4_send_key, RC4_KEY_LEN, rc4_buf);
-		RC4_set_key(&pcd->rc4_recv_key, RC4_KEY_LEN, rc4_buf + RC4_KEY_LEN);
-		enable_crypt(pcd->fd, rc4_recv, rc4_send, pcd);
+		struct sb_buffer sbb;
+		ret = recv_sb(ct, &s->rfds, &sbb);
+		if (ret <= 0)
+			goto out;
+		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;
-		for (i = 0; i < pcd->conf.inputs_num; i++) {
-			char *tmp = command;
-			command = make_message("%s\n%s", command?
-				command : "", pcd->conf.inputs[i]);
-			free(tmp);
+		if (!FD_ISSET(ct->scc.fd, &s->wfds))
+			return 0;
+		ret = send_sb_command(ct);
+		if (ret <= 0)
+			goto out;
+		ct->status = CL_EXECUTING;
+		return 0;
 		}
-		command = para_strcat(command, EOC_MSG "\n");
-		PARA_DEBUG_LOG("--> %s\n", command);
-		t->ret = send_buffer(pcd->fd, command);
-		free(command);
-		if (t->ret > 0)
-			pcd->status = CL_SENT_COMMAND;
-		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);
+			}
 		}
-	case CL_SENT_COMMAND:
-		pcd->loaded = 0;
-		t->ret = client_recv_buffer(pcd);
-		if (t->ret < 0)
-			return;
-		t->ret = -E_HANDSHAKE_COMPLETE;
-		if (strstr(pcd->buf, AWAITING_DATA_MSG))
-			pcd->status = CL_SENDING;
-		else
-			pcd->status = CL_RECEIVING;
-		return;
-	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)
-			return;
-		*pcd->in_loaded = 0;
-		return;
-	case CL_RECEIVING:
-		t->ret = client_recv_buffer(pcd);
-		return;
+		/* fall through */
+	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;
+				}
+			}
+		}
+		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:
+	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));
+	if (ct->scc.fd >= 0) {
+		close(ct->scc.fd);
+		ct->scc.fd = -1;
 	}
+	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;
+	return ret;
 }
 
-/* connect to para_server and register the client task */
-static int client_connect(struct private_client_data *pcd)
+/**
+ * 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;
+	const char *host = CLIENT_OPT_STRING_VAL(HOSTNAME, ct->lpr);
+	uint32_t port = CLIENT_OPT_UINT32_VAL(SERVER_PORT, ct->lpr);
 
-	pcd->fd = -1;
-	ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, pcd->conf.hostname_arg,
-		pcd->conf.server_port_arg);
+	PARA_NOTICE_LOG("connecting %s:%u\n", host, port);
+	ct->scc.fd = -1;
+	ret = para_connect_simple(IPPROTO_TCP, host, port);
 	if (ret < 0)
 		return ret;
-	pcd->fd = ret;
-	pcd->status = CL_CONNECTED;
-	ret = mark_fd_nonblocking(pcd->fd);
+	ct->scc.fd = ret;
+	ret = mark_fd_nonblocking(ct->scc.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);
+	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 = task_register(&(struct task_info) {
+		.name = "client",
+		.pre_select = client_pre_select,
+		.post_select = client_post_select,
+		.context = ct,
+	}, s);
 	return 1;
 err_out:
-	close(pcd->fd);
-	pcd->fd = -1;
+	close(ct->scc.fd);
+	ct->scc.fd = -1;
 	return ret;
 }
 
+static void handle_help_flag(struct lls_parse_result *lpr)
+{
+	char *help;
+
+	if (CLIENT_OPT_GIVEN(DETAILED_HELP, lpr))
+		help = lls_long_help(CLIENT_CMD_PTR);
+	else if (CLIENT_OPT_GIVEN(HELP, lpr))
+		help = lls_short_help(CLIENT_CMD_PTR);
+	else
+		return;
+	printf("%s\n", help);
+	free(help);
+	exit(EXIT_SUCCESS);
+}
+
 /**
- * Open connection to para_server.
+ * Parse a client configuration.
  *
  * \param argc Usual argument count.
  * \param argv Usual argument vector.
- * \param pcd_ptr Points to dynamically allocated and initialized private client data
- * 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.
  *
- * 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 private_client_data **pcd_ptr)
+int client_parse_config(int argc, char *argv[], struct client_task **ct_ptr,
+		int *loglevel)
 {
-	char *home = para_homedir();
-	struct stat statbuf;
-	int ret;
-	struct private_client_data *pcd =
-		para_calloc(sizeof(struct private_client_data));
-
-	*pcd_ptr = pcd;
-	pcd->fd = -1;
-	ret = client_cmdline_parser(argc, argv, &pcd->conf);
-	HANDLE_VERSION_FLAG("client", pcd->conf);
-	ret = -E_CLIENT_SYNTAX;
-	if (!pcd->conf.inputs_num)
+	const struct lls_command *cmd = CLIENT_CMD_PTR;
+	struct lls_parse_result *lpr;
+	int ret, ll;
+	struct client_task *ct;
+	char *kf = NULL, *user, *errctx, *home = para_homedir();
+
+	ret = lls(lls_parse(argc, argv, cmd, &lpr, &errctx));
+	if (ret < 0)
 		goto out;
-	pcd->user = pcd->conf.user_given?
-		para_strdup(pcd->conf.user_arg) : para_logname();
-
-	pcd->key_file = pcd->conf.key_file_given?
-		para_strdup(pcd->conf.key_file_arg) :
-		make_message("%s/.paraslash/key.%s", home, pcd->user);
-
-	pcd->config_file = pcd->conf.config_file_given?
-		para_strdup(pcd->conf.config_file_arg) :
-		make_message("%s/.paraslash/client.conf", home);
-	ret = stat(pcd->config_file, &statbuf);
-	if (ret && pcd->conf.config_file_given) {
-		ret = -E_NO_CONFIG;
+	version_handle_flag("client", CLIENT_OPT_GIVEN(VERSION, lpr));
+	handle_help_flag(lpr);
+
+	ret = lsu_merge_config_file_options(CLIENT_OPT_STRING_VAL(CONFIG_FILE, lpr),
+		"client.conf", &lpr, cmd, client_suite, 0U /* default flags */);
+	if (ret < 0)
 		goto out;
+	/* success */
+	ll = CLIENT_OPT_UINT32_VAL(LOGLEVEL, lpr);
+	if (loglevel)
+		*loglevel = ll;
+	user = CLIENT_OPT_GIVEN(USER, lpr)?
+		para_strdup(CLIENT_OPT_STRING_VAL(USER, lpr)) : para_logname();
+
+	if (CLIENT_OPT_GIVEN(KEY_FILE, lpr))
+		kf = para_strdup(CLIENT_OPT_STRING_VAL(KEY_FILE, lpr));
+	else {
+		kf = make_message("%s/.paraslash/key.%s", home, user);
+		if (!file_exists(kf)) {
+			free(kf);
+			kf = make_message("%s/.ssh/id_rsa", home);
+		}
 	}
-	if (!ret) {
-		struct client_cmdline_parser_params params = {
-			.override = 0,
-			.initialize = 0,
-			.check_required = 0,
-			.check_ambiguity = 0
-		};
-		client_cmdline_parser_config_file(pcd->config_file,
-			&pcd->conf, &params);
-	}
-	ret = 1;
-	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);
+	PARA_INFO_LOG("user: %s\n", user);
+	PARA_INFO_LOG("key file: %s\n", kf);
+	PARA_INFO_LOG("loglevel: %d\n", ll);
+	ct = para_calloc(sizeof(*ct));
+	ct->scc.fd = -1;
+	ct->lpr = lpr;
+	ct->key_file = kf;
+	ct->user = user;
+	*ct_ptr = ct;
+	ret = lls_num_inputs(lpr);
 out:
 	free(home);
 	if (ret < 0) {
-		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
-		client_close(pcd);
-		*pcd_ptr = NULL;
+		if (errctx)
+			PARA_ERROR_LOG("%s\n", errctx);
+		free(errctx);
+		lls_free_parse_result(lpr, cmd);
+		free(kf);
+		*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;
+}