-LRN: use correct character counting, instead of byte counting

[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..e48ad8badbadde02ab5b2e1a99e362130ad66901 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)
+     (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
@@ -26,7 +26,8 @@
 #ifndef GNUNET_SERVICE_CORE_H
 #define GNUNET_SERVICE_CORE_H
 
-
+#include "gnunet_statistics_service.h"
+#include "core.h"
 
 /**
  * Opaque handle to a client.
@@ -36,7 +37,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 +47,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?
@@ -74,6 +75,11 @@ struct GSC_ClientActiveRequest
    */
   uint32_t priority;
 
+  /**
+   * Has this request been solicited yet?
+   */
+  int was_solicited;
+
   /**
    * How many bytes does the client intend to send?
    */
@@ -102,10 +108,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