#include "string.h"
#include "error.h"
-static crypt_function **crypt_functions;
-static unsigned max_crypt_fd;
-void enable_crypt(int fd, crypt_function *recv, crypt_function *send)
+/** \cond holds information about one encrypted connection */
+struct crypt_data {
+ crypt_function *recv;
+ crypt_function *send;
+ void *private_data;
+};
+static unsigned cda_size = 0;
+static struct crypt_data *crypt_data_array;
+/** \endcond */
+
+
+/**
+ * activate encryption for one file descriptor
+ *
+ * \param fd the file descriptor
+ * \param recv_f the function used for decrypting received data
+ * \param send_f the function used for encrypting before sending
+ * \param private_data user data supplied by the caller
+ */
+void enable_crypt(int fd, crypt_function *recv_f, crypt_function *send_f,
+ void *private_data)
{
- if (max_crypt_fd < fd) {
- crypt_functions = para_realloc(crypt_functions,
- 2 * (fd + 1) * sizeof(crypt_function*));
- max_crypt_fd = fd;
+ if (fd + 1 > cda_size) {
+ crypt_data_array = para_realloc(crypt_data_array,
+ (fd + 1) * sizeof(struct crypt_data));
+ memset(crypt_data_array + cda_size, 0,
+ (fd + 1 - cda_size) * sizeof(struct crypt_data));
+ cda_size = fd + 1;
}
- crypt_functions[2 * fd] = recv;
- crypt_functions[2 * fd + 1] = send;
+ crypt_data_array[fd].recv = recv_f;
+ crypt_data_array[fd].send = send_f;
+ crypt_data_array[fd].private_data = private_data;
PARA_INFO_LOG("rc4 encryption activated for fd %d\n", fd);
}
+/**
+ * deactivate encryption for a given fd
+ *
+ * \param fd the file descriptor
+ *
+ * This must be called if and only if \p fd was activated via enable_crypt().
+ */
void disable_crypt(int fd)
{
- crypt_functions[2 * fd] = NULL;
- crypt_functions[2 * fd + 1] = NULL;
+ if (cda_size < fd + 1)
+ return;
+ crypt_data_array[fd].recv = NULL;
+ crypt_data_array[fd].send = NULL;
+ crypt_data_array[fd].private_data = NULL;
}
* @param buf the buffer to be encrypted and sent
* @param len the length of \a buf
*
- * Check if encrytion is available. If yes, encrypt the given buffer. Send out
+ * Check if encrytpion is available. If yes, encrypt the given buffer. Send out
* the buffer, encrypted or not, and try to resend the remaing part in case of
* short writes.
*
int ret;
crypt_function *cf = NULL;
- if (fd <= max_crypt_fd)
- cf = crypt_functions[2 * fd + 1];
-
if (!len)
PARA_CRIT_LOG("%s", "len == 0\n");
+ if (fd + 1 <= cda_size)
+ cf = crypt_data_array[fd].send;
if (cf) {
+ void *private = crypt_data_array[fd].private_data;
unsigned char *outbuf = para_malloc(len);
- (*cf)(len, (unsigned char *)buf, outbuf);
+ (*cf)(len, (unsigned char *)buf, outbuf, private);
ret = sendall(fd, (char *)outbuf, &len);
free(outbuf);
} else
* @param buf the buffer to write the decrypted data to
* @param size the size of @param buf
*
- * Receive at most \a size bytes from filedescriptor fd. If encrytion is
+ * Receive at most \a size bytes from filedescriptor fd. If encryption is
* available, decrypt the received buffer.
*
* @return the number of bytes received on success. On receive errors, -E_RECV
int n;
crypt_function *cf = NULL;
- if (fd <= max_crypt_fd)
- cf = crypt_functions[2 * fd];
+ if (fd + 1 <= cda_size)
+ cf = crypt_data_array[fd].recv;
if (cf) {
unsigned char *tmp = para_malloc(size);
+ void *private = crypt_data_array[fd].private_data;
n = recv(fd, tmp, size, 0);
if (n > 0)
- (*cf)(n, tmp, (unsigned char *)buf);
+ (*cf)(n, tmp, (unsigned char *)buf, private);
free(tmp);
} else
n = recv(fd, buf, size, 0);
/**
* wrapper around gethostbyname
*
- * @param host hostname or IPv4 address
- * \return The hostent structure or a NULL pointer if an error occurs
+ * \param host hostname or IPv4 address
+ * \param ret the hostent structure is returned here
+ *
+ * \return positive on success, negative on errors. On success, \a ret
+ * contains the return value of the underlying gethostbyname() call.
+ *
* \sa gethostbyname(2)
*/
int get_host_info(char *host, struct hostent **ret)
/**
* paraslash's wrapper around the accept system call
*
- * @param fd the listening socket
- * @param addr structure which is filled in with the address of the peer socket
- * @param size should contain the size of the structure pointed to by \a addr
+ * \param fd the listening socket
+ * \param addr structure which is filled in with the address of the peer socket
+ * \param size should contain the size of the structure pointed to by \a addr
*
* \sa accept(2).
*/
{
int new_fd;
- new_fd = accept(fd, (struct sockaddr *) addr, &size);
- return new_fd == -1? -E_ACCEPT : new_fd;
+ do
+ new_fd = accept(fd, (struct sockaddr *) addr, &size);
+ while (new_fd < 0 && errno == EINTR);
+ return new_fd < 0? -E_ACCEPT : new_fd;
}
static int setserversockopts(int socket_fd)
return 1;
}
-static int do_bind(int socket_fd, struct sockaddr_in *my_addr)
-{
- if (bind(socket_fd, (struct sockaddr *)my_addr,
- sizeof(struct sockaddr)) == -1)
- return -E_BIND;
- return 1;
-}
-
/**
* prepare a structure for \p AF_UNIX socket addresses
*
}
#ifndef HAVE_UCRED
- struct ucred {
- uid_t uid, pid, gid;
-};
ssize_t send_cred_buffer(int sock, char *buf)
{
return send_buffer(sock, buf);
*/
int init_tcp_socket(int port)
{
- int sockfd, ret;
struct sockaddr_in my_addr;
+ int fd, ret = get_socket();
- if ((sockfd = get_socket()) < 0)
- return sockfd;
- ret = setserversockopts(sockfd);
if (ret < 0)
return ret;
- init_sockaddr(&my_addr, port, NULL);
- ret = do_bind(sockfd, &my_addr);
+ fd = ret;
+ ret = setserversockopts(fd);
if (ret < 0)
- return ret;
- if (listen(sockfd, BACKLOG) == -1)
- return -E_LISTEN;
- PARA_INFO_LOG("listening on port %d, fd %d\n", port, sockfd);
- return sockfd;
+ goto err;
+ init_sockaddr(&my_addr, port, NULL);
+ ret = -E_BIND;
+ if (bind(fd, (struct sockaddr *)&my_addr,
+ sizeof(struct sockaddr)) == -1) {
+ PARA_CRIT_LOG("bind error: %s\n", strerror(errno));
+ goto err;
+ }
+ ret = -E_LISTEN;
+ if (listen(fd, BACKLOG) == -1)
+ goto err;
+ PARA_INFO_LOG("listening on port %d, fd %d\n", port, fd);
+ return fd;
+err:
+ close(fd);
+ return ret;
}
/**
goto out;
ret = 1;
out:
- if (ret < 0)
- PARA_NOTICE_LOG("did not receive pattern '%s'\n", pattern);
+ if (ret < 0) {
+ PARA_NOTICE_LOG("n = %d, did not receive pattern '%s'\n", n, pattern);
+ if (n > 0)
+ PARA_NOTICE_LOG("recvd: %s\n", buf);
+ }
free(buf);
return ret;
}
projects / paraslash.git / blobdiff