X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.h;h=93c0c5e8da3f2a4ea4c34dd047eded38c4c3d2b3;hp=831cd3b8b72f2b3a7f90592c64f6a5f725c4b7d7;hb=4e979d91dc967b241a0f034a5600447eb7826eef;hpb=a5927501e41fa3fca2975452617474e78ffecc48

diff --git a/net.h b/net.h
index 831cd3b8..93c0c5e8 100644
--- a/net.h
+++ b/net.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -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
+
+#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
-/** \endcond */
 
+#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
@@ -135,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);