X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=net.c;h=c5f33c822164195615d7f8f318f22a3f1d43a79f;hb=379a2724984d903b7be8981a85b6cc82cab6ea90;hp=458f5c8da356345fc5e0f18ece9d2b89a0957565;hpb=cd4b294da6f6802d9918c8fe5bcecb8a2a2363c3;p=paraslash.git

diff --git a/net.c b/net.c
index 458f5c8d..c5f33c82 100644
--- a/net.c
+++ b/net.c
@@ -12,21 +12,23 @@
 #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
  *
@@ -290,11 +292,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;
 }
@@ -374,11 +376,11 @@ int init_unix_addr(struct sockaddr_un *u, const char *name)
 }
 
 /**
- * prepare, create, and bind and socket for local communication
+ * Prepare, create, and bind a socket for local communication.
  *
- * \param name the socket pathname
- * \param unix_addr pointer to the \p AF_UNIX socket structure
- * \param mode the desired mode of the socket
+ * \param name The socket pathname.
+ * \param unix_addr Pointer to the \p AF_UNIX socket structure.
+ * \param mode The desired mode of the socket.
  *
  * This functions creates a local socket for sequenced, reliable,
  * two-way, connection-based byte streams.
@@ -394,18 +396,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 +542,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 +550,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;