#include "gnunet_util_lib.h"
-
+GNUNET_NETWORK_STRUCT_BEGIN
/**
* Initial message from a client to a testing control service.
*/
-struct GNUNET_TESTBED_InitMessage
+ struct GNUNET_TESTBED_InitMessage
{
/**
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_ADDHOST
+ * Type is GNUNET_MESSAGE_TYPE_TESTBED_ADD_HOST
*/
struct GNUNET_MessageHeader header;
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_ADDHOSTSUCCESS
+ * Type is GNUNET_MESSAGE_TYPE_TESTBED_ADD_HOST_SUCCESS
*/
struct GNUNET_MessageHeader header;
uint32_t host_id GNUNET_PACKED;
/* followed by the 0-terminated error message (on failure)
- * (typical errors include failure to login and
- * host-id already in use) */
+ * (typical errors include host-id already in use) */
};
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_SERVICESHARE
+ * Type is GNUNET_MESSAGE_TYPE_TESTBED_SHARE_SERVICE
*/
struct GNUNET_MessageHeader header;
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_LCONTROLLERS
+ * Type is GNUNET_MESSAGE_TYPE_TESTBED_LINK_CONTROLLERS
*/
struct GNUNET_MessageHeader header;
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_CREATEPEER
+ * Type is GNUNET_MESSAGE_TYPE_TESTBED_CREATE_PEER
*/
struct GNUNET_MessageHeader header;
{
/**
- * Type is GNUNET_MESSAGE_TYPDE_TESTBED_PEERRECONF
+ * Type is GNUNET_MESSAGE_TYPDE_TESTBED_RECONFIGURE_PEER
*/
struct GNUNET_MessageHeader header;
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_STARTPEER
+ * Type is GNUNET_MESSAGE_TYPE_TESTBED_START_PEER
*/
struct GNUNET_MessageHeader header;
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_STOPPEER
+ * Type is GNUNET_MESSAGE_TYPE_TESTBED_STOP_PEER
*/
struct GNUNET_MessageHeader header;
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_DESTROYPEER
+ * Type is GNUNET_MESSAGE_TYPE_TESTBED_DESTROY_PEER
*/
struct GNUNET_MessageHeader header;
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_CONFIGULLINK
+ * Type is GNUNET_MESSAGE_TYPE_TESTBED_CONFIGURE_UNDERLAY_LINK
*/
struct GNUNET_MessageHeader header;
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_OLCONNECT
+ * Type is GNUNET_MESSAGE_TYPE_TESTBED_OVERLAY_CONNECT
*/
struct GNUNET_MessageHeader header;
*/
uint32_t peer2 GNUNET_PACKED;
+ /**
+ * The ID of the host which runs peer2
+ */
+ uint32_t peer2_host_id GNUNET_PACKED;
+
};
* Message sent from host controller of a peer(A) to the host controller of
* another peer(B) to request B to connect to A
*/
-struct GNUNET_TESTBED_RequestConnectMessage
+struct GNUNET_TESTBED_RemoteOverlayConnectMessage
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_REQUESTCONNECT
+ * Type is GNUNET_MESSAGE_TYPE_TESTBED_REMOTE_OVERLAY_CONNECT
*/
struct GNUNET_MessageHeader header;
* Identity of A
*/
struct GNUNET_PeerIdentity peer_identity;
-
+
/**
* To be followed by the HELLO message of A
*/
struct GNUNET_MessageHeader hello[0];
-
+
};
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_PEEREVENT
+ * Type is GNUNET_MESSAGE_TYPE_TESTBED_PEER_EVENT
*/
struct GNUNET_MessageHeader header;
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_PEERCONEVENT
+ * Type is GNUNET_MESSAGE_TYPE_TESTBED_PEER_CONNECT_EVENT
*/
struct GNUNET_MessageHeader header;
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONFAILEVENT
+ * Type is GNUNET_MESSAGE_TYPE_TESTBED_OPERATION_FAIL_EVENT
*/
struct GNUNET_MessageHeader header;
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_PEERCREATESUCCESS
+ * Type is GNUNET_MESSAGE_TYPE_TESTBED_CREATE_PEER_SUCCESS
*/
struct GNUNET_MessageHeader header;
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_GENERICOPSUCCESS
+ * Type is GNUNET_MESSAGE_TYPE_TESTBED_GENERIC_OPERATION_SUCCESS
*/
struct GNUNET_MessageHeader header;
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_GETPEERCONFIG
+ * Type is GNUNET_MESSAGE_TYPE_TESTBED_GET_PEER_CONFIGURATION
*/
struct GNUNET_MessageHeader header;
{
/**
- * Type is GNUNET_MESSAGE_TYPE_TESTBED_PEERCONFIG
+ * Type is GNUNET_MESSAGE_TYPE_TESTBED_PEER_CONFIGURATION
*/
struct GNUNET_MessageHeader header;
/**
* The size of configuration when uncompressed
*/
- uint16_t config_size;
+ uint16_t config_size GNUNET_PACKED;
+
+ /* followed by gzip-compressed configuration of the peer */
+
+};
+
+
+/**
+ * Message to request configuration of a slave controller
+ */
+struct GNUNET_TESTBED_SlaveGetConfigurationMessage
+{
+ /**
+ * Type is GNUNET_MESSAGE_TYPE_TESTBED_GET_SLAVE_CONFIGURATION
+ */
+ struct GNUNET_MessageHeader header;
+
+ /**
+ * The id of the slave host
+ */
+ uint32_t slave_id GNUNET_PACKED;
+
+ /**
+ * Operation ID
+ */
+ uint64_t operation_id GNUNET_PACKED;
+
+};
+
+
+/**
+ * Reply to GNUNET_MESSAGE_TYPE_TESTBED_GET_SLAVE_CONFIG message
+ */
+struct GNUNET_TESTBED_SlaveConfiguration
+{
+ /**
+ * Type is GNUNET_MESSAGE_TYPE_TESTBED_SLAVE_CONFIGURATION
+ */
+ struct GNUNET_MessageHeader header;
+
+ /**
+ * The id of the host where the slave is running
+ */
+ uint32_t slave_id GNUNET_PACKED;
+
+ /**
+ * Operation ID
+ */
+ uint64_t operation_id GNUNET_PACKED;
+
+ /**
+ * The size of the configuration when uncompressed
+ */
+ uint16_t config_size GNUNET_PACKED;
/* followed by gzip-compressed configuration of the peer */
};
+GNUNET_NETWORK_STRUCT_END
#endif
/* end of testbed.h */