X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.h;h=66bf875568eadd9fe07587e31edc5539e472575d;hp=8ec9fa52b9e4a05d259a820e82de56a584351ead;hb=e9e826f4fb415c4225ff5934fe42572ffa3b5ebc;hpb=6ba0a5055cfdec25d54d90a56f9345d5d4be09be

diff --git a/net.h b/net.h
index 8ec9fa52..66bf8755 100644
--- a/net.h
+++ b/net.h
@@ -19,12 +19,26 @@
 
 /** \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	 */
+#define IPPROTO_DCCP	33	/* IANA assigned value */
+#define SOCK_DCCP	6	/* Linux socket type   */
+#define SOL_DCCP	269	/* Linux socket level  */
+/* Per-connection CCID support (since v2.6.30-rc1) */
+#define DCCP_SOCKOPT_AVAILABLE_CCIDS	12	/* List of supported CCIDs */
+#define DCCP_SOCKOPT_CCID		13	/* Sets both TX/RX CCID    */
+#define DCCP_SOCKOPT_TX_CCID		14	/* Set/get the TX CCID     */
+#define DCCP_SOCKOPT_RX_CCID		15	/* Set/get the RX CCID     */
 #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);
+extern const char *stringify_port(int port, const char *transport);
 /**
  * Ensure that string conforms to the IPv4 address format.
  *
@@ -39,6 +53,21 @@ _static_inline_ bool is_valid_ipv4_address(const char *address)
 	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).
  */
@@ -57,15 +86,13 @@ extern int para_listen(unsigned l3type, unsigned l4type, unsigned short port);
 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);
-
-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);
@@ -73,6 +100,10 @@ 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);
-void enable_crypt(int fd, crypt_function *recv_f, crypt_function *send_f,
-	void *private_data);
-void disable_crypt(int fd);
+
+/**
+ * Functions and definitions to support \p IPPROTO_DCCP
+ */
+/** Hardcoded maximum number of separate CCID modules compiled into a host */
+#define DCCP_MAX_HOST_CCIDS	20
+extern const uint8_t *dccp_available_ccids(uint8_t *ccids, uint8_t *nccids);