string.c: Use $HOME to get the home directory.

[paraslash.git] / net.c

diff --git a/net.c b/net.c
index a9708fcb51bcb88f1bd58aa525f42c1a22f9625d..c5f33c822164195615d7f8f318f22a3f1d43a79f 100644 (file)
--- 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;
 }
@@ -540,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)
@@ -548,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;