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

diff --git a/net.h b/net.h
index a2778d55..66bf8755 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 */
 
@@ -16,29 +17,93 @@
 #define UNIX_PATH_MAX 108
 #endif
 
-/** 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);
+/** \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  */
+/* 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.
+ *
+ * \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.
+ */
+/** 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);
 
-#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 send_buffer(int, const char *);
 int send_bin_buffer(int, const char *, size_t);
-int send_va_buffer(int, const char *, ...);
-int recv_buffer(int fd, char *buf, size_t size);
+int send_buffer(int, const char *);
+__printf_2_3 int send_va_buffer(int fd, const char *fmt, ...);
+
 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_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 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);
 
+/**
+ * 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);