X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.h;h=4eb79a82db9c303a7afd4c5e3ff13428ef79f0c0;hp=96fa07eeb43c4745687fd4efde9b7f16d4dabe5d;hb=0e4306dd5162a2850e623bf3082b3f7291aaad45;hpb=ed0c68b07ddbc130e033035baa1cc0862e511b46

diff --git a/net.h b/net.h
index 96fa07ee..4eb79a82 100644
--- a/net.h
+++ b/net.h
@@ -17,19 +17,36 @@
 #define UNIX_PATH_MAX 108
 #endif
 
-/** \cond Userland defines for Linux DCCP support. */
+/* 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     */
+#define IPPROTO_DCCP 33 /**< IANA assigned value. */
+#endif
+
+#ifndef SOCK_DCCP
+#define SOCK_DCCP 6 /**< Linux socket type. */
+#endif
+
+#ifndef DCCP_SOCKOPT_RX_CCID
+/** Per-connection CCID support (set/get the RX CCID, since v2.6.30-rc1). */
+#define DCCP_SOCKOPT_RX_CCID 15
 #endif
-/** \endcond */
 
+#ifndef SOL_DCCP
+#define SOL_DCCP 269 /**< Linux socket level. */
+#endif
+
+#ifndef DCCP_SOCKOPT_AVAILABLE_CCIDS
+#define DCCP_SOCKOPT_AVAILABLE_CCIDS 12 /**< List of supported CCIDs. */
+#endif
+
+#ifndef DCCP_SOCKOPT_CCID
+#define DCCP_SOCKOPT_CCID 13 /**< Sets both TX/RX CCID. */
+#endif
+
+#ifndef DCCP_SOCKOPT_TX_CCID
+#define DCCP_SOCKOPT_TX_CCID 14 /**< Set/get the TX CCID. */
+#endif
 
 /**
  * Flowopts: Transport-layer independent encapsulation of socket options
@@ -87,9 +104,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);
 
 /**
@@ -97,7 +121,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);
@@ -123,4 +152,4 @@ int recv_pattern(int fd, const char *pattern, size_t bufsize);
  */
 /** 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);
+extern int dccp_available_ccids(uint8_t **ccid_array);