hxing

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

diff --git a/src/core/core.h b/src/core/core.h
index fff4c3fa8234fd2aaa907747d9225d2cfa52d8ce..a1854ccb40b32a906399043f98db0c6ae80aff70 100644 (file)
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -30,12 +30,12 @@
 /**
  * General core debugging.
  */
-#define DEBUG_CORE GNUNET_NO
+#define DEBUG_CORE GNUNET_EXTRA_LOGGING
 
 /**
  * Debugging interaction core-clients.
  */
-#define DEBUG_CORE_CLIENT GNUNET_NO
+#define DEBUG_CORE_CLIENT GNUNET_EXTRA_LOGGING
 
 /**
  * Definition of bits in the InitMessage's options field that specify
@@ -95,7 +95,7 @@ struct InitReplyMessage
   /**
    * Public key of the local peer.
    */
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded publicKey;
+  struct GNUNET_PeerIdentity my_identity;
 
 };
 
@@ -300,6 +300,13 @@ struct ConfigurationInfoMessage
    */
   int32_t reserved_amount GNUNET_PACKED;
 
+  /**
+   * If the reservation request could not be satisfied (reserved_amount
+   * was zero), how long should the client wait until retrying? 0 if
+   * bandwidth was reserved.
+   */
+  struct GNUNET_TIME_RelativeNBO reserve_delay;
+
   /**
    * Unique request ID.
    */
@@ -371,7 +378,7 @@ struct SendMessageRequest
 
 
 /**
- * Core notifying client that it is allowed to now 
+ * Core notifying client that it is allowed to now
  * transmit a message to the given target
  * (response to GNUNET_MESSAGE_TYPE_CORE_SEND_REQUEST).
  */
@@ -383,9 +390,9 @@ struct SendMessageReady
   struct GNUNET_MessageHeader header;
 
   /**
-   * How many bytes are allowed for transmission? 
+   * How many bytes are allowed for transmission?
    * Guaranteed to be at least as big as the requested size,
-   * or ZERO if the request is rejected (will timeout, 
+   * or ZERO if the request is rejected (will timeout,
    * peer disconnected, queue full, etc.).
    */
   uint16_t size GNUNET_PACKED;
@@ -405,7 +412,7 @@ struct SendMessageReady
 
 /**
  * Client asking core to transmit a particular message to a particular
- * target (responsde to GNUNET_MESSAGE_TYPE_CORE_SEND_READY).
+ * target (response to GNUNET_MESSAGE_TYPE_CORE_SEND_READY).
  */
 struct SendMessage
 {
@@ -463,11 +470,6 @@ struct ConnectMessage
    */
   uint32_t reserved GNUNET_PACKED;
 
-  /**
-   * When to time out.
-   */
-  struct GNUNET_TIME_RelativeNBO timeout;
-
   /**
    * Identity of the other peer.
    */