/*
This file is part of GNUnet.
- (C) 2012 Christian Grothoff (and other contributing authors)
+ (C) 2008--2013 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
* @author Sree Harsha Totakura
*/
-#include "platform.h"
-#include "gnunet_service_lib.h"
-#include "gnunet_server_lib.h"
-#include <zlib.h>
+#include "gnunet-service-testbed.h"
+#include "gnunet-service-testbed_barriers.h"
+#include "gnunet-service-testbed_connectionpool.h"
-#include "testbed.h"
-#include "gnunet_testbed_service.h"
-#include "testbed_api_hosts.h"
-#include "gnunet_testing_lib-new.h"
+/***********/
+/* Globals */
+/***********/
/**
- * Generic logging
+ * Our configuration
*/
-#define LOG(kind,...) \
- GNUNET_log (kind, __VA_ARGS__)
+struct GNUNET_CONFIGURATION_Handle *GST_config;
/**
- * Debug logging
+ * The master context; generated with the first INIT message
*/
-#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
- */
- uint64_t event_mask;
-
- /**
- * Our host id according to this context
- */
- uint32_t host_id;
-};
-
+struct Context *GST_context;
/**
- * The message queue for sending messages to clients
+ * Array of hosts
*/
-struct MessageQueue
-{
- /**
- * The message to be sent
- */
- struct GNUNET_MessageHeader *msg;
-
- /**
- * The client to send the message to
- */
- struct GNUNET_SERVER_Client *client;
-
- /**
- * next pointer for DLL
- */
- struct MessageQueue *next;
-
- /**
- * prev pointer for DLL
- */
- struct MessageQueue *prev;
-};
-
+struct GNUNET_TESTBED_Host **GST_host_list;
/**
- * The structure for identifying a shared service
+ * DLL head for forwarded operation contexts
*/
-struct SharedService
-{
- /**
- * The name of the shared service
- */
- char *name;
-
- /**
- * Number of shared peers per instance of the shared service
- */
- uint32_t num_shared;
-
- /**
- * Number of peers currently sharing the service
- */
- uint32_t num_sharing;
-};
-
+struct ForwardedOperationContext *fopcq_head;
/**
- * A routing entry
+ * DLL tail for forwarded operation contexts
*/
-struct Route
-{
- /**
- * destination host
- */
- uint32_t dest;
-
- /**
- * The host destination is reachable thru
- */
- uint32_t thru;
-};
-
+struct ForwardedOperationContext *fopcq_tail;
/**
- * Structure representing a connected(directly-linked) controller
+ * Operation queue for open file descriptors
*/
-struct Slave
-{
- /**
- * The controller process handle if we had started the controller
- */
- struct GNUNET_TESTBED_ControllerProc *controller_proc;
-
- /**
- * The controller handle
- */
- struct GNUNET_TESTBED_Controller *controller;
-
- /**
- * The id of the host this controller is running on
- */
- uint32_t host_id;
-};
-
+struct OperationQueue *GST_opq_openfds;
/**
- * States of LCFContext
+ * Timeout for operations which may take some time
*/
-enum LCFContextState
- {
- /**
- * The Context has been initialized; Nothing has been done on it
- */
- INIT,
-
- /**
- * Delegated host has been registered at the forwarding controller
- */
- DELEGATED_HOST_REGISTERED,
-
- /**
- * The context has been finished (may have error)
- */
- FINISHED
-
- };
-
+const struct GNUNET_TIME_Relative GST_timeout;
/**
- * Link controllers request forwarding context
+ * The size of the host list
*/
-struct LCFContext
-{
- /**
- * The serialized and compressed configuration
- */
- char *sxcfg;
-
- /**
- * The gateway which will pass the link message to delegated host
- */
- 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?
- */
- int is_subordinate;
-
- /**
- * The state of this context
- */
- enum LCFContextState state;
-
- /**
- * The delegated host
- */
- uint32_t delegated_host_id;
-
-
-};
-
+unsigned int GST_host_list_size;
/**
- * Structure of a queue entry in LCFContext request queue
+ * The size of the peer list
*/
-struct LCFContextQueue
-{
- /**
- * The LCFContext
- */
- struct LCFContext *lcf;
+unsigned int GST_peer_list_size;
- /**
- * Head prt for DLL
- */
- struct LCFContextQueue *next;
-
- /**
- * Tail ptr for DLL
- */
- struct LCFContextQueue *prev;
-};
+/***********************************/
+/* Local definitions and variables */
+/***********************************/
/**
- * A locally started peer
+ * The message queue for sending messages to clients
*/
-struct Peer
+struct MessageQueue
{
/**
- * The peer handle from testing API
+ * The message to be sent
*/
- struct GNUNET_TESTING_Peer *peer;
+ struct GNUNET_MessageHeader *msg;
/**
- * The modified (by GNUNET_TESTING_peer_configure) configuration this peer is
- * configured with
+ * The client to send the message to
*/
- struct GNUNET_CONFIGURATION_Handle *cfg;
+ struct GNUNET_SERVER_Client *client;
/**
- * Our local reference id for this peer
+ * next pointer for DLL
*/
- uint32_t id;
+ struct MessageQueue *next;
+ /**
+ * prev pointer for DLL
+ */
+ struct MessageQueue *prev;
};
-
-/**
- * The master context; generated with the first INIT message
- */
-static struct Context *master_context;
-
-/***********/
-/* Handles */
-/***********/
-
/**
- * Wrapped stdin.
+ * Our hostname; we give this to all the peers we start
*/
-static struct GNUNET_DISK_FileHandle *fh;
+static char *hostname;
/**
* Current Transmit Handle; NULL if no notify transmit exists currently
*/
static struct GNUNET_SERVER_TransmitHandle *transmit_handle;
-/****************/
-/* Lists & Maps */
-/****************/
-
-/**
- * The head for the LCF queue
- */
-static struct LCFContextQueue *lcfq_head;
-
-/**
- * The tail for the LCF queue
- */
-static struct LCFContextQueue *lcfq_tail;
-
/**
* The message queue head
*/
*/
static struct MessageQueue *mq_tail;
-/**
- * Array of host list
- */
-static struct GNUNET_TESTBED_Host **host_list;
-
-/**
- * A list of routes
- */
-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 struct GNUNET_CONTAINER_MultiHashMap *ss_map;
-
-/**
- * The size of the host list
- */
-static uint32_t host_list_size;
-
-/**
- * The size of the route list
- */
-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 */
-/*********/
-
-/**
- * The lcf_task handle
- */
-static GNUNET_SCHEDULER_TaskIdentifier lcf_proc_task_id;
/**
* The shutdown task handle
*/
static GNUNET_SCHEDULER_TaskIdentifier shutdown_task_id;
-/******************/
-/* Testing System */
-/******************/
-
-/**
- * Our configuration; we also use this as template for starting other controllers
- */
-static struct GNUNET_CONFIGURATION_Handle *config;
-
/**
* Function called to notify a client about the connection begin ready to queue
size = ntohs (mq_entry->msg->size);
memcpy (buf, mq_entry->msg, size);
GNUNET_free (mq_entry->msg);
+ GNUNET_SERVER_client_drop (mq_entry->client);
GNUNET_CONTAINER_DLL_remove (mq_head, mq_tail, mq_entry);
GNUNET_free (mq_entry);
mq_entry = mq_head;
if (NULL != mq_entry)
- transmit_handle =
- GNUNET_SERVER_notify_transmit_ready (mq_entry->client,
- ntohs (mq_entry->msg->size),
- GNUNET_TIME_UNIT_FOREVER_REL,
- &transmit_ready_notify, NULL);
+ transmit_handle =
+ GNUNET_SERVER_notify_transmit_ready (mq_entry->client,
+ ntohs (mq_entry->msg->size),
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &transmit_ready_notify, NULL);
return size;
}
* @param client the client to whom the queued message has to be sent
* @param msg the message to queue
*/
-static void
-queue_message (struct GNUNET_SERVER_Client *client,
- struct GNUNET_MessageHeader *msg)
+void
+GST_queue_message (struct GNUNET_SERVER_Client *client,
+ struct GNUNET_MessageHeader *msg)
{
struct MessageQueue *mq_entry;
uint16_t type;
type = ntohs (msg->type);
size = ntohs (msg->size);
GNUNET_assert ((GNUNET_MESSAGE_TYPE_TESTBED_INIT <= type) &&
- (GNUNET_MESSAGE_TYPE_TESTBED_MAX > type));
- mq_entry = GNUNET_malloc (sizeof (struct MessageQueue));
+ (GNUNET_MESSAGE_TYPE_TESTBED_MAX > type));
+ mq_entry = GNUNET_new (struct MessageQueue);
mq_entry->msg = msg;
mq_entry->client = client;
- LOG_DEBUG ( "Queueing message of type %u, size %u for sending\n", type,
- ntohs (msg->size));
+ GNUNET_SERVER_client_keep (client);
+ LOG_DEBUG ("Queueing message of type %u, size %u for sending\n", type,
+ ntohs (msg->size));
GNUNET_CONTAINER_DLL_insert_tail (mq_head, mq_tail, mq_entry);
if (NULL == transmit_handle)
- transmit_handle =
- GNUNET_SERVER_notify_transmit_ready (client, size,
- GNUNET_TIME_UNIT_FOREVER_REL,
- &transmit_ready_notify, NULL);
-}
-
-
-/**
- * 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;
+ transmit_handle =
+ GNUNET_SERVER_notify_transmit_ready (client, size,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &transmit_ready_notify, NULL);
}
/**
* Function to add a host to the current list of known hosts
*
- * @param host the host to add
+ * @param host the host to add
* @return GNUNET_OK on success; GNUNET_SYSERR on failure due to host-id
* already in use
*/
uint32_t host_id;
host_id = GNUNET_TESTBED_host_get_id_ (host);
- if (host_list_size <= host_id)
- {
- 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])
+ if (GST_host_list_size <= host_id)
+ GST_array_grow_large_enough (GST_host_list, GST_host_list_size, host_id);
+ if (NULL != GST_host_list[host_id])
{
LOG_DEBUG ("A host with id: %u already exists\n", host_id);
return GNUNET_SYSERR;
}
- host_list[host_id] = host;
+ GST_host_list[host_id] = host;
return GNUNET_OK;
}
/**
- * Adds a route to the route list
+ * Send operation failure message to client
*
- * @param route the route to add
+ * @param client the client to which the failure message has to be sent to
+ * @param operation_id the id of the failed operation
+ * @param emsg the error message; can be NULL
*/
-static void
-route_list_add (struct Route *route)
+void
+GST_send_operation_fail_msg (struct GNUNET_SERVER_Client *client,
+ uint64_t operation_id, const char *emsg)
{
- 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;
+ struct GNUNET_TESTBED_OperationFailureEventMessage *msg;
+ uint16_t msize;
+ uint16_t emsg_len;
+
+ msize = sizeof (struct GNUNET_TESTBED_OperationFailureEventMessage);
+ emsg_len = (NULL == emsg) ? 0 : strlen (emsg) + 1;
+ msize += emsg_len;
+ msg = GNUNET_malloc (msize);
+ msg->header.size = htons (msize);
+ msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_OPERATION_FAIL_EVENT);
+ msg->event_type = htonl (GNUNET_TESTBED_ET_OPERATION_FINISHED);
+ msg->operation_id = GNUNET_htonll (operation_id);
+ if (0 != emsg_len)
+ memcpy (&msg[1], emsg, emsg_len);
+ GST_queue_message (client, &msg->header);
}
/**
- * Adds a slave to the slave array
+ * Function to send generic operation success message to given client
*
- * @param route the route to add
+ * @param client the client to send the message to
+ * @param operation_id the id of the operation which was successful
*/
-static void
-slave_list_add (struct Slave *slave)
+void
+GST_send_operation_success_msg (struct GNUNET_SERVER_Client *client,
+ uint64_t operation_id)
{
- 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;
-}
+ struct GNUNET_TESTBED_GenericOperationSuccessEventMessage *msg;
+ uint16_t msize;
+ msize = sizeof (struct GNUNET_TESTBED_GenericOperationSuccessEventMessage);
+ msg = GNUNET_malloc (msize);
+ msg->header.size = htons (msize);
+ msg->header.type =
+ htons (GNUNET_MESSAGE_TYPE_TESTBED_GENERIC_OPERATION_SUCCESS);
+ msg->operation_id = GNUNET_htonll (operation_id);
+ msg->event_type = htonl (GNUNET_TESTBED_ET_OPERATION_FINISHED);
+ GST_queue_message (client, &msg->header);
+}
/**
- * Adds a peer to the peer array
+ * Callback which will be called after a host registration succeeded or failed
*
- * @param route the route to add
+ * @param cls the handle to the slave at which the registration is completed
+ * @param emsg the error message; NULL if host registration is successful
*/
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;
-}
+hr_completion (void *cls, const char *emsg);
/**
- * Routes message to a host given its host_id
+ * Attempts to register the next host in the host registration queue
*
- * @param host_id the id of the destination host
- * @param msg the message to be routed
+ * @param slave the slave controller whose host registration queue is checked
+ * for host registrations
*/
static void
-route_message (uint32_t host_id, const struct GNUNET_MessageHeader *msg)
-{
- GNUNET_break (0);
+register_next_host (struct Slave *slave)
+{
+ struct HostRegistration *hr;
+
+ hr = slave->hr_dll_head;
+ GNUNET_assert (NULL != hr);
+ GNUNET_assert (NULL == slave->rhandle);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Registering host %u at %u\n",
+ GNUNET_TESTBED_host_get_id_ (hr->host),
+ GNUNET_TESTBED_host_get_id_ (GST_host_list[slave->host_id]));
+ slave->rhandle =
+ GNUNET_TESTBED_register_host (slave->controller, hr->host, hr_completion,
+ slave);
}
/**
- * The Link Controller forwarding task
+ * Callback which will be called to after a host registration succeeded or failed
*
- * @param cls the LCFContext
- * @param tc the Task context from scheduler
+ * @param cls the handle to the slave at which the registration is completed
+ * @param emsg the error message; NULL if host registration is successful
*/
static void
-lcf_proc_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+hr_completion (void *cls, const char *emsg)
+{
+ struct Slave *slave = cls;
+ struct HostRegistration *hr;
+
+ slave->rhandle = NULL;
+ hr = slave->hr_dll_head;
+ GNUNET_assert (NULL != hr);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Registering host %u at %u successful\n",
+ GNUNET_TESTBED_host_get_id_ (hr->host),
+ GNUNET_TESTBED_host_get_id_ (GST_host_list[slave->host_id]));
+ GNUNET_CONTAINER_DLL_remove (slave->hr_dll_head, slave->hr_dll_tail, hr);
+ if (NULL != hr->cb)
+ hr->cb (hr->cb_cls, emsg);
+ GNUNET_free (hr);
+ if (NULL != slave->hr_dll_head)
+ register_next_host (slave);
+}
/**
- * Completion callback for host registrations while forwarding Link Controller messages
+ * Adds a host registration's request to a slave's registration queue
*
- * @param cls the LCFContext
- * @param emsg the error message; NULL if host registration is successful
- */
-static void
-lcf_proc_cc (void *cls, const char *emsg)
-{
- struct LCFContext *lcf = cls;
-
- lcf->rhandle = NULL;
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == lcf_proc_task_id);
- switch (lcf->state)
- {
- case INIT:
- if (NULL != emsg)
- {
- 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;
- default:
- GNUNET_assert (0); /* Shouldn't reach here */
- }
+ * @param slave the slave controller at which the given host has to be
+ * registered
+ * @param cb the host registration completion callback
+ * @param cb_cls the closure for the host registration completion callback
+ * @param host the host which has to be registered
+ */
+void
+GST_queue_host_registration (struct Slave *slave,
+ GNUNET_TESTBED_HostRegistrationCompletion cb,
+ void *cb_cls, struct GNUNET_TESTBED_Host *host)
+{
+ struct HostRegistration *hr;
+ int call_register;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Queueing host registration for host %u at %u\n",
+ GNUNET_TESTBED_host_get_id_ (host),
+ GNUNET_TESTBED_host_get_id_ (GST_host_list[slave->host_id]));
+ hr = GNUNET_new (struct HostRegistration);
+ hr->cb = cb;
+ hr->cb_cls = cb_cls;
+ hr->host = host;
+ call_register = (NULL == slave->hr_dll_head) ? GNUNET_YES : GNUNET_NO;
+ GNUNET_CONTAINER_DLL_insert_tail (slave->hr_dll_head, slave->hr_dll_tail, hr);
+ if (GNUNET_YES == call_register)
+ register_next_host (slave);
}
/**
- * The Link Controller forwarding task
+ * Callback to relay the reply msg of a forwarded operation back to the client
*
- * @param cls the LCFContext
- * @param tc the Task context from scheduler
+ * @param cls ForwardedOperationContext
+ * @param msg the message to relay
*/
-static void
-lcf_proc_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+void
+GST_forwarded_operation_reply_relay (void *cls,
+ const struct GNUNET_MessageHeader *msg)
{
- struct LCFContext *lcf = cls;
- struct LCFContextQueue *lcfq;
+ struct ForwardedOperationContext *fopc = cls;
+ struct GNUNET_MessageHeader *dup_msg;
+ uint16_t msize;
- lcf_proc_task_id = GNUNET_SCHEDULER_NO_TASK;
- switch (lcf->state)
- {
- case INIT:
- if (GNUNET_NO ==
- GNUNET_TESTBED_is_host_registered_ (host_list[lcf->delegated_host_id],
- lcf->gateway->controller))
- {
- lcf->rhandle =
- GNUNET_TESTBED_register_host (lcf->gateway->controller,
- host_list[lcf->delegated_host_id],
- lcf_proc_cc, lcf);
- }
- else
- {
- lcf->state = DELEGATED_HOST_REGISTERED;
- lcf_proc_task_id = GNUNET_SCHEDULER_add_now (&lcf_proc_task, lcf);
- }
- break;
- case DELEGATED_HOST_REGISTERED:
- 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;
- case FINISHED:
- lcfq = lcfq_head;
- 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);
- }
+ msize = ntohs (msg->size);
+ LOG_DEBUG ("Relaying message with type: %u, size: %u\n", ntohs (msg->type),
+ msize);
+ dup_msg = GNUNET_copy_message (msg);
+ GST_queue_message (fopc->client, dup_msg);
+ GNUNET_SERVER_client_drop (fopc->client);
+ GNUNET_SCHEDULER_cancel (fopc->timeout_task);
+ GNUNET_CONTAINER_DLL_remove (fopcq_head, fopcq_tail, fopc);
+ GNUNET_free (fopc);
}
/**
- * Callback for event from slave controllers
+ * Task to free resources when forwarded operation has been timedout
*
- * @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);
+ * @param cls the ForwardedOperationContext
+ * @param tc the task context from scheduler
+ */
+void
+GST_forwarded_operation_timeout (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct ForwardedOperationContext *fopc = cls;
+
+ GNUNET_TESTBED_forward_operation_msg_cancel_ (fopc->opc);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "A forwarded operation has timed out\n");
+ GST_send_operation_fail_msg (fopc->client, fopc->operation_id,
+ "A forwarded operation has timed out");
+ GNUNET_SERVER_client_drop (fopc->client);
+ GNUNET_CONTAINER_DLL_remove (fopcq_head, fopcq_tail, fopc);
+ GNUNET_free (fopc);
}
/**
- * Callback for unexpected slave shutdowns
+ * Parse service sharing specification line.
+ * Format is "[<service:share>] [<service:share>] ..."
*
- * @param cls closure
- * @param emsg error message if available; can be NULL, which does NOT mean
- * that there was no error
- */
-static void
-slave_shutdown_handler (void *cls, const char *emsg)
-{
- struct Slave *slave;
-
- slave = (struct Slave *) cls;
- slave->controller_proc = NULL;
- LOG (GNUNET_ERROR_TYPE_WARNING,
- "Unexpected slave shutdown\n");
- if (NULL != emsg)
- LOG (GNUNET_ERROR_TYPE_WARNING, "Error: %s\n", emsg);
- GNUNET_SCHEDULER_shutdown (); /* We too shutdown */
+ * @param ss_str the spec string to be parsed
+ * @param cfg the configuration to use for shared services
+ * @return an array suitable to pass to GNUNET_TESTING_system_create(). NULL
+ * upon empty service sharing specification.
+ */
+static struct GNUNET_TESTING_SharedService *
+parse_shared_services (char *ss_str, struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ struct GNUNET_TESTING_SharedService ss;
+ struct GNUNET_TESTING_SharedService *slist;
+ char service[256];
+ char *arg;
+ unsigned int n;
+#define GROW_SS \
+ do { \
+ GNUNET_array_grow (slist, n, n+1); \
+ (void) memcpy (&slist[n - 1], &ss, \
+ sizeof (struct GNUNET_TESTING_SharedService)); \
+ } while (0)
+
+ slist = NULL;
+ n = 0;
+ ss.cfg = cfg;
+ for (; NULL != (arg = strtok (ss_str, " ")); ss_str = NULL)
+ {
+ ss.service = NULL;
+ ss.share = 0;
+ if (2 != sscanf (arg, "%255[^:]:%u", service, &ss.share))
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING, "Ignoring shared service spec: %s", arg);
+ continue;
+ }
+ LOG_DEBUG ("Will be sharing %s service among %u peers\n", service, ss.share);
+ ss.service = GNUNET_strdup (service);
+ GROW_SS;
+ }
+ if (NULL != slist)
+ {
+ /* Add trailing NULL block */
+ (void) memset (&ss, 0, sizeof (struct GNUNET_TESTING_SharedService));
+ GROW_SS;
+ }
+ return slist;
+#undef GROW_SS
}
* @param client identification of the client
* @param message the actual message
*/
-static void
-handle_init (void *cls,
- struct GNUNET_SERVER_Client *client,
+static void
+handle_init (void *cls, struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
const struct GNUNET_TESTBED_InitMessage *msg;
struct GNUNET_TESTBED_Host *host;
- void *addr;
- size_t addrlen;
+ const char *controller_hostname;
+ char *ss_str;
+ struct GNUNET_TESTING_SharedService *ss;
+ unsigned int cnt;
+ uint16_t msize;
- if (NULL != master_context)
+ if (NULL != GST_context)
+ {
+ LOG_DEBUG ("We are being connected to laterally\n");
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+ msg = (const struct GNUNET_TESTBED_InitMessage *) message;
+ msize = ntohs (message->size);
+ if (msize <= sizeof (struct GNUNET_TESTBED_InitMessage))
{
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- msg = (const struct GNUNET_TESTBED_InitMessage *) message;
- 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))
+ msize -= sizeof (struct GNUNET_TESTBED_InitMessage);
+ controller_hostname = (const char *) &msg[1];
+ if ('\0' != controller_hostname[msize - 1])
{
- LOG (GNUNET_ERROR_TYPE_WARNING,
- "Cannot determine the ip of master controller: %s\n", STRERROR (errno));
- GNUNET_assert (0);
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
}
- 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);
- master_context->event_mask = GNUNET_ntohll (msg->event_mask);
+ ss_str = NULL;
+ ss = NULL;
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (GST_config, "TESTBED",
+ "SHARED_SERVICES",
+ &ss_str))
+ {
+ ss = parse_shared_services (ss_str, GST_config);
+ GNUNET_free (ss_str);
+ ss_str = NULL;
+ }
+ GST_context = GNUNET_new (struct Context);
GNUNET_SERVER_client_keep (client);
- LOG_DEBUG ("Created master context with host ID: %u\n",
- master_context->host_id);
+ GST_context->client = client;
+ GST_context->host_id = ntohl (msg->host_id);
+ GST_context->master_ip = GNUNET_strdup (controller_hostname);
+ LOG_DEBUG ("Our IP: %s\n", GST_context->master_ip);
+ GST_context->system =
+ GNUNET_TESTING_system_create ("testbed", GST_context->master_ip,
+ hostname, ss);
+ if (NULL != ss)
+ {
+ for (cnt = 0; NULL != ss[cnt].service; cnt++)
+ {
+ ss_str = (char *) ss[cnt].service;
+ GNUNET_free (ss_str);
+ }
+ GNUNET_free (ss);
+ ss = NULL;
+ }
+ host =
+ GNUNET_TESTBED_host_create_with_id (GST_context->host_id,
+ GST_context->master_ip, NULL,
+ GST_config, 0);
+ host_list_add (host);
+ LOG_DEBUG ("Created master context with host ID: %u\n", GST_context->host_id);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
* @param client identification of the client
* @param message the actual message
*/
-static void
-handle_add_host (void *cls,
- struct GNUNET_SERVER_Client *client,
+static void
+handle_add_host (void *cls, struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
struct GNUNET_TESTBED_Host *host;
const struct GNUNET_TESTBED_AddHostMessage *msg;
struct GNUNET_TESTBED_HostConfirmedMessage *reply;
+ struct GNUNET_CONFIGURATION_Handle *host_cfg;
char *username;
char *hostname;
char *emsg;
+ const void *ptr;
uint32_t host_id;
uint16_t username_length;
uint16_t hostname_length;
uint16_t reply_size;
-
+ uint16_t msize;
+
msg = (const struct GNUNET_TESTBED_AddHostMessage *) message;
- username_length = ntohs (msg->user_name_length);
- username_length = (0 == username_length) ? 0 : username_length + 1;
- username = (char *) &(msg[1]);
- hostname = username + username_length;
- if (ntohs (message->size) <=
- (sizeof (struct GNUNET_TESTBED_AddHostMessage) + username_length))
+ msize = ntohs (msg->header.size);
+ if (msize <= sizeof (struct GNUNET_TESTBED_AddHostMessage))
{
- GNUNET_break (0);
+ GNUNET_break_op (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- hostname_length = ntohs (message->size)
- - (sizeof (struct GNUNET_TESTBED_AddHostMessage) + username_length);
- if (strlen (hostname) != hostname_length - 1)
+ username_length = ntohs (msg->username_length);
+ hostname_length = ntohs (msg->hostname_length);
+ /* msg must contain hostname */
+ if ((msize <= (sizeof (struct GNUNET_TESTBED_AddHostMessage) +
+ username_length))
+ || (0 == hostname_length))
{
- GNUNET_break (0);
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+ /* msg must contain configuration */
+ if (msize <= (sizeof (struct GNUNET_TESTBED_AddHostMessage) +
+ username_length + hostname_length))
+ {
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+ username = NULL;
+ hostname = NULL;
+ ptr = &msg[1];
+ if (0 != username_length)
+ {
+ username = GNUNET_malloc (username_length + 1);
+ strncpy (username, ptr, username_length);
+ ptr += username_length;
+ }
+ hostname = GNUNET_malloc (hostname_length + 1);
+ strncpy (hostname, ptr, hostname_length);
+ if (NULL == (host_cfg = GNUNET_TESTBED_extract_config_ (message)))
+ {
+ GNUNET_free_non_null (username);
+ GNUNET_free_non_null (hostname);
+ GNUNET_break_op (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
host_id = ntohl (msg->host_id);
- LOG_DEBUG ("Received ADDHOST message\n");
+ LOG_DEBUG ("Received ADDHOST %u message\n", host_id);
LOG_DEBUG ("-------host id: %u\n", host_id);
- if (NULL != hostname) LOG_DEBUG ("-------hostname: %s\n", hostname);
- if (0 != username_length) LOG_DEBUG ("-------username: %s\n", username);
- else LOG_DEBUG ("-------username: NULL\n");
+ LOG_DEBUG ("-------hostname: %s\n", hostname);
+ if (NULL != username)
+ LOG_DEBUG ("-------username: %s\n", username);
+ else
+ LOG_DEBUG ("-------username: <not given>\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));
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ host =
+ GNUNET_TESTBED_host_create_with_id (host_id, hostname, username,
+ host_cfg, ntohs (msg->ssh_port));
+ GNUNET_free_non_null (username);
+ GNUNET_free (hostname);
+ GNUNET_CONFIGURATION_destroy (host_cfg);
+ if (NULL == host)
+ {
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
reply_size = sizeof (struct GNUNET_TESTBED_HostConfirmedMessage);
if (GNUNET_OK != host_list_add (host))
- {
- /* We are unable to add a host */
+ {
+ /* We are unable to add a host */
emsg = "A host exists with given host-id";
LOG_DEBUG ("%s: %u", emsg, host_id);
GNUNET_TESTBED_host_destroy (host);
memcpy (&reply[1], emsg, strlen (emsg) + 1);
}
else
- reply = GNUNET_malloc (reply_size);
- reply->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_ADDHOSTCONFIRM);
- reply->header.size = htons (reply_size);
- reply->host_id = htonl (host_id);
- queue_message (client, (struct GNUNET_MessageHeader *) reply);
-}
-
-
-/**
- * Iterator over hash map entries.
- *
- * @param cls closure
- * @param key current key code
- * @param value value in the hash map
- * @return GNUNET_YES if we should continue to
- * iterate,
- * GNUNET_NO if not.
- */
-int ss_exists_iterator (void *cls,
- const struct GNUNET_HashCode * key,
- void *value)
-{
- struct SharedService *queried_ss = cls;
- struct SharedService *ss = value;
-
- if (0 == strcmp (ss->name, queried_ss->name))
- return GNUNET_NO;
- else
- return GNUNET_YES;
-}
-
-
-/**
- * Message handler for GNUNET_MESSAGE_TYPE_TESTBED_ADDHOST messages
- *
- * @param cls NULL
- * @param client identification of the client
- * @param message the actual message
- */
-static void
-handle_configure_shared_service (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
-{
- const struct GNUNET_TESTBED_ConfigureSharedServiceMessage *msg;
- struct SharedService *ss;
- char *service_name;
- struct GNUNET_HashCode hash;
- uint16_t msg_size;
- uint16_t service_name_size;
-
- msg = (const struct GNUNET_TESTBED_ConfigureSharedServiceMessage *) message;
- msg_size = ntohs (message->size);
- if (msg_size <= sizeof (struct GNUNET_TESTBED_ConfigureSharedServiceMessage))
{
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- service_name_size = msg_size -
- sizeof (struct GNUNET_TESTBED_ConfigureSharedServiceMessage);
- service_name = (char *) &msg[1];
- if ('\0' != service_name[service_name_size - 1])
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- LOG_DEBUG ("Received service sharing request for %s, with %d peers\n",
- service_name, ntohl (msg->num_peers));
- if (ntohl (msg->host_id) != master_context->host_id)
- {
- route_message (ntohl (msg->host_id), message);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
- return;
+ LOG_DEBUG ("Added host %u at %u\n", host_id, GST_context->host_id);
+ reply = GNUNET_malloc (reply_size);
}
+ reply->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_ADD_HOST_SUCCESS);
+ reply->header.size = htons (reply_size);
+ reply->host_id = htonl (host_id);
+ GST_queue_message (client, &reply->header);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
- ss = GNUNET_malloc (sizeof (struct SharedService));
- ss->name = strdup (service_name);
- ss->num_shared = ntohl (msg->num_peers);
- GNUNET_CRYPTO_hash (ss->name, service_name_size, &hash);
- if (GNUNET_SYSERR ==
- GNUNET_CONTAINER_multihashmap_get_multiple (ss_map, &hash,
- &ss_exists_iterator, ss))
- {
- LOG (GNUNET_ERROR_TYPE_WARNING,
- "Service %s already configured as a shared service. "
- "Ignoring service sharing request \n", ss->name);
- GNUNET_free (ss->name);
- GNUNET_free (ss);
- return;
- }
- GNUNET_CONTAINER_multihashmap_put (ss_map, &hash, ss,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
}
/**
- * Message handler for GNUNET_MESSAGE_TYPE_TESTBED_LCONTROLLERS message
+ * Handler for GNUNET_MESSAGE_TYPE_TESTBED_GETSLAVECONFIG messages
*
* @param cls NULL
* @param client identification of the client
* @param message the actual message
*/
-static void
-handle_link_controllers (void *cls,
- struct GNUNET_SERVER_Client *client,
+static void
+handle_slave_get_config (void *cls, struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
- const struct GNUNET_TESTBED_ControllerLinkMessage *msg;
- struct GNUNET_CONFIGURATION_Handle *cfg;
- struct LCFContextQueue *lcfq;
- struct Route *route;
- struct Route *new_route;
- char *config;
- uLongf dest_size;
+ struct GNUNET_TESTBED_SlaveGetConfigurationMessage *msg;
+ struct Slave *slave;
+ struct GNUNET_TESTBED_SlaveConfiguration *reply;
+ const struct GNUNET_CONFIGURATION_Handle *cfg;
+ char *config;
+ char *xconfig;
size_t config_size;
- uint32_t delegated_host_id;
- 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_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- msg = (const struct GNUNET_TESTBED_ControllerLinkMessage *) message;
- delegated_host_id = ntohl (msg->delegated_host_id);
- if (delegated_host_id == master_context->host_id)
- {
- GNUNET_break (0);
- LOG (GNUNET_ERROR_TYPE_WARNING, "Trying to link ourselves\n");
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- if ((delegated_host_id >= host_list_size) ||
- (NULL == host_list[delegated_host_id]))
- {
- LOG (GNUNET_ERROR_TYPE_WARNING, "Delegated host not registered with us\n");
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- slave_host_id = ntohl (msg->slave_host_id);
- if ((slave_host_id >= host_list_size) || (NULL == host_list[slave_host_id]))
- {
- LOG (GNUNET_ERROR_TYPE_WARNING, "Slave host not registered with us\n");
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- 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);
- config_size = ntohs (msg->config_size);
-
- if (slave_host_id == master_context->host_id) /* Link from us */
- {
- 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);
- 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[delegated_host_id],
- cfg, &slave_shutdown_handler,
- 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;
- new_route->thru = master_context->host_id;
- route_list_add (new_route);
+ size_t xconfig_size;
+ size_t reply_size;
+ uint64_t op_id;
+ uint32_t slave_id;
+
+ msg = (struct GNUNET_TESTBED_SlaveGetConfigurationMessage *) message;
+ slave_id = ntohl (msg->slave_id);
+ op_id = GNUNET_ntohll (msg->operation_id);
+ if ((GST_slave_list_size <= slave_id) || (NULL == GST_slave_list[slave_id]))
+ {
+ /* FIXME: Add forwardings for this type of message here.. */
+ GST_send_operation_fail_msg (client, op_id, "Slave not found");
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
-
- /* Route the request */
- if (slave_host_id >= route_list_size)
- {
- LOG (GNUNET_ERROR_TYPE_WARNING, "No route towards slave host");
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- 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);
+ slave = GST_slave_list[slave_id];
+ GNUNET_assert (NULL != (cfg = GNUNET_TESTBED_host_get_cfg_ (GST_host_list[slave->host_id])));
+ config = GNUNET_CONFIGURATION_serialize (cfg, &config_size);
+ xconfig_size =
+ GNUNET_TESTBED_compress_config_ (config, config_size, &xconfig);
+ GNUNET_free (config);
+ reply_size = xconfig_size + sizeof (struct GNUNET_TESTBED_SlaveConfiguration);
+ GNUNET_break (reply_size <= UINT16_MAX);
+ GNUNET_break (config_size <= UINT16_MAX);
+ reply = GNUNET_realloc (xconfig, reply_size);
+ (void) memmove (&reply[1], reply, xconfig_size);
+ reply->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_SLAVE_CONFIGURATION);
+ reply->header.size = htons ((uint16_t) reply_size);
+ reply->slave_id = msg->slave_id;
+ reply->operation_id = msg->operation_id;
+ reply->config_size = htons ((uint16_t) config_size);
+ GST_queue_message (client, &reply->header);
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);
}
/**
- * Handler for GNUNET_MESSAGE_TYPE_TESTBED_CREATEPEER messages
- *
- * @param cls NULL
- * @param client identification of the client
- * @param message the actual message
+ * Clears the forwarded operations queue
*/
-static void
-handle_peer_create (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+void
+GST_clear_fopcq ()
{
- const struct GNUNET_TESTBED_PeerCreateMessage *msg;
- struct GNUNET_CONFIGURATION_Handle *cfg;
- char *config;
- size_t dest_size;
- int ret;
- uint32_t config_size;
- uint16_t msize;
-
+ struct ForwardedOperationContext *fopc;
- msize = ntohs (message->size);
- if (msize <= sizeof (struct GNUNET_TESTBED_PeerCreateMessage))
+ while (NULL != (fopc = fopcq_head))
{
- 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)
- {
- 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)))
- {
- GNUNET_break (0); /* uncompression error */
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- if (config_size != dest_size)
- {
- GNUNET_break (0);/* Uncompressed config size mismatch */
- GNUNET_free (config);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- cfg = GNUNET_CONFIGURATION_create ();
- if (GNUNET_OK != GNUNET_CONFIGURATION_deserialize (cfg, config, config_size,
- GNUNET_NO))
+ GNUNET_CONTAINER_DLL_remove (fopcq_head, fopcq_tail, fopc);
+ GNUNET_TESTBED_forward_operation_msg_cancel_ (fopc->opc);
+ if (GNUNET_SCHEDULER_NO_TASK != fopc->timeout_task)
+ GNUNET_SCHEDULER_cancel (fopc->timeout_task);
+ GNUNET_SERVER_client_drop (fopc->client);
+ switch (fopc->type)
{
- GNUNET_break (0); /* Configuration parsing error */
- GNUNET_free (config);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- 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);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
- return;
- }
-
- /* Forward the peer to other host */
- GNUNET_break (0);
- 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_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);
- /* Reply with failure event message */
- }
- 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])))
+ case OP_PEER_CREATE:
+ GNUNET_free (fopc->cls);
break;
+ case OP_SHUTDOWN_PEERS:
+ {
+ struct HandlerContext_ShutdownPeers *hc = fopc->cls;
+
+ GNUNET_assert (0 < hc->nslaves);
+ hc->nslaves--;
+ if (0 == hc->nslaves)
+ GNUNET_free (hc);
+ }
+ break;
+ case OP_PEER_START:
+ case OP_PEER_STOP:
+ case OP_PEER_DESTROY:
+ case OP_PEER_INFO:
+ case OP_OVERLAY_CONNECT:
+ case OP_LINK_CONTROLLERS:
+ case OP_GET_SLAVE_CONFIG:
+ case OP_MANAGE_SERVICE:
+ case OP_PEER_RECONFIGURE:
+ break;
+ case OP_FORWARDED:
+ GNUNET_assert (0);
+ };
+ GNUNET_free (fopc);
}
- 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;
- queue_message (client, (struct GNUNET_MessageHeader *) reply);
-
-}
-
-
-/**
- * Iterator over hash map entries.
- *
- * @param cls closure
- * @param key current key code
- * @param value value in the hash map
- * @return GNUNET_YES if we should continue to
- * iterate,
- * GNUNET_NO if not.
- */
-static int
-ss_map_free_iterator (void *cls,
- const struct GNUNET_HashCode * key, void *value)
-{
- struct SharedService *ss = value;
-
- GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (ss_map, key, value));
- GNUNET_free (ss->name);
- GNUNET_free (ss);
- return GNUNET_YES;
}
* @param tc the TaskContext from scheduler
*/
static void
-shutdown_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct LCFContextQueue *lcfq;
+ struct MessageQueue *mq_entry;
uint32_t id;
shutdown_task_id = GNUNET_SCHEDULER_NO_TASK;
- 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;
- }
- if (NULL != lcfq_head)
- {
- if (GNUNET_SCHEDULER_NO_TASK != lcf_proc_task_id)
- {
- GNUNET_SCHEDULER_cancel (lcf_proc_task_id);
- lcf_proc_task_id = GNUNET_SCHEDULER_NO_TASK;
- }
- if (NULL != lcfq_head->lcf->rhandle)
- GNUNET_TESTBED_cancel_registration (lcfq_head->lcf->rhandle);
- }
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == lcf_proc_task_id);
- for (lcfq = lcfq_head; NULL != lcfq; lcfq = lcfq_head)
- {
- GNUNET_free (lcfq->lcf->sxcfg);
- GNUNET_free (lcfq->lcf);
- GNUNET_CONTAINER_DLL_remove (lcfq_head, lcfq_tail, lcfq);
- GNUNET_free (lcfq);
- }
+ LOG_DEBUG ("Shutting down testbed service\n");
+ /* cleanup any remaining forwarded operations */
+ GST_clear_fopcq ();
+ GST_free_lcfq ();
+ GST_free_mctxq ();
+ GST_free_occq ();
+ GST_free_roccq ();
+ GST_free_nccq ();
+ GST_neighbour_list_clean();
+ GST_free_prcq ();
/* 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 (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);
+ GST_destroy_peers ();
/* Clear route list */
- 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])
- {
- 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 (master_context->master_ip);
- if (NULL != master_context->system)
- GNUNET_TESTING_system_destroy (master_context->system, GNUNET_YES);
- GNUNET_free_non_null (master_context);
-}
-
-
-/**
- * Debug shutdown task in case of stdin getting closed
- *
- * @param cls NULL
- * @param tc the TaskContext from scheduler
- */
-static void
-shutdown_task_ (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "STDIN closed ...\n");
- shutdown_task (cls, tc);
+ GST_route_list_clear ();
+ /* Clear GST_slave_list */
+ GST_slave_list_clear ();
+ /* Clear host list */
+ for (id = 0; id < GST_host_list_size; id++)
+ if (NULL != GST_host_list[id])
+ GNUNET_TESTBED_host_destroy (GST_host_list[id]);
+ GNUNET_free_non_null (GST_host_list);
+ if (NULL != GST_context)
+ {
+ GNUNET_free_non_null (GST_context->master_ip);
+ if (NULL != GST_context->system)
+ GNUNET_TESTING_system_destroy (GST_context->system, GNUNET_YES);
+ GNUNET_SERVER_client_drop (GST_context->client);
+ GNUNET_free (GST_context);
+ GST_context = NULL;
+ }
+ if (NULL != transmit_handle)
+ GNUNET_SERVER_notify_transmit_ready_cancel (transmit_handle);
+ while (NULL != (mq_entry = mq_head))
+ {
+ GNUNET_free (mq_entry->msg);
+ GNUNET_SERVER_client_drop (mq_entry->client);
+ GNUNET_CONTAINER_DLL_remove (mq_head, mq_tail, mq_entry);
+ GNUNET_free (mq_entry);
+ }
+ GNUNET_free_non_null (hostname);
+ /* Free hello cache */
+ GST_cache_clear ();
+ GST_connection_pool_destroy ();
+ GNUNET_TESTBED_operation_queue_destroy_ (GST_opq_openfds);
+ GST_opq_openfds = NULL;
+ GST_stats_destroy ();
+ GST_barriers_destroy ();
+ GNUNET_CONFIGURATION_destroy (GST_config);
}
static void
client_disconnect_cb (void *cls, struct GNUNET_SERVER_Client *client)
{
- if (NULL == master_context)
+ if (NULL == GST_context)
return;
- if (client == master_context->client)
+ if (client == GST_context->client)
{
LOG (GNUNET_ERROR_TYPE_DEBUG, "Master client disconnected\n");
- GNUNET_SERVER_client_drop (client);
/* should not be needed as we're terminated by failure to read
- from stdin, but if stdin fails for some reason, this shouldn't
- 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 ();
+ * from stdin, but if stdin fails for some reason, this shouldn't
+ * 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 ();
}
}
* @param server the initialized server
* @param cfg configuration to use
*/
-static void
-testbed_run (void *cls,
- struct GNUNET_SERVER_Handle *server,
+static void
+testbed_run (void *cls, struct GNUNET_SERVER_Handle *server,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- static const struct GNUNET_SERVER_MessageHandler message_handlers[] =
- {
- {&handle_init, NULL, GNUNET_MESSAGE_TYPE_TESTBED_INIT,
- sizeof (struct GNUNET_TESTBED_InitMessage)},
- {&handle_add_host, NULL, GNUNET_MESSAGE_TYPE_TESTBED_ADDHOST, 0},
- {&handle_configure_shared_service, NULL,
- 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)},
- {NULL}
- };
-
- config = GNUNET_CONFIGURATION_dup (cfg);
- GNUNET_SERVER_add_handlers (server,
- message_handlers);
- GNUNET_SERVER_disconnect_notify (server,
- &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);
+ static const struct GNUNET_SERVER_MessageHandler message_handlers[] = {
+ {&handle_init, NULL, GNUNET_MESSAGE_TYPE_TESTBED_INIT, 0},
+ {&handle_add_host, NULL, GNUNET_MESSAGE_TYPE_TESTBED_ADD_HOST, 0},
+ {&GST_handle_link_controllers, NULL,
+ GNUNET_MESSAGE_TYPE_TESTBED_LINK_CONTROLLERS,
+ sizeof (struct GNUNET_TESTBED_ControllerLinkRequest)},
+ {&GST_handle_peer_create, NULL, GNUNET_MESSAGE_TYPE_TESTBED_CREATE_PEER, 0},
+ {&GST_handle_peer_destroy, NULL, GNUNET_MESSAGE_TYPE_TESTBED_DESTROY_PEER,
+ sizeof (struct GNUNET_TESTBED_PeerDestroyMessage)},
+ {&GST_handle_peer_start, NULL, GNUNET_MESSAGE_TYPE_TESTBED_START_PEER,
+ sizeof (struct GNUNET_TESTBED_PeerStartMessage)},
+ {&GST_handle_peer_stop, NULL, GNUNET_MESSAGE_TYPE_TESTBED_STOP_PEER,
+ sizeof (struct GNUNET_TESTBED_PeerStopMessage)},
+ {&GST_handle_peer_get_config, NULL,
+ GNUNET_MESSAGE_TYPE_TESTBED_GET_PEER_INFORMATION,
+ sizeof (struct GNUNET_TESTBED_PeerGetConfigurationMessage)},
+ {&GST_handle_overlay_connect, NULL,
+ GNUNET_MESSAGE_TYPE_TESTBED_OVERLAY_CONNECT,
+ sizeof (struct GNUNET_TESTBED_OverlayConnectMessage)},
+ {&GST_handle_remote_overlay_connect, NULL,
+ GNUNET_MESSAGE_TYPE_TESTBED_REMOTE_OVERLAY_CONNECT, 0},
+ {&GST_handle_manage_peer_service, NULL,
+ GNUNET_MESSAGE_TYPE_TESTBED_MANAGE_PEER_SERVICE, 0},
+ {&handle_slave_get_config, NULL,
+ GNUNET_MESSAGE_TYPE_TESTBED_GET_SLAVE_CONFIGURATION,
+ sizeof (struct GNUNET_TESTBED_SlaveGetConfigurationMessage)},
+ {&GST_handle_shutdown_peers, NULL, GNUNET_MESSAGE_TYPE_TESTBED_SHUTDOWN_PEERS,
+ sizeof (struct GNUNET_TESTBED_ShutdownPeersMessage)},
+ {&GST_handle_peer_reconfigure, NULL,
+ GNUNET_MESSAGE_TYPE_TESTBED_RECONFIGURE_PEER, 0},
+ {&GST_handle_barrier_init, NULL,
+ GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_INIT, 0},
+ {&GST_handle_barrier_cancel, NULL,
+ GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_CANCEL, 0},
+ {&GST_handle_barrier_status, NULL,
+ GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_STATUS, 0},
+ {NULL, NULL, 0, 0}
+ };
+ char *logfile;
+ unsigned long long num;
+
+ LOG_DEBUG ("Starting testbed\n");
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_filename (cfg, "TESTBED", "LOG_FILE",
+ &logfile))
+ {
+ GNUNET_break (GNUNET_OK == GNUNET_log_setup ("testbed", "DEBUG", logfile));
+ GNUNET_free (logfile);
+ }
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number (cfg, "TESTBED",
+ "CACHE_SIZE", &num));
+ GST_cache_init ((unsigned int) num);
+ GST_connection_pool_init ((unsigned int) num);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number (cfg, "TESTBED",
+ "MAX_OPEN_FDS", &num));
+ GST_opq_openfds = GNUNET_TESTBED_operation_queue_create_
+ (OPERATION_QUEUE_TYPE_FIXED, (unsigned int) num);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_time (cfg, "TESTBED",
+ "OPERATION_TIMEOUT",
+ (struct
+ GNUNET_TIME_Relative *)
+ &GST_timeout));
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string (cfg, "testbed",
+ "HOSTNAME", &hostname));
+ GST_config = GNUNET_CONFIGURATION_dup (cfg);
+ GNUNET_SERVER_add_handlers (server, message_handlers);
+ GNUNET_SERVER_disconnect_notify (server, &client_disconnect_cb, NULL);
+ shutdown_task_id =
+ GNUNET_SCHEDULER_add_delayed_with_priority (GNUNET_TIME_UNIT_FOREVER_REL,
+ GNUNET_SCHEDULER_PRIORITY_IDLE,
+ &shutdown_task, NULL);
LOG_DEBUG ("Testbed startup complete\n");
+ GST_stats_init (GST_config);
+ GST_barriers_init (GST_config);
}
/**
* The starting point of execution
*/
-int main (int argc, char *const *argv)
+int
+main (int argc, char *const *argv)
{
- return
- (GNUNET_OK ==
- GNUNET_SERVICE_run (argc,
- argv,
- "testbed",
- GNUNET_SERVICE_OPTION_NONE,
- &testbed_run,
- NULL)) ? 0 : 1;
+ //sleep (15); /* Debugging */
+ return (GNUNET_OK ==
+ GNUNET_SERVICE_run (argc, argv, "testbed", GNUNET_SERVICE_OPTION_NONE,
+ &testbed_run, NULL)) ? 0 : 1;
}
+
+/* end of gnunet-service-testbed.c */
projects / oweals / gnunet.git / blobdiff