X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.h;h=d42031e84b4f68c3ef79905f5c99c76b3d5ea3dc;hp=ddc250952bd9592e0e7195518559528f3be65138;hb=c9381f1e1f60439f0edd8d67100cc13ad8f4c0bf;hpb=8211954fc3390c0fa19cca788b03336a37aa9dc0

diff --git a/net.h b/net.h
index ddc25095..d42031e8 100644
--- a/net.h
+++ b/net.h
@@ -24,7 +24,6 @@ typedef void crypt_function(unsigned long len,
 int get_host_info(char *host, struct hostent **ret);
 int get_stream_socket(int domain);
 void init_sockaddr(struct sockaddr_in*, int, const struct hostent*);
-int para_connect(int fd, struct sockaddr_in *their_addr);
 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, ...);
@@ -42,3 +41,25 @@ 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)))