#include "gnunet_crypto_lib.h"
#include "gnunet_time_lib.h"
#include "gnunet_transport_service.h"
+#include "gnunet_constants.h"
-#define DEBUG_TRANSPORT GNUNET_YES
+#define DEBUG_TRANSPORT GNUNET_EXTRA_LOGGING
-#define DEBUG_TRANSPORT_TIMEOUT GNUNET_NO
-
-#define DEBUG_TRANSPORT_DISCONNECT GNUNET_NO
-
-#define DEBUG_TRANSPORT_API GNUNET_NO
/**
* For how long do we allow unused bandwidth
* from the past to carry over into the future? (in seconds)
*/
-#define MAX_BANDWIDTH_CARRY_S 5
+#define MAX_BANDWIDTH_CARRY_S GNUNET_CONSTANTS_MAX_BANDWIDTH_CARRY_S
/**
* How often do we (at most) do a full quota
*/
#define CONNECTED_LATENCY_EVALUATION_MAX_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 1)
+/**
+ * Similiar to GNUNET_TRANSPORT_NotifyDisconnect but in and out quotas are
+ * included here. These values are not required outside transport_api
+ *
+ * @param cls closure
+ * @param peer the peer that connected
+ * @param ats performance data
+ * @param ats_count number of entries in ats (excluding 0-termination)
+ * @param bandwidth_in inbound bandwidth in NBO
+ * @param bandwidth_out outbound bandwidth in NBO
+ *
+ */
+
+typedef void (*NotifyConnect) (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_ATS_Information *ats,
+ uint32_t ats_count,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out);
+
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Message from the transport service to the library
* asking to check if both processes agree about this
struct GNUNET_MessageHeader header;
/**
- * Should the 'self' field be checked?
+ * 0: no options
+ * 1: The 'self' field should be checked
+ * 2: this client is interested in payload traffic
*/
- uint32_t do_check;
+ uint32_t options;
/**
* Identity we think we have. If it does not match, the
struct GNUNET_PeerIdentity id;
/**
- * First of the ATS information blocks (we must have at least
- * one due to the 0-termination requirement).
+ * Current inbound quota for this peer
+ */
+ struct GNUNET_BANDWIDTH_Value32NBO quota_in;
+
+ /**
+ * Current outbound quota for this peer
*/
- struct GNUNET_TRANSPORT_ATS_Information ats;
+ struct GNUNET_BANDWIDTH_Value32NBO quota_out;
};
{
/**
- * Type will be GNUNET_MESSAGE_TYPE_TRANSPORT_NEIGHBOUR_INFO
+ * Type will be GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA
*/
struct GNUNET_MessageHeader header;
*/
struct GNUNET_MessageHeader header;
- /**
- * Always zero.
- */
- uint32_t reserved GNUNET_PACKED;
-
/**
* Number of ATS key-value pairs that follow this struct
* (excluding the 0-terminator).
*/
struct GNUNET_PeerIdentity peer;
- /**
- * First of the ATS information blocks (we must have at least
- * one due to the 0-termination requirement).
- */
- struct GNUNET_TRANSPORT_ATS_Information ats;
};
*/
uint32_t success GNUNET_PACKED;
+
+ /**
+ * Size of message sent
+ */
+ uint32_t bytes_msg GNUNET_PACKED;
+
+ /**
+ * Size of message sent over wire
+ * Includes plugin and protocol specific overhead
+ */
+ uint32_t bytes_physical GNUNET_PACKED;
+
/**
* Latency estimate.
*/
{
/**
- * Type will be GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_LOOKUP
+ * Type will be GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_TO_STRING
*/
struct GNUNET_MessageHeader header;
* Should the conversion use numeric IP addresses (otherwise
* a reverse DNS lookup is OK -- if applicable).
*/
- int32_t numeric_only GNUNET_PACKED;
+ int16_t numeric_only GNUNET_PACKED;
/**
- * timeout to give up.
+ * Length of the (binary) address in bytes, in big-endian.
*/
- struct GNUNET_TIME_RelativeNBO timeout;
+ uint16_t addrlen GNUNET_PACKED;
/**
- * Length of the (binary) address in bytes, in big-endian.
+ * timeout to give up.
*/
- uint32_t addrlen GNUNET_PACKED;
+ struct GNUNET_TIME_RelativeNBO timeout;
/* followed by 'addrlen' bytes of the actual address, then
* followed by the 0-terminated name of the transport */
struct GNUNET_MessageHeader header;
/**
- * For alignment.
+ * One shot call or continous replies?
*/
- uint32_t reserved;
+ uint32_t one_shot;
/**
* timeout to give up. FIXME: remove in the future
*/
struct GNUNET_TIME_AbsoluteNBO timeout;
+
+ /**
+ * The identity of the peer to look up.
+ */
+ struct GNUNET_PeerIdentity peer;
+
};
+
/**
- * Message from the library to the transport service
- * asking for human readable addresses known for a peer.
+ * Message from the transport service to the library
+ * containing binary addresses known for a peer.
+ * Memory layout:
+ * [AddressIterateResponseMessage][address[addrlen]][transportname[pluginlen]]
*/
struct AddressIterateResponseMessage
{
/**
- * Type will be GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_REPLY
+ * Type will be GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_ITERATE_RESPONSE
*/
struct GNUNET_MessageHeader header;
*/
uint32_t reserved;
- /**
+ /**
* Peer identity
*/
struct GNUNET_PeerIdentity peer;
* length of the plugin name
*/
uint32_t pluginlen GNUNET_PACKED;
+
};
struct GNUNET_PeerIdentity peer;
};
-
+GNUNET_NETWORK_STRUCT_END
/* end of transport.h */
#endif