osx_write.c: Add two missing headers.

[paraslash.git] / net.c

diff --git a/net.c b/net.c
index 3dcd9c0be5884f59293d012c3e117ea61b83a282..0e41be1c3fa804c772f4547a16ac68ec8b42e262 100644 (file)
--- a/net.c
+++ b/net.c
@@ -6,10 +6,10 @@
 
 /** \file net.c networking-related helper functions */
 
 
 /** \file net.c networking-related helper functions */
 

+#include "error.h"

 #include "para.h"
 #include "net.h"
 #include "string.h"
 #include "para.h"
 #include "net.h"
 #include "string.h"

-#include "error.h"

 
 
 /** Information about one encrypted connection. */
 
 
 /** Information about one encrypted connection. */


@@ -128,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.
  */
  *
  * \return Positive on success, \p -E_SEND on errors.
  */


@@ -302,26 +302,6 @@ int get_stream_socket(int domain)
        return socket_fd;
 }
 
        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
  *
 /**
  * paraslash's wrapper around the accept system call
  *