X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=0105ef6902114ae108da577186c1d58d8e52c0fb;hp=850a9f3996990bfd76a0e3586fc44e9d82c4b271;hb=17cba74507aad9a2cf5a8f113270e4bf6f8ade40;hpb=0b976cff31e330df80b7a278d5f9d3a0615a644c

diff --git a/net.c b/net.c
index 850a9f39..0105ef69 100644
--- a/net.c
+++ b/net.c
@@ -23,25 +23,56 @@
 #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;
 }
 
 
@@ -104,7 +135,7 @@ static int sendall(int fd, const char *buf, size_t *len)
  * @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.
  *
@@ -115,14 +146,14 @@ int send_bin_buffer(int fd, const char *buf, size_t len)
 	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
@@ -170,7 +201,7 @@ __printf_2_3 int send_va_buffer(int fd, const char *fmt, ...)
  * @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
@@ -183,13 +214,14 @@ __must_check int recv_bin_buffer(int fd, char *buf, ssize_t size)
 	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);
@@ -280,9 +312,9 @@ int para_connect(int fd, struct sockaddr_in *their_addr)
 /**
  * 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).
  */
@@ -290,8 +322,10 @@ int para_accept(int fd, void *addr, socklen_t size)
 {
 	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)
@@ -357,9 +391,6 @@ int create_pf_socket(const char *name, struct sockaddr_un *unix_addr, int mode)
 }
 
 #ifndef HAVE_UCRED
-	struct ucred {
-	uid_t uid, pid, gid;
-};
 ssize_t send_cred_buffer(int sock, char *buf)
 {
 	return send_buffer(sock, buf);
@@ -546,8 +577,11 @@ int recv_pattern(int fd, const char *pattern, size_t bufsize)
 		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;
 }