X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=c7bb8b4b71293ee89964b55175c2170fb10c3e31;hp=cb504f3cce860f26eb8dd53d6c3c0a1d33424f24;hb=d81f6efa05b305c9a8655124b001ea71e1c86679;hpb=007d547044e1d93ca56fd8a61506578e26ccdcb0

diff --git a/net.c b/net.c
index cb504f3c..c7bb8b4b 100644
--- a/net.c
+++ b/net.c
@@ -7,26 +7,28 @@
 /** \file net.c networking-related helper functions */
 
 #include "para.h"
+#include "error.h"
 #include "net.h"
 #include "string.h"
-#include "error.h"
 
 
-/** holds information about one encrypted connection */
+/** Information about one encrypted connection. */
 struct crypt_data {
-	/** function used to decrypt received data */
+	/** Function used to decrypt received data. */
 	crypt_function *recv;
-	/** function used to encrypt data to be sent */
+	/** Function used to encrypt data to be sent. */
 	crypt_function *send;
-	/** context-dependent data, passed to \a recv() and \a send() */
+	/**
+	 * Context-dependent data (crypt keys), passed verbatim to the above
+	 * crypt functions.
+	 */
 	void *private_data;
 };
-/** array holding per fd crypt data per */
+/** Array holding per fd crypt data. */
 static struct crypt_data *crypt_data_array;
-/** current size of the crypt data array */
+/** Current size of the crypt data array. */
 static unsigned cda_size = 0;
 
-
 /**
  * activate encryption for one file descriptor
  *
@@ -118,7 +120,7 @@ static int sendall(int fd, const char *buf, size_t *len)
 		total += n;
 		bytesleft -= n;
 		if (total < *len)
-			PARA_DEBUG_LOG("short write (%zd byte(s) left)",
+			PARA_DEBUG_LOG("short write (%zd byte(s) left)\n",
 				*len - total);
 	}
 	*len = total; /* return number actually sent here */
@@ -126,15 +128,15 @@ static int sendall(int fd, const char *buf, size_t *len)
 }
 
 /**
- * encrypt and send buffer
+ * Encrypt and send a binary buffer.
  *
- * \param fd:  the file descriptor
- * \param buf the buffer to be encrypted and sent
- * \param len the length of \a buf
+ * \param fd The file descriptor.
+ * \param buf The buffer to be encrypted and sent.
+ * \param len The length of \a buf.
  *
- * 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.
+ * Check if encryption 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.
  *
  * \return Positive on success, \p -E_SEND on errors.
  */
@@ -149,7 +151,8 @@ int send_bin_buffer(int fd, const char *buf, size_t len)
 		cf = crypt_data_array[fd].send;
 	if (cf) {
 		void *private = crypt_data_array[fd].private_data;
-		unsigned char *outbuf = para_malloc(len);
+		/* RC4 may write more than len to the output buffer */
+		unsigned char *outbuf = para_malloc(ROUND_UP(len, 8));
 		(*cf)(len, (unsigned char *)buf, outbuf, private);
 		ret = sendall(fd, (char *)outbuf, &len);
 		free(outbuf);
@@ -229,7 +232,7 @@ __must_check int recv_bin_buffer(int fd, char *buf, size_t size)
 	} else
 		n = recv(fd, buf, size, 0);
 	if (n == -1)
-		n = -E_RECV;
+		return -ERRNO_TO_PARA_ERROR(errno);
 	return n;
 }
 
@@ -281,44 +284,26 @@ int get_host_info(char *host, struct hostent **ret)
 }
 
 /**
- * a wrapper around socket(2)
+ * A wrapper around socket(2).
  *
- * Create an IPv4 socket for sequenced, reliable, two-way, connection-based
- * byte streams.
+ * \param domain The communication domain that selects the protocol family.
  *
  * \return The socket fd on success, -E_SOCKET on errors.
  *
- * \sa socket(2)
+ * Create an IPv4 socket for sequenced, reliable, two-way, connection-based
+ * byte streams.
+ *
+ * \sa socket(2).
  */
-int get_socket(void)
+int get_stream_socket(int domain)
 {
 	int socket_fd;
 
-	if ((socket_fd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
+	if ((socket_fd = socket(domain, SOCK_STREAM, 0)) == -1)
 		return -E_SOCKET;
 	return socket_fd;
 }
 
-/**
- * a wrapper around connect(2)
- *
- * \param fd the file descriptor
- * \param their_addr the address to connect
- *
- * \return \p -E_CONNECT on errors, 1 on success
- *
- * \sa connect(2)
- */
-int para_connect(int fd, struct sockaddr_in *their_addr)
-{
-	int ret;
-
-	if ((ret = connect(fd, (struct sockaddr *)their_addr,
-			sizeof(struct sockaddr))) == -1)
-		return -E_CONNECT;
-	return 1;
-}
-
 /**
  * paraslash's wrapper around the accept system call
  *
@@ -394,18 +379,22 @@ int create_local_socket(const char *name, struct sockaddr_un *unix_addr,
 {
 	int fd, ret;
 
-	fd = socket(PF_UNIX, SOCK_STREAM, 0);
-	if (fd < 0)
-		return -E_SOCKET;
-//	unlink(name);
 	ret = init_unix_addr(unix_addr, name);
 	if (ret < 0)
 		return ret;
+	fd = socket(PF_UNIX, SOCK_STREAM, 0);
+	if (fd < 0)
+		return -E_SOCKET;
+	ret = -E_BIND;
 	if (bind(fd, (struct sockaddr *) unix_addr, UNIX_PATH_MAX) < 0)
-		return -E_BIND;
+		goto err;
+	ret = -E_CHMOD;
 	if (chmod(name, mode) < 0)
-		return -E_CHMOD;
+		goto err;
 	return fd;
+err:
+	close(fd);
+	return ret;
 }
 
 #ifndef HAVE_UCRED
@@ -536,7 +525,7 @@ int recv_cred_buffer(int fd, char *buf, size_t size)
  * \return The file descriptor of the created socket, negative
  * on errors.
  *
- * \sa get_socket()
+ * \sa get_stream_socket()
  * \sa setsockopt(2)
  * \sa bind(2)
  * \sa listen(2)
@@ -544,7 +533,7 @@ int recv_cred_buffer(int fd, char *buf, size_t size)
 int init_tcp_socket(int port)
 {
 	struct sockaddr_in my_addr;
-	int fd, ret = get_socket();
+	int fd, ret = get_stream_socket(AF_INET);
 
 	if (ret < 0)
 		return ret;