X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=3dcd9c0be5884f59293d012c3e117ea61b83a282;hp=bc7d234bfa2ec01619d8bc698dfb2841053b0eca;hb=48027ab6ec9113c037dfd388e91579ecf0a70eae;hpb=de25f9d0d999b2a911ecc93d19511ff437211d18;ds=sidebyside

diff --git a/net.c b/net.c
index bc7d234b..3dcd9c0b 100644
--- a/net.c
+++ b/net.c
@@ -151,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);
@@ -292,11 +293,11 @@ int get_host_info(char *host, struct hostent **ret)
  *
  * \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;
 }
@@ -542,7 +543,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)
@@ -550,7 +551,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;