Implement data ack in CADET MQ API

[oweals/gnunet.git] / src / include / gnunet_common.h

diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 29a5f7cfb69d98286d01f8f50bc10838826e8638..fdcae66fa19e9cc71dd6bc4e1bf89d03b108fa26 100644 (file)
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet.
 /*
      This file is part of GNUnet.

-     (C) 2006, 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2006-2013 GNUnet e.V.

 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published

-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your

      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but


@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the

-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.

 */
 
 /**
 */
 
 /**


@@ -26,6 +26,11 @@
  *
  * @author Christian Grothoff
  * @author Nils Durner
  *
  * @author Christian Grothoff
  * @author Nils Durner

+ *
+ * @defgroup logging Logging
+ * @see [Documentation](https://gnunet.org/logging)
+ *
+ * @defgroup memory Memory management

  */
 #ifndef GNUNET_COMMON_H
 #define GNUNET_COMMON_H
  */
 #ifndef GNUNET_COMMON_H
 #define GNUNET_COMMON_H


@@ -46,6 +51,10 @@
 #include <stdarg.h>
 #endif
 
 #include <stdarg.h>
 #endif
 

+#ifdef HAVE_BYTESWAP_H
+#include <byteswap.h>
+#endif
+

 #ifdef __cplusplus
 extern "C"
 {
 #ifdef __cplusplus
 extern "C"
 {


@@ -57,13 +66,14 @@ extern "C"
 /**
  * Version of the API (for entire gnunetutil.so library).
  */
 /**
  * Version of the API (for entire gnunetutil.so library).
  */

-#define GNUNET_UTIL_VERSION 0x00090500
+#define GNUNET_UTIL_VERSION 0x000A0102
+

 
 /**
 
 /**

- * Named constants for return values.  The following
- * invariants hold: "GNUNET_NO == 0" (to allow "if (GNUNET_NO)")
- * "GNUNET_OK != GNUNET_SYSERR", "GNUNET_OK != GNUNET_NO", "GNUNET_NO != GNUNET_SYSERR"
- * and finally "GNUNET_YES != GNUNET_NO".
+ * Named constants for return values.  The following invariants hold:
+ * `GNUNET_NO == 0` (to allow `if (GNUNET_NO)`) `GNUNET_OK !=
+ * GNUNET_SYSERR`, `GNUNET_OK != GNUNET_NO`, `GNUNET_NO !=
+ * GNUNET_SYSERR` and finally `GNUNET_YES != GNUNET_NO`.

  */
 #define GNUNET_OK      1
 #define GNUNET_SYSERR -1
  */
 #define GNUNET_OK      1
 #define GNUNET_SYSERR -1


@@ -103,6 +113,15 @@ extern "C"
 #endif
 #endif
 
 #endif
 #endif
 

+/**
+ * @ingroup logging
+ * define #GNUNET_EXTRA_LOGGING if using this header outside the GNUnet source
+ * tree where gnunet_config.h is unavailable
+ */
+#ifndef GNUNET_EXTRA_LOGGING
+#define GNUNET_EXTRA_LOGGING 0
+#endif
+

 /**
  * Endian operations
  */
 /**
  * Endian operations
  */


@@ -205,7 +224,7 @@ extern "C"
 /**
  * Define as empty, GNUNET_PACKED should suffice, but this won't work on W32
  */
 /**
  * Define as empty, GNUNET_PACKED should suffice, but this won't work on W32
  */

-#define GNUNET_NETWORK_STRUCT_BEGIN 
+#define GNUNET_NETWORK_STRUCT_BEGIN

 
 /**
  * Define as empty, GNUNET_PACKED should suffice, but this won't work on W32;
 
 /**
  * Define as empty, GNUNET_PACKED should suffice, but this won't work on W32;


@@ -238,31 +257,27 @@ struct GNUNET_MessageHeader
 
 
 /**
 
 
 /**

- * @brief A SHA-512 hashcode
+ * Answer from service to client about last operation.

  */
  */

-struct GNUNET_HashCode
+struct GNUNET_OperationResultMessage

 {
 {

-  uint32_t bits[512 / 8 / sizeof (uint32_t)];   /* = 16 */
-};
+  struct GNUNET_MessageHeader header;

 
 

+  uint32_t reserved GNUNET_PACKED;

 
 

-/**
- * @brief A SHA-256 hashcode
- */
-struct GNUNET_CRYPTO_ShortHashCode
-{
-  uint32_t bits[256 / 8 / sizeof (uint32_t)];   /* = 8 */
-};
+  /**
+   * Operation ID.
+   */
+  uint64_t op_id GNUNET_PACKED;

 
 

+  /**
+   * Status code for the operation.
+   */
+  uint64_t result_code GNUNET_PACKED;

 
 

-/**
- * The identity of the host (basically the SHA-512 hashcode of
- * it's public key).
- */
-struct GNUNET_PeerIdentity
-{
-  struct GNUNET_HashCode hashPubKey;
+  /* Followed by data. */

 };
 };

+

 GNUNET_NETWORK_STRUCT_END
 
 /**
 GNUNET_NETWORK_STRUCT_END
 
 /**


@@ -270,15 +285,45 @@ GNUNET_NETWORK_STRUCT_END
  *
  * @param cls closure
  * @param filename complete filename (absolute path)
  *
  * @param cls closure
  * @param filename complete filename (absolute path)

- * @return GNUNET_OK to continue to iterate,
- *  GNUNET_SYSERR to abort iteration with error!
+ * @return #GNUNET_OK to continue to iterate,
+ *  #GNUNET_NO to stop iteration with no error,
+ *  #GNUNET_SYSERR to abort iteration with error!
+ */
+typedef int
+(*GNUNET_FileNameCallback) (void *cls,
+                            const char *filename);
+
+
+/**
+ * Generic continuation callback.
+ *
+ * @param cls  Closure.
+ */
+typedef void
+(*GNUNET_ContinuationCallback) (void *cls);
+
+
+/**
+ * Function called with the result of an asynchronous operation.
+ *
+ * @param cls
+ *        Closure.
+ * @param result_code
+ *        Result code for the operation.
+ * @param data
+ *        Data result for the operation.
+ * @param data_size
+ *        Size of @a data.

  */
  */

-typedef int (*GNUNET_FileNameCallback) (void *cls, const char *filename);
+typedef void
+(*GNUNET_ResultCallback) (void *cls, int64_t result_code,
+                          const void *data, uint16_t data_size);

 
 
 /* ****************************** logging ***************************** */
 
 /**
 
 
 /* ****************************** logging ***************************** */
 
 /**

+ * @ingroup logging

  * Types of errors.
  */
 enum GNUNET_ErrorType
  * Types of errors.
  */
 enum GNUNET_ErrorType


@@ -287,14 +332,19 @@ enum GNUNET_ErrorType
   GNUNET_ERROR_TYPE_NONE = 0,
   GNUNET_ERROR_TYPE_ERROR = 1,
   GNUNET_ERROR_TYPE_WARNING = 2,
   GNUNET_ERROR_TYPE_NONE = 0,
   GNUNET_ERROR_TYPE_ERROR = 1,
   GNUNET_ERROR_TYPE_WARNING = 2,

-  GNUNET_ERROR_TYPE_INFO = 4,
-  GNUNET_ERROR_TYPE_DEBUG = 8,
-  GNUNET_ERROR_TYPE_INVALID = 16,
-  GNUNET_ERROR_TYPE_BULK = 32
+  /* UX: We need a message type that is output by
+   * default without looking like there is a problem.
+   */
+  GNUNET_ERROR_TYPE_MESSAGE = 4,
+  GNUNET_ERROR_TYPE_INFO = 8,
+  GNUNET_ERROR_TYPE_DEBUG = 16,
+  GNUNET_ERROR_TYPE_INVALID = 32,
+  GNUNET_ERROR_TYPE_BULK = 64

 };
 
 
 /**
 };
 
 
 /**

+ * @ingroup logging

  * User-defined handler for log messages.
  *
  * @param cls closure
  * User-defined handler for log messages.
  *
  * @param cls closure


@@ -303,27 +353,36 @@ enum GNUNET_ErrorType
  * @param date when was the message logged?
  * @param message what is the message
  */
  * @param date when was the message logged?
  * @param message what is the message
  */

-typedef void (*GNUNET_Logger) (void *cls, enum GNUNET_ErrorType kind,
-                               const char *component, const char *date,
-                               const char *message);
+typedef void
+(*GNUNET_Logger) (void *cls,
+                  enum GNUNET_ErrorType kind,
+                  const char *component,
+                  const char *date,
+                  const char *message);

 
 
 /**
 
 
 /**

+ * @ingroup logging

  * Get the number of log calls that are going to be skipped
  *
  * @return number of log calls to be ignored
  */
 int
  * Get the number of log calls that are going to be skipped
  *
  * @return number of log calls to be ignored
  */
 int

-GNUNET_get_log_skip ();
+GNUNET_get_log_skip (void);
+

 
 #if !defined(GNUNET_CULL_LOGGING)
 int
 
 #if !defined(GNUNET_CULL_LOGGING)
 int

-GNUNET_get_log_call_status (int caller_level, const char *comp,
-                            const char *file, const char *function, int line);
+GNUNET_get_log_call_status (int caller_level,
+                            const char *comp,
+                            const char *file,
+                            const char *function,
+                            int line);

 #endif
 
 
 /**
 #endif
 
 
 /**

+ * @ingroup logging

  * Main log function.
  *
  * @param kind how serious is the error?
  * Main log function.
  *
  * @param kind how serious is the error?


@@ -331,7 +390,8 @@ GNUNET_get_log_call_status (int caller_level, const char *comp,
  * @param ... arguments for format string
  */
 void
  * @param ... arguments for format string
  */
 void

-GNUNET_log_nocheck (enum GNUNET_ErrorType kind, const char *message, ...);
+GNUNET_log_nocheck (enum GNUNET_ErrorType kind, const char *message, ...)
+  __attribute__ ((format (printf, 2, 3)));

 
 /* from glib */
 #if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
 
 /* from glib */
 #if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)


@@ -355,7 +415,9 @@ GNUNET_log_nocheck (enum GNUNET_ErrorType kind, const char *message, ...);
 #define GNUNET_LOG_CALL_STATUS -1
 #endif
 
 #define GNUNET_LOG_CALL_STATUS -1
 #endif
 

+

 /**
 /**

+ * @ingroup logging

  * Log function that specifies an alternative component.
  * This function should be used by plugins.
  *
  * Log function that specifies an alternative component.
  * This function should be used by plugins.
  *


@@ -382,7 +444,7 @@ GNUNET_log_from_nocheck (enum GNUNET_ErrorType kind, const char *comp,
   }\
 } while (0)
 
   }\
 } while (0)
 

-#define GNUNET_log(kind,...) do { int log_line = __LINE__;\
+ #define GNUNET_log(kind,...) do { int log_line = __LINE__;\

   static int log_call_enabled = GNUNET_LOG_CALL_STATUS;\
   if ((GNUNET_EXTRA_LOGGING > 0) || ((GNUNET_ERROR_TYPE_DEBUG & (kind)) == 0)) { \
     if (GN_UNLIKELY(log_call_enabled == -1))\
   static int log_call_enabled = GNUNET_LOG_CALL_STATUS;\
   if ((GNUNET_EXTRA_LOGGING > 0) || ((GNUNET_ERROR_TYPE_DEBUG & (kind)) == 0)) { \
     if (GN_UNLIKELY(log_call_enabled == -1))\


@@ -401,6 +463,7 @@ GNUNET_log_from_nocheck (enum GNUNET_ErrorType kind, const char *comp,
 
 
 /**
 
 
 /**

+ * @ingroup logging

  * Log error message about missing configuration option.
  *
  * @param kind log level
  * Log error message about missing configuration option.
  *
  * @param kind log level


@@ -408,12 +471,13 @@ GNUNET_log_from_nocheck (enum GNUNET_ErrorType kind, const char *comp,
  * @param option name of missing option
  */
 void
  * @param option name of missing option
  */
 void

-GNUNET_log_config_missing (enum GNUNET_ErrorType kind, 
+GNUNET_log_config_missing (enum GNUNET_ErrorType kind,

                           const char *section,
                           const char *option);
 
 
 /**
                           const char *section,
                           const char *option);
 
 
 /**

+ * @ingroup logging

  * Log error message about invalid configuration option value.
  *
  * @param kind log level
  * Log error message about invalid configuration option value.
  *
  * @param kind log level


@@ -422,87 +486,106 @@ GNUNET_log_config_missing (enum GNUNET_ErrorType kind,
  * @param required what is required that is invalid about the option
  */
 void
  * @param required what is required that is invalid about the option
  */
 void

-GNUNET_log_config_invalid (enum GNUNET_ErrorType kind, 
+GNUNET_log_config_invalid (enum GNUNET_ErrorType kind,

                           const char *section,
                           const char *option,
                           const char *required);
 
 
 /**
                           const char *section,
                           const char *option,
                           const char *required);
 
 
 /**

+ * @ingroup logging

  * Abort the process, generate a core dump if possible.
  * Abort the process, generate a core dump if possible.

+ * Most code should use `GNUNET_assert (0)` instead to
+ * first log the location of the failure.

  */
 void
  */
 void

-GNUNET_abort (void) GNUNET_NORETURN;
+GNUNET_abort_ (void) GNUNET_NORETURN;
+

 
 /**
 
 /**

- * Ignore the next n calls to the log function.
+ * @ingroup logging
+ * Ignore the next @a n calls to the log function.

  *
  * @param n number of log calls to ignore (could be negative)
  *
  * @param n number of log calls to ignore (could be negative)

- * @param check_reset GNUNET_YES to assert that the log skip counter is currently zero
+ * @param check_reset #GNUNET_YES to assert that the log skip counter is currently zero

  */
 void
  */
 void

-GNUNET_log_skip (int n, int check_reset);
+GNUNET_log_skip (int n,
+                 int check_reset);

 
 
 /**
 
 
 /**

+ * @ingroup logging

  * Setup logging.
  *
  * @param comp default component to use
  * @param loglevel what types of messages should be logged
  * @param logfile change logging to logfile (use NULL to keep stderr)
  * Setup logging.
  *
  * @param comp default component to use
  * @param loglevel what types of messages should be logged
  * @param logfile change logging to logfile (use NULL to keep stderr)

- * @return GNUNET_OK on success, GNUNET_SYSERR if logfile could not be opened
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR if logfile could not be opened

  */
 int
  */
 int

-GNUNET_log_setup (const char *comp, const char *loglevel, const char *logfile);
+GNUNET_log_setup (const char *comp,
+                  const char *loglevel,
+                  const char *logfile);

 
 
 /**
 
 
 /**

- * Add a custom logger.
+ * @ingroup logging
+ * Add a custom logger.  Note that installing any custom logger
+ * will disable the standard logger.  When multiple custom loggers
+ * are installed, all will be called.  The standard logger will
+ * only be used if no custom loggers are present.

  *
  * @param logger log function
  *
  * @param logger log function

- * @param logger_cls closure for logger
+ * @param logger_cls closure for @a logger

  */
 void
  */
 void

-GNUNET_logger_add (GNUNET_Logger logger, void *logger_cls);
+GNUNET_logger_add (GNUNET_Logger logger,
+                   void *logger_cls);

 
 
 /**
 
 
 /**

+ * @ingroup logging

  * Remove a custom logger.
  *
  * @param logger log function
  * Remove a custom logger.
  *
  * @param logger log function

- * @param logger_cls closure for logger
+ * @param logger_cls closure for @a logger

  */
 void
  */
 void

-GNUNET_logger_remove (GNUNET_Logger logger, void *logger_cls);
+GNUNET_logger_remove (GNUNET_Logger logger,
+                      void *logger_cls);

 
 
 /**
 
 
 /**

+ * @ingroup logging

  * Convert a short hash value to a string (for printing debug messages).
  * This is one of the very few calls in the entire API that is
  * NOT reentrant!
  *
  * Convert a short hash value to a string (for printing debug messages).
  * This is one of the very few calls in the entire API that is
  * NOT reentrant!
  *

- * @param hc the short hash code
+ * @param shc the hash code

  * @return string
  */
 const char *
  * @return string
  */
 const char *

-GNUNET_short_h2s (const struct GNUNET_CRYPTO_ShortHashCode * hc);
+GNUNET_sh2s (const struct GNUNET_ShortHashCode *shc);

 
 
 /**
 
 
 /**

- * Convert a short hash value to a string (for printing debug messages).
- * This prints all 104 characters of a hashcode!
+ * @ingroup logging
+ * Convert a hash value to a string (for printing debug messages).

  * This is one of the very few calls in the entire API that is
  * NOT reentrant!
  *
  * This is one of the very few calls in the entire API that is
  * NOT reentrant!
  *

- * @param hc the short hash code
+ * @param hc the hash code

  * @return string
  */
 const char *
  * @return string
  */
 const char *

-GNUNET_short_h2s_full (const struct GNUNET_CRYPTO_ShortHashCode * hc);
+GNUNET_h2s (const struct GNUNET_HashCode * hc);

 
 
 /**
 
 
 /**

+ * @ingroup logging

  * Convert a hash value to a string (for printing debug messages).
  * Convert a hash value to a string (for printing debug messages).

+ * This prints all 104 characters of a hashcode!

  * This is one of the very few calls in the entire API that is
  * NOT reentrant!
  *
  * This is one of the very few calls in the entire API that is
  * NOT reentrant!
  *


@@ -510,60 +593,71 @@ GNUNET_short_h2s_full (const struct GNUNET_CRYPTO_ShortHashCode * hc);
  * @return string
  */
 const char *
  * @return string
  */
 const char *

-GNUNET_h2s (const struct GNUNET_HashCode * hc);
+GNUNET_h2s_full (const struct GNUNET_HashCode * hc);

 
 
 /**
 
 
 /**

- * Convert a hash value to a string (for printing debug messages).
- * This prints all 104 characters of a hashcode!
+ * @ingroup logging
+ * Convert a peer identity to a string (for printing debug messages).

  * This is one of the very few calls in the entire API that is
  * NOT reentrant!
  *
  * This is one of the very few calls in the entire API that is
  * NOT reentrant!
  *

- * @param hc the hash code
- * @return string
+ * @param pid the peer identity
+ * @return string form of the pid; will be overwritten by next
+ *         call to #GNUNET_i2s().

  */
 const char *
  */
 const char *

-GNUNET_h2s_full (const struct GNUNET_HashCode * hc);
+GNUNET_i2s (const struct GNUNET_PeerIdentity *pid);

 
 
 /**
 
 
 /**

+ * @ingroup logging

  * Convert a peer identity to a string (for printing debug messages).
  * This is one of the very few calls in the entire API that is
  * Convert a peer identity to a string (for printing debug messages).
  * This is one of the very few calls in the entire API that is

- * NOT reentrant!
+ * NOT reentrant!  Identical to #GNUNET_i2s(), except that another
+ * buffer is used so both #GNUNET_i2s() and #GNUNET_i2s2() can be
+ * used within the same log statement.

  *
  * @param pid the peer identity
  * @return string form of the pid; will be overwritten by next
  *
  * @param pid the peer identity
  * @return string form of the pid; will be overwritten by next

- *         call to GNUNET_i2s.
+ *         call to #GNUNET_i2s().

  */
 const char *
  */
 const char *

-GNUNET_i2s (const struct GNUNET_PeerIdentity *pid);
+GNUNET_i2s2 (const struct GNUNET_PeerIdentity *pid);
+

 
 /**
 
 /**

+ * @ingroup logging

  * Convert a peer identity to a string (for printing debug messages).
  * This is one of the very few calls in the entire API that is
  * NOT reentrant!
  *
  * @param pid the peer identity
  * @return string form of the pid; will be overwritten by next
  * Convert a peer identity to a string (for printing debug messages).
  * This is one of the very few calls in the entire API that is
  * NOT reentrant!
  *
  * @param pid the peer identity
  * @return string form of the pid; will be overwritten by next

- *         call to GNUNET_i2s.
+ *         call to #GNUNET_i2s_full().

  */
 const char *
 GNUNET_i2s_full (const struct GNUNET_PeerIdentity *pid);
 
  */
 const char *
 GNUNET_i2s_full (const struct GNUNET_PeerIdentity *pid);
 

+

 /**
 /**

+ * @ingroup logging

  * Convert a "struct sockaddr*" (IPv4 or IPv6 address) to a string
  * (for printing debug messages).  This is one of the very few calls
  * in the entire API that is NOT reentrant!
  *
  * @param addr the address
  * Convert a "struct sockaddr*" (IPv4 or IPv6 address) to a string
  * (for printing debug messages).  This is one of the very few calls
  * in the entire API that is NOT reentrant!
  *
  * @param addr the address

- * @param addrlen the length of the address
+ * @param addrlen the length of the @a addr

  * @return nicely formatted string for the address
  * @return nicely formatted string for the address

- *  will be overwritten by next call to GNUNET_a2s.
+ *  will be overwritten by next call to #GNUNET_a2s().

  */
 const char *
  */
 const char *

-GNUNET_a2s (const struct sockaddr *addr, socklen_t addrlen);
+GNUNET_a2s (const struct sockaddr *addr,
+            socklen_t addrlen);
+

 
 /**
 
 /**

+ * @ingroup logging

  * Convert error type to string.
  *
  * @param kind type to convert
  * Convert error type to string.
  *
  * @param kind type to convert


@@ -574,22 +668,39 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
 
 
 /**
 
 
 /**

+ * @ingroup logging

  * Use this for fatal errors that cannot be handled
  */
  * Use this for fatal errors that cannot be handled
  */

-#define GNUNET_assert(cond) do { if (! (cond)) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, _("Assertion failed at %s:%d.\n"), __FILE__, __LINE__); GNUNET_abort(); } } while(0)
+#define GNUNET_assert(cond) do { if (! (cond)) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, _("Assertion failed at %s:%d.\n"), __FILE__, __LINE__); GNUNET_abort_(); } } while(0)
+

 
 /**
 
 /**

+ * @ingroup logging

  * Use this for fatal errors that cannot be handled
  */
  * Use this for fatal errors that cannot be handled
  */

-#define GNUNET_assert_at(cond, f, l) do { if (! (cond)) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, _("Assertion failed at %s:%d.\n"), f, l); GNUNET_abort(); } } while(0)
+#define GNUNET_assert_at(cond, f, l) do { if (! (cond)) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, _("Assertion failed at %s:%d.\n"), f, l); GNUNET_abort_(); } } while(0)
+

 
 /**
 
 /**

+ * @ingroup logging
+ * Use this for fatal errors that cannot be handled
+ *
+ * @param cond Condition to evaluate
+ * @param comp Component string to use for logging
+ */
+#define GNUNET_assert_from(cond, comp) do { if (! (cond)) { GNUNET_log_from(GNUNET_ERROR_TYPE_ERROR, comp, _("Assertion failed at %s:%d.\n"), __FILE__, __LINE__); GNUNET_abort_(); } } while(0)
+
+
+/**
+ * @ingroup logging

  * Use this for internal assertion violations that are
  * not fatal (can be handled) but should not occur.
  */
 #define GNUNET_break(cond)  do { if (! (cond)) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, _("Assertion failed at %s:%d.\n"), __FILE__, __LINE__); } } while(0)
 
  * Use this for internal assertion violations that are
  * not fatal (can be handled) but should not occur.
  */
 #define GNUNET_break(cond)  do { if (! (cond)) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, _("Assertion failed at %s:%d.\n"), __FILE__, __LINE__); } } while(0)
 

+

 /**
 /**

+ * @ingroup logging

  * Use this for assertion violations caused by other
  * peers (i.e. protocol violations).  We do not want to
  * confuse end-users (say, some other peer runs an
  * Use this for assertion violations caused by other
  * peers (i.e. protocol violations).  We do not want to
  * confuse end-users (say, some other peer runs an


@@ -599,28 +710,36 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
  */
 #define GNUNET_break_op(cond)  do { if (! (cond)) { GNUNET_log(GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK, _("External protocol violation detected at %s:%d.\n"), __FILE__, __LINE__); } } while(0)
 
  */
 #define GNUNET_break_op(cond)  do { if (! (cond)) { GNUNET_log(GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK, _("External protocol violation detected at %s:%d.\n"), __FILE__, __LINE__); } } while(0)
 

+

 /**
 /**

+ * @ingroup logging

  * Log an error message at log-level 'level' that indicates
  * a failure of the command 'cmd' with the message given
  * by strerror(errno).
  */
 #define GNUNET_log_strerror(level, cmd) do { GNUNET_log(level, _("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, __LINE__, STRERROR(errno)); } while(0)
 
  * Log an error message at log-level 'level' that indicates
  * a failure of the command 'cmd' with the message given
  * by strerror(errno).
  */
 #define GNUNET_log_strerror(level, cmd) do { GNUNET_log(level, _("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, __LINE__, STRERROR(errno)); } while(0)
 

+

 /**
 /**

+ * @ingroup logging

  * Log an error message at log-level 'level' that indicates
  * a failure of the command 'cmd' with the message given
  * by strerror(errno).
  */
 #define GNUNET_log_from_strerror(level, component, cmd) do { GNUNET_log_from (level, component, _("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, __LINE__, STRERROR(errno)); } while(0)
 
  * Log an error message at log-level 'level' that indicates
  * a failure of the command 'cmd' with the message given
  * by strerror(errno).
  */
 #define GNUNET_log_from_strerror(level, component, cmd) do { GNUNET_log_from (level, component, _("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, __LINE__, STRERROR(errno)); } while(0)
 

+

 /**
 /**

+ * @ingroup logging

  * Log an error message at log-level 'level' that indicates
  * a failure of the command 'cmd' with the message given
  * by strerror(errno).
  */
  * Log an error message at log-level 'level' that indicates
  * a failure of the command 'cmd' with the message given
  * by strerror(errno).
  */

-#define GNUNET_log_strerror_file(level, cmd, filename) do { GNUNET_log(level, _("`%s' failed on file `%s' at %s:%d with error: %s\n"), cmd, filename,__FILE__, __LINE__, STRERROR(errno)); } while(0)
+#define GNUNET_log_strerror_file(level, cmd, filename) do { GNUNET_log(level, _("`%s' failed on file `%s' at %s:%d with error: %s\n"), cmd, filename, __FILE__, __LINE__, STRERROR(errno)); } while(0)
+

 
 /**
 
 /**

+ * @ingroup logging

  * Log an error message at log-level 'level' that indicates
  * a failure of the command 'cmd' with the message given
  * by strerror(errno).
  * Log an error message at log-level 'level' that indicates
  * a failure of the command 'cmd' with the message given
  * by strerror(errno).


@@ -630,47 +749,65 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
 /* ************************* endianess conversion ****************** */
 
 /**
 /* ************************* endianess conversion ****************** */
 
 /**

- * Convert unsigned 64-bit integer to host-byte-order.
- * @param n the value in network byte order
- * @return the same value in host byte order
+ * Convert unsigned 64-bit integer to network byte order.
+ *
+ * @param n
+ *        The value in host byte order.
+ *
+ * @return The same value in network byte order.

  */
 uint64_t
  */
 uint64_t

-GNUNET_ntohll (uint64_t n);
+GNUNET_htonll (uint64_t n);
+

 
 /**
 
 /**

- * Convert unsigned 64-bit integer to network-byte-order.
- * @param n the value in host byte order
- * @return the same value in network byte order
+ * Convert unsigned 64-bit integer to host byte order.
+ *
+ * @param n
+ *        The value in network byte order.
+ *
+ * @return The same value in host byte order.

  */
 uint64_t
  */
 uint64_t

-GNUNET_htonll (uint64_t n);
+GNUNET_ntohll (uint64_t n);
+

 
 /**
 
 /**

- * Convert double to network-byte-order.
- * @param d the value in network byte order
- * @return the same value in host byte order
+ * Convert double to network byte order.
+ *
+ * @param d
+ *        The value in host byte order.
+ *
+ * @return The same value in network byte order.

  */
  */

-double 
+double

 GNUNET_hton_double (double d);
 
 GNUNET_hton_double (double d);
 

+

 /**
 /**

- * Convert double to host-byte-order
- * @param d the value in network byte order
- * @return the same value in host byte order
+ * Convert double to host byte order
+ *
+ * @param d
+ *        The value in network byte order.
+ *
+ * @return The same value in host byte order.

  */
  */

-double 
+double

 GNUNET_ntoh_double (double d);
 
 GNUNET_ntoh_double (double d);
 

+

 /* ************************* allocation functions ****************** */
 
 /**
 /* ************************* allocation functions ****************** */
 
 /**

+ * @ingroup memory

  * Maximum allocation with GNUNET_malloc macro.
  */
 #define GNUNET_MAX_MALLOC_CHECKED (1024 * 1024 * 40)
 
 /**
  * Maximum allocation with GNUNET_malloc macro.
  */
 #define GNUNET_MAX_MALLOC_CHECKED (1024 * 1024 * 40)
 
 /**

- * Allocate a struct or union of the given 'type'.
- * Wrapper around GNUNET_malloc that returns a pointer
+ * @ingroup memory
+ * Allocate a struct or union of the given @a type.
+ * Wrapper around #GNUNET_malloc that returns a pointer

  * to the newly created object of the correct type.
  *
  * @param type name of the struct or union, i.e. pass 'struct Foo'.
  * to the newly created object of the correct type.
  *
  * @param type name of the struct or union, i.e. pass 'struct Foo'.


@@ -678,6 +815,53 @@ GNUNET_ntoh_double (double d);
 #define GNUNET_new(type) (type *) GNUNET_malloc (sizeof (type))
 
 /**
 #define GNUNET_new(type) (type *) GNUNET_malloc (sizeof (type))
 
 /**

+ * Call memcpy() but check for @a n being 0 first. In the latter
+ * case, it is now safe to pass NULL for @a src or @a dst.
+ * Unlike traditional memcpy(), returns nothing.
+ *
+ * @param dst destination of the copy, may be NULL if @a n is zero
+ * @param src source of the copy, may be NULL if @a n is zero
+ * @param n number of bytes to copy
+ */
+#define GNUNET_memcpy(dst,src,n) do { if (0 != n) { (void) memcpy (dst,src,n); } } while (0)
+
+
+/**
+ * @ingroup memory
+ * Allocate a size @a n array with structs or unions of the given @a type.
+ * Wrapper around #GNUNET_malloc that returns a pointer
+ * to the newly created objects of the correct type.
+ *
+ * @param n number of elements in the array
+ * @param type name of the struct or union, i.e. pass 'struct Foo'.
+ */
+#define GNUNET_new_array(n, type) (type *) GNUNET_malloc ((n) * sizeof (type))
+
+/**
+ * @ingroup memory
+ * Allocate a size @a n times @a m array
+ * with structs or unions of the given @a type.
+ *
+ * @param n size of the first dimension
+ * @param m size of the second dimension
+ * @param type name of the struct or union, i.e. pass 'struct Foo'.
+ */
+#define GNUNET_new_array_2d(n, m, type) (type **) GNUNET_xnew_array_2d_ (n, m, sizeof (type), __FILE__, __LINE__)
+
+/**
+ * @ingroup memory
+ * Allocate a size @a n times @a m times @a o array
+ * with structs or unions of the given @a type.
+ *
+ * @param n size of the first dimension
+ * @param m size of the second dimension
+ * @param o size of the third dimension
+ * @param type name of the struct or union, i.e. pass 'struct Foo'.
+ */
+#define GNUNET_new_array_3d(n, m, o, type) (type ***) GNUNET_xnew_array_3d_ (n, m, o, sizeof (type), __FILE__, __LINE__)
+
+/**
+ * @ingroup memory

  * Wrapper around malloc. Allocates size bytes of memory.
  * The memory will be zero'ed out.
  *
  * Wrapper around malloc. Allocates size bytes of memory.
  * The memory will be zero'ed out.
  *


@@ -688,6 +872,7 @@ GNUNET_ntoh_double (double d);
 #define GNUNET_malloc(size) GNUNET_xmalloc_(size, __FILE__, __LINE__)
 
 /**
 #define GNUNET_malloc(size) GNUNET_xmalloc_(size, __FILE__, __LINE__)
 
 /**

+ * @ingroup memory

  * Allocate and initialize a block of memory.
  *
  * @param buf data to initalize the block with
  * Allocate and initialize a block of memory.
  *
  * @param buf data to initalize the block with


@@ -697,6 +882,7 @@ GNUNET_ntoh_double (double d);
 #define GNUNET_memdup(buf,size) GNUNET_xmemdup_(buf, size, __FILE__, __LINE__)
 
 /**
 #define GNUNET_memdup(buf,size) GNUNET_xmemdup_(buf, size, __FILE__, __LINE__)
 
 /**

+ * @ingroup memory

  * Wrapper around malloc. Allocates size bytes of memory.
  * The memory will be zero'ed out.
  *
  * Wrapper around malloc. Allocates size bytes of memory.
  * The memory will be zero'ed out.
  *


@@ -706,7 +892,9 @@ GNUNET_ntoh_double (double d);
 #define GNUNET_malloc_large(size) GNUNET_xmalloc_unchecked_(size, __FILE__, __LINE__)
 
 /**
 #define GNUNET_malloc_large(size) GNUNET_xmalloc_unchecked_(size, __FILE__, __LINE__)
 
 /**

- * Wrapper around realloc. Rellocates size bytes of memory.
+ * @ingroup memory
+ * Wrapper around realloc. Reallocates size bytes of memory.
+ * The content of the intersection of the new and old size will be unchanged.

  *
  * @param ptr the pointer to reallocate
  * @param size the number of bytes to reallocate
  *
  * @param ptr the pointer to reallocate
  * @param size the number of bytes to reallocate


@@ -715,25 +903,28 @@ GNUNET_ntoh_double (double d);
 #define GNUNET_realloc(ptr, size) GNUNET_xrealloc_(ptr, size, __FILE__, __LINE__)
 
 /**
 #define GNUNET_realloc(ptr, size) GNUNET_xrealloc_(ptr, size, __FILE__, __LINE__)
 
 /**

+ * @ingroup memory

  * Wrapper around free. Frees the memory referred to by ptr.
  * Wrapper around free. Frees the memory referred to by ptr.

- * Note that is is generally better to free memory that was
- * allocated with GNUNET_array_grow using GNUNET_array_grow(mem, size, 0) instead of GNUNET_free.
+ * Note that it is generally better to free memory that was
+ * allocated with #GNUNET_array_grow using #GNUNET_array_grow(mem, size, 0) instead of #GNUNET_free.

  *
  * @param ptr location where to free the memory. ptr must have
  *
  * @param ptr location where to free the memory. ptr must have

- *     been returned by GNUNET_strdup, GNUNET_strndup, GNUNET_malloc or GNUNET_array_grow earlier.
+ *     been returned by #GNUNET_strdup, #GNUNET_strndup, #GNUNET_malloc or #GNUNET_array_grow earlier.

  */
 #define GNUNET_free(ptr) GNUNET_xfree_(ptr, __FILE__, __LINE__)
 
 /**
  */
 #define GNUNET_free(ptr) GNUNET_xfree_(ptr, __FILE__, __LINE__)
 
 /**

+ * @ingroup memory

  * Free the memory pointed to by ptr if ptr is not NULL.
  * Free the memory pointed to by ptr if ptr is not NULL.

- * Equivalent to if (ptr!=null)GNUNET_free(ptr).
+ * Equivalent to `if (NULL != ptr) GNUNET_free(ptr)`.

  *
  * @param ptr the location in memory to free
  */
 #define GNUNET_free_non_null(ptr) do { void * __x__ = ptr; if (__x__ != NULL) { GNUNET_free(__x__); } } while(0)
 
 /**
  *
  * @param ptr the location in memory to free
  */
 #define GNUNET_free_non_null(ptr) do { void * __x__ = ptr; if (__x__ != NULL) { GNUNET_free(__x__); } } while(0)
 
 /**

- * Wrapper around GNUNET_strdup.  Makes a copy of the zero-terminated string
+ * @ingroup memory
+ * Wrapper around #GNUNET_xstrdup_.  Makes a copy of the zero-terminated string

  * pointed to by a.
  *
  * @param a pointer to a zero-terminated string
  * pointed to by a.
  *
  * @param a pointer to a zero-terminated string


@@ -742,7 +933,8 @@ GNUNET_ntoh_double (double d);
 #define GNUNET_strdup(a) GNUNET_xstrdup_(a,__FILE__,__LINE__)
 
 /**
 #define GNUNET_strdup(a) GNUNET_xstrdup_(a,__FILE__,__LINE__)
 
 /**

- * Wrapper around GNUNET_strndup.  Makes a partial copy of the string
+ * @ingroup memory
+ * Wrapper around #GNUNET_xstrndup_.  Makes a partial copy of the string

  * pointed to by a.
  *
  * @param a pointer to a string
  * pointed to by a.
  *
  * @param a pointer to a string


@@ -752,9 +944,10 @@ GNUNET_ntoh_double (double d);
 #define GNUNET_strndup(a,length) GNUNET_xstrndup_(a,length,__FILE__,__LINE__)
 
 /**
 #define GNUNET_strndup(a,length) GNUNET_xstrndup_(a,length,__FILE__,__LINE__)
 
 /**

+ * @ingroup memory

  * Grow a well-typed (!) array.  This is a convenience
  * Grow a well-typed (!) array.  This is a convenience

- * method to grow a vector <tt>arr</tt> of size <tt>size</tt>
- * to the new (target) size <tt>tsize</tt>.
+ * method to grow a vector @a arr of size @a size
+ * to the new (target) size @a tsize.

  * <p>
  *
  * Example (simple, well-typed stack):
  * <p>
  *
  * Example (simple, well-typed stack):


@@ -765,12 +958,12 @@ GNUNET_ntoh_double (double d);
  *
  * static void push(struct foo * elem) {
  *   GNUNET_array_grow(myVector, myVecLen, myVecLen+1);
  *
  * static void push(struct foo * elem) {
  *   GNUNET_array_grow(myVector, myVecLen, myVecLen+1);

- *   memcpy(&myVector[myVecLen-1], elem, sizeof(struct foo));
+ *   GNUNET_memcpy(&myVector[myVecLen-1], elem, sizeof(struct foo));

  * }
  *
  * static void pop(struct foo * elem) {
  *   if (myVecLen == 0) die();
  * }
  *
  * static void pop(struct foo * elem) {
  *   if (myVecLen == 0) die();

- *   memcpy(elem, myVector[myVecLen-1], sizeof(struct foo));
+ *   GNUNET_memcpy(elem, myVector[myVecLen-1], sizeof(struct foo));

  *   GNUNET_array_grow(myVector, myVecLen, myVecLen-1);
  * }
  * </pre>
  *   GNUNET_array_grow(myVector, myVecLen, myVecLen-1);
  * }
  * </pre>


@@ -787,16 +980,18 @@ GNUNET_ntoh_double (double d);
 #define GNUNET_array_grow(arr,size,tsize) GNUNET_xgrow_((void**)&arr, sizeof(arr[0]), &size, tsize, __FILE__, __LINE__)
 
 /**
 #define GNUNET_array_grow(arr,size,tsize) GNUNET_xgrow_((void**)&arr, sizeof(arr[0]), &size, tsize, __FILE__, __LINE__)
 
 /**

+ * @ingroup memory

  * Append an element to a list (growing the
  * list by one).
  */
 #define GNUNET_array_append(arr,size,element) do { GNUNET_array_grow(arr,size,size+1); arr[size-1] = element; } while(0)
 
 /**
  * Append an element to a list (growing the
  * list by one).
  */
 #define GNUNET_array_append(arr,size,element) do { GNUNET_array_grow(arr,size,size+1); arr[size-1] = element; } while(0)
 
 /**

+ * @ingroup memory

  * Like snprintf, just aborts if the buffer is of insufficient size.
  *
  * @param buf pointer to buffer that is written to
  * Like snprintf, just aborts if the buffer is of insufficient size.
  *
  * @param buf pointer to buffer that is written to

- * @param size number of bytes in buf
+ * @param size number of bytes in @a buf

  * @param format format strings
  * @param ... data for format string
  * @return number of bytes written to buf or negative value on error
  * @param format format strings
  * @param ... data for format string
  * @return number of bytes written to buf or negative value on error


@@ -806,6 +1001,7 @@ GNUNET_snprintf (char *buf, size_t size, const char *format, ...);
 
 
 /**
 
 
 /**

+ * @ingroup memory

  * Like asprintf, just portable.
  *
  * @param buf set to a buffer of sufficient size (allocated, caller must free)
  * Like asprintf, just portable.
  *
  * @param buf set to a buffer of sufficient size (allocated, caller must free)


@@ -822,7 +1018,7 @@ GNUNET_asprintf (char **buf, const char *format, ...);
 /**
  * Allocate memory. Checks the return value, aborts if no more
  * memory is available.  Don't use GNUNET_xmalloc_ directly. Use the
 /**
  * Allocate memory. Checks the return value, aborts if no more
  * memory is available.  Don't use GNUNET_xmalloc_ directly. Use the

- * GNUNET_malloc macro.
+ * #GNUNET_malloc macro.

  * The memory will be zero'ed out.
  *
  * @param size number of bytes to allocate
  * The memory will be zero'ed out.
  *
  * @param size number of bytes to allocate


@@ -834,10 +1030,49 @@ void *
 GNUNET_xmalloc_ (size_t size, const char *filename, int linenumber);
 
 
 GNUNET_xmalloc_ (size_t size, const char *filename, int linenumber);
 
 

+/**
+ * Allocate memory for a two dimensional array in one block
+ * and set up pointers. Aborts if no more memory is available.
+ * Don't use GNUNET_xnew_array_2d_ directly. Use the
+ * #GNUNET_new_array_2d macro.
+ * The memory of the elements will be zero'ed out.
+ *
+ * @param n size of the first dimension
+ * @param m size of the second dimension
+ * @param elementSize size of a single element in bytes
+ * @param filename where is this call being made (for debugging)
+ * @param linenumber line where this call is being made (for debugging)
+ * @return allocated memory, never NULL
+ */
+void **
+GNUNET_xnew_array_2d_ (size_t n, size_t m, size_t elementSize,
+                       const char *filename, int linenumber);
+
+
+/**
+ * Allocate memory for a three dimensional array in one block
+ * and set up pointers. Aborts if no more memory is available.
+ * Don't use GNUNET_xnew_array_3d_ directly. Use the
+ * #GNUNET_new_array_3d macro.
+ * The memory of the elements will be zero'ed out.
+ *
+ * @param n size of the first dimension
+ * @param m size of the second dimension
+ * @param o size of the third dimension
+ * @param elementSize size of a single element in bytes
+ * @param filename where is this call being made (for debugging)
+ * @param linenumber line where this call is being made (for debugging)
+ * @return allocated memory, never NULL
+ */
+void ***
+GNUNET_xnew_array_3d_ (size_t n, size_t m, size_t o, size_t elementSize,
+                       const char *filename, int linenumber);
+
+

 /**
  * Allocate and initialize memory. Checks the return value, aborts if no more
  * memory is available.  Don't use GNUNET_xmemdup_ directly. Use the
 /**
  * Allocate and initialize memory. Checks the return value, aborts if no more
  * memory is available.  Don't use GNUNET_xmemdup_ directly. Use the

- * GNUNET_memdup macro.
+ * #GNUNET_memdup macro.

  *
  * @param buf buffer to initialize from (must contain size bytes)
  * @param size number of bytes to allocate
  *
  * @param buf buffer to initialize from (must contain size bytes)
  * @param size number of bytes to allocate


@@ -854,7 +1089,7 @@ GNUNET_xmemdup_ (const void *buf, size_t size, const char *filename,
  * Allocate memory.  This function does not check if the allocation
  * request is within reasonable bounds, allowing allocations larger
  * than 40 MB.  If you don't expect the possibility of very large
  * Allocate memory.  This function does not check if the allocation
  * request is within reasonable bounds, allowing allocations larger
  * than 40 MB.  If you don't expect the possibility of very large

- * allocations, use GNUNET_malloc instead.  The memory will be zero'ed
+ * allocations, use #GNUNET_malloc instead.  The memory will be zero'ed

  * out.
  *
  * @param size number of bytes to allocate
  * out.
  *
  * @param size number of bytes to allocate


@@ -865,6 +1100,7 @@ GNUNET_xmemdup_ (const void *buf, size_t size, const char *filename,
 void *
 GNUNET_xmalloc_unchecked_ (size_t size, const char *filename, int linenumber);
 
 void *
 GNUNET_xmalloc_unchecked_ (size_t size, const char *filename, int linenumber);
 

+

 /**
  * Reallocate memory. Checks the return value, aborts if no more
  * memory is available.
 /**
  * Reallocate memory. Checks the return value, aborts if no more
  * memory is available.


@@ -872,10 +1108,11 @@ GNUNET_xmalloc_unchecked_ (size_t size, const char *filename, int linenumber);
 void *
 GNUNET_xrealloc_ (void *ptr, size_t n, const char *filename, int linenumber);
 
 void *
 GNUNET_xrealloc_ (void *ptr, size_t n, const char *filename, int linenumber);
 

+

 /**
  * Free memory. Merely a wrapper for the case that we
  * want to keep track of allocations.  Don't use GNUNET_xfree_
 /**
  * Free memory. Merely a wrapper for the case that we
  * want to keep track of allocations.  Don't use GNUNET_xfree_

- * directly. Use the GNUNET_free macro.
+ * directly. Use the #GNUNET_free macro.

  *
  * @param ptr pointer to memory to free
  * @param filename where is this call being made (for debugging)
  *
  * @param ptr pointer to memory to free
  * @param filename where is this call being made (for debugging)


@@ -886,7 +1123,7 @@ GNUNET_xfree_ (void *ptr, const char *filename, int linenumber);
 
 
 /**
 
 
 /**

- * Dup a string. Don't call GNUNET_xstrdup_ directly. Use the GNUNET_strdup macro.
+ * Dup a string. Don't call GNUNET_xstrdup_ directly. Use the #GNUNET_strdup macro.

  * @param str string to duplicate
  * @param filename where is this call being made (for debugging)
  * @param linenumber line where this call is being made (for debugging)
  * @param str string to duplicate
  * @param filename where is this call being made (for debugging)
  * @param linenumber line where this call is being made (for debugging)


@@ -896,7 +1133,7 @@ char *
 GNUNET_xstrdup_ (const char *str, const char *filename, int linenumber);
 
 /**
 GNUNET_xstrdup_ (const char *str, const char *filename, int linenumber);
 
 /**

- * Dup partially a string. Don't call GNUNET_xstrndup_ directly. Use the GNUNET_strndup macro.
+ * Dup partially a string. Don't call GNUNET_xstrndup_ directly. Use the #GNUNET_strndup macro.

  *
  * @param str string to duplicate
  * @param len length of the string to duplicate
  *
  * @param str string to duplicate
  * @param len length of the string to duplicate


@@ -913,7 +1150,7 @@ GNUNET_xstrndup_ (const char *str, size_t len, const char *filename,
  * Grows old by (*oldCount-newCount)*elementSize
  * bytes and sets *oldCount to newCount.
  *
  * Grows old by (*oldCount-newCount)*elementSize
  * bytes and sets *oldCount to newCount.
  *

- * Don't call GNUNET_xgrow_ directly. Use the GNUNET_array_grow macro.
+ * Don't call GNUNET_xgrow_ directly. Use the #GNUNET_array_grow macro.

  *
  * @param old address of the pointer to the array
  *        *old may be NULL
  *
  * @param old address of the pointer to the array
  *        *old may be NULL


@@ -929,6 +1166,7 @@ GNUNET_xgrow_ (void **old, size_t elementSize, unsigned int *oldCount,
 
 
 /**
 
 
 /**

+ * @ingroup memory

  * Create a copy of the given message.
  *
  * @param msg message to copy
  * Create a copy of the given message.
  *
  * @param msg message to copy


@@ -947,6 +1185,75 @@ GNUNET_copy_message (const struct GNUNET_MessageHeader *msg);
 #endif
 
 
 #endif
 
 

+/**
+ * Valid task priorities.  Use these, do not pass random integers!
+ * For various reasons (#3862 -- building with QT Creator, and
+ * our restricted cross-compilation with emscripten) this cannot
+ * be in gnunet_scheduler_lib.h, but it works if we declare it here.
+ * Naturally, logically this is part of the scheduler.
+ */
+enum GNUNET_SCHEDULER_Priority
+{
+  /**
+   * Run with the same priority as the current job.
+   */
+  GNUNET_SCHEDULER_PRIORITY_KEEP = 0,
+
+  /**
+   * Run when otherwise idle.
+   */
+  GNUNET_SCHEDULER_PRIORITY_IDLE = 1,
+
+  /**
+   * Run as background job (higher than idle,
+   * lower than default).
+   */
+  GNUNET_SCHEDULER_PRIORITY_BACKGROUND = 2,
+
+  /**
+   * Run with the default priority (normal
+   * P2P operations).  Any task that is scheduled
+   * without an explicit priority being specified
+   * will run with this priority.
+   */
+  GNUNET_SCHEDULER_PRIORITY_DEFAULT = 3,
+
+  /**
+   * Run with high priority (important requests).
+   * Higher than DEFAULT.
+   */
+  GNUNET_SCHEDULER_PRIORITY_HIGH = 4,
+
+  /**
+   * Run with priority for interactive tasks.
+   * Higher than "HIGH".
+   */
+  GNUNET_SCHEDULER_PRIORITY_UI = 5,
+
+  /**
+   * Run with priority for urgent tasks.  Use
+   * for things like aborts and shutdowns that
+   * need to preempt "UI"-level tasks.
+   * Higher than "UI".
+   */
+  GNUNET_SCHEDULER_PRIORITY_URGENT = 6,
+
+  /**
+   * This is an internal priority level that is only used for tasks
+   * that are being triggered due to shutdown (they have automatically
+   * highest priority).  User code must not use this priority level
+   * directly.  Tasks run with this priority level that internally
+   * schedule other tasks will see their original priority level
+   * be inherited (unless otherwise specified).
+   */
+  GNUNET_SCHEDULER_PRIORITY_SHUTDOWN = 7,
+
+  /**
+   * Number of priorities (must be the last priority).
+   * This priority must not be used by clients.
+   */
+  GNUNET_SCHEDULER_PRIORITY_COUNT = 8
+};

 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */


@@ -956,7 +1263,4 @@ GNUNET_copy_message (const struct GNUNET_MessageHeader *msg);
 }
 #endif
 
 }
 #endif
 

-
-
-
-#endif /*GNUNET_COMMON_H_ */
+#endif /* GNUNET_COMMON_H */