/*
- * Copyright (C) 1997-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2007 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
#include "client.h"
#include "error.h"
-void rc4_send(unsigned long len, const unsigned char *indata,
+/*
+ * 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 pointer that holds the encrypted data after return
+ * \param private_data pointer to the private client data containing
+ * 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);
}
-void rc4_recv(unsigned long len, const unsigned char *indata,
+/*
+ * rc4 decrypt received data
+ *
+ * \param len the number of bytes to decrypt
+ * \param indata pointer to the input data of length \a len
+ * \param outdata pointer that holds the decrypted data after return
+ * \param private_data pointer to the private client data containing
+ * the rc4 key
+ * */
+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);
}
-
+/**
+ * close the connection to para_server and free all resources
+ *
+ * \param pcd pointer to the client data
+ *
+ * \sa client_open.
+ * */
void client_close(struct private_client_data *pcd)
{
- if (pcd)
+ if (!pcd)
return;
- if (pcd->fd >= 0)
+ 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);
}
-int client_parse_config(int argc, char *argv[],
- struct private_client_data **pcd_ptr)
+static int client_connect(struct private_client_data *pcd)
+{
+ int ret;
+ struct hostent *he;
+ struct sockaddr_in their_addr;
+
+ pcd->fd = -1;
+ ret = get_host_info(pcd->conf.hostname_arg, &he);
+ if (ret < 0)
+ return ret;
+ /* get new socket */
+ ret = get_socket();
+ if (ret < 0)
+ return ret;
+ pcd->fd = ret;
+ /* init their_addr */
+ init_sockaddr(&their_addr, pcd->conf.server_port_arg, he);
+ ret = para_connect(pcd->fd, &their_addr);
+ if (ret < 0)
+ goto err_out;
+ pcd->status = CL_CONNECTED;
+ ret = mark_fd_nonblock(pcd->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);
+ return 1;
+err_out:
+ close(pcd->fd);
+ pcd->fd = -1;
+ return ret;
+}
+
+/**
+ * open connection to para_server
+ *
+ * \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
+ *
+ * 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.
+ *
+ * \return Positive on success, negative on errors.
+ */
+int client_open(int argc, char *argv[], struct private_client_data **pcd_ptr)
{
char *home = para_homedir();
struct stat statbuf;
struct private_client_data *pcd =
para_calloc(sizeof(struct private_client_data));
+ *pcd_ptr = pcd;
pcd->fd = -1;
- client_cmdline_parser(argc, argv, &pcd->conf);
- ret = - E_CLIENT_SYNTAX;
+ ret = client_cmdline_parser(argc, argv, &pcd->conf);
+ HANDLE_VERSION_FLAG("client", pcd->conf);
+ ret = -E_CLIENT_SYNTAX;
if (!pcd->conf.inputs_num)
goto out;
pcd->user = pcd->conf.user_given?
client_cmdline_parser_configfile(pcd->config_file,
&pcd->conf, 0, 0, 0);
ret = 1;
- *pcd_ptr = pcd;
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);
out:
free(home);
- if (ret < 0)
+ if (ret < 0) {
+ PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
client_close(pcd);
+ *pcd_ptr = NULL;
+ }
return ret;
}
+/**
+ * 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
+ */
void client_pre_select(struct sched *s, struct task *t)
{
struct private_client_data *pcd = t->private_data;
}
+/**
+ * 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 neccessary steps to
+ * authenticate the connection, to send the commmand given by \a
+ * t->private_data and to receive para_server's output, if any.
+ *
+ * \sa struct sched, struct task
+ */
void client_post_select(struct sched *s, struct task *t)
{
struct private_client_data *pcd = t->private_data;
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) {
- if (!t->ret)
- t->ret = 1;
+ if (t->ret < 0)
return;
- }
*pcd->in_loaded = 0; /* FIXME: short writes */
return;
case CL_RECEIVING:
t->ret = client_recv_buffer(pcd);
return;
}
-
-}
-
-int client_open(struct private_client_data *pcd)
-{
- int ret;
- struct hostent *he;
- struct sockaddr_in their_addr;
-
- 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);
- ret = para_connect(pcd->fd, &their_addr);
- if (ret < 0)
- goto out;
- pcd->status = CL_CONNECTED;
- ret = mark_fd_nonblock(pcd->fd);
- if (ret < 0)
- goto 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);
- ret = 1;
-out:
- return ret;
}
projects / paraslash.git / blobdiff