X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.h;h=831cd3b8b72f2b3a7f90592c64f6a5f725c4b7d7;hp=15412586583ae9398090f98a8bfee83b59a09d59;hb=a5927501e41fa3fca2975452617474e78ffecc48;hpb=802348691238fbca1b50f19a9331806a0786b097

diff --git a/net.h b/net.h
index 15412586..831cd3b8 100644
--- a/net.h
+++ b/net.h
@@ -19,13 +19,34 @@
 
 /** \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 */
 
 
+/**
+ * Flowopts: Transport-layer independent encapsulation of socket options
+ *           that need to be registered prior to setting up a connection.
+ */
+struct flowopts;
+
+extern struct flowopts *flowopt_new(void);
+extern void flowopt_add(struct flowopts *fo, int level, int opt,
+			char *name, const void *val, int len);
+extern void flowopt_add_bool(struct flowopts *fo, int lev, int opt,
+			     char *optname, bool on_or_off);
+/** Flowopt shortcut macros */
+#define OPT_ADD(fo, lev, opt, val, len)	flowopt_add(fo, lev, opt, #opt, val, len)
+#define OPT_ENABLE(fo, lev, opt)	flowopt_add_bool(fo, lev, opt, #opt, 1)
+#define OPT_DISABLE(fo, lev, opt)	flowopt_add_bool(fo, lev, opt, #opt, 0)
+
 /**
  * Functions to parse and validate (parts of) URLs.
  */
@@ -33,6 +54,7 @@ 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.
  *
@@ -65,8 +87,16 @@ _static_inline_ bool is_valid_ipv6_address(const char *address)
 /**
  * Generic socket creation (passive and active sockets).
  */
-extern int makesock(unsigned l3type, unsigned l4type, int passive,
-	            const char *host, unsigned short port_number);
+extern int makesock(unsigned l4type, bool passive,
+		    const char *host, uint16_t port_number,
+		    struct flowopts *fo);
+
+static inline int para_connect_simple(unsigned l4type,
+				      const char *host, uint16_t port)
+{
+	return makesock(l4type, 0, host, port, NULL);
+}
+
 extern struct in_addr extract_v4_addr(const struct sockaddr_storage *ss);
 
 /**
@@ -74,7 +104,12 @@ extern struct in_addr extract_v4_addr(const struct sockaddr_storage *ss);
  */
 /** 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);
+extern int para_listen(unsigned l4type, uint16_t port, struct flowopts *fo);
+
+static inline int para_listen_simple(unsigned l4type, uint16_t port)
+{
+	return para_listen(l4type, port, NULL);
+}
 
 /** Pretty-printing of IPv4/6 socket addresses */
 extern char *local_name(int sockfd);
@@ -94,3 +129,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);
+
+/**
+ * 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);