/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+ (C) 2009, 2010 Christian Grothoff (and other contributing authors)
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
* @brief common internal definitions for core service
* @author Christian Grothoff
*/
+#include "gnunet_bandwidth_lib.h"
#include "gnunet_crypto_lib.h"
#include "gnunet_time_lib.h"
#define GNUNET_CORE_OPTION_NOTHING 0
#define GNUNET_CORE_OPTION_SEND_CONNECT 1
#define GNUNET_CORE_OPTION_SEND_DISCONNECT 2
-#define GNUNET_CORE_OPTION_SEND_BFC 4
+#define GNUNET_CORE_OPTION_SEND_STATUS_CHANGE 4
#define GNUNET_CORE_OPTION_SEND_FULL_INBOUND 8
#define GNUNET_CORE_OPTION_SEND_HDR_INBOUND 16
#define GNUNET_CORE_OPTION_SEND_FULL_OUTBOUND 32
/**
* Message sent by the service to clients to notify them
- * about a peer connecting or disconnecting.
+ * about a peer connecting.
*/
struct ConnectNotifyMessage
{
/**
* Header with type GNUNET_MESSAGE_TYPE_CORE_NOTIFY_CONNECT
- * or GNUNET_MESSAGE_TYPE_CORE_NOTIFY_DISCONNECT.
+ */
+ struct GNUNET_MessageHeader header;
+
+ /**
+ * Distance to the peer.
+ */
+ uint32_t distance GNUNET_PACKED;
+
+ /**
+ * Currently observed latency.
+ */
+ struct GNUNET_TIME_RelativeNBO latency;
+
+ /**
+ * Identity of the connecting peer.
+ */
+ struct GNUNET_PeerIdentity peer;
+
+};
+
+
+/**
+ * Message sent by the service to clients to notify them
+ * about a peer changing status.
+ */
+struct PeerStatusNotifyMessage
+{
+ /**
+ * Header with type GNUNET_MESSAGE_TYPE_CORE_NOTIFY_PEER_STATUS
+ */
+ struct GNUNET_MessageHeader header;
+
+ /**
+ * Distance to the peer.
+ */
+ uint32_t distance GNUNET_PACKED;
+
+ /**
+ * Currently observed latency.
+ */
+ struct GNUNET_TIME_RelativeNBO latency;
+
+ /**
+ * When the peer would time out (unless we see activity)
+ */
+ struct GNUNET_TIME_AbsoluteNBO timeout;
+
+ /**
+ * Available bandwidth from the peer.
+ */
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in;
+
+ /**
+ * Available bandwidth to the peer.
+ */
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out;
+
+ /**
+ * Identity of the peer.
+ */
+ struct GNUNET_PeerIdentity peer;
+
+};
+
+
+/**
+ * Message sent by the service to clients to notify them
+ * about a peer disconnecting.
+ */
+struct DisconnectNotifyMessage
+{
+ /**
+ * Header with type GNUNET_MESSAGE_TYPE_CORE_NOTIFY_DISCONNECT.
*/
struct GNUNET_MessageHeader header;
struct GNUNET_MessageHeader header;
/**
- * Always zero.
+ * Distance to the peer.
*/
- uint32_t reserved GNUNET_PACKED;
+ uint32_t distance GNUNET_PACKED;
+
+ /**
+ * Currently observed latency.
+ */
+ struct GNUNET_TIME_RelativeNBO latency;
/**
* Identity of the receiver or sender.
* Message sent to the core asking for configuration
* information and possibly preference changes.
*/
-struct RequestConfigureMessage
+struct RequestInfoMessage
{
/**
* Header with type GNUNET_MESSAGE_TYPE_CORE_REQUEST_CONFIGURE
* peer to at most the specified amount (naturally, the
* amount is also limited by the receiving peer).
*/
- uint32_t limit_outbound_bpm GNUNET_PACKED;
+ struct GNUNET_BANDWIDTH_Value32NBO limit_outbound;
/**
* Number of bytes of inbound traffic to reserve, can
/**
- * Response from the core to a "RequestConfigureMessage"
+ * Response from the core to a "RequestInfoMessage"
* providing traffic status information for a peer.
*/
struct ConfigurationInfoMessage
int32_t reserved_amount GNUNET_PACKED;
/**
- * Available bandwidth in (in bytes per minute) for this peer.
+ * Available bandwidth in for this peer.
* 0 if we have been disconnected.
*/
- uint32_t bpm_in GNUNET_PACKED;
+ struct GNUNET_BANDWIDTH_Value32NBO bw_in;
/**
- * Available bandwidth out (in bytes per minute) for this peer,
+ * Available bandwidth out for this peer,
* 0 if we have been disconnected.
*/
- uint32_t bpm_out GNUNET_PACKED;
-
- /**
- * Latest transport latency estimate for the peer.
- * FOREVER if we have been disconnected.
- */
- struct GNUNET_TIME_RelativeNBO latency;
+ struct GNUNET_BANDWIDTH_Value32NBO bw_out;
/**
* Current traffic preference for the peer.
* 0 if we have been disconnected.
*/
- double preference;
+ uint64_t preference;
/**
* Identity of the receiver or sender.
/**
- * Core asking a client to generate traffic for a particular
- * target.
+ * Client asking core to transmit a particular message to
+ * a particular target.
*/
-struct SolicitTrafficMessage
+struct SendMessage
{
/**
- * Header with type GNUNET_MESSAGE_TYPE_CORE_SOLICIT_TRAFFIC
- * or GNUNET_MESSAGE_TYPE_CORE_RECV_OK
+ * Header with type GNUNET_MESSAGE_TYPE_CORE_SEND
*/
struct GNUNET_MessageHeader header;
/**
- * Number of bytes of traffic being solicited.
+ * How important is this message?
*/
- uint32_t solicit_size GNUNET_PACKED;
+ uint32_t priority GNUNET_PACKED;
+
+ /**
+ * By what time would the sender really like to see this
+ * message transmitted?
+ */
+ struct GNUNET_TIME_AbsoluteNBO deadline;
/**
* Identity of the receiver or sender.
/**
- * Client asking core to transmit a particular message to
- * a particular target. Does NOT have to be solicited.
+ * Client asking core to connect to a particular target. There is no
+ * response from the core to this type of request (however, if an
+ * actual connection is created or destroyed, be it because of this
+ * type request or not, the core generally needs to notify the
+ * clients).
*/
-struct SendMessage
+struct ConnectMessage
{
/**
- * Header with type GNUNET_MESSAGE_TYPE_CORE_SEND
+ * Header with type GNUNET_MESSAGE_TYPE_REQUEST_CONNECT or
+ * GNUNET_MESSAGE_TYPE_REQUEST_DISCONNECT.
*/
struct GNUNET_MessageHeader header;
/**
- * How important is this message?
+ * For alignment.
*/
- uint32_t priority GNUNET_PACKED;
+ uint32_t reserved GNUNET_PACKED;
/**
- * By what time would the sender really like to see this
- * message transmitted?
+ * When to time out.
*/
- struct GNUNET_TIME_AbsoluteNBO deadline;
+ struct GNUNET_TIME_RelativeNBO timeout;
/**
- * Identity of the receiver or sender.
+ * Identity of the other peer.
*/
struct GNUNET_PeerIdentity peer;
};
-
/* end of core.h */
projects / oweals / gnunet.git / blobdiff