#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"
/**
* Generic logging
#define LOG_DEBUG(...) \
LOG (GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__)
+
+#define LIST_GROW_STEP 10
+
struct Context
{
/**
* 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
struct Route
{
/**
- * The forwarding (next hop) host id
+ * destination host
+ */
+ uint32_t dest;
+
+ /**
+ * The host destination is reachable thru
+ */
+ uint32_t thru;
+};
+
+
+/**
+ * Structure representing a connected(directly-linked) controller
+ */
+struct Slave
+{
+ /**
+ * The controller process handle if we had started the controller
+ */
+ struct GNUNET_TESTBED_ControllerProc *controller_proc;
+
+ /**
+ * The controller handle
*/
- uint32_t next_hop;
+ struct GNUNET_TESTBED_Controller *controller;
/**
- * The controller handle if we have started the controller at the next hop
- * host
+ * The id of the host this controller is running on
*/
- struct GNUNET_TESTBED_Controller *fcontroller;
+ uint32_t host_id;
};
*/
DELEGATED_HOST_REGISTERED,
- /**
- * The slave host has been registred at the forwarding controller
- */
- SLAVE_HOST_REGISTERED,
-
/**
* The context has been finished (may have error)
*/
struct LCFContext
{
/**
- * The configuration
+ * The serialized and compressed configuration
*/
- struct GNUNET_CONFIGURATION_Handle *cfg;
+ char *sxcfg;
/**
- * The handle of the controller this request has to be forwarded to
+ * The gateway which will pass the link message to delegated host
*/
- struct GNUNET_TESTBED_Controller *fcontroller;
+ struct Slave *gateway;
/**
* The host registration handle while registered hosts in this context
*/
struct GNUNET_TESTBED_HostRegistrationHandle *rhandle;
+ /**
+ * The size of the compressed serialized configuration
+ */
+ size_t sxcfg_size;
+
+ /**
+ * The size of the uncompressed configuration
+ */
+ size_t scfg_size;
+
/**
* Should the delegated host be started by the slave host?
*/
* The delegated host
*/
uint32_t delegated_host_id;
-
- /**
- * The slave host
- */
- uint32_t slave_host_id;
+
};
};
+/**
+ * A locally started peer
+ */
+struct Peer
+{
+ /**
+ * The peer handle from testing API
+ */
+ struct GNUNET_TESTING_Peer *peer;
+
+ /**
+ * The modified (by GNUNET_TESTING_peer_configure) configuration this peer is
+ * configured with
+ */
+ struct GNUNET_CONFIGURATION_Handle *cfg;
+
+ /**
+ * Our local reference id for this peer
+ */
+ uint32_t id;
+
+};
+
+
+/**
+ * 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 struct Route **route_list;
+/**
+ * A list of directly linked neighbours
+ */
+static struct Slave **slave_list;
+
+/**
+ * A list of peers we own locally
+ */
+static struct Peer **peer_list;
+
/**
* The hashmap of shared services
*/
*/
static uint32_t route_list_size;
+/**
+ * The size of directly linked neighbours list
+ */
+static uint32_t slave_list_size;
+
+/**
+ * The size of the peer list
+ */
+static uint32_t peer_list_size;
+
/*********/
/* Tasks */
/*********/
}
+/**
+ * Similar to GNUNET_realloc; however clears tail part of newly allocated memory
+ *
+ * @param ptr the memory block to realloc
+ * @param size the size of ptr
+ * @param new_size the size to which ptr has to be realloc'ed
+ * @return the newly reallocated memory block
+ */
+static void *
+TESTBED_realloc (void *ptr, size_t size, size_t new_size)
+{
+ ptr = GNUNET_realloc (ptr, new_size);
+ if (new_size > size)
+ ptr = memset (ptr + size, 0, new_size - size);
+ return ptr;
+}
+
+
/**
* Function to add a host to the current list of known hosts
*
host_list_add (struct GNUNET_TESTBED_Host *host)
{
uint32_t host_id;
-
+
host_id = GNUNET_TESTBED_host_get_id_ (host);
if (host_list_size <= host_id)
{
- host_list = GNUNET_realloc (host_list,
- sizeof (struct GNUNET_TESTBED_Host *)
- * (host_id + 10));
- host_list_size += (host_id + 10);
+ host_list =
+ TESTBED_realloc (host_list,
+ sizeof (struct GNUNET_TESTBED_Host *) * host_list_size,
+ sizeof (struct GNUNET_TESTBED_Host *) *
+ (host_list_size + LIST_GROW_STEP));
+ host_list_size += LIST_GROW_STEP;
}
if (NULL != host_list[host_id])
{
}
+/**
+ * Adds a route to the route list
+ *
+ * @param route the route to add
+ */
+static void
+route_list_add (struct Route *route)
+{
+ if (route->dest >= route_list_size)
+ {
+ route_list =
+ TESTBED_realloc (route_list,
+ sizeof (struct Route *) * route_list_size,
+ sizeof (struct Route *) *
+ (route_list_size + LIST_GROW_STEP));
+ route_list_size += LIST_GROW_STEP;
+ }
+ GNUNET_assert (NULL == route_list[route->dest]);
+ route_list[route->dest] = route;
+}
+
+
+/**
+ * Adds a slave to the slave array
+ *
+ * @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));
+ slave_list_size += LIST_GROW_STEP;
+ }
+ GNUNET_assert (NULL == slave_list[slave->host_id]);
+ slave_list[slave->host_id] = slave;
+}
+
+
+/**
+ * Adds a peer to the peer array
+ *
+ * @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 + LIST_GROW_STEP));
+ peer_list_size += LIST_GROW_STEP;
+ }
+ GNUNET_assert (NULL == peer_list[peer->id]);
+ peer_list[peer->id] = peer;
+}
+
+
/**
* Routes message to a host given its host_id
*
{
case INIT:
if (NULL != emsg)
- goto registration_error;
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Host registration failed with message: %s\n", emsg);
+ lcf->state = FINISHED;
+ lcf_proc_task_id = GNUNET_SCHEDULER_add_now (&lcf_proc_task, lcf);
+ return;
+ }
lcf->state = DELEGATED_HOST_REGISTERED;
lcf_proc_task_id = GNUNET_SCHEDULER_add_now (&lcf_proc_task, lcf);
break;
- case DELEGATED_HOST_REGISTERED:
- if (NULL != emsg)
- goto registration_error;
- lcf->state = SLAVE_HOST_REGISTERED;
- lcf_proc_task_id = GNUNET_SCHEDULER_add_now (&lcf_proc_task, lcf);
- break;
default:
GNUNET_assert (0); /* Shouldn't reach here */
}
- return;
-
- registration_error:
- LOG (GNUNET_ERROR_TYPE_WARNING,
- "Host registration failed with message: %s\n", emsg);
- lcf->state = FINISHED;
- lcf_proc_task_id = GNUNET_SCHEDULER_add_now (&lcf_proc_task, lcf);
}
case INIT:
if (GNUNET_NO ==
GNUNET_TESTBED_is_host_registered_ (host_list[lcf->delegated_host_id],
- lcf->fcontroller))
+ lcf->gateway->controller))
{
lcf->rhandle =
- GNUNET_TESTBED_register_host (lcf->fcontroller,
+ GNUNET_TESTBED_register_host (lcf->gateway->controller,
host_list[lcf->delegated_host_id],
lcf_proc_cc, lcf);
}
}
break;
case DELEGATED_HOST_REGISTERED:
- if (GNUNET_NO ==
- GNUNET_TESTBED_is_host_registered_ (host_list[lcf->slave_host_id],
- lcf->fcontroller))
- {
- lcf->rhandle =
- GNUNET_TESTBED_register_host (lcf->fcontroller,
- host_list[lcf->slave_host_id],
- lcf_proc_cc, lcf);
- }
- else
- {
- lcf->state = SLAVE_HOST_REGISTERED;
- lcf_proc_task_id = GNUNET_SCHEDULER_add_now (&lcf_proc_task, lcf);
- }
- break;
- case SLAVE_HOST_REGISTERED:
- GNUNET_TESTBED_controller_link (lcf->fcontroller,
- host_list[lcf->delegated_host_id],
- host_list[lcf->slave_host_id],
- lcf->cfg, lcf->is_subordinate);
+ GNUNET_TESTBED_controller_link_2 (lcf->gateway->controller,
+ host_list[lcf->delegated_host_id],
+ host_list[lcf->gateway->host_id],
+ lcf->sxcfg, lcf->sxcfg_size,
+ lcf->scfg_size,
+ lcf->is_subordinate);
lcf->state = FINISHED;
- break;
- case FINISHED:
+ case FINISHED:
lcfq = lcfq_head;
- GNUNET_CONFIGURATION_destroy (lcfq->lcf->cfg);
- GNUNET_free (lcfq->lcf);
+ GNUNET_assert (lcfq->lcf == lcf);
+ GNUNET_free (lcf->sxcfg);
+ GNUNET_free (lcf);
GNUNET_CONTAINER_DLL_remove (lcfq_head, lcfq_tail, lcfq);
GNUNET_free (lcfq);
if (NULL != lcfq_head)
- lcf_proc_task_id = GNUNET_SCHEDULER_add_now (&lcf_proc_task, lcfq_head->lcf);
+ lcf_proc_task_id =
+ GNUNET_SCHEDULER_add_now (&lcf_proc_task, lcfq_head->lcf);
}
}
+/**
+ * Callback for event from slave controllers
+ *
+ * @param cls struct Slave *
+ * @param event information about the event
+ */
+static void
+slave_event_callback(void *cls,
+ const struct GNUNET_TESTBED_EventInformation *event)
+{
+ GNUNET_break (0);
+}
+
+
+/**
+ * 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);
}
hostname_length = ntohs (message->size)
- (sizeof (struct GNUNET_TESTBED_AddHostMessage) + username_length);
- if (strlen (hostname) != hostname_length)
+ if (strlen (hostname) != hostname_length - 1)
{
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
LOG_DEBUG ("Received ADDHOST message\n");
LOG_DEBUG ("-------host id: %u\n", host_id);
if (NULL != hostname) LOG_DEBUG ("-------hostname: %s\n", hostname);
- if (NULL != username) LOG_DEBUG ("-------username: %s\n", username);
+ if (0 != username_length) LOG_DEBUG ("-------username: %s\n", username);
+ else LOG_DEBUG ("-------username: NULL\n");
LOG_DEBUG ("-------ssh port: %u\n", ntohs (msg->ssh_port));
host = GNUNET_TESTBED_host_create_with_id (host_id, hostname, username,
ntohs (msg->ssh_port));
return GNUNET_YES;
}
+
/**
* Message handler for GNUNET_MESSAGE_TYPE_TESTBED_ADDHOST messages
*
struct GNUNET_CONFIGURATION_Handle *cfg;
struct LCFContextQueue *lcfq;
struct Route *route;
+ struct Route *new_route;
char *config;
uLongf dest_size;
size_t config_size;
uint32_t slave_host_id;
uint16_t msize;
+ if (NULL == master_context)
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
msize = ntohs (message->size);
if (sizeof (struct GNUNET_TESTBED_ControllerLinkMessage) >= msize)
{
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
-
- config_size = ntohs (msg->config_size);
- config = GNUNET_malloc (config_size);
- dest_size = (uLongf) config_size;
+ if (slave_host_id == delegated_host_id)
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING, "Slave and delegated host are same\n");
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
msize -= sizeof (struct GNUNET_TESTBED_ControllerLinkMessage);
- if (Z_OK != uncompress ((Bytef *) config, &dest_size,
- (const Bytef *) &msg[1], (uLong) msize))
+ config_size = ntohs (msg->config_size);
+
+ if (slave_host_id == master_context->host_id) /* Link from us */
{
- GNUNET_break (0); /* Compression error */
+ struct Slave *slave;
+
+ if ((delegated_host_id < slave_list_size) &&
+ (NULL != slave_list[delegated_host_id])) /* We have already added */
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING, "Host %u already connected\n",
+ delegated_host_id);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+ config = GNUNET_malloc (config_size);
+ dest_size = (uLongf) config_size;
+ if (Z_OK != uncompress ((Bytef *) config, &dest_size,
+ (const Bytef *) &msg[1], (uLong) msize))
+ {
+ GNUNET_break (0); /* Compression error */
+ GNUNET_free (config);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+ if (config_size == dest_size)
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING, "Uncompressed config size mismatch\n");
+ GNUNET_free (config);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ }
+ cfg = GNUNET_CONFIGURATION_create (); /* Free here or in lcfcontext */
+ if (GNUNET_OK != GNUNET_CONFIGURATION_deserialize (cfg, config, config_size,
+ GNUNET_NO))
+ {
+ GNUNET_break (0); /* Configuration parsing error */
+ GNUNET_free (config);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
GNUNET_free (config);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ if ((delegated_host_id < slave_list_size) &&
+ (NULL != slave_list[delegated_host_id]))
+ {
+ GNUNET_break (0); /* Configuration parsing error */
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+ slave = GNUNET_malloc (sizeof (struct Slave));
+ slave->host_id = delegated_host_id;
+ slave_list_add (slave);
+ if (1 == msg->is_subordinate)
+ {
+ slave->controller_proc =
+ 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);
+ }
+ GNUNET_CONFIGURATION_destroy (cfg);
+ new_route = GNUNET_malloc (sizeof (struct Route));
+ new_route->dest = delegated_host_id;
+ new_route->thru = master_context->host_id;
+ route_list_add (new_route);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
- GNUNET_assert (config_size == dest_size);
- cfg = GNUNET_CONFIGURATION_create ();
- if (GNUNET_OK != GNUNET_CONFIGURATION_deserialize (cfg, config, config_size,
- GNUNET_NO))
+
+ /* Route the request */
+ if (slave_host_id >= route_list_size)
{
- GNUNET_break (0); /* Configuration parsing error */
- GNUNET_break (config);
+ LOG (GNUNET_ERROR_TYPE_WARNING, "No route towards slave host");
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- GNUNET_free (config);
+ while (NULL != (route = route_list[slave_host_id]))
+ {
+ if (route->thru == master_context->host_id)
+ break;
+ slave_host_id = route->thru;
+ }
+ GNUNET_assert (NULL != route); /* because we add routes carefully */
+ GNUNET_assert (route->dest < slave_list_size);
+ GNUNET_assert (NULL != slave_list[route->dest]);
+ lcfq = GNUNET_malloc (sizeof (struct LCFContextQueue));
+ lcfq->lcf = GNUNET_malloc (sizeof (struct LCFContext));
+ lcfq->lcf->delegated_host_id = delegated_host_id;
+ lcfq->lcf->is_subordinate =
+ (1 == msg->is_subordinate) ? GNUNET_YES : GNUNET_NO;
+ lcfq->lcf->state = INIT;
+ lcfq->lcf->gateway = slave_list[route->dest];
+ lcfq->lcf->sxcfg_size = msize;
+ lcfq->lcf->sxcfg = GNUNET_malloc (msize);
+ lcfq->lcf->scfg_size = config_size;
+ (void) memcpy (lcfq->lcf->sxcfg, &msg[1], msize);
+ if (NULL == lcfq_head)
+ {
+ GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == lcf_proc_task_id);
+ GNUNET_CONTAINER_DLL_insert_tail (lcfq_head, lcfq_tail, lcfq);
+ lcf_proc_task_id = GNUNET_SCHEDULER_add_now (&lcf_proc_task, lcfq);
+ }
+ else
+ GNUNET_CONTAINER_DLL_insert_tail (lcfq_head, lcfq_tail, lcfq);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ new_route = GNUNET_malloc (sizeof (struct Route));
+ new_route->dest = delegated_host_id;
+ new_route->thru = route->dest;
+ route_list_add (new_route);
+}
- /* If delegated host and slave host are not same we have to forward
- towards delegated host */
- if (slave_host_id != delegated_host_id)
+
+/**
+ * Handler for GNUNET_MESSAGE_TYPE_TESTBED_CREATEPEER messages
+ *
+ * @param cls NULL
+ * @param client identification of the client
+ * @param message the actual message
+ */
+static void
+handle_peer_create (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ 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;
+ int ret;
+ uint32_t config_size;
+ uint16_t msize;
+
+
+ msize = ntohs (message->size);
+ if (msize <= sizeof (struct GNUNET_TESTBED_PeerCreateMessage))
+ {
+ GNUNET_break (0); /* We need configuration */
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+ msg = (const struct GNUNET_TESTBED_PeerCreateMessage *) message;
+ if (ntohl (msg->host_id) == master_context->host_id)
{
- if ((slave_host_id >= route_list_size) ||
- (NULL == (route = route_list[slave_host_id])) ||
- (NULL == route->fcontroller))
+ struct Peer *peer;
+ char *emsg;
+
+ /* We are responsible for this peer */
+ msize -= sizeof (struct GNUNET_TESTBED_PeerCreateMessage);
+ config_size = ntohl (msg->config_size);
+ config = GNUNET_malloc (config_size);
+ dest_size = config_size;
+ if (Z_OK != (ret = uncompress ((Bytef *) config, (uLongf *) &dest_size,
+ (const Bytef *) &msg[1], (uLong) msize)))
{
- LOG (GNUNET_ERROR_TYPE_WARNING, "Not route towards slave host");
+ GNUNET_break (0); /* uncompression error */
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- if (slave_host_id == route->next_hop) /* Slave directly connected */
+ if (config_size != dest_size)
{
- /* Then make slave host and delegated host same so that slave
- will startup directly link to the delegated host */
- slave_host_id = delegated_host_id;
+ GNUNET_break (0);/* Uncompressed config size mismatch */
+ GNUNET_free (config);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
}
- lcfq = GNUNET_malloc (sizeof (struct LCFContextQueue));
- lcfq->lcf = GNUNET_malloc (sizeof (struct LCFContext));
- lcfq->lcf->delegated_host_id = delegated_host_id;
- lcfq->lcf->slave_host_id = slave_host_id;
- lcfq->lcf->is_subordinate =
- (1 == msg->is_subordinate) ? GNUNET_YES : GNUNET_NO;
- lcfq->lcf->state = INIT;
- lcfq->lcf->fcontroller = route->fcontroller;
- lcfq->lcf->cfg = cfg;
- if (NULL == lcfq_head)
+ cfg = GNUNET_CONFIGURATION_create ();
+ if (GNUNET_OK != GNUNET_CONFIGURATION_deserialize (cfg, config, config_size,
+ GNUNET_NO))
{
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == lcf_proc_task_id);
- GNUNET_CONTAINER_DLL_insert_tail (lcfq_head, lcfq_tail, lcfq);
- lcf_proc_task_id = GNUNET_SCHEDULER_add_now (&lcf_proc_task, lcfq);
+ GNUNET_break (0); /* Configuration parsing error */
+ GNUNET_free (config);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
}
- else
- GNUNET_CONTAINER_DLL_insert_tail (lcfq_head, lcfq_tail, lcfq);
+ GNUNET_free (config);
+ peer = GNUNET_malloc (sizeof (struct Peer));
+ 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 (master_context->system, peer->cfg,
+ peer->id,
+ NULL /* Peer id */,
+ &emsg);
+ if (NULL == peer->peer)
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING, "Configuring peer failed: %s\n", emsg);
+ GNUNET_free (emsg);
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ 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;
}
+
+ /* FIXME: Forward the peer to other host */
+ GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
- /* If we are not the slave controller then we have to route the request
- towards the slave controller */
- if (1 == msg->is_subordinate)
+}
+
+
+/**
+ * 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_destroy (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
+{
+ const struct GNUNET_TESTBED_PeerDestroyMessage *msg;
+ struct GNUNET_TESTBED_GenericOperationSuccessEventMessage *reply;
+ uint32_t peer_id;
+ uint32_t id;
+ uint16_t reply_size;
+
+ msg = (const struct GNUNET_TESTBED_PeerDestroyMessage *) message;
+ peer_id = ntohl (msg->peer_id);
+ LOG_DEBUG ("Received peer destory on peer: %u and operation id: %ul\n",
+ peer_id, GNUNET_ntohll (msg->operation_id));
+ if ((peer_list_size <= peer_id) || (NULL == peer_list[peer_id]))
{
- GNUNET_break (0); /* FIXME: Implement the slave controller
- startup */
+ GNUNET_break (0);
+ /* FIXME: Reply with failure event message or forward to slave controller */
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
}
- GNUNET_CONFIGURATION_destroy (cfg);
+ GNUNET_TESTING_peer_destroy (peer_list[peer_id]->peer);
+ GNUNET_CONFIGURATION_destroy (peer_list[peer_id]->cfg);
+ GNUNET_free (peer_list[peer_id]);
+ peer_list[peer_id] = NULL;
+ for (id = 0; id < LIST_GROW_STEP; id++)
+ {
+ if (((peer_id + id >= peer_list_size) ||
+ (NULL != peer_list[peer_id])))
+ break;
+ }
+ if (LIST_GROW_STEP == id)
+ {
+ peer_list_size -= LIST_GROW_STEP;
+ peer_list = GNUNET_realloc (peer_list, peer_list_size);
+ }
+ reply_size =
+ sizeof (struct GNUNET_TESTBED_GenericOperationSuccessEventMessage);
+ reply = GNUNET_malloc (reply_size);
+ reply->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_GENERICOPSUCCESS);
+ reply->header.size = htons (reply_size);
+ reply->operation_id = msg->operation_id;
+ 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);
}
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct LCFContextQueue *lcfq;
- uint32_t host_id;
- uint32_t route_id;
+ 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);
- 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)
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == lcf_proc_task_id);
for (lcfq = lcfq_head; NULL != lcfq; lcfq = lcfq_head)
{
- GNUNET_CONFIGURATION_destroy (lcfq->lcf->cfg);
+ GNUNET_free (lcfq->lcf->sxcfg);
GNUNET_free (lcfq->lcf);
GNUNET_CONTAINER_DLL_remove (lcfq_head, lcfq_tail, lcfq);
GNUNET_free (lcfq);
}
+ /* Clear peer list */
+ for (id = 0; id < peer_list_size; id++)
+ if (NULL != peer_list[id])
+ {
+ GNUNET_TESTING_peer_destroy (peer_list[id]->peer);
+ GNUNET_CONFIGURATION_destroy (peer_list[id]->cfg);
+ GNUNET_free (peer_list[id]);
+ }
+ GNUNET_free_non_null (peer_list);
/* Clear host list */
- for (host_id = 0; host_id < host_list_size; host_id++)
- if (NULL != host_list[host_id])
- GNUNET_TESTBED_host_destroy (host_list[host_id]);
+ for (id = 0; id < host_list_size; id++)
+ if (NULL != host_list[id])
+ GNUNET_TESTBED_host_destroy (host_list[id]);
GNUNET_free_non_null (host_list);
/* Clear route list */
- for (route_id = 0; route_id < route_list_size; route_id++)
- if (NULL != route_list[route_id])
+ for (id = 0; id < route_list_size; id++)
+ if (NULL != route_list[id])
+ GNUNET_free (route_list[id]);
+ GNUNET_free_non_null (route_list);
+ /* Clear slave_list */
+ for (id = 0; id < slave_list_size; id++)
+ if (NULL != slave_list[id])
{
- if (NULL != route_list[route_id]->fcontroller)
- GNUNET_TESTBED_controller_stop (route_list[route_id]->fcontroller);
- GNUNET_free (route_list[route_id]);
+ GNUNET_assert (NULL != slave_list[id]->controller);
+ GNUNET_TESTBED_controller_disconnect (slave_list[id]->controller);
+ if (NULL != slave_list[id]->controller_proc)
+ GNUNET_TESTBED_controller_stop (slave_list[id]->controller_proc);
}
- GNUNET_free_non_null (route_list);
- 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 ();
}
}
GNUNET_MESSAGE_TYPE_TESTBED_SERVICESHARE, 0},
{&handle_link_controllers, NULL,
GNUNET_MESSAGE_TYPE_TESTBED_LCONTROLLERS, 0},
+ {&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);
- 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