* @author Sree Harsha Totakura
*/
-#include "platform.h"
-#include "gnunet_service_lib.h"
-#include "gnunet_server_lib.h"
-#include "gnunet_transport_service.h"
-#include "gnunet_core_service.h"
-#include "gnunet_hello_lib.h"
+#include "gnunet-service-testbed.h"
+
#include <zlib.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(kind,...) \
- GNUNET_log (kind, __VA_ARGS__)
+/***********/
+/* Globals */
+/***********/
/**
- * Debug logging
+ * Our configuration
*/
-#define LOG_DEBUG(...) \
- LOG (GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__)
+struct GNUNET_CONFIGURATION_Handle *our_config;
/**
- * By how much should the arrays lists grow
+ * The master context; generated with the first INIT message
*/
-#define LIST_GROW_STEP 10
+struct Context *GST_context;
/**
- * Default timeout for operations which may take some time
+ * A list of directly linked neighbours
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 30)
+struct Slave **GST_slave_list;
/**
- * The main context information associated with the client which started us
+ * A list of peers we know about
*/
-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 Peer **GST_peer_list;
/**
- * 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 slave host has been registred at the forwarding controller
- */
- SLAVE_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 gateway which will pass the link message to delegated host
- */
- struct Slave *gateway;
-
- /**
- * The controller link message that has to be forwarded to
- */
- struct GNUNET_TESTBED_ControllerLinkMessage *msg;
-
- /**
- * The client which has asked to perform this operation
- */
- struct GNUNET_SERVER_Client *client;
-
- /**
- * The host registration handle while registered hosts in this context
- */
- struct GNUNET_TESTBED_HostRegistrationHandle *rhandle;
-
- /**
- * The id of the operation which created this context
- */
- uint64_t operation_id;
-
- /**
- * The state of this context
- */
- enum LCFContextState state;
-
- /**
- * The delegated host
- */
- uint32_t delegated_host_id;
-
- /**
- * The slave host
- */
- uint32_t slave_host_id;
-
-};
-
+unsigned int GST_host_list_size;
/**
- * Structure of a queue entry in LCFContext request queue
- */
-struct LCFContextQueue
-{
- /**
- * The LCFContext
- */
- struct LCFContext *lcf;
-
- /**
- * Head prt for DLL
- */
- struct LCFContextQueue *next;
-
- /**
- * Tail ptr for DLL
- */
- struct LCFContextQueue *prev;
-};
-
-
-/**
- * A locally started peer
+ * The size of directly linked neighbours list
*/
-struct Peer
-{
- union
- {
- struct
- {
- /**
- * 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;
-
- /**
- * Is the peer running
- */
- int is_running;
-
- } local;
-
- struct
- {
- /**
- * The controller this peer is started through
- */
- struct GNUNET_TESTBED_Controller *controller;
-
- } remote;
-
- } details;
-
- /**
- * Is this peer locally created?
- */
- int is_remote;
-
- /**
- * Our local reference id for this peer
- */
- uint32_t id;
-
-};
-
+unsigned int GST_slave_list_size;
/**
- * Context information for connecting 2 peers in overlay
+ * The size of the peer list
*/
-struct OverlayConnectContext
-{
- /**
- * The client which has requested for overlay connection
- */
- struct GNUNET_SERVER_Client *client;
-
- /**
- * the peer which has to connect to the other peer
- */
- struct Peer *peer;
-
- /**
- * The other peer
- */
- struct Peer *other_peer;
-
- /**
- * Transport handle of the first peer to get its HELLO
- */
- struct GNUNET_TRANSPORT_Handle *p1th;
-
- /**
- * Transport handle of other peer to offer first peer's HELLO
- */
- struct GNUNET_TRANSPORT_Handle *p2th;
-
- /**
- * Core handles of the first peer; used to notify when second peer connects to it
- */
- struct GNUNET_CORE_Handle *ch;
-
- /**
- * HELLO of the other peer
- */
- struct GNUNET_MessageHeader *hello;
-
- /**
- * Get hello handle to acquire HELLO of first peer
- */
- struct GNUNET_TRANSPORT_GetHelloHandle *ghh;
-
- /**
- * The error message we send if this overlay connect operation has timed out
- */
- char *emsg;
-
- /**
- * The peer identity of the first peer
- */
- struct GNUNET_PeerIdentity peer_identity;
-
- /**
- * The peer identity of the other peer
- */
- struct GNUNET_PeerIdentity other_peer_identity;
-
- /**
- * The id of the operation responsible for creating this context
- */
- uint64_t op_id;
-
- /**
- * The id of the task for sending HELLO of peer 2 to peer 1 and ask peer 1 to
- * connect to peer 2
- */
- GNUNET_SCHEDULER_TaskIdentifier send_hello_task;
-
- /**
- * The id of the overlay connect timeout task
- */
- GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+unsigned int GST_peer_list_size;
-};
+/***********************************/
+/* Local definitions and variables */
+/***********************************/
/**
- * Context information for operations forwarded to subcontrollers
+ * The message queue for sending messages to clients
*/
-struct ForwardedOperationContext
+struct MessageQueue
{
/**
- * The generated operation context
- */
- struct OperationContext *opc;
-
- /**
- * The client to which we have to reply
- */
- struct GNUNET_SERVER_Client *client;
-
- /**
- * Closure pointer
- */
- void *cls;
-
- /**
- * Task ID for the timeout task
- */
- GNUNET_SCHEDULER_TaskIdentifier timeout_task;
-
- /**
- * The id of the operation that has been forwarded
+ * The message to be sent
*/
- uint64_t operation_id;
-
-};
-
+ struct GNUNET_MessageHeader *msg;
-/**
- * Context information used while linking controllers
- */
-struct LinkControllersContext
-{
/**
- * The client which initiated the link controller operation
+ * The client to send the message to
*/
struct GNUNET_SERVER_Client *client;
/**
- * The ID of the operation
+ * next pointer for DLL
*/
- uint64_t operation_id;
+ struct MessageQueue *next;
/**
- * Pointer to the slave handle if we are directly starting/connecting to the controller
+ * prev pointer for DLL
*/
- struct Slave *slave;
+ struct MessageQueue *prev;
};
-
-
/**
- * The master context; generated with the first INIT message
+ * Our hostname; we give this to all the peers we start
*/
-static struct Context *master_context;
-
-/***********/
-/* Handles */
-/***********/
+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 MessageQueue *mq_tail;
/**
- * Array of host list
+ * The hashmap of shared services
*/
-static struct GNUNET_TESTBED_Host **host_list;
+static struct GNUNET_CONTAINER_MultiHashMap *ss_map;
/**
* 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
+ * The event mask for the events we listen from sub-controllers
*/
-static uint32_t host_list_size;
+static uint64_t event_mask;
/**
* 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 */
-/*********/
+static unsigned int route_list_size;
/**
* The lcf_task handle
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;
* @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;
mq_entry = GNUNET_malloc (sizeof (struct MessageQueue));
mq_entry->msg = msg;
mq_entry->client = client;
+ 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);
/**
- * Similar to GNUNET_realloc; however clears tail part of newly allocated memory
+ * Similar to GNUNET_array_grow(); however instead of calling GNUNET_array_grow()
+ * several times we call it only once. The array is also made to grow in steps
+ * of LIST_GROW_STEP.
*
- * @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;
-}
+ * @param ptr the array pointer to grow
+ * @param size the size of array
+ * @param accommodate_size the size which the array has to accommdate; after
+ * this call the array will be big enough to accommdate sizes upto
+ * accommodate_size
+ */
+#define array_grow_large_enough(ptr, size, accommodate_size) \
+ do \
+ { \
+ unsigned int growth_size; \
+ GNUNET_assert (size <= accommodate_size); \
+ growth_size = size; \
+ while (growth_size <= accommodate_size) \
+ growth_size += LIST_GROW_STEP; \
+ GNUNET_array_grow (ptr, size, growth_size); \
+ GNUNET_assert (size > accommodate_size); \
+ } while (0)
/**
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)
+ 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;
}
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;
- }
+ array_grow_large_enough (route_list, route_list_size, route->dest);
GNUNET_assert (NULL == route_list[route->dest]);
route_list[route->dest] = route;
}
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;
+ if (slave->host_id >= GST_slave_list_size)
+ array_grow_large_enough (GST_slave_list, GST_slave_list_size,
+ slave->host_id);
+ GNUNET_assert (NULL == GST_slave_list[slave->host_id]);
+ GST_slave_list[slave->host_id] = slave;
}
static void
peer_list_add (struct Peer *peer)
{
- uint32_t orig_size;
-
- orig_size = peer_list_size;
- if (peer->id >= peer_list_size)
- {
- while (peer->id >= peer_list_size)
- peer_list_size += LIST_GROW_STEP;
- peer_list =
- TESTBED_realloc (peer_list, sizeof (struct Peer *) * orig_size,
- sizeof (struct Peer *) * peer_list_size);
- }
- GNUNET_assert (NULL == peer_list[peer->id]);
- peer_list[peer->id] = peer;
+ if (peer->id >= GST_peer_list_size)
+ array_grow_large_enough (GST_peer_list, GST_peer_list_size, peer->id);
+ GNUNET_assert (NULL == GST_peer_list[peer->id]);
+ GST_peer_list[peer->id] = peer;
}
static void
peer_list_remove (struct Peer *peer)
{
+ unsigned int orig_size;
uint32_t id;
- uint32_t orig_size;
- peer_list[peer->id] = NULL;
- orig_size = peer_list_size;
- while (peer_list_size >= LIST_GROW_STEP)
+ GST_peer_list[peer->id] = NULL;
+ orig_size = GST_peer_list_size;
+ while (GST_peer_list_size >= LIST_GROW_STEP)
{
- for (id = peer_list_size - 1;
- (id >= peer_list_size - LIST_GROW_STEP) && (id != UINT32_MAX); id--)
- if (NULL != peer_list[id])
+ for (id = GST_peer_list_size - 1;
+ (id >= GST_peer_list_size - LIST_GROW_STEP) && (id != UINT32_MAX);
+ id--)
+ if (NULL != GST_peer_list[id])
break;
- if (id != ((peer_list_size - LIST_GROW_STEP) - 1))
+ if (id != ((GST_peer_list_size - LIST_GROW_STEP) - 1))
break;
- peer_list_size -= LIST_GROW_STEP;
+ GST_peer_list_size -= LIST_GROW_STEP;
}
- if (orig_size == peer_list_size)
+ if (orig_size == GST_peer_list_size)
return;
- peer_list =
- GNUNET_realloc (peer_list, sizeof (struct Peer *) * peer_list_size);
+ GST_peer_list =
+ GNUNET_realloc (GST_peer_list,
+ sizeof (struct Peer *) * GST_peer_list_size);
}
* @return the route with directly connected destination host; NULL if no route
* is found
*/
-static struct Route *
-find_dest_route (uint32_t host_id)
+struct Route *
+GST_find_dest_route (uint32_t host_id)
{
struct Route *route;
+ if (route_list_size <= host_id)
+ return NULL;
while (NULL != (route = route_list[host_id]))
{
- if (route->thru == master_context->host_id)
+ if (route->thru == GST_context->host_id)
break;
host_id = route->thru;
}
* @param operation_id the id of the failed operation
* @param emsg the error message; can be NULL
*/
-static void
-send_operation_fail_msg (struct GNUNET_SERVER_Client *client,
- uint64_t operation_id, const char *emsg)
+void
+GST_send_operation_fail_msg (struct GNUNET_SERVER_Client *client,
+ uint64_t operation_id, const char *emsg)
{
struct GNUNET_TESTBED_OperationFailureEventMessage *msg;
uint16_t msize;
msize += emsg_len;
msg = GNUNET_malloc (msize);
msg->header.size = htons (msize);
- msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONFAILEVENT);
+ 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);
- queue_message (client, &msg->header);
+ GST_queue_message (client, &msg->header);
}
msize = sizeof (struct GNUNET_TESTBED_GenericOperationSuccessEventMessage);
msg = GNUNET_malloc (msize);
msg->header.size = htons (msize);
- msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_GENERICOPSUCCESS);
+ 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);
- queue_message (client, &msg->header);
+ GST_queue_message (client, &msg->header);
+}
+
+
+/**
+ * Callback which will be called to after a host registration succeeded or failed
+ *
+ * @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
+hr_completion (void *cls, const char *emsg);
+
+
+/**
+ * Attempts to register the next host in the host registration queue
+ *
+ * @param slave the slave controller whose host registration queue is checked
+ * for host registrations
+ */
+static void
+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);
+}
+
+
+/**
+ * Callback which will be called to after a host registration succeeded or failed
+ *
+ * @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
+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);
+}
+
+
+/**
+ * Adds a host registration's request to a slave's registration queue
+ *
+ * @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_malloc (sizeof (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);
}
{
struct LCFContext *lcf = cls;
- lcf->rhandle = NULL;
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == lcf_proc_task_id);
switch (lcf->state)
{
}
return;
- registration_error:
+registration_error:
LOG (GNUNET_ERROR_TYPE_WARNING, "Host registration failed with message: %s\n",
emsg);
lcf->state = FINISHED;
/**
- * Callback to be called when forwarded link controllers operation is
- * successfull. We have to relay the reply msg back to the client
+ * Callback to relay the reply msg of a forwarded operation back to the client
*
* @param cls ForwardedOperationContext
- * @param msg the peer create success message
+ * @param msg the message to relay
*/
-static void
-forwarded_operation_reply_relay (void *cls,
- const struct GNUNET_MessageHeader *msg)
+void
+GST_forwarded_operation_reply_relay (void *cls,
+ const struct GNUNET_MessageHeader *msg)
{
struct ForwardedOperationContext *fopc = cls;
struct GNUNET_MessageHeader *dup_msg;
uint16_t msize;
msize = ntohs (msg->size);
- dup_msg = GNUNET_malloc (msize);
- (void) memcpy (dup_msg, msg, msize);
- queue_message (fopc->client, dup_msg);
+ 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);
+}
+
+
+/**
+ * Task to free resources when forwarded operation has been timedout
+ *
+ * @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_WARNING, "A forwarded operation has timed out\n");
+ GST_send_operation_fail_msg (fopc->client, fopc->operation_id, "Timeout");
+ GNUNET_SERVER_client_drop (fopc->client);
+ GNUNET_CONTAINER_DLL_remove (fopcq_head, fopcq_tail, fopc);
GNUNET_free (fopc);
}
+/**
+ * The Link Controller forwarding task
+ *
+ * @param cls the LCFContext
+ * @param tc the Task context from scheduler
+ */
+static void
+lcf_proc_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+
+
+/**
+ * Callback to be called when forwarded link controllers operation is
+ * successfull. We have to relay the reply msg back to the client
+ *
+ * @param cls the LCFContext
+ * @param msg the message to relay
+ */
+static void
+lcf_forwarded_operation_reply_relay (void *cls,
+ const struct GNUNET_MessageHeader *msg)
+{
+ struct LCFContext *lcf = cls;
+
+ GNUNET_assert (NULL != lcf->fopc);
+ GST_forwarded_operation_reply_relay (lcf->fopc, msg);
+ lcf->fopc = NULL;
+ GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == lcf_proc_task_id);
+ lcf_proc_task_id = GNUNET_SCHEDULER_add_now (&lcf_proc_task, lcf);
+}
+
+
/**
* Task to free resources when forwarded link controllers has been timedout
*
- * @param cls the ForwardedOperationContext
+ * @param cls the LCFContext
* @param tc the task context from scheduler
*/
static void
-forwarded_operation_timeout (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+lcf_forwarded_operation_timeout (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct ForwardedOperationContext *fopc = cls;
+ struct LCFContext *lcf = cls;
- GNUNET_TESTBED_forward_operation_msg_cancel_ (fopc->opc);
- send_operation_fail_msg (fopc->client, fopc->operation_id, "Timeout");
- GNUNET_SERVER_client_drop (fopc->client);
- GNUNET_free (fopc);
+ GNUNET_assert (NULL != lcf->fopc);
+ lcf->fopc->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ GST_forwarded_operation_timeout (lcf->fopc, tc);
+ lcf->fopc = NULL;
+ GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == lcf_proc_task_id);
+ lcf_proc_task_id = GNUNET_SCHEDULER_add_now (&lcf_proc_task, lcf);
}
{
struct LCFContext *lcf = cls;
struct LCFContextQueue *lcfq;
- struct ForwardedOperationContext *fopc;
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],
+ GNUNET_TESTBED_is_host_registered_ (GST_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);
+ GST_queue_host_registration (lcf->gateway, lcf_proc_cc, lcf,
+ GST_host_list[lcf->delegated_host_id]);
}
else
{
break;
case DELEGATED_HOST_REGISTERED:
if (GNUNET_NO ==
- GNUNET_TESTBED_is_host_registered_ (host_list[lcf->slave_host_id],
+ GNUNET_TESTBED_is_host_registered_ (GST_host_list[lcf->slave_host_id],
lcf->gateway->controller))
{
- lcf->rhandle =
- GNUNET_TESTBED_register_host (lcf->gateway->controller,
- host_list[lcf->slave_host_id],
- lcf_proc_cc, lcf);
+ GST_queue_host_registration (lcf->gateway, lcf_proc_cc, lcf,
+ GST_host_list[lcf->slave_host_id]);
}
else
{
}
break;
case SLAVE_HOST_REGISTERED:
- fopc = GNUNET_malloc (sizeof (struct ForwardedOperationContext));
- fopc->client = lcf->client;
- fopc->operation_id = lcf->operation_id;
- fopc->opc =
+ lcf->fopc = GNUNET_malloc (sizeof (struct ForwardedOperationContext));
+ lcf->fopc->client = lcf->client;
+ lcf->fopc->operation_id = lcf->operation_id;
+ lcf->fopc->type = OP_LINK_CONTROLLERS;
+ lcf->fopc->opc =
GNUNET_TESTBED_forward_operation_msg_ (lcf->gateway->controller,
lcf->operation_id,
&lcf->msg->header,
- &forwarded_operation_reply_relay,
- fopc);
- fopc->timeout_task =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT, &forwarded_operation_timeout,
- fopc);
+ &lcf_forwarded_operation_reply_relay,
+ lcf);
+ lcf->fopc->timeout_task =
+ GNUNET_SCHEDULER_add_delayed (GST_timeout, &lcf_forwarded_operation_timeout,
+ lcf);
+ GNUNET_CONTAINER_DLL_insert_tail (fopcq_head, fopcq_tail, lcf->fopc);
lcf->state = FINISHED;
- lcf_proc_task_id = GNUNET_SCHEDULER_add_now (&lcf_proc_task, lcf);
break;
case FINISHED:
lcfq = lcfq_head;
slave_event_callback (void *cls,
const struct GNUNET_TESTBED_EventInformation *event)
{
- GNUNET_break (0);
+ struct RegisteredHostContext *rhc;
+ struct GNUNET_CONFIGURATION_Handle *cfg;
+ struct GNUNET_TESTBED_Operation *old_op;
+
+ /* We currently only get here when working on RegisteredHostContexts */
+ GNUNET_assert (GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type);
+ rhc = event->details.operation_finished.op_cls;
+ GNUNET_assert (rhc->sub_op == event->details.operation_finished.operation);
+ switch (rhc->state)
+ {
+ case RHC_GET_CFG:
+ cfg = event->details.operation_finished.generic;
+ old_op = rhc->sub_op;
+ rhc->state = RHC_LINK;
+ rhc->sub_op =
+ GNUNET_TESTBED_controller_link (rhc, rhc->gateway->controller,
+ rhc->reg_host, rhc->host, cfg,
+ GNUNET_NO);
+ GNUNET_TESTBED_operation_done (old_op);
+ break;
+ case RHC_LINK:
+ LOG_DEBUG ("OL: Linking controllers successfull\n");
+ GNUNET_TESTBED_operation_done (rhc->sub_op);
+ rhc->sub_op = NULL;
+ rhc->state = RHC_OL_CONNECT;
+ GST_process_next_focc (rhc);
+ break;
+ default:
+ GNUNET_assert (0);
+ }
}
/**
* Callback to signal successfull startup of the controller process
*
- * @param cls the closure from GNUNET_TESTBED_controller_start()
+ * @param cls the handle to the slave whose status is to be found here
* @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,
slave_status_callback (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg,
int status)
{
- struct LinkControllersContext *lcc = cls;
+ struct Slave *slave = cls;
+ struct LinkControllersContext *lcc;
+ lcc = slave->lcc;
if (GNUNET_SYSERR == status)
{
- lcc->slave->controller_proc = NULL;
+ slave->controller_proc = NULL;
+ GST_slave_list[slave->host_id] = NULL;
+ if (NULL != slave->cfg)
+ GNUNET_CONFIGURATION_destroy (slave->cfg);
+ GNUNET_free (slave);
+ slave = NULL;
LOG (GNUNET_ERROR_TYPE_WARNING, "Unexpected slave shutdown\n");
GNUNET_SCHEDULER_shutdown (); /* We too shutdown */
- return;
+ goto clean_lcc;
}
- lcc->slave->controller =
- GNUNET_TESTBED_controller_connect (cfg, host_list[lcc->slave->host_id],
- master_context->event_mask,
- &slave_event_callback, lcc->slave);
- if (NULL != lcc->slave->controller)
+ slave->controller =
+ GNUNET_TESTBED_controller_connect (cfg, GST_host_list[slave->host_id],
+ event_mask, &slave_event_callback,
+ slave);
+ if (NULL != slave->controller)
+ {
send_operation_success_msg (lcc->client, lcc->operation_id);
+ slave->cfg = GNUNET_CONFIGURATION_dup (cfg);
+ }
else
- send_operation_fail_msg (lcc->client, lcc->operation_id,
- "Could not connect to delegated controller");
- GNUNET_SERVER_client_drop (lcc->client);
- GNUNET_free (lcc);
+ {
+ GST_send_operation_fail_msg (lcc->client, lcc->operation_id,
+ "Could not connect to delegated controller");
+ GNUNET_TESTBED_controller_stop (slave->controller_proc);
+ GST_slave_list[slave->host_id] = NULL;
+ GNUNET_free (slave);
+ slave = NULL;
+ }
+
+clean_lcc:
+ if (NULL != lcc)
+ {
+ if (NULL != lcc->client)
+ {
+ GNUNET_SERVER_receive_done (lcc->client, GNUNET_OK);
+ GNUNET_SERVER_client_drop (lcc->client);
+ lcc->client = NULL;
+ }
+ GNUNET_free (lcc);
+ }
+ if (NULL != slave)
+ slave->lcc = NULL;
}
const char *controller_hostname;
uint16_t msize;
- if (NULL != master_context)
+ if (NULL != GST_context)
{
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ LOG_DEBUG ("We are being connected to laterally\n");
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
msg = (const struct GNUNET_TESTBED_InitMessage *) message;
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- master_context = GNUNET_malloc (sizeof (struct Context));
- master_context->client = client;
- master_context->host_id = ntohl (msg->host_id);
- master_context->master_ip = GNUNET_strdup (controller_hostname);
- LOG_DEBUG ("Master Controller IP: %s\n", master_context->master_ip);
- master_context->system =
- GNUNET_TESTING_system_create ("testbed", master_context->master_ip);
+ GST_context = GNUNET_malloc (sizeof (struct Context));
+ GNUNET_SERVER_client_keep (client);
+ 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);
host =
- GNUNET_TESTBED_host_create_with_id (master_context->host_id, NULL, NULL,
- 0);
+ GNUNET_TESTBED_host_create_with_id (GST_context->host_id,
+ GST_context->master_ip, NULL, 0);
host_list_add (host);
- master_context->event_mask = GNUNET_ntohll (msg->event_mask);
- GNUNET_SERVER_client_keep (client);
- LOG_DEBUG ("Created master context with host ID: %u\n",
- master_context->host_id);
+ LOG_DEBUG ("Created master context with host ID: %u\n", GST_context->host_id);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
msg = (const struct GNUNET_TESTBED_AddHostMessage *) message;
msize = ntohs (msg->header.size);
- username = (char *) &(msg[1]);
+ username = (char *) &msg[1];
username_length = ntohs (msg->user_name_length);
- GNUNET_assert (msize > (sizeof (struct GNUNET_TESTBED_AddHostMessage) + username_length + 1)); /* msg must contain hostname */
if (0 != username_length)
- GNUNET_assert ('\0' == username[username_length]);
- username_length = (0 == username_length) ? 0 : username_length + 1;
+ username_length++;
+ /* msg must contain hostname */
+ GNUNET_assert (msize >
+ (sizeof (struct GNUNET_TESTBED_AddHostMessage) +
+ username_length + 1));
+ if (0 != username_length)
+ GNUNET_assert ('\0' == username[username_length - 1]);
hostname = username + username_length;
hostname_length =
msize - (sizeof (struct GNUNET_TESTBED_AddHostMessage) + username_length);
GNUNET_assert ('\0' == hostname[hostname_length - 1]);
GNUNET_assert (strlen (hostname) == hostname_length - 1);
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);
+ LOG_DEBUG ("-------hostname: %s\n", hostname);
if (0 != username_length)
LOG_DEBUG ("-------username: %s\n", username);
else
GNUNET_TESTBED_host_create_with_id (host_id, hostname, username,
ntohs (msg->ssh_port));
GNUNET_assert (NULL != host);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
reply_size = sizeof (struct GNUNET_TESTBED_HostConfirmedMessage);
if (GNUNET_OK != host_list_add (host))
{
memcpy (&reply[1], emsg, strlen (emsg) + 1);
}
else
+ {
+ 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_ADDHOSTCONFIRM);
+ }
+ reply->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_ADD_HOST_SUCCESS);
reply->header.size = htons (reply_size);
reply->host_id = htonl (host_id);
- queue_message (client, &reply->header);
+ GST_queue_message (client, &reply->header);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
}
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)
+ if (ntohl (msg->host_id) != GST_context->host_id)
{
route_message (ntohl (msg->host_id), message);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
uint32_t slave_host_id;
uint16_t msize;
- if (NULL == master_context)
+ if (NULL == GST_context)
{
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
}
msg = (const struct GNUNET_TESTBED_ControllerLinkMessage *) message;
delegated_host_id = ntohl (msg->delegated_host_id);
- if (delegated_host_id == master_context->host_id)
+ if (delegated_host_id == GST_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]))
+ if ((delegated_host_id >= GST_host_list_size) ||
+ (NULL == GST_host_list[delegated_host_id]))
{
- LOG (GNUNET_ERROR_TYPE_WARNING, "Delegated host not registered with us\n");
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Delegated host %u not registered with us\n", delegated_host_id);
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]))
+ if ((slave_host_id >= GST_host_list_size) ||
+ (NULL == GST_host_list[slave_host_id]))
{
- LOG (GNUNET_ERROR_TYPE_WARNING, "Slave host not registered with us\n");
+ LOG (GNUNET_ERROR_TYPE_WARNING, "Slave host %u not registered with us\n",
+ slave_host_id);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
return;
}
- if (slave_host_id == master_context->host_id) /* Link from us */
+ if (slave_host_id == GST_context->host_id) /* Link from us */
{
struct Slave *slave;
struct LinkControllersContext *lcc;
msize -= sizeof (struct GNUNET_TESTBED_ControllerLinkMessage);
config_size = ntohs (msg->config_size);
- if ((delegated_host_id < slave_list_size) && (NULL != slave_list[delegated_host_id])) /* We have already added */
+ if ((delegated_host_id < GST_slave_list_size) && (NULL != GST_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);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
config = GNUNET_malloc (config_size);
return;
}
GNUNET_free (config);
- if ((delegated_host_id < slave_list_size) &&
- (NULL != slave_list[delegated_host_id]))
+ if ((delegated_host_id < GST_slave_list_size) &&
+ (NULL != GST_slave_list[delegated_host_id]))
{
GNUNET_break (0); /* Configuration parsing error */
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
}
slave = GNUNET_malloc (sizeof (struct Slave));
slave->host_id = delegated_host_id;
+ slave->reghost_map = GNUNET_CONTAINER_multihashmap_create (100, GNUNET_NO);
slave_list_add (slave);
if (1 != msg->is_subordinate)
{
slave->controller =
- GNUNET_TESTBED_controller_connect (cfg, host_list[slave->host_id],
- master_context->event_mask,
- &slave_event_callback, slave);
- GNUNET_CONFIGURATION_destroy (cfg);
+ GNUNET_TESTBED_controller_connect (cfg, GST_host_list[slave->host_id],
+ event_mask, &slave_event_callback,
+ slave);
+ slave->cfg = cfg;
if (NULL != slave->controller)
send_operation_success_msg (client, GNUNET_ntohll (msg->operation_id));
else
- send_operation_fail_msg (client, GNUNET_ntohll (msg->operation_id),
- "Could not connect to delegated controller");
+ GST_send_operation_fail_msg (client, GNUNET_ntohll (msg->operation_id),
+ "Could not connect to delegated controller");
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
lcc->operation_id = GNUNET_ntohll (msg->operation_id);
GNUNET_SERVER_client_keep (client);
lcc->client = client;
- lcc->slave = slave;
+ slave->lcc = lcc;
slave->controller_proc =
- GNUNET_TESTBED_controller_start (master_context->master_ip,
- host_list[slave->host_id], cfg,
- &slave_status_callback, lcc);
+ GNUNET_TESTBED_controller_start (GST_context->master_ip,
+ GST_host_list[slave->host_id], cfg,
+ &slave_status_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;
+ new_route->thru = GST_context->host_id;
route_list_add (new_route);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
lcfq->lcf = GNUNET_malloc (sizeof (struct LCFContext));
lcfq->lcf->delegated_host_id = delegated_host_id;
lcfq->lcf->slave_host_id = slave_host_id;
- route = find_dest_route (slave_host_id);
+ route = GST_find_dest_route (slave_host_id);
GNUNET_assert (NULL != route); /* because we add routes carefully */
- GNUNET_assert (route->dest < slave_list_size);
- GNUNET_assert (NULL != slave_list[route->dest]);
+ GNUNET_assert (route->dest < GST_slave_list_size);
+ GNUNET_assert (NULL != GST_slave_list[route->dest]);
lcfq->lcf->state = INIT;
lcfq->lcf->operation_id = GNUNET_ntohll (msg->operation_id);
- lcfq->lcf->gateway = slave_list[route->dest];
+ lcfq->lcf->gateway = GST_slave_list[route->dest];
lcfq->lcf->msg = GNUNET_malloc (msize);
(void) memcpy (lcfq->lcf->msg, msg, msize);
GNUNET_SERVER_client_keep (client);
GNUNET_CONTAINER_DLL_insert_tail (lcfq_head, lcfq_tail, lcfq);
/* FIXME: Adding a new route should happen after the controllers are linked
* successfully */
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ if (1 != msg->is_subordinate)
+ {
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+ if ((delegated_host_id < route_list_size) &&
+ (NULL != route_list[delegated_host_id]))
+ {
+ GNUNET_break_op (0); /* Are you trying to link delegated host twice
+ * with is subordinate flag set to GNUNET_YES? */
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
new_route = GNUNET_malloc (sizeof (struct Route));
new_route->dest = delegated_host_id;
new_route->thru = route->dest;
route_list_add (new_route);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
peer_create_forward_timeout (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct ForwardedOperationContext *fo_ctxt = cls;
+ struct ForwardedOperationContext *fopc = cls;
- /* send error msg to client */
- send_operation_fail_msg (fo_ctxt->client, fo_ctxt->operation_id, "Timedout");
- GNUNET_SERVER_client_drop (fo_ctxt->client);
- GNUNET_TESTBED_forward_operation_msg_cancel_ (fo_ctxt->opc);
- GNUNET_free (fo_ctxt);
+ GNUNET_free (fopc->cls);
+ GST_forwarded_operation_timeout (fopc, tc);
}
/**
- * Callback to be called when forwarded peer create operation is
- * successfull. We have to relay the reply msg back to the client
+ * Callback to be called when forwarded peer create operation is successfull. We
+ * have to relay the reply msg back to the client
*
* @param cls ForwardedOperationContext
* @param msg the peer create success message
static void
peer_create_success_cb (void *cls, const struct GNUNET_MessageHeader *msg)
{
- struct ForwardedOperationContext *fo_ctxt = cls;
- const struct GNUNET_TESTBED_PeerCreateSuccessEventMessage *success_msg;
- struct GNUNET_MessageHeader *dup_msg;
- struct Peer *peer;
- uint16_t msize;
+ struct ForwardedOperationContext *fopc = cls;
+ struct Peer *remote_peer;
- GNUNET_SCHEDULER_cancel (fo_ctxt->timeout_task);
- if (ntohs (msg->type) == GNUNET_MESSAGE_TYPE_TESTBED_PEERCREATESUCCESS)
+ if (ntohs (msg->type) == GNUNET_MESSAGE_TYPE_TESTBED_CREATE_PEER_SUCCESS)
{
- success_msg =
- (const struct GNUNET_TESTBED_PeerCreateSuccessEventMessage *) msg;
- peer = GNUNET_malloc (sizeof (struct Peer));
- peer->is_remote = GNUNET_YES;
- peer->id = ntohl (success_msg->peer_id);
- GNUNET_assert (NULL != fo_ctxt->cls);
- peer->details.remote.controller = fo_ctxt->cls;
- peer_list_add (peer);
+ GNUNET_assert (NULL != fopc->cls);
+ remote_peer = fopc->cls;
+ peer_list_add (remote_peer);
}
- msize = ntohs (msg->size);
- dup_msg = GNUNET_malloc (msize);
- (void) memcpy (dup_msg, msg, msize);
- queue_message (fo_ctxt->client, dup_msg);
- GNUNET_SERVER_client_drop (fo_ctxt->client);
- GNUNET_free (fo_ctxt);
+ GST_forwarded_operation_reply_relay (fopc, msg);
+}
+
+
+/**
+ * Function to destroy a peer
+ *
+ * @param peer the peer structure to destroy
+ */
+void
+GST_destroy_peer (struct Peer *peer)
+{
+ GNUNET_break (0 == peer->reference_cnt);
+ if (GNUNET_YES == peer->is_remote)
+ {
+ peer_list_remove (peer);
+ GNUNET_free (peer);
+ return;
+ }
+ if (GNUNET_YES == peer->details.local.is_running)
+ {
+ GNUNET_TESTING_peer_stop (peer->details.local.peer);
+ peer->details.local.is_running = GNUNET_NO;
+ }
+ GNUNET_TESTING_peer_destroy (peer->details.local.peer);
+ GNUNET_CONFIGURATION_destroy (peer->details.local.cfg);
+ peer_list_remove (peer);
+ GNUNET_free (peer);
+}
+
+
+/**
+ * Callback to be called when forwarded peer destroy operation is successfull. We
+ * have to relay the reply msg back to the client
+ *
+ * @param cls ForwardedOperationContext
+ * @param msg the peer create success message
+ */
+static void
+peer_destroy_success_cb (void *cls, const struct GNUNET_MessageHeader *msg)
+{
+ struct ForwardedOperationContext *fopc = cls;
+ struct Peer *remote_peer;
+
+ if (GNUNET_MESSAGE_TYPE_TESTBED_GENERIC_OPERATION_SUCCESS ==
+ ntohs (msg->type))
+ {
+ remote_peer = fopc->cls;
+ GNUNET_assert (NULL != remote_peer);
+ remote_peer->destroy_flag = GNUNET_YES;
+ if (0 == remote_peer->reference_cnt)
+ GST_destroy_peer (remote_peer);
+ }
+ GST_forwarded_operation_reply_relay (fopc, msg);
}
peer_id = ntohl (msg->peer_id);
if (UINT32_MAX == peer_id)
{
- send_operation_fail_msg (client, GNUNET_ntohll (msg->operation_id),
- "Cannot create peer with given ID");
+ GST_send_operation_fail_msg (client, GNUNET_ntohll (msg->operation_id),
+ "Cannot create peer with given ID");
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
- if (host_id == master_context->host_id)
+ if (host_id == GST_context->host_id)
{
char *emsg;
return;
}
GNUNET_free (config);
+ GNUNET_CONFIGURATION_set_value_number (cfg, "TESTBED", "PEERID",
+ (unsigned long long) peer_id);
peer = GNUNET_malloc (sizeof (struct Peer));
peer->is_remote = GNUNET_NO;
peer->details.local.cfg = cfg;
peer->id = peer_id;
- LOG_DEBUG ("Creating peer with id: %u\n", peer->id);
+ LOG_DEBUG ("Creating peer with id: %u\n", (unsigned int) peer->id);
peer->details.local.peer =
- GNUNET_TESTING_peer_configure (master_context->system,
+ GNUNET_TESTING_peer_configure (GST_context->system,
peer->details.local.cfg, peer->id,
NULL /* Peer id */ ,
&emsg);
(struct GNUNET_TESTBED_PeerCreateSuccessEventMessage));
reply->header.size =
htons (sizeof (struct GNUNET_TESTBED_PeerCreateSuccessEventMessage));
- reply->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_PEERCREATESUCCESS);
+ reply->header.type =
+ htons (GNUNET_MESSAGE_TYPE_TESTBED_CREATE_PEER_SUCCESS);
reply->peer_id = msg->peer_id;
reply->operation_id = msg->operation_id;
- queue_message (client, &reply->header);
+ GST_queue_message (client, &reply->header);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
/* Forward peer create request */
- route = find_dest_route (host_id);
+ route = GST_find_dest_route (host_id);
if (NULL == route)
{
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
+
+ peer = GNUNET_malloc (sizeof (struct Peer));
+ peer->is_remote = GNUNET_YES;
+ peer->id = peer_id;
+ peer->details.remote.slave = GST_slave_list[route->dest];
+ peer->details.remote.remote_host_id = host_id;
fo_ctxt = GNUNET_malloc (sizeof (struct ForwardedOperationContext));
GNUNET_SERVER_client_keep (client);
fo_ctxt->client = client;
fo_ctxt->operation_id = GNUNET_ntohll (msg->operation_id);
- fo_ctxt->cls = slave_list[route->dest]->controller;
+ fo_ctxt->cls = peer; //GST_slave_list[route->dest]->controller;
+ fo_ctxt->type = OP_PEER_CREATE;
fo_ctxt->opc =
- GNUNET_TESTBED_forward_operation_msg_ (slave_list
+ GNUNET_TESTBED_forward_operation_msg_ (GST_slave_list
[route->dest]->controller,
fo_ctxt->operation_id,
&msg->header,
peer_create_success_cb, fo_ctxt);
fo_ctxt->timeout_task =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT, &peer_create_forward_timeout,
+ GNUNET_SCHEDULER_add_delayed (GST_timeout, &peer_create_forward_timeout,
fo_ctxt);
-
+ GNUNET_CONTAINER_DLL_insert_tail (fopcq_head, fopcq_tail, fo_ctxt);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
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]))
+ if ((GST_peer_list_size <= peer_id) || (NULL == GST_peer_list[peer_id]))
{
LOG (GNUNET_ERROR_TYPE_ERROR,
"Asked to destroy a non existent peer with id: %u\n", peer_id);
- send_operation_fail_msg (client, GNUNET_ntohll (msg->operation_id),
- "Peer doesn't exist");
+ GST_send_operation_fail_msg (client, GNUNET_ntohll (msg->operation_id),
+ "Peer doesn't exist");
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
- peer = peer_list[peer_id];
+ peer = GST_peer_list[peer_id];
if (GNUNET_YES == peer->is_remote)
{
/* Forward the destory message to sub controller */
fopc = GNUNET_malloc (sizeof (struct ForwardedOperationContext));
GNUNET_SERVER_client_keep (client);
fopc->client = client;
+ fopc->cls = peer;
+ fopc->type = OP_PEER_DESTROY;
fopc->operation_id = GNUNET_ntohll (msg->operation_id);
fopc->opc =
- GNUNET_TESTBED_forward_operation_msg_ (peer->details.remote.controller,
+ GNUNET_TESTBED_forward_operation_msg_ (peer->details.remote.
+ slave->controller,
fopc->operation_id, &msg->header,
- &forwarded_operation_reply_relay,
- fopc);
+ &peer_destroy_success_cb, fopc);
fopc->timeout_task =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT, &forwarded_operation_timeout,
+ GNUNET_SCHEDULER_add_delayed (GST_timeout, &GST_forwarded_operation_timeout,
fopc);
+ GNUNET_CONTAINER_DLL_insert_tail (fopcq_head, fopcq_tail, fopc);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
- GNUNET_TESTING_peer_destroy (peer->details.local.peer);
- GNUNET_CONFIGURATION_destroy (peer->details.local.cfg);
- peer_list_remove (peer);
- GNUNET_free (peer);
+ peer->destroy_flag = GNUNET_YES;
+ if (0 == peer->reference_cnt)
+ GST_destroy_peer (peer);
+ else
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Delaying peer destroy as peer is currently in use\n");
send_operation_success_msg (client, GNUNET_ntohll (msg->operation_id));
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
msg = (const struct GNUNET_TESTBED_PeerStartMessage *) message;
peer_id = ntohl (msg->peer_id);
- if ((peer_id >= peer_list_size) || (NULL == peer_list[peer_id]))
+ if ((peer_id >= GST_peer_list_size) || (NULL == GST_peer_list[peer_id]))
{
GNUNET_break (0);
LOG (GNUNET_ERROR_TYPE_ERROR,
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
- peer = peer_list[peer_id];
+ peer = GST_peer_list[peer_id];
if (GNUNET_YES == peer->is_remote)
{
fopc = GNUNET_malloc (sizeof (struct ForwardedOperationContext));
GNUNET_SERVER_client_keep (client);
fopc->client = client;
fopc->operation_id = GNUNET_ntohll (msg->operation_id);
+ fopc->type = OP_PEER_START;
fopc->opc =
- GNUNET_TESTBED_forward_operation_msg_ (peer->details.remote.controller,
+ GNUNET_TESTBED_forward_operation_msg_ (peer->details.remote.
+ slave->controller,
fopc->operation_id, &msg->header,
- &forwarded_operation_reply_relay,
+ &GST_forwarded_operation_reply_relay,
fopc);
fopc->timeout_task =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT, &forwarded_operation_timeout,
+ GNUNET_SCHEDULER_add_delayed (GST_timeout, &GST_forwarded_operation_timeout,
fopc);
+ GNUNET_CONTAINER_DLL_insert_tail (fopcq_head, fopcq_tail, fopc);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
if (GNUNET_OK != GNUNET_TESTING_peer_start (peer->details.local.peer))
{
- send_operation_fail_msg (client, GNUNET_ntohll (msg->operation_id),
- "Failed to start");
+ GST_send_operation_fail_msg (client, GNUNET_ntohll (msg->operation_id),
+ "Failed to start");
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
peer->details.local.is_running = GNUNET_YES;
reply = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerEventMessage));
- reply->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_PEEREVENT);
+ reply->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_PEER_EVENT);
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->host_id = htonl (GST_context->host_id);
reply->peer_id = msg->peer_id;
reply->operation_id = msg->operation_id;
- queue_message (client, &reply->header);
+ GST_queue_message (client, &reply->header);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
msg = (const struct GNUNET_TESTBED_PeerStopMessage *) message;
peer_id = ntohl (msg->peer_id);
- if ((peer_id >= peer_list_size) || (NULL == peer_list[peer_id]))
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Received PEER_STOP for peer %u\n", peer_id);
+ if ((peer_id >= GST_peer_list_size) || (NULL == GST_peer_list[peer_id]))
{
- send_operation_fail_msg (client, GNUNET_ntohll (msg->operation_id),
- "Peer not found");
+ GST_send_operation_fail_msg (client, GNUNET_ntohll (msg->operation_id),
+ "Peer not found");
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
- peer = peer_list[peer_id];
+ peer = GST_peer_list[peer_id];
if (GNUNET_YES == peer->is_remote)
{
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Forwarding PEER_STOP for peer %u\n",
+ peer_id);
fopc = GNUNET_malloc (sizeof (struct ForwardedOperationContext));
GNUNET_SERVER_client_keep (client);
fopc->client = client;
fopc->operation_id = GNUNET_ntohll (msg->operation_id);
+ fopc->type = OP_PEER_STOP;
fopc->opc =
- GNUNET_TESTBED_forward_operation_msg_ (peer->details.remote.controller,
+ GNUNET_TESTBED_forward_operation_msg_ (peer->details.remote.
+ slave->controller,
fopc->operation_id, &msg->header,
- &forwarded_operation_reply_relay,
+ &GST_forwarded_operation_reply_relay,
fopc);
fopc->timeout_task =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT, &forwarded_operation_timeout,
+ GNUNET_SCHEDULER_add_delayed (GST_timeout, &GST_forwarded_operation_timeout,
fopc);
+ GNUNET_CONTAINER_DLL_insert_tail (fopcq_head, fopcq_tail, fopc);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
if (GNUNET_OK != GNUNET_TESTING_peer_stop (peer->details.local.peer))
{
- send_operation_fail_msg (client, GNUNET_ntohll (msg->operation_id),
- "Peer not running");
+ LOG (GNUNET_ERROR_TYPE_WARNING, "Stopping peer %u failed\n", peer_id);
+ GST_send_operation_fail_msg (client, GNUNET_ntohll (msg->operation_id),
+ "Peer not running");
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Peer %u successfully stopped\n", peer_id);
peer->details.local.is_running = GNUNET_NO;
reply = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerEventMessage));
- reply->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_PEEREVENT);
+ reply->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_PEER_EVENT);
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->host_id = htonl (GST_context->host_id);
reply->peer_id = msg->peer_id;
reply->operation_id = msg->operation_id;
- queue_message (client, &reply->header);
+ GST_queue_message (client, &reply->header);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
msg = (const struct GNUNET_TESTBED_PeerGetConfigurationMessage *) message;
peer_id = ntohl (msg->peer_id);
- if ((peer_id >= peer_list_size) || (NULL == peer_list[peer_id]))
+ if ((peer_id >= GST_peer_list_size) || (NULL == GST_peer_list[peer_id]))
{
- send_operation_fail_msg (client, GNUNET_ntohll (msg->operation_id),
- "Peer not found");
+ GST_send_operation_fail_msg (client, GNUNET_ntohll (msg->operation_id),
+ "Peer not found");
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
- peer = peer_list[peer_id];
+ peer = GST_peer_list[peer_id];
if (GNUNET_YES == peer->is_remote)
{
- /* FIXME: forward to sub controller */
- GNUNET_break (0);
+ struct ForwardedOperationContext *fopc;
+
+ LOG_DEBUG ("Forwarding PEER_GET_CONFIG for peer: %u\n", peer_id);
+ fopc = GNUNET_malloc (sizeof (struct ForwardedOperationContext));
+ GNUNET_SERVER_client_keep (client);
+ fopc->client = client;
+ fopc->operation_id = GNUNET_ntohll (msg->operation_id);
+ fopc->type = OP_PEER_INFO;
+ fopc->opc =
+ GNUNET_TESTBED_forward_operation_msg_ (peer->details.remote.
+ slave->controller,
+ fopc->operation_id, &msg->header,
+ &GST_forwarded_operation_reply_relay,
+ fopc);
+ fopc->timeout_task =
+ GNUNET_SCHEDULER_add_delayed (GST_timeout, &GST_forwarded_operation_timeout,
+ fopc);
+ GNUNET_CONTAINER_DLL_insert_tail (fopcq_head, fopcq_tail, fopc);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
+ LOG_DEBUG ("Received PEER_GET_CONFIG for peer: %u\n", peer_id);
config =
- GNUNET_CONFIGURATION_serialize (peer_list[peer_id]->details.local.cfg,
+ GNUNET_CONFIGURATION_serialize (GST_peer_list[peer_id]->details.local.cfg,
&c_size);
xc_size = GNUNET_TESTBED_compress_config_ (config, c_size, &xconfig);
GNUNET_free (config);
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->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_PEER_CONFIGURATION);
reply->peer_id = msg->peer_id;
reply->operation_id = msg->operation_id;
- GNUNET_TESTING_peer_get_identity (peer_list[peer_id]->details.local.peer,
+ GNUNET_TESTING_peer_get_identity (GST_peer_list[peer_id]->details.local.peer,
&reply->peer_identity);
reply->config_size = htons ((uint16_t) c_size);
- queue_message (client, &reply->header);
+ GST_queue_message (client, &reply->header);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
/**
- * Task for cleaing up overlay connect context structure
- *
- * @param cls the overlay connect context
- * @param tc the task context
- */
-static void
-occ_cleanup (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct OverlayConnectContext *occ = cls;
-
- LOG_DEBUG ("Cleaning up occ\n");
- GNUNET_free_non_null (occ->emsg);
- GNUNET_free_non_null (occ->hello);
- if (GNUNET_SCHEDULER_NO_TASK != occ->send_hello_task)
- GNUNET_SCHEDULER_cancel (occ->send_hello_task);
- if (NULL != occ->ch)
- GNUNET_CORE_disconnect (occ->ch);
- if (NULL != occ->ghh)
- GNUNET_TRANSPORT_get_hello_cancel (occ->ghh);
- if (NULL != occ->p1th)
- GNUNET_TRANSPORT_disconnect (occ->p1th);
- if (NULL != occ->p2th)
- GNUNET_TRANSPORT_disconnect (occ->p2th);
- GNUNET_free (occ);
-}
-
-
-/**
- * Task which will be run when overlay connect request has been timed out
+ * Handler for GNUNET_MESSAGE_TYPE_TESTBED_GETSLAVECONFIG messages
*
- * @param cls the OverlayConnectContext
- * @param tc the TaskContext
+ * @param cls NULL
+ * @param client identification of the client
+ * @param message the actual message
*/
static void
-timeout_overlay_connect (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+handle_slave_get_config (void *cls, struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
{
- struct OverlayConnectContext *occ = cls;
-
- occ->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- send_operation_fail_msg (occ->client, occ->op_id, occ->emsg);
- GNUNET_SERVER_client_drop (occ->client);
- occ_cleanup (occ, tc);
-}
-
-
+ struct GNUNET_TESTBED_SlaveGetConfigurationMessage *msg;
+ struct Slave *slave;
+ struct GNUNET_TESTBED_SlaveConfiguration *reply;
+ char *config;
+ char *xconfig;
+ size_t config_size;
+ size_t xconfig_size;
+ size_t reply_size;
+ uint64_t op_id;
+ uint32_t slave_id;
-/**
- * Function called to notify transport users that another
- * peer connected to us.
- *
- * @param cls closure
- * @param new_peer the peer that connected
- * @param ats performance data
- * @param ats_count number of entries in ats (excluding 0-termination)
- */
-static void
-overlay_connect_notify (void *cls, const struct GNUNET_PeerIdentity *new_peer,
- const struct GNUNET_ATS_Information *ats,
- unsigned int ats_count)
-{
- struct OverlayConnectContext *occ = cls;
- struct GNUNET_TESTBED_ConnectionEventMessage *msg;
- char *new_peer_str;
- char *other_peer_str;
-
- LOG_DEBUG ("Overlay connect notify\n");
- if (0 ==
- memcmp (new_peer, &occ->peer_identity,
- sizeof (struct GNUNET_PeerIdentity)))
- return;
- new_peer_str = GNUNET_strdup (GNUNET_i2s (new_peer));
- other_peer_str = GNUNET_strdup (GNUNET_i2s (&occ->other_peer_identity));
- if (0 !=
- memcmp (new_peer, &occ->other_peer_identity,
- sizeof (struct GNUNET_PeerIdentity)))
- {
- LOG_DEBUG ("Unexpected peer %4s connected when expecting peer %4s\n",
- new_peer_str, other_peer_str);
- GNUNET_free (new_peer_str);
- GNUNET_free (other_peer_str);
- return;
- }
- GNUNET_free (new_peer_str);
- LOG_DEBUG ("Peer %4s connected to peer %4s\n", other_peer_str,
- GNUNET_i2s (&occ->peer_identity));
- GNUNET_free (other_peer_str);
- if (GNUNET_SCHEDULER_NO_TASK != occ->send_hello_task)
+ 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]))
{
- GNUNET_SCHEDULER_cancel (occ->send_hello_task);
- occ->send_hello_task = GNUNET_SCHEDULER_NO_TASK;
- }
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != occ->timeout_task);
- GNUNET_SCHEDULER_cancel (occ->timeout_task);
- occ->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_free_non_null (occ->emsg);
- occ->emsg = NULL;
- if (NULL != occ->p2th)
- GNUNET_TRANSPORT_disconnect (occ->p2th);
- occ->p2th = NULL;
- LOG_DEBUG ("Peers connected - Sending overlay connect success\n");
- msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_ConnectionEventMessage));
- msg->header.size =
- htons (sizeof (struct GNUNET_TESTBED_ConnectionEventMessage));
- msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_PEERCONEVENT);
- msg->event_type = htonl (GNUNET_TESTBED_ET_CONNECT);
- msg->peer1 = htonl (occ->peer->id);
- msg->peer2 = htonl (occ->other_peer->id);
- msg->operation_id = GNUNET_htonll (occ->op_id);
- queue_message (occ->client, &msg->header);
- GNUNET_SERVER_client_drop (occ->client);
- GNUNET_SCHEDULER_add_now (&occ_cleanup, occ);
-}
-
-
-/**
- * Task to offer HELLO of peer 1 to peer 2 and try to make peer 2 to connect to
- * peer 1.
- *
- * @param cls the OverlayConnectContext
- * @param tc the TaskContext from scheduler
- */
-static void
-send_hello (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct OverlayConnectContext *occ = cls;
- char *other_peer_str;
-
- occ->send_hello_task = GNUNET_SCHEDULER_NO_TASK;
- if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+ /* 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;
- GNUNET_assert (NULL != occ->hello);
- if (GNUNET_YES == occ->other_peer->is_remote)
- {
- struct GNUNET_TESTBED_RequestConnectMessage *msg;
- uint16_t msize;
- uint16_t hello_size;
-
- hello_size = ntohs (occ->hello->size);
- msize = sizeof (struct GNUNET_TESTBED_RequestConnectMessage) + hello_size;
- msg = GNUNET_malloc (msize);
- msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_REQUESTCONNECT);
- msg->header.size = htons (msize);
- msg->peer = htonl (occ->peer->id);
- msg->operation_id = GNUNET_htonll (occ->op_id);
- (void) memcpy (&msg->peer_identity, &occ->peer_identity,
- sizeof (struct GNUNET_PeerIdentity));
- memcpy (msg->hello, occ->hello, hello_size);
- GNUNET_TESTBED_queue_message_ (occ->other_peer->details.remote.controller,
- &msg->header);
- }
- else
- {
- other_peer_str = GNUNET_strdup (GNUNET_i2s (&occ->other_peer_identity));
- LOG_DEBUG ("Offering HELLO of %s to %s\n",
- GNUNET_i2s (&occ->peer_identity), other_peer_str);
- GNUNET_free (other_peer_str);
- GNUNET_TRANSPORT_offer_hello (occ->p2th, occ->hello, NULL, NULL);
- GNUNET_TRANSPORT_try_connect (occ->p2th, &occ->peer_identity);
}
- occ->send_hello_task =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &send_hello, occ);
-}
-
-/**
- * Test for checking whether HELLO message is empty
- *
- * @param cls empty flag to set
- * @param address the HELLO
- * @param expiration expiration of the HELLO
- * @return
- */
-static int
-test_address (void *cls, const struct GNUNET_HELLO_Address *address,
- struct GNUNET_TIME_Absolute expiration)
-{
- int *empty = cls;
-
- *empty = GNUNET_NO;
- return GNUNET_OK;
-}
-
-
-/**
- * Function called whenever there is an update to the
- * HELLO of peers in the OverlayConnectClosure
- *
- * @param cls closure
- * @param hello our updated HELLO
- */
-static void
-hello_update_cb (void *cls, const struct GNUNET_MessageHeader *hello)
-{
- struct OverlayConnectContext *occ = cls;
- int empty;
- uint16_t msize;
-
- msize = ntohs (hello->size);
- empty = GNUNET_YES;
- (void) GNUNET_HELLO_iterate_addresses ((const struct GNUNET_HELLO_Message *)
- hello, GNUNET_NO, &test_address,
- &empty);
- if (GNUNET_YES == empty)
+ slave = GST_slave_list[slave_id];
+ if (NULL == slave->cfg)
{
- LOG_DEBUG ("HELLO of %s is empty\n", GNUNET_i2s (&occ->peer_identity));
+ GST_send_operation_fail_msg (client, op_id,
+ "Configuration not found (slave not started by me)");
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
- LOG_DEBUG ("Received HELLO of %s\n", GNUNET_i2s (&occ->peer_identity));
- occ->hello = GNUNET_malloc (msize);
- memcpy (occ->hello, hello, msize);
- GNUNET_TRANSPORT_get_hello_cancel (occ->ghh);
- occ->ghh = NULL;
- GNUNET_TRANSPORT_disconnect (occ->p1th);
- occ->p1th = NULL;
- GNUNET_free_non_null (occ->emsg);
- if (GNUNET_NO == occ->other_peer->is_remote)
- {
- occ->p2th =
- GNUNET_TRANSPORT_connect (occ->other_peer->details.local.cfg,
- &occ->other_peer_identity, NULL, NULL, NULL,
- NULL);
- if (NULL == occ->p2th)
- {
- occ->emsg = GNUNET_strdup ("Cannot connect to TRANSPORT of peer B");
- GNUNET_SCHEDULER_cancel (occ->timeout_task);
- occ->timeout_task = GNUNET_SCHEDULER_add_now (&timeout_overlay_connect, occ);
- return;
- }
- }
- occ->emsg = GNUNET_strdup ("Timeout while offering HELLO to other peer");
- occ->send_hello_task = GNUNET_SCHEDULER_add_now (&send_hello, occ);
+ config = GNUNET_CONFIGURATION_serialize (slave->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);
}
/**
- * Function called after GNUNET_CORE_connect has succeeded (or failed
- * for good). Note that the private key of the peer is intentionally
- * not exposed here; if you need it, your process should try to read
- * the private key file directly (which should work if you are
- * authorized...).
+ * Iterator over hash map entries.
*
* @param cls closure
- * @param server handle to the server, NULL if we failed
- * @param my_identity ID of this peer, NULL if we failed
+ * @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 void
-core_startup_cb (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_identity)
+static int
+ss_map_free_iterator (void *cls, const struct GNUNET_HashCode *key, void *value)
{
- struct OverlayConnectContext *occ = cls;
-
- GNUNET_free_non_null (occ->emsg);
- occ->emsg = GNUNET_strdup ("Failed to connect to CORE\n");
- if ((NULL == server) || (NULL == my_identity))
- goto error_return;
- GNUNET_free (occ->emsg);
- occ->emsg = NULL;
- memcpy (&occ->peer_identity, my_identity,
- sizeof (struct GNUNET_PeerIdentity));
- occ->p1th =
- GNUNET_TRANSPORT_connect (occ->peer->details.local.cfg,
- &occ->peer_identity, NULL, NULL, NULL, NULL);
- if (NULL == occ->p1th)
- {
- GNUNET_asprintf (&occ->emsg, "Cannot connect to TRANSPORT of peers %4s",
- GNUNET_i2s (&occ->peer_identity));
- goto error_return;
- }
- LOG_DEBUG ("Acquiring HELLO of peer %s\n", GNUNET_i2s (&occ->peer_identity));
- occ->emsg = GNUNET_strdup ("Timeout while acquiring HELLO message");
- occ->ghh = GNUNET_TRANSPORT_get_hello (occ->p1th, &hello_update_cb, occ);
- return;
-
- error_return:
- GNUNET_SCHEDULER_cancel (occ->timeout_task);
- occ->timeout_task = GNUNET_SCHEDULER_add_now (&timeout_overlay_connect, occ);
- return;
-}
-
+ struct SharedService *ss = value;
-/**
- * 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;
- const struct GNUNET_CORE_MessageHandler no_handlers[] = {
- {NULL, 0, 0}
- };
- 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]);
- /* FIXME: Add cases where we have to forward overlay connect message to sub
- * controllers */
- GNUNET_assert (GNUNET_NO == peer_list[p1]->is_remote);
- occ = GNUNET_malloc (sizeof (struct OverlayConnectContext));
- GNUNET_SERVER_client_keep (client);
- occ->client = client;
- occ->peer = peer_list[p1];
- occ->other_peer = peer_list[p2];
- occ->op_id = GNUNET_ntohll (msg->operation_id);
- /* Get the identity of the second peer */
- GNUNET_TESTING_peer_get_identity (occ->other_peer->details.local.peer,
- &occ->other_peer_identity);
- /* Connect to the core of 1st peer and wait for the 2nd peer to connect */
- occ->emsg = GNUNET_strdup ("Timeout while connecting to CORE");
- occ->ch =
- GNUNET_CORE_connect (occ->peer->details.local.cfg, occ, &core_startup_cb,
- &overlay_connect_notify, NULL, NULL, GNUNET_NO, NULL,
- GNUNET_NO, no_handlers);
- if (NULL == occ->ch)
- occ->timeout_task =
- GNUNET_SCHEDULER_add_now (&timeout_overlay_connect, occ);
- else
- occ->timeout_task =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 30),
- &timeout_overlay_connect, occ);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove (ss_map, key, value));
+ GNUNET_free (ss->name);
+ GNUNET_free (ss);
+ return GNUNET_YES;
}
/**
- * Iterator over hash map entries.
+ * Iterator for freeing hash map entries in a slave's reghost_map
*
- * @param cls closure
+ * @param cls handle to the slave
* @param key current key code
* @param value value in the hash map
* @return GNUNET_YES if we should continue to
* GNUNET_NO if not.
*/
static int
-ss_map_free_iterator (void *cls, const struct GNUNET_HashCode *key, void *value)
+reghost_free_iterator (void *cls, const struct GNUNET_HashCode *key,
+ void *value)
{
- struct SharedService *ss = value;
+ struct Slave *slave = cls;
+ struct RegisteredHostContext *rhc = value;
+ struct ForwardedOverlayConnectContext *focc;
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (ss_map, key, value));
- GNUNET_free (ss->name);
- GNUNET_free (ss);
+ GNUNET_CONTAINER_multihashmap_remove (slave->reghost_map, key,
+ value));
+ while (NULL != (focc = rhc->focc_dll_head))
+ {
+ GNUNET_CONTAINER_DLL_remove (rhc->focc_dll_head, rhc->focc_dll_tail, focc);
+ GST_cleanup_focc (focc);
+ }
+ if (NULL != rhc->sub_op)
+ GNUNET_TESTBED_operation_done (rhc->sub_op);
+ if (NULL != rhc->client)
+ GNUNET_SERVER_client_drop (rhc->client);
+ GNUNET_free (value);
return GNUNET_YES;
}
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct LCFContextQueue *lcfq;
+ struct ForwardedOperationContext *fopc;
+ struct MessageQueue *mq_entry;
uint32_t id;
shutdown_task_id = GNUNET_SCHEDULER_NO_TASK;
(void) GNUNET_CONTAINER_multihashmap_iterate (ss_map, &ss_map_free_iterator,
NULL);
GNUNET_CONTAINER_multihashmap_destroy (ss_map);
+ /* cleanup any remaining forwarded operations */
+ while (NULL != (fopc = fopcq_head))
+ {
+ 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)
+ {
+ case OP_PEER_CREATE:
+ GNUNET_free (fopc->cls);
+ 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:
+ break;
+ case OP_FORWARDED:
+ GNUNET_assert (0);
+ };
+ GNUNET_free (fopc);
+ }
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_CONTAINER_DLL_remove (lcfq_head, lcfq_tail, lcfq);
GNUNET_free (lcfq);
}
+ GST_free_occq ();
+ GST_free_roccq ();
/* Clear peer list */
- for (id = 0; id < peer_list_size; id++)
- if (NULL != peer_list[id])
+ for (id = 0; id < GST_peer_list_size; id++)
+ if (NULL != GST_peer_list[id])
+ {
+ /* If destroy flag is set it means that this peer should have been
+ * destroyed by a context which we destroy before */
+ GNUNET_break (GNUNET_NO == GST_peer_list[id]->destroy_flag);
+ /* counter should be zero as we free all contexts before */
+ GNUNET_break (0 == GST_peer_list[id]->reference_cnt);
+ if ((GNUNET_NO == GST_peer_list[id]->is_remote) &&
+ (GNUNET_YES == GST_peer_list[id]->details.local.is_running))
+ GNUNET_TESTING_peer_kill (GST_peer_list[id]->details.local.peer);
+ }
+ for (id = 0; id < GST_peer_list_size; id++)
+ if (NULL != GST_peer_list[id])
{
- if (GNUNET_NO == peer_list[id]->is_remote)
+ if (GNUNET_NO == GST_peer_list[id]->is_remote)
{
- if (GNUNET_YES == peer_list[id]->details.local.is_running)
- GNUNET_TESTING_peer_stop (peer_list[id]->details.local.peer);
- GNUNET_TESTING_peer_destroy (peer_list[id]->details.local.peer);
- GNUNET_CONFIGURATION_destroy (peer_list[id]->details.local.cfg);
+ if (GNUNET_YES == GST_peer_list[id]->details.local.is_running)
+ GNUNET_TESTING_peer_wait (GST_peer_list[id]->details.local.peer);
+ GNUNET_TESTING_peer_destroy (GST_peer_list[id]->details.local.peer);
+ GNUNET_CONFIGURATION_destroy (GST_peer_list[id]->details.local.cfg);
}
- GNUNET_free (peer_list[id]);
+ GNUNET_free (GST_peer_list[id]);
}
- GNUNET_free_non_null (peer_list);
+ GNUNET_free_non_null (GST_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);
+ 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);
/* 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])
+ /* Clear GST_slave_list */
+ for (id = 0; id < GST_slave_list_size; id++)
+ if (NULL != GST_slave_list[id])
{
- if (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);
+ struct HostRegistration *hr_entry;
+
+ while (NULL != (hr_entry = GST_slave_list[id]->hr_dll_head))
+ {
+ GNUNET_CONTAINER_DLL_remove (GST_slave_list[id]->hr_dll_head,
+ GST_slave_list[id]->hr_dll_tail, hr_entry);
+ GNUNET_free (hr_entry);
+ }
+ if (NULL != GST_slave_list[id]->rhandle)
+ GNUNET_TESTBED_cancel_registration (GST_slave_list[id]->rhandle);
+ (void)
+ GNUNET_CONTAINER_multihashmap_iterate (GST_slave_list
+ [id]->reghost_map,
+ reghost_free_iterator,
+ GST_slave_list[id]);
+ GNUNET_CONTAINER_multihashmap_destroy (GST_slave_list[id]->reghost_map);
+ if (NULL != GST_slave_list[id]->cfg)
+ GNUNET_CONFIGURATION_destroy (GST_slave_list[id]->cfg);
+ if (NULL != GST_slave_list[id]->controller)
+ GNUNET_TESTBED_controller_disconnect (GST_slave_list[id]->controller);
+ if (NULL != GST_slave_list[id]->controller_proc)
+ GNUNET_TESTBED_controller_stop (GST_slave_list[id]->controller_proc);
+ GNUNET_free (GST_slave_list[id]);
}
- if (NULL != master_context)
+ GNUNET_free_non_null (GST_slave_list);
+ if (NULL != GST_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;
+ 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);
+ GNUNET_CONFIGURATION_destroy (our_config);
+ /* Free hello cache */
+ GST_cache_clear ();
+ GNUNET_TESTBED_operation_queue_destroy_ (GST_opq_openfds);
+ GST_opq_openfds = NULL;
}
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
{
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_ADDHOST, 0},
+ {&handle_add_host, NULL, GNUNET_MESSAGE_TYPE_TESTBED_ADD_HOST, 0},
{&handle_configure_shared_service, NULL,
- GNUNET_MESSAGE_TYPE_TESTBED_SERVICESHARE, 0},
+ GNUNET_MESSAGE_TYPE_TESTBED_SHARE_SERVICE, 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,
+ GNUNET_MESSAGE_TYPE_TESTBED_LINK_CONTROLLERS, 0},
+ {&handle_peer_create, NULL, GNUNET_MESSAGE_TYPE_TESTBED_CREATE_PEER, 0},
+ {&handle_peer_destroy, NULL, GNUNET_MESSAGE_TYPE_TESTBED_DESTROY_PEER,
sizeof (struct GNUNET_TESTBED_PeerDestroyMessage)},
- {&handle_peer_start, NULL, GNUNET_MESSAGE_TYPE_TESTBED_STARTPEER,
+ {&handle_peer_start, NULL, GNUNET_MESSAGE_TYPE_TESTBED_START_PEER,
sizeof (struct GNUNET_TESTBED_PeerStartMessage)},
- {&handle_peer_stop, NULL, GNUNET_MESSAGE_TYPE_TESTBED_STOPPEER,
+ {&handle_peer_stop, NULL, GNUNET_MESSAGE_TYPE_TESTBED_STOP_PEER,
sizeof (struct GNUNET_TESTBED_PeerStopMessage)},
- {&handle_peer_get_config, NULL, GNUNET_MESSAGE_TYPE_TESTBED_GETPEERCONFIG,
+ {&handle_peer_get_config, NULL,
+ GNUNET_MESSAGE_TYPE_TESTBED_GET_PEER_CONFIGURATION,
sizeof (struct GNUNET_TESTBED_PeerGetConfigurationMessage)},
- {&handle_overlay_connect, NULL, GNUNET_MESSAGE_TYPE_TESTBED_OLCONNECT,
+ {&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},
+ {handle_slave_get_config, NULL,
+ GNUNET_MESSAGE_TYPE_TESTBED_GET_SLAVE_CONFIGURATION,
+ sizeof (struct GNUNET_TESTBED_SlaveGetConfigurationMessage)},
{NULL}
};
+ char *logfile;
+ unsigned long long num;
+ 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);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number (cfg, "TESTBED",
+ "MAX_OPEN_FDS", &num));
+ GST_opq_openfds = GNUNET_TESTBED_operation_queue_create_ ((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));
+ our_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);
+ ss_map = GNUNET_CONTAINER_multihashmap_create (5, GNUNET_NO);
shutdown_task_id =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &shutdown_task, NULL);
+ GNUNET_SCHEDULER_add_delayed_with_priority (GNUNET_TIME_UNIT_FOREVER_REL,
+ GNUNET_SCHEDULER_PRIORITY_IDLE,
+ &shutdown_task, NULL);
LOG_DEBUG ("Testbed startup complete\n");
+ event_mask = 1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED;
}