#include "platform.h"
#include "gnunet_service_lib.h"
#include "gnunet_server_lib.h"
+#include "gnunet_transport_service.h"
#include <zlib.h>
-#include "testbed.h"
#include "gnunet_testbed_service.h"
+#include "testbed.h"
+#include "testbed_api.h"
#include "testbed_api_hosts.h"
#include "gnunet_testing_lib-new.h"
* The client handle associated with this context
*/
struct GNUNET_SERVER_Client *client;
+
+ /**
+ * The network address of the master controller
+ */
+ char *master_ip;
+
+ /**
+ * The TESTING system handle for starting peers locally
+ */
+ struct GNUNET_TESTING_System *system;
/**
* Event mask of event to be responded in this context
};
+/**
+ * Context information for connecting 2 peers in overlay
+ */
+struct OverlayConnectContext
+{
+ /**
+ * peer 1
+ */
+ struct Peer *peer1;
+
+ /**
+ * peer 2
+ */
+ struct Peer *peer2;
+
+ /**
+ * Transport handle of peer1
+ */
+ struct GNUNET_TRANSPORT_Handle *peer1_transport;
+
+ /**
+ * Transport handle of peer2
+ */
+ struct GNUNET_TRANSPORT_Handle *peer2_transport;
+
+ /**
+ * HELLO of peer1
+ */
+ struct GNUNET_MessageHeader *peer1_hello;
+
+ /**
+ * HELLO of peer2
+ */
+ struct GNUNET_MessageHeader *peer2_hello;
+
+ /**
+ * Get hello handle for peer1
+ */
+ struct GNUNET_TRANSPORT_GetHelloHandle *peer1_ghh;
+
+ /**
+ * Get hello handle for peer2
+ */
+ struct GNUNET_TRANSPORT_GetHelloHandle *peer2_ghh;
+};
+
+
/**
* The master context; generated with the first INIT message
*/
/* Handles */
/***********/
-/**
- * Wrapped stdin.
- */
-static struct GNUNET_DISK_FileHandle *fh;
-
/**
* Current Transmit Handle; NULL if no notify transmit exists currently
*/
*/
static GNUNET_SCHEDULER_TaskIdentifier shutdown_task_id;
-/******************/
-/* Testing System */
-/******************/
-
-/**
- * Handle to the local testing system - for starting peers locally
- */
-static struct GNUNET_TESTING_System *test_system;
-
/**
* Function called to notify a client about the connection begin ready to queue
/**
* Adds a slave to the slave array
*
- * @param route the route to add
+ * @param slave the slave controller to add
*/
static void
slave_list_add (struct Slave *slave)
if (slave->host_id >= slave_list_size)
{
slave_list = TESTBED_realloc (slave_list,
- sizeof (struct Slave *) *slave_list_size,
- sizeof (struct Slave *) *
- (slave_list_size) + LIST_GROW_STEP);
+ sizeof (struct Slave *) *slave_list_size,
+ sizeof (struct Slave *) *
+ (slave_list_size + LIST_GROW_STEP));
slave_list_size += LIST_GROW_STEP;
}
GNUNET_assert (NULL == slave_list[slave->host_id]);
/**
* Adds a peer to the peer array
*
- * @param route the route to add
+ * @param peer the peer to add
*/
static void
peer_list_add (struct Peer *peer)
if (peer->id >= peer_list_size)
{
peer_list = TESTBED_realloc (peer_list,
- sizeof (struct Peer *) *peer_list_size,
+ sizeof (struct Peer *) * peer_list_size,
sizeof (struct Peer *) *
- (peer_list_size) + LIST_GROW_STEP);
+ (peer_list_size + LIST_GROW_STEP));
peer_list_size += LIST_GROW_STEP;
}
GNUNET_assert (NULL == peer_list[peer->id]);
}
+/**
+ * Callback to signal successfull startup of the controller process
+ *
+ * @param cls the closure from GNUNET_TESTBED_controller_start()
+ * @param cfg the configuration with which the controller has been started;
+ * NULL if status is not GNUNET_OK
+ * @param status GNUNET_OK if the startup is successfull; GNUNET_SYSERR if not,
+ * GNUNET_TESTBED_controller_stop() shouldn't be called in this case
+ */
+static void
+slave_status_callback (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ int status)
+{
+ struct Slave *slave = cls;
+
+ if (GNUNET_SYSERR == status)
+ {
+ slave->controller_proc = NULL;
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Unexpected slave shutdown\n");
+ GNUNET_SCHEDULER_shutdown (); /* We too shutdown */
+ return;
+ }
+ slave->controller =
+ GNUNET_TESTBED_controller_connect (cfg, host_list[slave->host_id],
+ master_context->event_mask,
+ &slave_event_callback, slave);
+}
+
/**
* Message handler for GNUNET_MESSAGE_TYPE_TESTBED_INIT messages
{
const struct GNUNET_TESTBED_InitMessage *msg;
struct GNUNET_TESTBED_Host *host;
+ void *addr;
+ size_t addrlen;
if (NULL != master_context)
{
master_context = GNUNET_malloc (sizeof (struct Context));
master_context->client = client;
master_context->host_id = ntohl (msg->host_id);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_SERVER_client_get_address (client, &addr, &addrlen));
+ master_context->master_ip = GNUNET_malloc (NI_MAXHOST);
+ if (0 != getnameinfo (addr, addrlen, master_context->master_ip, NI_MAXHOST,
+ NULL, 0, NI_NUMERICHOST))
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Cannot determine the ip of master controller: %s\n", STRERROR (errno));
+ GNUNET_free (addr);
+ GNUNET_free (master_context->master_ip);
+ GNUNET_assert (0);
+ }
+ GNUNET_free (addr);
+ if (0 == strcasecmp (master_context->master_ip, "localhost"))
+ { /* Hack for connections via unix sockets */
+ LOG_DEBUG ("May be using local sockets - assuming loopback for master ip\n");
+ GNUNET_free (master_context->master_ip);
+ master_context->master_ip = strdup ("127.0.0.1");
+ }
+ LOG_DEBUG ("Master Controller IP: %s\n", master_context->master_ip);
+ master_context->system =
+ GNUNET_TESTING_system_create ("testbed", master_context->master_ip);
host = GNUNET_TESTBED_host_create_with_id (master_context->host_id,
NULL, NULL, 0);
host_list_add (host);
return;
}
slave = GNUNET_malloc (sizeof (struct Slave));
- slave->host_id = delegated_host_id;
- slave_list_add (slave);
+ slave->host_id = delegated_host_id;
+ slave_list_add (slave);
if (1 == msg->is_subordinate)
{
slave->controller_proc =
- GNUNET_TESTBED_controller_start (host_list[delegated_host_id]);
+ GNUNET_TESTBED_controller_start (master_context->master_ip,
+ host_list[slave->host_id],
+ cfg, &slave_status_callback,
+ slave);
+ }
+ else {
+ slave->controller =
+ GNUNET_TESTBED_controller_connect (cfg, host_list[slave->host_id],
+ master_context->event_mask,
+ &slave_event_callback, slave);
}
- slave->controller =
- GNUNET_TESTBED_controller_connect (cfg, host_list[delegated_host_id],
- master_context->event_mask,
- &slave_event_callback, slave);
GNUNET_CONFIGURATION_destroy (cfg);
new_route = GNUNET_malloc (sizeof (struct Route));
new_route->dest = delegated_host_id;
const struct GNUNET_MessageHeader *message)
{
const struct GNUNET_TESTBED_PeerCreateMessage *msg;
+ struct GNUNET_TESTBED_PeerCreateSuccessEventMessage *reply;
struct GNUNET_CONFIGURATION_Handle *cfg;
char *config;
size_t dest_size;
peer->cfg = cfg;
peer->id = ntohl (msg->peer_id);
LOG_DEBUG ("Creating peer with id: %u\n", peer->id);
- peer->peer = GNUNET_TESTING_peer_configure (test_system, peer->cfg,
+ peer->peer = GNUNET_TESTING_peer_configure (master_context->system, peer->cfg,
peer->id,
NULL /* Peer id */,
&emsg);
return;
}
peer_list_add (peer);
+ reply = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerCreateSuccessEventMessage));
+ reply->header.size = htons (sizeof (struct GNUNET_TESTBED_PeerCreateSuccessEventMessage));
+ reply->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_PEERCREATESUCCESS);
+ reply->peer_id = msg->peer_id;
+ reply->operation_id = msg->operation_id;
+ queue_message (client, &reply->header);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
- /* Forward the peer to other host */
+ /* FIXME: Forward the peer to other host */
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
if ((peer_list_size <= peer_id) || (NULL == peer_list[peer_id]))
{
GNUNET_break (0);
- /* Reply with failure event message */
+ /* FIXME: Reply with failure event message or forward to slave controller */
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
}
GNUNET_TESTING_peer_destroy (peer_list[peer_id]->peer);
GNUNET_CONFIGURATION_destroy (peer_list[peer_id]->cfg);
reply->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_GENERICOPSUCCESS);
reply->header.size = htons (reply_size);
reply->operation_id = msg->operation_id;
- queue_message (client, (struct GNUNET_MessageHeader *) reply);
+ reply->event_type = htonl (GNUNET_TESTBED_ET_OPERATION_FINISHED);
+ queue_message (client, &reply->header);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+}
+
+
+/**
+ * Message handler for GNUNET_MESSAGE_TYPE_TESTBED_DESTROYPEER messages
+ *
+ * @param cls NULL
+ * @param client identification of the client
+ * @param message the actual message
+ */
+static void
+handle_peer_start (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
+{
+ const struct GNUNET_TESTBED_PeerStartMessage *msg;
+ struct GNUNET_TESTBED_PeerEventMessage *reply;
+ uint32_t peer_id;
+
+ msg = (const struct GNUNET_TESTBED_PeerStartMessage *) message;
+ peer_id = ntohl (msg->peer_id);
+ if ((peer_id >= peer_list_size)
+ || (NULL == peer_list[peer_id]))
+ {
+ GNUNET_break (0);
+ /* FIXME: reply with failure message or forward to slave controller */
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+ if (GNUNET_OK != GNUNET_TESTING_peer_start (peer_list[peer_id]->peer))
+ {
+ /* FIXME: return FAILURE message */
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+ reply = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerEventMessage));
+ reply->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_PEEREVENT);
+ reply->header.size = htons (sizeof (struct GNUNET_TESTBED_PeerEventMessage));
+ reply->event_type = htonl (GNUNET_TESTBED_ET_PEER_START);
+ reply->host_id = htonl (master_context->host_id);
+ reply->peer_id = msg->peer_id;
+ reply->operation_id = msg->operation_id;
+ queue_message (client, &reply->header);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+}
+
+
+/**
+ * Message handler for GNUNET_MESSAGE_TYPE_TESTBED_DESTROYPEER messages
+ *
+ * @param cls NULL
+ * @param client identification of the client
+ * @param message the actual message
+ */
+static void
+handle_peer_stop (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
+{
+ const struct GNUNET_TESTBED_PeerStopMessage *msg;
+ struct GNUNET_TESTBED_PeerEventMessage *reply;
+ uint32_t peer_id;
+
+ msg = (const struct GNUNET_TESTBED_PeerStopMessage *) message;
+ peer_id = ntohl (msg->peer_id);
+ if ((peer_id >= peer_list_size) || (NULL == peer_list[peer_id]))
+ {
+ GNUNET_break (0); /* FIXME: route to slave? */
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+ if (GNUNET_OK != GNUNET_TESTING_peer_stop (peer_list[peer_id]->peer))
+ {
+ /* FIXME: return FAILURE message */
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+ reply = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerEventMessage));
+ reply->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_PEEREVENT);
+ reply->header.size = htons (sizeof (struct GNUNET_TESTBED_PeerEventMessage));
+ reply->event_type = htonl (GNUNET_TESTBED_ET_PEER_STOP);
+ reply->host_id = htonl (master_context->host_id);
+ reply->peer_id = msg->peer_id;
+ reply->operation_id = msg->operation_id;
+ queue_message (client, &reply->header);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+}
+
+
+/**
+ * Handler for GNUNET_MESSAGE_TYPE_TESTBED_GETPEERCONFIG messages
+ *
+ * @param cls NULL
+ * @param client identification of the client
+ * @param message the actual message
+ */
+static void
+handle_peer_get_config (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
+{
+ const struct GNUNET_TESTBED_PeerGetConfigurationMessage *msg;
+ struct GNUNET_TESTBED_PeerConfigurationInformationMessage *reply;
+ char *config;
+ char *xconfig;
+ size_t c_size;
+ size_t xc_size;
+ uint32_t peer_id;
+ uint16_t msize;
+ msg = (const struct GNUNET_TESTBED_PeerGetConfigurationMessage *) message;
+ peer_id = ntohl (msg->peer_id);
+ if ((peer_id >= peer_list_size) || (NULL == peer_list[peer_id]))
+ {
+ /* FIXME: return FAILURE message */
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ }
+ config = GNUNET_CONFIGURATION_serialize (peer_list[peer_id]->cfg,
+ &c_size);
+ xc_size = GNUNET_TESTBED_compress_config_ (config, c_size, &xconfig);
+ GNUNET_free (config);
+ msize = xc_size + sizeof (struct
+ GNUNET_TESTBED_PeerConfigurationInformationMessage);
+ reply = GNUNET_realloc (xconfig, msize);
+ (void) memmove (&reply[1], reply, xc_size);
+ reply->header.size = htons (msize);
+ reply->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_PEERCONFIG);
+ reply->peer_id = msg->peer_id;
+ reply->operation_id = msg->operation_id;
+ GNUNET_TESTING_peer_get_identity (peer_list[peer_id]->peer,
+ &reply->peer_identity);
+ reply->config_size = htons ((uint16_t) c_size);
+ queue_message (client, &reply->header);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+}
+
+
+
+/**
+ * Function called whenever there is an update to the
+ * HELLO of this peer.
+ *
+ * @param cls closure
+ * @param hello our updated HELLO
+ */
+static void
+hello_update_cb (void *cls,
+ const struct GNUNET_MessageHeader *hello)
+{
+ GNUNET_break(0);
+}
+
+
+/**
+ * Handler for GNUNET_MESSAGE_TYPE_TESTBED_OLCONNECT messages
+ *
+ * @param cls NULL
+ * @param client identification of the client
+ * @param message the actual message
+ */
+static void
+handle_overlay_connect (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
+{
+ const struct GNUNET_TESTBED_OverlayConnectMessage *msg;
+ struct OverlayConnectContext *occ;
+ uint32_t p1;
+ uint32_t p2;
+
+ msg = (const struct GNUNET_TESTBED_OverlayConnectMessage *) message;
+ p1 = ntohl (msg->peer1);
+ p2 = ntohl (msg->peer2);
+ GNUNET_assert (p1 < peer_list_size);
+ GNUNET_assert (NULL != peer_list[p1]);
+ GNUNET_assert (p2 < peer_list_size);
+ GNUNET_assert (NULL != peer_list[p2]);
+ occ = GNUNET_malloc (sizeof (struct OverlayConnectContext));
+ occ->peer1 = peer_list[p1];
+ occ->peer2 = peer_list[p2];
+ occ->peer1_transport = GNUNET_TRANSPORT_connect (occ->peer1->cfg, NULL, occ,
+ NULL, NULL, NULL);
+ occ->peer2_transport = GNUNET_TRANSPORT_connect (occ->peer2->cfg, NULL, occ,
+ NULL, NULL, NULL);
+ occ->peer1_ghh = GNUNET_TRANSPORT_get_hello (occ->peer1_transport, &hello_update_cb, occ);
+ occ->peer2_ghh = GNUNET_TRANSPORT_get_hello (occ->peer2_transport, &hello_update_cb, occ);
}
uint32_t id;
shutdown_task_id = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_SCHEDULER_shutdown ();
LOG (GNUNET_ERROR_TYPE_DEBUG, "Shutting down testbed service\n");
(void) GNUNET_CONTAINER_multihashmap_iterate (ss_map, &ss_map_free_iterator,
NULL);
- GNUNET_CONTAINER_multihashmap_destroy (ss_map);
- GNUNET_TESTING_system_destroy (test_system, GNUNET_YES);
- if (NULL != fh)
- {
- GNUNET_DISK_file_close (fh);
- fh = NULL;
- }
+ GNUNET_CONTAINER_multihashmap_destroy (ss_map);
if (NULL != lcfq_head)
{
if (GNUNET_SCHEDULER_NO_TASK != lcf_proc_task_id)
if (NULL != slave_list[id]->controller_proc)
GNUNET_TESTBED_controller_stop (slave_list[id]->controller_proc);
}
- GNUNET_free_non_null (master_context);
+ if (NULL != master_context)
+ {
+ GNUNET_free_non_null (master_context->master_ip);
+ if (NULL != master_context->system)
+ GNUNET_TESTING_system_destroy (master_context->system, GNUNET_YES);
+ GNUNET_free (master_context);
+ master_context = NULL;
+ }
}
hurt for now --- might need to revise this later if we ever
decide that master connections might be temporarily down
for some reason */
- GNUNET_SCHEDULER_shutdown ();
+ //GNUNET_SCHEDULER_shutdown ();
}
}
{&handle_peer_create, NULL, GNUNET_MESSAGE_TYPE_TESTBED_CREATEPEER, 0},
{&handle_peer_destroy, NULL, GNUNET_MESSAGE_TYPE_TESTBED_DESTROYPEER,
sizeof (struct GNUNET_TESTBED_PeerDestroyMessage)},
+ {&handle_peer_start, NULL, GNUNET_MESSAGE_TYPE_TESTBED_STARTPEER,
+ sizeof (struct GNUNET_TESTBED_PeerStartMessage)},
+ {&handle_peer_stop, NULL, GNUNET_MESSAGE_TYPE_TESTBED_STOPPEER,
+ sizeof (struct GNUNET_TESTBED_PeerStopMessage)},
+ {&handle_peer_get_config, NULL, GNUNET_MESSAGE_TYPE_TESTBED_GETPEERCONFIG,
+ sizeof (struct GNUNET_TESTBED_PeerGetConfigurationMessage)},
+ {&handle_overlay_connect, NULL, GNUNET_MESSAGE_TYPE_TESTBED_OLCONNECT,
+ sizeof (struct GNUNET_TESTBED_OverlayConnectMessage)},
{NULL}
};
&client_disconnect_cb,
NULL);
ss_map = GNUNET_CONTAINER_multihashmap_create (5);
- test_system = GNUNET_TESTING_system_create ("testbed_peers", NULL);
-
- fh = GNUNET_DISK_get_handle_from_native (stdin);
- if (NULL == fh)
- shutdown_task_id =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &shutdown_task,
- NULL);
- else
- shutdown_task_id =
- GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
- fh,
- &shutdown_task,
- NULL);
+ shutdown_task_id =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+ &shutdown_task,
+ NULL);
LOG_DEBUG ("Testbed startup complete\n");
}
projects / oweals / gnunet.git / blobdiff