include element type in hash

[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 2b0a0c557eb00aafd024f53cffc47cc9a6320f41..15e9959211f877b7863dce906967c571290fa6db 100644 (file)
--- a/src/core/gnunet-service-core.h
+++ b/src/core/gnunet-service-core.h
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009, 2010, 2011 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -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
-     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,7 +26,9 @@
 #ifndef GNUNET_SERVICE_CORE_H
 #define GNUNET_SERVICE_CORE_H
 
-
+#include "gnunet_statistics_service.h"
+#include "gnunet_core_service.h"
+#include "core.h"
 
 /**
  * Opaque handle to a client.
@@ -36,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
@@ -46,13 +48,18 @@ 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;
+
+  /**
+   * Handle to the client.
+   */
+  struct GSC_Client *client_handle;
 
   /**
    * Which peer is the message going to be for?
@@ -60,9 +67,9 @@ struct GSC_ClientActiveRequest
   struct GNUNET_PeerIdentity target;
 
   /**
-   * Handle to the client.
+   * At what time did we first see this request?
    */
-  struct GSC_Client *client_handle;
+  struct GNUNET_TIME_Absolute received_time;
 
   /**
    * By what time would the client want to see this message out?
@@ -72,7 +79,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?
@@ -102,10 +114,5 @@ extern struct GNUNET_STATISTICS_Handle *GSC_stats;
  */
 extern struct GNUNET_PeerIdentity GSC_my_identity;
 
-/**
- * Our message stream tokenizer (for encrypted payload).
- */
-extern struct GNUNET_SERVER_MessageStreamTokenizer *GSC_mst;
-
 
 #endif