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

diff --git a/net.h b/net.h
index a2778d55..8b5d4a1a 100644
--- a/net.h
+++ b/net.h
@@ -20,25 +20,44 @@
 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 get_socket(void);
-void init_sockaddr(struct sockaddr_in*, int, const struct hostent*);
-int para_connect(int, struct sockaddr_in *);
+int tcp_connect(char *host, int port);
+int get_stream_socket(int domain);
 int send_buffer(int, const char *);
 int send_bin_buffer(int, const char *, size_t);
-int send_va_buffer(int, const char *, ...);
+__printf_2_3 int send_va_buffer(int fd, const char *fmt, ...);
 int recv_buffer(int fd, char *buf, size_t size);
 int recv_bin_buffer(int fd, char *buf, size_t size);
 int para_accept(int, void *addr, socklen_t size);
-int create_pf_socket(const char *name, struct sockaddr_un *unix_addr,
+int create_local_socket(const char *name, struct sockaddr_un *unix_addr,
 	mode_t mode);
 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);
 
+/**
+ * A wrapper around connect(2).
+ *
+ * \param fd The file descriptor.
+ * \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.
+ *
+ * \return \p -E_CONNECT on errors, 1 on success.
+ *
+ * \sa connect(2), PARA_CONNECT.
+ */
+static inline int _para_connect(int fd, void *addr, socklen_t len)
+{
+	if (connect(fd, (struct sockaddr *)addr, len) == -1)
+		return -E_CONNECT;
+	return 1;
+}
+
+/** A macro for connect() which does not need a \a len parameter. */
+#define PARA_CONNECT(fd, addr) _para_connect(fd, addr, sizeof(*(addr)))