X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.h;h=15412586583ae9398090f98a8bfee83b59a09d59;hp=e78b7629348bde49831ccc31a2f660719ad3d16d;hb=b6100d88b5a03e824991b4a5bfd90b0e951e8d2b;hpb=84856762fd231cd3c3d48783e70182cfd6d9bb22;ds=sidebyside

diff --git a/net.h b/net.h
index e78b7629..15412586 100644
--- a/net.h
+++ b/net.h
@@ -1,8 +1,9 @@
 /*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
+#include <stdbool.h>
 
 /** \file net.h exported symbols from net.c */
 
@@ -24,11 +25,49 @@
 #endif
 /** \endcond */
 
+
+/**
+ * Functions to parse and validate (parts of) URLs.
+ */
+extern char *parse_cidr(const char *cidr,
+			char *addr, ssize_t addrlen, int32_t *netmask);
+extern char *parse_url(const char *url,
+		       char *host, ssize_t hostlen, int32_t *port);
+/**
+ * Ensure that string conforms to the IPv4 address format.
+ *
+ * \param address The address string to check.
+ *
+ * \return 1 if \a address conforms to the IPv4 address format, else 0.
+ */
+_static_inline_ bool is_valid_ipv4_address(const char *address)
+{
+	struct in_addr test_it;
+
+	return inet_pton(AF_INET, address, &test_it) != 0;
+}
+
+/**
+ * Ensure that string conforms to IPv6 address format.
+ *
+ * \param address The address string to check.
+ *
+ * \return 1 if string has a valid IPv6 address syntax, 0 if not.
+ * \sa RFC 4291
+ */
+_static_inline_ bool is_valid_ipv6_address(const char *address)
+{
+	struct in6_addr test_it;
+
+	return inet_pton(AF_INET6, address, &test_it) != 0;
+}
+
 /**
  * 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.
@@ -37,48 +76,21 @@ extern int makesock(unsigned l3type, unsigned l4type, int passive,
 #define BACKLOG	10
 extern int para_listen(unsigned l3type, unsigned l4type, unsigned short port);
 
-/** 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);
+/** Pretty-printing of IPv4/6 socket addresses */
+extern char *local_name(int sockfd);
+extern char *remote_name(int sockfd);
 
-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_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 recv_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 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)))