wip

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

diff --git a/src/transport/transport.h b/src/transport/transport.h
index aa934c944e9dac8c4eebca1a8887e40003a30463..c06e42eaa5437487c1c3fed465fd7f93bd8db1d7 100644 (file)
--- a/src/transport/transport.h
+++ b/src/transport/transport.h
@@ -30,6 +30,12 @@
 #include "gnunet_time_lib.h"
 #include "gnunet_transport_service.h"
 
+/* Minimum time between to calculations*/
+#define ATS_MIN_INTERVAL  GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 15)
+#define ATS_EXEC_INTERVAL GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 30)
+#define ATS_MAX_EXEC_DURATION GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 3)
+#define ATS_MAX_ITERATIONS INT_MAX
+
 #define DEBUG_TRANSPORT GNUNET_NO
 #define DEBUG_TRANSPORT_TIMEOUT GNUNET_NO
 #define DEBUG_TRANSPORT_DISCONNECT GNUNET_NO
@@ -86,20 +92,21 @@ struct ConnectInfoMessage
   struct GNUNET_MessageHeader header;
 
   /**
-   * Transport distance metric (i.e. hops for DV)
-   */
-  uint32_t distance;
-
-  /**
-   * Latency estimate.
+   * Number of ATS key-value pairs that follow this struct
+   * (excluding the 0-terminator).
    */
-  struct GNUNET_TIME_RelativeNBO latency;
+  uint32_t ats_count GNUNET_PACKED;
 
   /**
    * Identity of the new neighbour.
    */
   struct GNUNET_PeerIdentity id;
 
+  /**
+   * First of the ATS information blocks (we must have at least
+   * one due to the 0-termination requirement).
+   */
+  struct GNUNET_TRANSPORT_ATS_Information ats;
 };
 
 
@@ -127,6 +134,24 @@ struct DisconnectInfoMessage
 
 };
 
+/**
+ * Message type for sending a request connect message
+ * to the transport service.  Must be done before transport
+ * api will allow messages to be queued/sent to transport
+ * service for transmission to a peer.
+ */
+struct TransportRequestConnectMessage
+{
+  /**
+   *  Message header
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Identity of the peer we would like to connect to.
+   */
+  struct GNUNET_PeerIdentity peer;
+};
 
 /**
  * Message used to set a particular bandwidth quota.  Send TO the
@@ -172,9 +197,10 @@ struct InboundMessage
   uint32_t reserved GNUNET_PACKED;
 
   /**
-   * Latency estimate.
+   * Number of ATS key-value pairs that follow this struct
+   * (excluding the 0-terminator).
    */
-  struct GNUNET_TIME_RelativeNBO latency;
+  uint32_t ats_count GNUNET_PACKED;
 
   /**
    * Which peer sent the message?
@@ -182,10 +208,10 @@ struct InboundMessage
   struct GNUNET_PeerIdentity peer;
 
   /**
-   * Distance metric.
+   * First of the ATS information blocks (we must have at least
+   * one due to the 0-termination requirement).
    */
-  uint32_t distance;
-
+  struct GNUNET_TRANSPORT_ATS_Information ats;
 };