X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.h;h=8b5d4a1a8aef2c87fbb0329fedd0b64c7e5528a8;hp=8fdaa3eebf0285dc490470186093fbe8f4529ebe;hb=9492ba2d1b8f21af37436b121569e51a9b1df0c0;hpb=74d8b443aba528dc65af874a81c53be26aaace9e

diff --git a/net.h b/net.h
index 8fdaa3ee..8b5d4a1a 100644
--- a/net.h
+++ b/net.h
@@ -20,10 +20,8 @@
 typedef void crypt_function(unsigned long len,
 	const unsigned char *indata, unsigned char *outdata, void *private_data);
 
-#include <netdb.h> /* hostent */
-int get_host_info(char *host, struct hostent **ret);
+int tcp_connect(char *host, int port);
 int get_stream_socket(int domain);
-void init_sockaddr(struct sockaddr_in*, int, const struct hostent*);
 int send_buffer(int, const char *);
 int send_bin_buffer(int, const char *, size_t);
 __printf_2_3 int send_va_buffer(int fd, const char *fmt, ...);
@@ -36,7 +34,7 @@ int init_unix_addr(struct sockaddr_un *, const char *);
 int recv_cred_buffer(int, char *, size_t);
 ssize_t send_cred_buffer(int, char*);
 int recv_pattern(int fd, const char *pattern, size_t bufsize);
-int init_tcp_socket(int port);
+int tcp_listen(int port);
 void enable_crypt(int fd, crypt_function *recv_f, crypt_function *send_f,
 	void *private_data);
 void disable_crypt(int fd);
@@ -45,7 +43,8 @@ void disable_crypt(int fd);
  * A wrapper around connect(2).
  *
  * \param fd The file descriptor.
- * \param their_addr The address to connect.
+ * \param addr The address to connect.
+ * \param len The size of \a addr.
  *
  * This should not be called directly. Always use the PARA_CONNECT macro.
  *
@@ -53,7 +52,7 @@ void disable_crypt(int fd);
  *
  * \sa connect(2), PARA_CONNECT.
  */
-_static_inline_ int _para_connect(int fd, void *addr, socklen_t len)
+static inline int _para_connect(int fd, void *addr, socklen_t len)
 {
 	if (connect(fd, (struct sockaddr *)addr, len) == -1)
 		return -E_CONNECT;