towards fixing #3363: replacing old iteration API with new monitoring API for core...

[oweals/gnunet.git] / src / core / gnunet-service-core.h

diff --git a/src/core/gnunet-service-core.h b/src/core/gnunet-service-core.h
index 9068e7c3d948980c8882cb448f3e146cd4acc83a..8d3e8ee2ac2f68e0310349d9d013c41447dba178 100644 (file)
--- a/src/core/gnunet-service-core.h
+++ b/src/core/gnunet-service-core.h
@@ -27,9 +27,8 @@
 #define GNUNET_SERVICE_CORE_H
 
 #include "gnunet_statistics_service.h"
-
-
-#define DEBUG_CORE GNUNET_EXTRA_LOGGING
+#include "gnunet_core_service.h"
+#include "core.h"
 
 /**
  * Opaque handle to a client.
@@ -39,7 +38,7 @@ struct GSC_Client;
 
 /**
  * Record kept for each request for transmission issued by a
- * client that is still pending. (This struct is used by 
+ * client that is still pending. (This struct is used by
  * both the 'CLIENTS' and 'SESSIONS' subsystems.)
  */
 struct GSC_ClientActiveRequest
@@ -49,13 +48,13 @@ struct GSC_ClientActiveRequest
    * Active requests are kept in a doubly-linked list of
    * the respective target peer.
    */
-  struct ClientActiveRequest *next;
+  struct GSC_ClientActiveRequest *next;
 
   /**
    * Active requests are kept in a doubly-linked list of
    * the respective target peer.
    */
-  struct ClientActiveRequest *prev;
+  struct GSC_ClientActiveRequest *prev;
 
   /**
    * Which peer is the message going to be for?
@@ -75,7 +74,12 @@ struct GSC_ClientActiveRequest
   /**
    * How important is this request.
    */
-  uint32_t priority;
+  enum GNUNET_CORE_Priority priority;
+
+  /**
+   * Has this request been solicited yet?
+   */
+  int was_solicited;
 
   /**
    * How many bytes does the client intend to send?