/*
- * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2011 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
}
}
-static ssize_t client_recv_buffer(struct client_task *ct, char *buf, size_t len)
+static int client_recv_buffer(struct client_task *ct, fd_set *rfds,
+ char *buf, size_t sz, size_t *n)
{
- ssize_t ret;
+ int ret;
if (ct->status < CL_SENT_CH_RESPONSE)
- ret = recv_buffer(ct->rc4c.fd, buf, len);
- else
- ret = rc4_recv_buffer(&ct->rc4c, buf, len);
+ return read_nonblock(ct->rc4c.fd, buf, sz, rfds, n);
+
+ *n = 0;
+ ret = rc4_recv_buffer(&ct->rc4c, buf, sz);
+ /*
+ * rc4_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;
- return ret;
+ if (ret == -ERRNO_TO_PARA_ERROR(EAGAIN))
+ return 0;
+ if (ret < 0)
+ return ret;
+ *n = ret;
+ return 0;
}
/**
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;
return;
switch (ct->status) {
case CL_CONNECTED: /* receive welcome message */
- if (!FD_ISSET(ct->rc4c.fd, &s->rfds))
- return;
- ret = client_recv_buffer(ct, buf, sizeof(buf));
- if (ret < 0)
- goto err;
+ ret = client_recv_buffer(ct, &s->rfds, buf, sizeof(buf), &n);
+ if (ret < 0 || n == 0)
+ goto out;
ct->status = CL_RECEIVED_WELCOME;
return;
case CL_RECEIVED_WELCOME: /* send auth command */
return;
ret = send_buffer(ct->rc4c.fd, buf);
if (ret < 0)
- goto err;
+ goto out;
ct->status = CL_SENT_AUTH;
return;
case CL_SENT_AUTH:
/* the SHA1 of the decrypted challenge */
unsigned char challenge_sha1[HASH_SIZE];
- if (!FD_ISSET(ct->rc4c.fd, &s->rfds))
- return;
- ret = client_recv_buffer(ct, buf, sizeof(buf));
- if (ret < 0)
- goto err;
- PARA_INFO_LOG("<-- [challenge] (%d bytes)\n", ret);
+ ret = client_recv_buffer(ct, &s->rfds, buf, sizeof(buf), &n);
+ if (ret < 0 || n == 0)
+ goto out;
+ PARA_INFO_LOG("<-- [challenge] (%zu bytes)\n", n);
ret = para_decrypt_buffer(ct->key_file, crypt_buf,
- (unsigned char *)buf, ret);
+ (unsigned char *)buf, n);
if (ret < 0)
- goto err;
+ goto out;
sha1_hash((char *)crypt_buf, CHALLENGE_SIZE, challenge_sha1);
RC4_set_key(&ct->rc4c.send_key, RC4_KEY_LEN,
crypt_buf + CHALLENGE_SIZE);
ret = send_bin_buffer(ct->rc4c.fd, (char *)challenge_sha1,
HASH_SIZE);
if (ret < 0)
- goto err;
+ goto out;
ct->status = CL_SENT_CH_RESPONSE;
return;
}
case CL_SENT_CH_RESPONSE: /* read server response */
{
- size_t bytes_received;
- if (!FD_ISSET(ct->rc4c.fd, &s->rfds))
- return;
- ret = client_recv_buffer(ct, buf, sizeof(buf));
- if (ret < 0)
- goto err;
- bytes_received = ret;
+ ret = client_recv_buffer(ct, &s->rfds, buf, sizeof(buf), &n);
+ if (ret < 0 || n == 0)
+ goto out;
/* check if server has sent "Proceed" message */
ret = -E_CLIENT_AUTH;
- if (bytes_received < PROCEED_MSG_LEN)
- goto err;
+ if (n < PROCEED_MSG_LEN)
+ goto out;
if (!strstr(buf, PROCEED_MSG))
- goto err;
+ goto out;
ct->status = CL_RECEIVED_PROCEED;
return;
}
ret = rc4_send_buffer(&ct->rc4c, command);
free(command);
if (ret < 0)
- goto err;
+ goto out;
ct->status = CL_SENT_COMMAND;
return;
}
case CL_SENT_COMMAND:
{
char *buf2;
- if (!FD_ISSET(ct->rc4c.fd, &s->rfds))
- return;
/* can not use "buf" here because we need a malloced buffer */
buf2 = para_malloc(CLIENT_BUFSIZE);
- ret = client_recv_buffer(ct, buf2, CLIENT_BUFSIZE);
- if (ret < 0) {
- free(buf2);
- goto err;
- }
- if (strstr(buf2, AWAITING_DATA_MSG)) {
+ 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;
+ }
+ ct->status = CL_RECEIVING;
+ btr_add_output(buf2, n, btrn);
+ } else
free(buf2);
- ct->status = CL_SENDING;
- return;
- }
- ct->status = CL_RECEIVING;
- btr_add_output(buf2, ret, btrn);
- return;
+ goto out;
}
case CL_SENDING:
{
size_t sz;
ret = btr_node_status(btrn, 0, BTR_NT_LEAF);
if (ret < 0)
- goto err;
+ goto out;
if (ret == 0)
return;
if (!FD_ISSET(ct->rc4c.fd, &s->wfds))
sz = btr_next_buffer(btrn, &buf2);
ret = rc4_send_bin_buffer(&ct->rc4c, buf2, sz);
if (ret < 0)
- goto err;
+ goto out;
btr_consume(btrn, sz);
return;
}
char *buf2;
ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
if (ret < 0)
- goto err;
+ 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->rc4c.fd, &s->rfds))
return;
buf2 = para_malloc(CLIENT_BUFSIZE);
- ret = client_recv_buffer(ct, buf2, CLIENT_BUFSIZE);
- if (ret < 0) {
+ 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);
- goto err;
- }
- buf2 = para_realloc(buf2, ret);
- btr_add_output(buf2, ret, btrn);
- return;
+ goto out;
}
}
-err:
+out:
t->error = ret;
if (ret < 0) {
if (ret != -E_SERVER_EOF && ret != -E_BTR_EOF)
int ret;
ct->rc4c.fd = -1;
- ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, ct->conf.hostname_arg,
- ct->conf.server_port_arg);
+ ret = para_connect_simple(IPPROTO_TCP, ct->conf.hostname_arg,
+ ct->conf.server_port_arg);
if (ret < 0)
return ret;
ct->rc4c.fd = ret;
* \param ct_ptr Points to dynamically allocated and initialized client task
* struct upon successful return.
* \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.
ret = -E_CLIENT_SYNTAX;
if (!ct->conf.inputs_num)
goto out;
- 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);
ct->config_file = ct->conf.config_file_given?
para_strdup(ct->conf.config_file_arg) :
&ct->conf, ¶ms))
goto out;
}
+ 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 (loglevel)
*loglevel = get_loglevel_by_name(ct->conf.loglevel_arg);
PARA_INFO_LOG("loglevel: %s\n", ct->conf.loglevel_arg);
projects / paraslash.git / blobdiff