transport service hello reduction, klocwork fixes

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

diff --git a/src/transport/transport.h b/src/transport/transport.h
index 89f004ab810d99d22c0c3cada7d66050320fe15d..aa934c944e9dac8c4eebca1a8887e40003a30463 100644 (file)
--- a/src/transport/transport.h
+++ b/src/transport/transport.h
@@ -4,7 +4,7 @@
 
      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
@@ -31,12 +31,14 @@
 #include "gnunet_transport_service.h"
 
 #define DEBUG_TRANSPORT GNUNET_NO
+#define DEBUG_TRANSPORT_TIMEOUT GNUNET_NO
+#define DEBUG_TRANSPORT_DISCONNECT GNUNET_NO
 
 /**
  * For how long do we allow unused bandwidth
- * from the past to carry over into the future? (in ms)
+ * from the past to carry over into the future? (in seconds)
  */
-#define MAX_BANDWIDTH_CARRY 5000
+#define MAX_BANDWIDTH_CARRY_S 5
 
 /**
  * How often do we (at most) do a full quota
@@ -44,6 +46,33 @@
  */
 #define MIN_QUOTA_REFRESH_TIME 2000
 
+/**
+ * Message from the transport service to the library
+ * asking to check if both processes agree about this
+ * peers identity.
+ */
+struct StartMessage
+{
+
+  /**
+   * Type will be GNUNET_MESSAGE_TYPE_TRANSPORT_START
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Should the 'self' field be checked?
+   */
+  uint32_t do_check;
+
+  /**
+   * Identity we think we have.  If it does not match, the
+   * receiver should print out an error message and disconnect.
+   */
+  struct GNUNET_PeerIdentity self;
+
+};
+
+
 /**
  * Message from the transport service to the library
  * informing about neighbors.
@@ -57,21 +86,15 @@ struct ConnectInfoMessage
   struct GNUNET_MessageHeader header;
 
   /**
-   * Current quota for outbound traffic in bytes/ms.
-   * (should be equal to system default)
+   * Transport distance metric (i.e. hops for DV)
    */
-  uint32_t quota_out GNUNET_PACKED;
+  uint32_t distance;
 
   /**
    * Latency estimate.
    */
   struct GNUNET_TIME_RelativeNBO latency;
 
-  /*
-   * Transport distance metric (i.e. hops for DV)
-   */
-  uint16_t distance;
-
   /**
    * Identity of the new neighbour.
    */
@@ -106,9 +129,9 @@ struct DisconnectInfoMessage
 
 
 /**
- * Message used to set a particular bandwidth quota.  Send
- * TO the service to set an incoming quota, send FROM the
- * service to update an outgoing quota.
+ * Message used to set a particular bandwidth quota.  Send TO the
+ * service to set an incoming quota, send FROM the service to update
+ * an outgoing quota.
  */
 struct QuotaSetMessage
 {
@@ -119,10 +142,9 @@ struct QuotaSetMessage
   struct GNUNET_MessageHeader header;
 
   /**
-   * Quota in bytes per ms, 0 to drop everything;
-   * in network byte order.
+   * Quota.
    */
-  uint32_t quota_in GNUNET_PACKED;
+  struct GNUNET_BANDWIDTH_Value32NBO quota;
 
   /**
    * About which peer are we talking here?
@@ -132,30 +154,6 @@ struct QuotaSetMessage
 };
 
 
-/**
- * Message used to ask the transport service to connect
- * to a particular peer.
- */
-struct TryConnectMessage
-{
-
-  /**
-   * Type will be GNUNET_MESSAGE_TYPE_TRANSPORT_TRY_CONNECT.
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Always zero.
-   */
-  uint32_t reserved GNUNET_PACKED;
-
-  /**
-   * About which peer are we talking here?
-  */
-  struct GNUNET_PeerIdentity peer;
-
-};
-
 /**
  * Message used to notify the transport API about a message
  * received from the network.  The actual message follows.
@@ -183,10 +181,10 @@ struct InboundMessage
    */
   struct GNUNET_PeerIdentity peer;
 
-  /*
+  /**
    * Distance metric.
    */
-  uint16_t distance;
+  uint32_t distance;
 
 };
 
@@ -211,6 +209,11 @@ struct SendOkMessage
    */
   uint32_t success GNUNET_PACKED;
 
+  /**
+   * Latency estimate.
+   */
+  struct GNUNET_TIME_RelativeNBO latency;
+
   /**
    * Which peer can send more now?
    */
@@ -236,6 +239,11 @@ struct OutboundMessage
    */
   uint32_t priority GNUNET_PACKED;
 
+  /**
+   * Allowed delay.
+   */
+  struct GNUNET_TIME_RelativeNBO timeout;
+
   /**
    * Which peer should receive the message?
    */
@@ -287,27 +295,22 @@ struct BlacklistMessage
 {
 
   /**
-   * Type will be GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST
+   * Type will be GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_QUERY or
+   * GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_REPLY.
    */
   struct GNUNET_MessageHeader header;
 
   /**
-   * Reserved (for alignment).
+   * 0 for the query, GNUNET_OK (allowed) or GNUNET_SYSERR (disallowed)
+   * for the response.
    */
-  uint32_t reserved GNUNET_PACKED;
+  uint32_t is_allowed GNUNET_PACKED;
 
   /**
-   * Which peer is being blacklisted (or has seen its
-   * blacklisting expire)?
+   * Which peer is being blacklisted or queried?
    */
   struct GNUNET_PeerIdentity peer;
 
-  /**
-   * Until what time is this peer blacklisted (zero for
-   * no longer blacklisted).
-   */
-  struct GNUNET_TIME_AbsoluteNBO until;
-
 };