X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.h;h=0cb2767c72181e4d98222fbf6c8d6f54f312071e;hp=d42031e84b4f68c3ef79905f5c99c76b3d5ea3dc;hb=dded41e5bed40cca8876e1056351cc1dbab309d0;hpb=755bbd9fa36e16f266467bed60b158e5737bd838;ds=sidebyside

diff --git a/net.h b/net.h
index d42031e8..0cb2767c 100644
--- a/net.h
+++ b/net.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -16,14 +16,36 @@
 #define UNIX_PATH_MAX 108
 #endif
 
+/** \cond Userland defines for Linux DCCP support. */
+#ifndef IPPROTO_DCCP
+#define IPPROTO_DCCP	33	/**< IANA assigned value */
+#define SOCK_DCCP	6	/**< Linux socket type	 */
+#define SOL_DCCP        269	/**< Linux socket level	 */
+#endif
+/** \endcond */
+
+/**
+ * Generic socket creation (passive and active sockets).
+ */
+extern int makesock(unsigned l3type, unsigned l4type, int passive,
+	            const char *host, unsigned short port_number);
+extern struct in_addr extract_v4_addr(const struct sockaddr_storage *ss);
+
+/**
+ * Functions to support listening sockets.
+ */
+/** How many pending connections queue of a listening server will hold. */
+#define BACKLOG	10
+extern int para_listen(unsigned l3type, unsigned l4type, unsigned short port);
+
+/** Pretty-printing of IPv4/6 socket addresses */
+extern char *local_name(int sockfd);
+extern char *remote_name(int sockfd);
+
 /** used to crypt the communication between para_server and para_client */
 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_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, ...);
@@ -32,34 +54,10 @@ int recv_bin_buffer(int fd, char *buf, size_t size);
 int para_accept(int, void *addr, socklen_t size);
 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 create_remote_socket(const char *name);
 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);
 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)))