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
#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
/**
* 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
/**
* Message from the transport service to the library
- * informing about neighbors.
+ * asking to check if both processes agree about this
+ * peers identity.
*/
-struct ConnectInfoMessage
+struct StartMessage
{
/**
- * Type will be GNUNET_MESSAGE_TYPE_TRANSPORT_CONNECT
+ * Type will be GNUNET_MESSAGE_TYPE_TRANSPORT_START
*/
struct GNUNET_MessageHeader header;
/**
- * Transport distance metric (i.e. hops for DV)
+ * Should the 'self' field be checked?
*/
- uint32_t distance;
+ uint32_t do_check;
/**
- * Latency estimate.
+ * Identity we think we have. If it does not match, the
+ * receiver should print out an error message and disconnect.
*/
- struct GNUNET_TIME_RelativeNBO latency;
+ struct GNUNET_PeerIdentity self;
+
+};
+
+
+/**
+ * Message from the transport service to the library
+ * informing about neighbors.
+ */
+struct ConnectInfoMessage
+{
+
+ /**
+ * Type will be GNUNET_MESSAGE_TYPE_TRANSPORT_CONNECT
+ */
+ struct GNUNET_MessageHeader header;
+
+ /**
+ * Number of ATS key-value pairs that follow this struct
+ * (excluding the 0-terminator).
+ */
+ 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;
};
};
+/**
+ * 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 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
{
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?
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?
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;
};
{
/**
- * 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;
-
};