* @author Sree Harsha Totakura
*/
-#include "platform.h"
#include "gnunet-service-testbed.h"
#include <zlib.h>
+/***********/
+/* Globals */
+/***********/
+
/**
- * The message queue for sending messages to clients
+ * Our configuration
*/
-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_CONFIGURATION_Handle *our_config;
/**
* The master context; generated with the first INIT message
*/
-static struct Context *master_context;
+struct Context *GST_context;
/**
- * Our hostname; we give this to all the peers we start
+ * A list of directly linked neighbours
*/
-static char *hostname;
-
-
-/***********/
-/* Handles */
-/***********/
+struct Slave **GST_slave_list;
/**
- * Our configuration
+ * A list of peers we know about
*/
-static struct GNUNET_CONFIGURATION_Handle *our_config;
+struct Peer **GST_peer_list;
/**
- * Current Transmit Handle; NULL if no notify transmit exists currently
+ * Array of hosts
*/
-static struct GNUNET_SERVER_TransmitHandle *transmit_handle;
-
-/****************/
-/* Lists & Maps */
-/****************/
+struct GNUNET_TESTBED_Host **GST_host_list;
/**
- * The head for the LCF queue
+ * DLL head for forwarded operation contexts
*/
-static struct LCFContextQueue *lcfq_head;
+struct ForwardedOperationContext *fopcq_head;
/**
- * The tail for the LCF queue
+ * DLL tail for forwarded operation contexts
*/
-static struct LCFContextQueue *lcfq_tail;
+struct ForwardedOperationContext *fopcq_tail;
/**
- * The message queue head
+ * Operation queue for open file descriptors
*/
-static struct MessageQueue *mq_head;
+struct OperationQueue *GST_opq_openfds;
/**
- * The message queue tail
+ * Timeout for operations which may take some time
*/
-static struct MessageQueue *mq_tail;
+const struct GNUNET_TIME_Relative GST_timeout;
/**
- * DLL head for OverlayConnectContext DLL - to be used to clean up during shutdown
+ * The size of the host list
*/
-static struct OverlayConnectContext *occq_head;
+unsigned int GST_host_list_size;
/**
- * DLL tail for OverlayConnectContext DLL
+ * The size of directly linked neighbours list
*/
-static struct OverlayConnectContext *occq_tail;
+unsigned int GST_slave_list_size;
/**
- * DLL head for RequectOverlayConnectContext DLL - to be used to clean up during
- * shutdown
+ * The size of the peer list
*/
-static struct RequestOverlayConnectContext *roccq_head;
+unsigned int GST_peer_list_size;
-/**
- * DLL tail for RequectOverlayConnectContext DLL
- */
-static struct RequestOverlayConnectContext *roccq_tail;
-/**
- * DLL head for forwarded operation contexts
- */
-static struct ForwardedOperationContext *fopcq_head;
+/***********************************/
+/* Local definitions and variables */
+/***********************************/
/**
- * DLL tail for forwarded operation contexts
+ * The message queue for sending messages to clients
*/
-static struct ForwardedOperationContext *fopcq_tail;
+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;
+};
/**
- * DLL head for least recently used hello cache entries; least recently used
- * cache items are at the head
+ * Our hostname; we give this to all the peers we start
*/
-static struct HelloCacheEntry *lru_hcache_head;
+static char *hostname;
/**
- * DLL tail for least recently used hello cache entries; recently used cache
- * items are at the tail
+ * Current Transmit Handle; NULL if no notify transmit exists currently
*/
-static struct HelloCacheEntry *lru_hcache_tail;
+static struct GNUNET_SERVER_TransmitHandle *transmit_handle;
/**
- * Array of hosts
+ * The head for the LCF queue
*/
-static struct GNUNET_TESTBED_Host **host_list;
+static struct LCFContextQueue *lcfq_head;
/**
- * A list of routes
+ * The tail for the LCF queue
*/
-static struct Route **route_list;
+static struct LCFContextQueue *lcfq_tail;
/**
- * A list of directly linked neighbours
+ * The message queue head
*/
-static struct Slave **slave_list;
+static struct MessageQueue *mq_head;
/**
- * A list of peers we know about
+ * The message queue tail
*/
-static struct Peer **peer_list;
+static struct MessageQueue *mq_tail;
/**
* The hashmap of shared services
static struct GNUNET_CONTAINER_MultiHashMap *ss_map;
/**
- * Hashmap to maintain HELLO cache
+ * A list of routes
*/
-static struct GNUNET_CONTAINER_MultiHashMap *hello_cache;
+static struct Route **route_list;
/**
* The event mask for the events we listen from sub-controllers
*/
static uint64_t event_mask;
-/**
- * The size of the host list
- */
-static unsigned int host_list_size;
-
/**
* The size of the route list
*/
static unsigned int route_list_size;
-/**
- * The size of directly linked neighbours list
- */
-static unsigned int slave_list_size;
-
-/**
- * The size of the peer list
- */
-static unsigned int peer_list_size;
-
-/**
- * The size of hello cache
- */
-static unsigned int hello_cache_size;
-
-/*********/
-/* Tasks */
-/*********/
-
/**
* The lcf_task handle
*/
static GNUNET_SCHEDULER_TaskIdentifier shutdown_task_id;
-/**
- * Looks up in the hello cache and returns the HELLO of the given peer
- *
- * @param id the peer identity of the peer whose HELLO has to be looked up
- * @return the HELLO message; NULL if not found
- */
-static const struct GNUNET_MessageHeader *
-hello_cache_lookup (const struct GNUNET_PeerIdentity *id)
-{
- struct HelloCacheEntry *entry;
-
- if (NULL == hello_cache)
- return NULL;
- entry = GNUNET_CONTAINER_multihashmap_get (hello_cache, &id->hashPubKey);
- if (NULL == entry)
- return NULL;
- GNUNET_CONTAINER_DLL_remove (lru_hcache_head, lru_hcache_tail, entry);
- GNUNET_CONTAINER_DLL_insert_tail (lru_hcache_head, lru_hcache_tail, entry);
- return entry->hello;
-}
-
-
-/**
- * Removes the given hello cache centry from hello cache and frees its resources
- *
- * @param entry the entry to remove
- */
-static void
-hello_cache_remove (struct HelloCacheEntry *entry)
-{
- GNUNET_CONTAINER_DLL_remove (lru_hcache_head, lru_hcache_tail, entry);
- GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (hello_cache,
- &entry->key,
- entry));
- GNUNET_free (entry->hello);
- GNUNET_free (entry);
-}
-
-
-/**
- * Caches the HELLO of the given peer. Updates the HELLO if it was already
- * cached before
- *
- * @param id the peer identity of the peer whose HELLO has to be cached
- * @param hello the HELLO message
- */
-static void
-hello_cache_add (const struct GNUNET_PeerIdentity *id,
- const struct GNUNET_MessageHeader *hello)
-{
- struct HelloCacheEntry *entry;
-
- if (NULL == hello_cache)
- return;
- entry = GNUNET_CONTAINER_multihashmap_get (hello_cache, &id->hashPubKey);
- if (NULL == entry)
- {
- entry = GNUNET_malloc (sizeof (struct HelloCacheEntry));
- memcpy (&entry->key, &id->hashPubKey, sizeof (struct GNUNET_HashCode));
- if (GNUNET_CONTAINER_multihashmap_size (hello_cache) == hello_cache_size)
- {
- GNUNET_assert (NULL != lru_hcache_head);
- hello_cache_remove (lru_hcache_head);
- }
- GNUNET_assert (GNUNET_OK == GNUNET_CONTAINER_multihashmap_put
- (hello_cache,
- &entry->key,
- entry,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
- }
- else
- {
- GNUNET_CONTAINER_DLL_remove (lru_hcache_head, lru_hcache_tail, entry);
- GNUNET_free (entry->hello);
- }
- entry->hello = GNUNET_copy_message (hello);
- GNUNET_CONTAINER_DLL_insert_tail (lru_hcache_head, lru_hcache_tail, entry);
-}
-
-
/**
* Function called to notify a client about the connection begin ready to queue
* more data. "buf" will be NULL and "size" zero if the connection was closed
* @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;
uint32_t host_id;
host_id = GNUNET_TESTBED_host_get_id_ (host);
- if (host_list_size <= host_id)
- array_grow_large_enough (host_list, host_list_size, host_id);
- 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;
}
static void
slave_list_add (struct Slave *slave)
{
- if (slave->host_id >= slave_list_size)
- array_grow_large_enough (slave_list, slave_list_size, slave->host_id);
- 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)
{
- if (peer->id >= peer_list_size)
- array_grow_large_enough (peer_list, peer_list_size, peer->id);
- 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;
}
unsigned int orig_size;
uint32_t id;
- 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;
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);
}
* @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
+static void
hr_completion (void *cls, const char *emsg);
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",
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Registering host %u at %u\n",
GNUNET_TESTBED_host_get_id_ (hr->host),
- GNUNET_TESTBED_host_get_id_ (host_list[slave->host_id]));
- slave->rhandle = GNUNET_TESTBED_register_host (slave->controller,
- hr->host,
- hr_completion,
- slave);
+ GNUNET_TESTBED_host_get_id_ (GST_host_list[slave->host_id]));
+ slave->rhandle =
+ GNUNET_TESTBED_register_host (slave->controller, hr->host, hr_completion,
+ slave);
}
* @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
+static void
hr_completion (void *cls, const char *emsg)
{
struct Slave *slave = cls;
slave->rhandle = NULL;
hr = slave->hr_dll_head;
GNUNET_assert (NULL != hr);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Registering host %u at %u successful\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Registering host %u at %u successful\n",
GNUNET_TESTBED_host_get_id_ (hr->host),
- GNUNET_TESTBED_host_get_id_ (host_list[slave->host_id]));
- GNUNET_CONTAINER_DLL_remove (slave->hr_dll_head,
- slave->hr_dll_tail,
- hr);
+ 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);
* 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
+ * 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
*/
-static void
-queue_host_registration (struct Slave *slave,
- GNUNET_TESTBED_HostRegistrationCompletion cb,
- void *cb_cls,
- struct GNUNET_TESTBED_Host *host)
+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_ (host_list[slave->host_id]));
+ 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);
+ GNUNET_CONTAINER_DLL_insert_tail (slave->hr_dll_head, slave->hr_dll_tail, hr);
if (GNUNET_YES == call_register)
register_next_host (slave);
}
}
return;
- registration_error:
+registration_error:
LOG (GNUNET_ERROR_TYPE_WARNING, "Host registration failed with message: %s\n",
emsg);
lcf->state = FINISHED;
* @param cls ForwardedOperationContext
* @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;
LOG_DEBUG ("Relaying message with type: %u, size: %u\n", ntohs (msg->type),
msize);
dup_msg = GNUNET_copy_message (msg);
- queue_message (fopc->client, dup_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);
* @param cls the ForwardedOperationContext
* @param tc the task context from scheduler
*/
-static void
-forwarded_operation_timeout (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+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");
- send_operation_fail_msg (fopc->client, fopc->operation_id, "Timeout");
+ 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);
struct LCFContext *lcf = cls;
GNUNET_assert (NULL != lcf->fopc);
- forwarded_operation_reply_relay (lcf->fopc, msg);
+ 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);
GNUNET_assert (NULL != lcf->fopc);
lcf->fopc->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- forwarded_operation_timeout (lcf->fopc, tc);
+ 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);
{
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))
{
- queue_host_registration (lcf->gateway,
- lcf_proc_cc, lcf,
- host_list[lcf->delegated_host_id]);
+ 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))
{
- queue_host_registration (lcf->gateway,
- lcf_proc_cc, lcf,
- host_list[lcf->slave_host_id]);
+ GST_queue_host_registration (lcf->gateway, lcf_proc_cc, lcf,
+ GST_host_list[lcf->slave_host_id]);
}
else
{
&lcf_forwarded_operation_reply_relay,
lcf);
lcf->fopc->timeout_task =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT, &lcf_forwarded_operation_timeout,
+ 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;
}
-/**
- * Cleans up ForwardedOverlayConnectContext
- *
- * @param focc the ForwardedOverlayConnectContext to cleanup
- */
-static void
-cleanup_focc (struct ForwardedOverlayConnectContext *focc)
-{
- GNUNET_free_non_null (focc->orig_msg);
- GNUNET_free (focc);
-}
-
-
-/**
- * Processes a forwarded overlay connect context in the queue of the given RegisteredHostContext
- *
- * @param rhc the RegisteredHostContext
- */
-static void
-process_next_focc (struct RegisteredHostContext *rhc);
-
-
-/**
- * Timeout task for cancelling a forwarded overlay connect connect
- *
- * @param cls the ForwardedOverlayConnectContext
- * @param tc the task context from the scheduler
- */
-static void
-forwarded_overlay_connect_timeout (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext
- *tc)
-{
- struct ForwardedOperationContext *fopc = cls;
- struct RegisteredHostContext *rhc;
- struct ForwardedOverlayConnectContext *focc;
-
- rhc = fopc->cls;
- focc = rhc->focc_dll_head;
- GNUNET_CONTAINER_DLL_remove (rhc->focc_dll_head, rhc->focc_dll_tail, focc);
- cleanup_focc (focc);
- LOG_DEBUG ("Overlay linking between peers %u and %u failed\n",
- focc->peer1, focc->peer2);
- forwarded_operation_timeout (cls, tc);
- if (NULL != rhc->focc_dll_head)
- process_next_focc (rhc);
-}
-
-
-/**
- * Callback to be called when forwarded overlay connection operation has a reply
- * from the sub-controller successfull. We have to relay the reply msg back to
- * the client
- *
- * @param cls ForwardedOperationContext
- * @param msg the peer create success message
- */
-static void
-forwarded_overlay_connect_listener (void *cls,
- const struct GNUNET_MessageHeader *msg)
-{
- struct ForwardedOperationContext *fopc = cls;
- struct RegisteredHostContext *rhc;
- struct ForwardedOverlayConnectContext *focc;
-
- rhc = fopc->cls;
- forwarded_operation_reply_relay (cls, msg);
- focc = rhc->focc_dll_head;
- GNUNET_CONTAINER_DLL_remove (rhc->focc_dll_head, rhc->focc_dll_tail, focc);
- cleanup_focc (focc);
- if (NULL != rhc->focc_dll_head)
- process_next_focc (rhc);
-}
-
-
-/**
- * Processes a forwarded overlay connect context in the queue of the given RegisteredHostContext
- *
- * @param rhc the RegisteredHostContext
- */
-static void
-process_next_focc (struct RegisteredHostContext *rhc)
-{
- struct ForwardedOperationContext *fopc;
- struct ForwardedOverlayConnectContext *focc;
-
- focc = rhc->focc_dll_head;
- GNUNET_assert (NULL != focc);
- GNUNET_assert (RHC_OL_CONNECT == rhc->state);
- fopc = GNUNET_malloc (sizeof (struct ForwardedOperationContext));
- GNUNET_SERVER_client_keep (rhc->client);
- fopc->client = rhc->client;
- fopc->operation_id = focc->operation_id;
- fopc->cls = rhc;
- fopc->type = OP_OVERLAY_CONNECT;
- fopc->opc =
- GNUNET_TESTBED_forward_operation_msg_ (rhc->gateway->controller,
- focc->operation_id, focc->orig_msg,
- &forwarded_overlay_connect_listener,
- fopc);
- GNUNET_free (focc->orig_msg);
- focc->orig_msg = NULL;
- fopc->timeout_task =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT, &forwarded_overlay_connect_timeout,
- fopc);
- GNUNET_CONTAINER_DLL_insert_tail (fopcq_head, fopcq_tail, fopc);
-}
-
-
/**
* Callback for event from slave controllers
*
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;
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_TESTBED_controller_link (rhc, rhc->gateway->controller,
+ rhc->reg_host, rhc->host, cfg,
GNUNET_NO);
GNUNET_TESTBED_operation_done (old_op);
break;
GNUNET_TESTBED_operation_done (rhc->sub_op);
rhc->sub_op = NULL;
rhc->state = RHC_OL_CONNECT;
- process_next_focc (rhc);
+ GST_process_next_focc (rhc);
break;
default:
GNUNET_assert (0);
if (GNUNET_SYSERR == status)
{
slave->controller_proc = NULL;
- slave_list[slave->host_id] = NULL;
+ GST_slave_list[slave->host_id] = NULL;
if (NULL != slave->cfg)
GNUNET_CONFIGURATION_destroy (slave->cfg);
GNUNET_free (slave);
goto clean_lcc;
}
slave->controller =
- GNUNET_TESTBED_controller_connect (cfg, host_list[slave->host_id],
- event_mask,
- &slave_event_callback, slave);
+ 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);
}
else
{
- send_operation_fail_msg (lcc->client, lcc->operation_id,
- "Could not connect to delegated controller");
+ GST_send_operation_fail_msg (lcc->client, lcc->operation_id,
+ "Could not connect to delegated controller");
GNUNET_TESTBED_controller_stop (slave->controller_proc);
- slave_list[slave->host_id] = NULL;
+ GST_slave_list[slave->host_id] = NULL;
GNUNET_free (slave);
slave = NULL;
}
- clean_lcc:
+clean_lcc:
if (NULL != lcc)
{
if (NULL != lcc->client)
const char *controller_hostname;
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);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- master_context = GNUNET_malloc (sizeof (struct Context));
+ GST_context = GNUNET_malloc (sizeof (struct Context));
GNUNET_SERVER_client_keep (client);
- master_context->client = client;
- master_context->host_id = ntohl (msg->host_id);
- master_context->master_ip = GNUNET_strdup (controller_hostname);
- LOG_DEBUG ("Our IP: %s\n", master_context->master_ip);
- master_context->system =
- GNUNET_TESTING_system_create ("testbed", master_context->master_ip, hostname);
+ 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,
- master_context->master_ip,
- NULL,
- 0);
+ GNUNET_TESTBED_host_create_with_id (GST_context->host_id,
+ GST_context->master_ip, NULL, 0);
host_list_add (host);
- 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);
}
if (0 != username_length)
username_length++;
/* msg must contain hostname */
- GNUNET_assert (msize > (sizeof (struct GNUNET_TESTBED_AddHostMessage) +
- username_length + 1));
+ 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;
}
else
{
- LOG_DEBUG ("Added host %u at %u\n",
- host_id, master_context->host_id);
+ 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 %u not registered with us\n", delegated_host_id);
+ "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 %u not registered with us\n",
- slave_host_id);
+ 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);
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);
if (1 != msg->is_subordinate)
{
slave->controller =
- GNUNET_TESTBED_controller_connect (cfg, host_list[slave->host_id],
- event_mask,
- &slave_event_callback, slave);
+ 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->client = client;
slave->lcc = lcc;
slave->controller_proc =
- GNUNET_TESTBED_controller_start (master_context->master_ip,
- host_list[slave->host_id], cfg,
- &slave_status_callback, slave);
+ 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);
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_SERVER_receive_done (client, GNUNET_OK);
return;
}
- if ((delegated_host_id < route_list_size)
- && (NULL != route_list[delegated_host_id]))
+ 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_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;
}
struct ForwardedOperationContext *fopc = cls;
GNUNET_free (fopc->cls);
- forwarded_operation_timeout (fopc, tc);
+ GST_forwarded_operation_timeout (fopc, tc);
}
struct ForwardedOperationContext *fopc = cls;
struct Peer *remote_peer;
- if (ntohs (msg->type) == GNUNET_MESSAGE_TYPE_TESTBED_PEERCREATESUCCESS)
+ if (ntohs (msg->type) == GNUNET_MESSAGE_TYPE_TESTBED_CREATE_PEER_SUCCESS)
{
GNUNET_assert (NULL != fopc->cls);
remote_peer = fopc->cls;
peer_list_add (remote_peer);
}
- forwarded_operation_reply_relay (fopc, msg);
+ GST_forwarded_operation_reply_relay (fopc, msg);
}
*
* @param peer the peer structure to destroy
*/
-static void
-destroy_peer (struct Peer *peer)
+void
+GST_destroy_peer (struct Peer *peer)
{
GNUNET_break (0 == peer->reference_cnt);
if (GNUNET_YES == peer->is_remote)
struct ForwardedOperationContext *fopc = cls;
struct Peer *remote_peer;
- if (GNUNET_MESSAGE_TYPE_TESTBED_GENERICOPSUCCESS == ntohs (msg->type))
+ 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)
- destroy_peer (remote_peer);
+ GST_destroy_peer (remote_peer);
}
- forwarded_operation_reply_relay (fopc, msg);
+ 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);
+ 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",
- (unsigned int) 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);
peer = GNUNET_malloc (sizeof (struct Peer));
peer->is_remote = GNUNET_YES;
peer->id = peer_id;
- peer->details.remote.slave = slave_list[route->dest];
+ 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 = peer; //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 [route->dest]->controller,
+ 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->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.slave->controller,
+ fopc->operation_id = GNUNET_ntohll (msg->operation_id);
+ fopc->opc =
+ GNUNET_TESTBED_forward_operation_msg_ (peer->details.remote.
+ slave->controller,
fopc->operation_id, &msg->header,
- &peer_destroy_success_cb,
- 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);
}
peer->destroy_flag = GNUNET_YES;
if (0 == peer->reference_cnt)
- destroy_peer (peer);
+ GST_destroy_peer (peer);
else
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Delaying peer destroy as peer is currently in use\n");
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));
fopc->operation_id = GNUNET_ntohll (msg->operation_id);
fopc->type = OP_PEER_START;
fopc->opc =
- GNUNET_TESTBED_forward_operation_msg_ (peer->details.remote.slave->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);
}
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);
LOG (GNUNET_ERROR_TYPE_DEBUG, "Received PEER_STOP for peer %u\n", 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)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Forwarding PEER_STOP for peer %u\n", peer_id);
+ 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.slave->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);
if (GNUNET_OK != GNUNET_TESTING_peer_stop (peer->details.local.peer))
{
LOG (GNUNET_ERROR_TYPE_WARNING, "Stopping peer %u failed\n", peer_id);
- send_operation_fail_msg (client, GNUNET_ntohll (msg->operation_id),
- "Peer not running");
+ 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)
{
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->operation_id = GNUNET_ntohll (msg->operation_id);
fopc->type = OP_PEER_INFO;
fopc->opc =
- GNUNET_TESTBED_forward_operation_msg_ (peer->details.remote.slave->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_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);
}
/**
- * Cleanup overlay connect context structure
+ * Handler for GNUNET_MESSAGE_TYPE_TESTBED_GETSLAVECONFIG messages
*
- * @param occ the overlay connect context
+ * @param cls NULL
+ * @param client identification of the client
+ * @param message the actual message
*/
static void
-cleanup_occ (struct OverlayConnectContext *occ)
+handle_slave_get_config (void *cls, struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
{
- LOG_DEBUG ("0x%llx: Cleaning up occ\n", occ->op_id);
- GNUNET_free_non_null (occ->emsg);
- GNUNET_free_non_null (occ->hello);
- GNUNET_SERVER_client_drop (occ->client);
- if (NULL != occ->opc)
- GNUNET_TESTBED_forward_operation_msg_cancel_ (occ->opc);
- if (GNUNET_SCHEDULER_NO_TASK != occ->send_hello_task)
- GNUNET_SCHEDULER_cancel (occ->send_hello_task);
- if (GNUNET_SCHEDULER_NO_TASK != occ->cleanup_task)
- GNUNET_SCHEDULER_cancel (occ->cleanup_task);
- if (GNUNET_SCHEDULER_NO_TASK != occ->timeout_task)
- GNUNET_SCHEDULER_cancel (occ->timeout_task);
- if (NULL != occ->ch)
- {
- GNUNET_CORE_disconnect (occ->ch);
- occ->peer->reference_cnt--;
- }
- if (NULL != occ->ghh)
- GNUNET_TRANSPORT_get_hello_cancel (occ->ghh);
- if (NULL != occ->ohh)
- GNUNET_TRANSPORT_offer_hello_cancel (occ->ohh);
- if (GNUNET_SCHEDULER_NO_TASK != occ->tcc.task)
- GNUNET_SCHEDULER_cancel (occ->tcc.task);
- if (NULL != occ->tcc.tch)
- GNUNET_TRANSPORT_try_connect_cancel (occ->tcc.tch);
- if (NULL != occ->p1th)
+ 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;
+
+ 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_TRANSPORT_disconnect (occ->p1th);
- occ->peer->reference_cnt--;
+ /* 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;
}
- if (NULL != occ->tcc.th)
+ slave = GST_slave_list[slave_id];
+ if (NULL == slave->cfg)
{
- GNUNET_TRANSPORT_disconnect (occ->tcc.th);
- peer_list[occ->other_peer_id]->reference_cnt--;
- }
- if ((GNUNET_YES == occ->peer->destroy_flag)
- && (0 == occ->peer->reference_cnt))
- destroy_peer (occ->peer);
- if ((NULL == occ->peer2_controller)
- && (GNUNET_YES == peer_list[occ->other_peer_id]->destroy_flag)
- && (0 == peer_list[occ->other_peer_id]->reference_cnt))
- destroy_peer (peer_list[occ->other_peer_id]);
- GNUNET_CONTAINER_DLL_remove (occq_head, occq_tail, occ);
- GNUNET_free (occ);
-}
-
-
-/**
- * Task for cleaing up overlay connect context structure
- *
- * @param cls the overlay connect context
- * @param tc the task context
- */
-static void
-do_cleanup_occ (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct OverlayConnectContext *occ = cls;
-
- occ->cleanup_task = GNUNET_SCHEDULER_NO_TASK;
- cleanup_occ (occ);
-}
-
-
-/**
- * Task which will be run when overlay connect request has been timed out
- *
- * @param cls the OverlayConnectContext
- * @param tc the TaskContext
- */
-static void
-timeout_overlay_connect (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct OverlayConnectContext *occ = cls;
-
- occ->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- LOG (GNUNET_ERROR_TYPE_WARNING,
- "0x%llx: Timeout while connecting peers %u and %u\n",
- occ->op_id, occ->peer_id, occ->other_peer_id);
- send_operation_fail_msg (occ->client, occ->op_id, occ->emsg);
- cleanup_occ (occ);
-}
-
-
-
-/**
- * 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 ("0x%llx: Peer %4s connected to peer %4s\n", occ->op_id,
- other_peer_str, GNUNET_i2s (&occ->peer_identity));
- GNUNET_free (other_peer_str);
- if (GNUNET_SCHEDULER_NO_TASK != occ->send_hello_task)
- {
- 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;
- if (GNUNET_SCHEDULER_NO_TASK != occ->tcc.task)
- {
- GNUNET_SCHEDULER_cancel (occ->tcc.task);
- occ->tcc.task = GNUNET_SCHEDULER_NO_TASK;
- }
- GNUNET_free_non_null (occ->emsg);
- occ->emsg = NULL;
- LOG_DEBUG ("0x%llx: Peers connected - Sending overlay connect success\n",
- occ->op_id);
- 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);
- occ->cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup_occ, occ);
- //cleanup_occ (occ);
-}
-
-
-/**
- * Task to ask transport of a peer to connect to another peer
- *
- * @param cls the TryConnectContext
- * @param tc the scheduler task context
- */
-static void
-try_connect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
-
-
-/**
- * Callback to be called with result of the try connect request.
- *
- * @param cls the overlay connect context
- * @param result GNUNET_OK if message was transmitted to transport service
- * GNUNET_SYSERR if message was not transmitted to transport service
- */
-static void
-try_connect_cb (void *cls, const int result)
-{
- struct TryConnectContext *tcc = cls;
-
- tcc->tch = NULL;
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == tcc->task);
- tcc->task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_MILLISECONDS,
- 500 + pow(2, ++tcc->retries)),
- &try_connect_task, tcc);
-}
-
-
-/**
- * Task to ask transport of a peer to connect to another peer
- *
- * @param cls the TryConnectContext
- * @param tc the scheduler task context
- */
-static void
-try_connect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct TryConnectContext *tcc = cls;
-
- tcc->task = GNUNET_SCHEDULER_NO_TASK;
- if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
- return;
- GNUNET_assert (NULL == tcc->tch);
- GNUNET_assert (NULL != tcc->pid);
- GNUNET_assert (NULL != tcc->th);
- LOG_DEBUG ("0x%llx: Trail %u to connect to peer %s\n", tcc->op_id, tcc->retries,
- GNUNET_i2s(tcc->pid));
- tcc->tch = GNUNET_TRANSPORT_try_connect (tcc->th, tcc->pid, &try_connect_cb, tcc);
-}
-
-
-/**
- * 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);
-
-
-/**
- * Task that is run when hello has been sent
- *
- * @param cls the overlay connect context
- * @param tc the scheduler task context; if tc->reason =
- * GNUNET_SCHEDULER_REASON_TIMEOUT then sending HELLO failed; if
- * GNUNET_SCHEDULER_REASON_READ_READY is succeeded
- */
-static void
-occ_hello_sent_cb (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct OverlayConnectContext *occ = cls;
-
- occ->ohh = NULL;
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == occ->send_hello_task);
- if (GNUNET_SCHEDULER_REASON_TIMEOUT == tc->reason)
- {
- GNUNET_free_non_null (occ->emsg);
- GNUNET_asprintf (&occ->emsg,
- "0x%llx: Timeout while offering HELLO to other peer",
- occ->op_id);
- occ->send_hello_task = GNUNET_SCHEDULER_add_now (&send_hello, occ);
- return;
- }
- if (GNUNET_SCHEDULER_REASON_READ_READY != tc->reason)
- return;
- GNUNET_free_non_null (occ->emsg);
- GNUNET_asprintf (&occ->emsg, "0x%llx: Timeout while try connect",
- occ->op_id);
- occ->tcc.pid = &occ->peer_identity;
- occ->tcc.op_id = occ->op_id;
- occ->tcc.task = GNUNET_SCHEDULER_add_now (&try_connect_task, &occ->tcc);
-}
-
-
-/**
- * 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))
- return;
- GNUNET_assert (NULL != occ->hello);
- other_peer_str = GNUNET_strdup (GNUNET_i2s (&occ->other_peer_identity));
- if (NULL != occ->peer2_controller)
- {
- struct GNUNET_TESTBED_RequestConnectMessage *msg;
- uint16_t msize;
- uint16_t hello_size;
-
- LOG_DEBUG ("0x%llx: Offering HELLO of %s (size: %u) to %s via Remote "
- "Overlay Request\n",
- occ->op_id,
- GNUNET_i2s (&occ->peer_identity),
- ntohs (occ->hello->size),
- other_peer_str);
- 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->other_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->peer2_controller, &msg->header);
- }
- else
- {
- LOG_DEBUG ("0x%llx: Offering HELLO of %s to %s\n",
- occ->op_id,
- GNUNET_i2s (&occ->peer_identity), other_peer_str);
- occ->ohh = GNUNET_TRANSPORT_offer_hello (occ->tcc.th,
- occ->hello,
- occ_hello_sent_cb,
- occ);
- if (NULL == occ->ohh)
- {
- GNUNET_break (0);
- occ->send_hello_task =
- GNUNET_SCHEDULER_add_delayed
- (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
- 100 + GNUNET_CRYPTO_random_u32
- (GNUNET_CRYPTO_QUALITY_WEAK, 500)),
- &send_hello, occ);
- }
- }
- GNUNET_free (other_peer_str);
-}
-
-
-/**
- * Connects to the transport of the other peer if it is a local peer and
- * schedules the send hello task
- *
- * @param occ the overlay connect context
- */
-static void
-p2_transport_connect (struct OverlayConnectContext *occ)
-{
- GNUNET_assert (NULL == occ->emsg);
- GNUNET_assert (NULL != occ->hello);
- GNUNET_assert (NULL == occ->ghh);
- GNUNET_assert (NULL == occ->p1th);
- if (NULL == occ->peer2_controller)
- {
- peer_list[occ->other_peer_id]->reference_cnt++;
- occ->tcc.th =
- GNUNET_TRANSPORT_connect (peer_list[occ->other_peer_id]->details.local.cfg,
- &occ->other_peer_identity, NULL, NULL, NULL,
- NULL);
- if (NULL == occ->tcc.th)
- {
- GNUNET_asprintf (&occ->emsg, "0x%llx: Cannot connect to TRANSPORT of %s",
- occ->op_id, GNUNET_i2s (&occ->other_peer_identity));
- GNUNET_SCHEDULER_cancel (occ->timeout_task);
- occ->timeout_task = GNUNET_SCHEDULER_add_now (&timeout_overlay_connect, occ);
- return;
- }
- }
- GNUNET_asprintf (&occ->emsg, "0x%llx: Timeout while offering HELLO to %s",
- occ->op_id, GNUNET_i2s (&occ->other_peer_identity));
- occ->send_hello_task = GNUNET_SCHEDULER_add_now (&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. If we have a valid HELLO, we connect to the peer 2's
- * transport and offer peer 1's HELLO and ask peer 2 to connect to peer 1
- *
- * @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)
- {
- LOG_DEBUG ("0x%llx: HELLO of %s is empty\n",
- occ->op_id, GNUNET_i2s (&occ->peer_identity));
- return;
- }
- LOG_DEBUG ("0x%llx: Received HELLO of %s\n",
- occ->op_id, GNUNET_i2s (&occ->peer_identity));
- occ->hello = GNUNET_malloc (msize);
- hello_cache_add (&occ->peer_identity, hello);
- memcpy (occ->hello, hello, msize);
- GNUNET_TRANSPORT_get_hello_cancel (occ->ghh);
- occ->ghh = NULL;
- GNUNET_TRANSPORT_disconnect (occ->p1th);
- occ->p1th = NULL;
- occ->peer->reference_cnt--;
- GNUNET_free_non_null (occ->emsg);
- occ->emsg = NULL;
- p2_transport_connect (occ);
-}
-
-
-/**
- * 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...).
- *
- * @param cls closure
- * @param server handle to the server, NULL if we failed
- * @param my_identity ID of this peer, NULL if we failed
- */
-static void
-core_startup_cb (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_identity)
-{
- struct OverlayConnectContext *occ = cls;
- const struct GNUNET_MessageHeader *hello;
-
- GNUNET_free_non_null (occ->emsg);
- (void) GNUNET_asprintf (&occ->emsg,
- "0x%llx: Failed to connect to CORE of peer with"
- "id: %u", occ->op_id, occ->peer_id);
- if ((NULL == server) || (NULL == my_identity))
- goto error_return;
- GNUNET_free (occ->emsg);
- occ->ch = server;
- occ->emsg = NULL;
- memcpy (&occ->peer_identity, my_identity,
- sizeof (struct GNUNET_PeerIdentity));
- LOG_DEBUG ("0x%llx: Acquiring HELLO of peer %s\n",
- occ->op_id, GNUNET_i2s (&occ->peer_identity));
- /* Lookup for HELLO in hello cache */
- if (NULL != (hello = hello_cache_lookup (&occ->peer_identity)))
- {
- LOG_DEBUG ("0x%llx: HELLO of peer %s found in cache\n",
- occ->op_id, GNUNET_i2s (&occ->peer_identity));
- occ->hello = GNUNET_copy_message (hello);
- p2_transport_connect (occ);
- return;
- }
- occ->peer->reference_cnt++;
- 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,
- "0x%llx: Cannot connect to TRANSPORT of peer %4s",
- occ->op_id, GNUNET_i2s (&occ->peer_identity));
- goto error_return;
- }
- GNUNET_asprintf (&occ->emsg,
- "0x%llx: Timeout while acquiring HELLO of peer %4s",
- occ->op_id, GNUNET_i2s (&occ->peer_identity));
- 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;
-}
-
-
-/**
- * Callback to be called when forwarded get peer config operation as part of
- * overlay connect is successfull. Connection to Peer 1's core is made and is
- * checked for new connection from peer 2
- *
- * @param cls ForwardedOperationContext
- * @param msg the peer create success message
- */
-static void
-overlay_connect_get_config (void *cls, const struct GNUNET_MessageHeader *msg)
-{
- struct OverlayConnectContext *occ = cls;
- const struct GNUNET_TESTBED_PeerConfigurationInformationMessage *cmsg;
- const struct GNUNET_CORE_MessageHandler no_handlers[] = {
- {NULL, 0, 0}
- };
-
- occ->opc = NULL;
- if (GNUNET_MESSAGE_TYPE_TESTBED_PEERCONFIG != ntohs (msg->type))
- goto error_return;
- cmsg = (const struct GNUNET_TESTBED_PeerConfigurationInformationMessage *)
- msg;
- memcpy (&occ->other_peer_identity, &cmsg->peer_identity,
- sizeof (struct GNUNET_PeerIdentity));
- GNUNET_free_non_null (occ->emsg);
- GNUNET_asprintf (&occ->emsg, "0x%llx: Timeout while connecting to CORE",
- occ->op_id);
- occ->peer->reference_cnt++;
- 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)
- goto error_return;
- return;
-
- error_return:
- GNUNET_SCHEDULER_cancel (occ->timeout_task);
- occ->timeout_task =
- GNUNET_SCHEDULER_add_now (&timeout_overlay_connect, occ);
-}
-
-
-/**
- * Callback which will be called to after a host registration succeeded or failed
- *
- * @param cls the RegisteredHostContext
- * @param emsg the error message; NULL if host registration is successful
- */
-static void
-registeredhost_registration_completion (void *cls, const char *emsg)
-{
- struct RegisteredHostContext *rhc = cls;
- struct GNUNET_CONFIGURATION_Handle *cfg;
- uint32_t peer2_host_id;
-
- /* if (NULL != rhc->focc_dll_head) */
- /* process_next_focc (rhc); */
- peer2_host_id = GNUNET_TESTBED_host_get_id_ (rhc->reg_host);
- GNUNET_assert (RHC_INIT == rhc->state);
- GNUNET_assert (NULL == rhc->sub_op);
- if ((NULL == rhc->gateway2)
- || ((peer2_host_id < slave_list_size) /* Check if we have the needed config */
- && (NULL != slave_list[peer2_host_id])))
- {
- rhc->state = RHC_LINK;
- cfg = (NULL == rhc->gateway2) ? our_config : slave_list[peer2_host_id]->cfg;
- rhc->sub_op =
- GNUNET_TESTBED_controller_link (rhc,
- rhc->gateway->controller,
- rhc->reg_host,
- rhc->host,
- cfg,
- GNUNET_NO);
- return;
- }
- rhc->state = RHC_GET_CFG;
- rhc->sub_op = GNUNET_TESTBED_get_slave_config (rhc,
- rhc->gateway2->controller,
- rhc->reg_host);
-}
-
-
-/**
- * Iterator to match a registered host context
- *
- * @param cls pointer 2 pointer of RegisteredHostContext
- * @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
-reghost_match_iterator (void *cls,
- const struct GNUNET_HashCode * key,
- void *value)
-{
- struct RegisteredHostContext **rh = cls;
- struct RegisteredHostContext *rh_val = value;
-
- if ((rh_val->host == (*rh)->host) && (rh_val->reg_host == (*rh)->reg_host))
- {
- GNUNET_free (*rh);
- *rh = rh_val;
- return GNUNET_NO;
- }
- return GNUNET_YES;
-}
-
-
-/**
- * Function to generate the hashcode corresponding to a RegisteredHostContext
- *
- * @param reg_host the host which is being registered in RegisteredHostContext
- * @param host the host of the controller which has to connect to the above rhost
- * @return the hashcode
- */
-static struct GNUNET_HashCode
-hash_hosts (struct GNUNET_TESTBED_Host *reg_host,
- struct GNUNET_TESTBED_Host *host)
-{
- struct GNUNET_HashCode hash;
- uint32_t host_ids[2];
-
- host_ids[0] = GNUNET_TESTBED_host_get_id_ (reg_host);
- host_ids[1] = GNUNET_TESTBED_host_get_id_ (host);
- GNUNET_CRYPTO_hash (host_ids, sizeof (host_ids), &hash);
- return hash;
-}
-
-
-/**
- * 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;
- const struct GNUNET_CORE_MessageHandler no_handlers[] = {
- {NULL, 0, 0}
- };
- struct Peer *peer;
- struct OverlayConnectContext *occ;
- struct GNUNET_TESTBED_Controller *peer2_controller;
- uint64_t operation_id;
- uint32_t p1;
- uint32_t p2;
- uint32_t peer2_host_id;
-
- msg = (const struct GNUNET_TESTBED_OverlayConnectMessage *) message;
- p1 = ntohl (msg->peer1);
- p2 = ntohl (msg->peer2);
- peer2_host_id = ntohl (msg->peer2_host_id);
- GNUNET_assert (p1 < peer_list_size);
- GNUNET_assert (NULL != peer_list[p1]);
- peer = peer_list[p1];
- operation_id = GNUNET_ntohll (msg->operation_id);
- LOG_DEBUG ("Received overlay connect for peers %u and %u with op id: 0x%llx\n",
- p1, p2, operation_id);
- if (GNUNET_YES == peer->is_remote)
- {
- struct ForwardedOperationContext *fopc;
- struct Route *route_to_peer2_host;
- struct Route *route_to_peer1_host;
-
- LOG_DEBUG ("0x%llx: Forwarding overlay connect\n", operation_id);
- route_to_peer2_host = NULL;
- route_to_peer1_host = NULL;
- route_to_peer2_host = find_dest_route (peer2_host_id);
- if ((NULL != route_to_peer2_host)
- || (peer2_host_id == master_context->host_id))
- {
- /* Peer 2 either below us OR with us */
- route_to_peer1_host =
- find_dest_route (peer_list[p1]->details.remote.remote_host_id);
- /* Because we get this message only if we know where peer 1 is */
- GNUNET_assert (NULL != route_to_peer1_host);
- if ((peer2_host_id == master_context->host_id)
- || (route_to_peer2_host->dest != route_to_peer1_host->dest))
- {
- /* Peer2 is either with us OR peer1 and peer2 can be reached through
- different gateways */
- struct GNUNET_HashCode hash;
- struct RegisteredHostContext *rhc;
- int skip_focc;
-
- rhc = GNUNET_malloc (sizeof (struct RegisteredHostContext));
- if (NULL != route_to_peer2_host)
- rhc->reg_host = host_list[route_to_peer2_host->dest];
- else
- rhc->reg_host = host_list[master_context->host_id];
- rhc->host = host_list[route_to_peer1_host->dest];
- GNUNET_assert (NULL != rhc->reg_host);
- GNUNET_assert (NULL != rhc->host);
- rhc->gateway = peer->details.remote.slave;
- rhc->gateway2 = (NULL == route_to_peer2_host) ? NULL :
- slave_list[route_to_peer2_host->dest];
- rhc->state = RHC_INIT;
- GNUNET_SERVER_client_keep (client);
- rhc->client = client;
- hash = hash_hosts (rhc->reg_host, rhc->host);
- skip_focc = GNUNET_NO;
- if ((GNUNET_NO ==
- GNUNET_CONTAINER_multihashmap_contains
- (peer->details.remote.slave->reghost_map, &hash))
- || (GNUNET_SYSERR != GNUNET_CONTAINER_multihashmap_get_multiple
- (peer->details.remote.slave->reghost_map, &hash,
- reghost_match_iterator, &rhc)))
- {
- /* create and add a new registerd host context */
- /* add the focc to its queue */
- GNUNET_CONTAINER_multihashmap_put
- (peer->details.remote.slave->reghost_map,
- &hash, rhc, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
- GNUNET_assert (NULL != host_list[peer2_host_id]);
- queue_host_registration (peer->details.remote.slave,
- registeredhost_registration_completion, rhc,
- host_list[peer2_host_id]);
- }
- else {
- /* rhc is now set to the existing one from the hash map by
- reghost_match_iterator() */
- /* if queue is empty then ignore creating focc and proceed with
- normal forwarding */
- if (RHC_OL_CONNECT == rhc->state)
- skip_focc = GNUNET_YES;
- }
- if (GNUNET_NO == skip_focc)
- {
- struct ForwardedOverlayConnectContext *focc;
-
- focc = GNUNET_malloc (sizeof (struct ForwardedOverlayConnectContext));
- focc->peer1 = p1;
- focc->peer2 = p2;
- focc->peer2_host_id = peer2_host_id;
- focc->orig_msg = GNUNET_copy_message (message);
- focc->operation_id = operation_id;
- GNUNET_CONTAINER_DLL_insert_tail (rhc->focc_dll_head,
- rhc->focc_dll_tail,
- focc);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
- return;
- }
- }
- }
- fopc = GNUNET_malloc (sizeof (struct ForwardedOperationContext));
- GNUNET_SERVER_client_keep (client);
- fopc->client = client;
- fopc->operation_id = operation_id;
- fopc->type = OP_OVERLAY_CONNECT;
- fopc->opc =
- GNUNET_TESTBED_forward_operation_msg_ (peer->details.remote.slave->controller,
- operation_id, message,
- &forwarded_operation_reply_relay,
- fopc);
- fopc->timeout_task =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT, &forwarded_operation_timeout,
- fopc);
- GNUNET_CONTAINER_DLL_insert_tail (fopcq_head, fopcq_tail, fopc);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
- return;
- }
-
- peer2_controller = NULL;
- if ((p2 >= peer_list_size) || (NULL == peer_list[p2]))
- {
- if ((peer2_host_id >= slave_list_size)
- || (NULL ==slave_list[peer2_host_id]))
- {
- LOG (GNUNET_ERROR_TYPE_WARNING,
- "0x%llx: Configuration of peer2's controller missing for connecting peers"
- "%u and %u\n", operation_id, p1, p2);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- peer2_controller = slave_list[peer2_host_id]->controller;
- if (NULL == peer2_controller)
- {
- GNUNET_break (0); /* What's going on? */
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- }
- else
- {
- if (GNUNET_YES == peer_list[p2]->is_remote)
- peer2_controller = peer_list[p2]->details.remote.slave->controller;
- }
- occ = GNUNET_malloc (sizeof (struct OverlayConnectContext));
- GNUNET_CONTAINER_DLL_insert_tail (occq_head, occq_tail, occ);
- GNUNET_SERVER_client_keep (client);
- occ->client = client;
- occ->peer_id = p1;
- occ->other_peer_id = p2;
- occ->peer = peer_list[p1];
- occ->op_id = GNUNET_ntohll (msg->operation_id);
- occ->peer2_controller = peer2_controller;
- /* Get the identity of the second peer */
- if (NULL != occ->peer2_controller)
- {
- struct GNUNET_TESTBED_PeerGetConfigurationMessage cmsg;
-
- cmsg.header.size =
- htons (sizeof (struct GNUNET_TESTBED_PeerGetConfigurationMessage));
- cmsg.header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_GETPEERCONFIG);
- cmsg.peer_id = msg->peer2;
- cmsg.operation_id = msg->operation_id;
- occ->opc =
- GNUNET_TESTBED_forward_operation_msg_ (occ->peer2_controller,
- occ->op_id, &cmsg.header,
- &overlay_connect_get_config,
- occ);
- GNUNET_asprintf (&occ->emsg,
- "0x%llx: Timeout while getting peer identity of peer "
- "with id: %u", occ->op_id, occ->other_peer_id);
- occ->timeout_task =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT,
- &timeout_overlay_connect, occ);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
- return;
- }
- GNUNET_TESTING_peer_get_identity (peer_list[occ->other_peer_id]->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");
- GNUNET_asprintf (&occ->emsg,
- "0x%llx: Timeout while connecting to CORE of peer with "
- "id: %u", occ->op_id, occ->peer_id);
- occ->peer->reference_cnt++;
- 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 (TIMEOUT,
- &timeout_overlay_connect, occ);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
-}
-
-
-/**
- * Function to cleanup RequestOverlayConnectContext and any associated tasks
- * with it
- *
- * @param rocc the RequestOverlayConnectContext
- */
-static void
-cleanup_rocc (struct RequestOverlayConnectContext *rocc)
-{
- LOG_DEBUG ("0x%llx: Cleaning up rocc\n", rocc->op_id);
- if (GNUNET_SCHEDULER_NO_TASK != rocc->attempt_connect_task_id)
- GNUNET_SCHEDULER_cancel (rocc->attempt_connect_task_id);
- if (GNUNET_SCHEDULER_NO_TASK != rocc->timeout_rocc_task_id)
- GNUNET_SCHEDULER_cancel (rocc->timeout_rocc_task_id);
- if (NULL != rocc->ohh)
- GNUNET_TRANSPORT_offer_hello_cancel (rocc->ohh);
- if (NULL != rocc->tcc.tch)
- GNUNET_TRANSPORT_try_connect_cancel (rocc->tcc.tch);
- if (GNUNET_SCHEDULER_NO_TASK != rocc->tcc.task)
- GNUNET_SCHEDULER_cancel (rocc->tcc.task);
- GNUNET_TRANSPORT_disconnect (rocc->tcc.th);
- rocc->peer->reference_cnt--;
- if ((GNUNET_YES == rocc->peer->destroy_flag)
- && (0 == rocc->peer->reference_cnt))
- destroy_peer (rocc->peer);
- GNUNET_free_non_null (rocc->hello);
- GNUNET_CONTAINER_DLL_remove (roccq_head, roccq_tail, rocc);
- GNUNET_free (rocc);
-}
-
-
-/**
- * Task to timeout rocc and cleanit up
- *
- * @param cls the RequestOverlayConnectContext
- * @param tc the TaskContext from scheduler
- */
-static void
-timeout_rocc_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct RequestOverlayConnectContext *rocc = cls;
-
- GNUNET_assert (rocc->timeout_rocc_task_id != GNUNET_SCHEDULER_NO_TASK);
- rocc->timeout_rocc_task_id = GNUNET_SCHEDULER_NO_TASK;
- LOG_DEBUG ("0x%llx: rocc timed out\n", rocc->op_id);
- cleanup_rocc (rocc);
-}
-
-
-/**
- * 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
-transport_connect_notify (void *cls, const struct GNUNET_PeerIdentity *new_peer,
- const struct GNUNET_ATS_Information * ats,
- uint32_t ats_count)
-{
- struct RequestOverlayConnectContext *rocc = cls;
-
- LOG_DEBUG ("0x%llx: Request Overlay connect notify\n", rocc->op_id);
- if (0 != memcmp (new_peer, &rocc->a_id, sizeof (struct GNUNET_PeerIdentity)))
- return;
- LOG_DEBUG ("0x%llx: Peer %4s connected\n", rocc->op_id,
- GNUNET_i2s (&rocc->a_id));
- cleanup_rocc (rocc);
-}
-
-
-/**
- * Task to offer the HELLO message to the peer and ask it to connect to the peer
- * whose identity is in RequestOverlayConnectContext
- *
- * @param cls the RequestOverlayConnectContext
- * @param tc the TaskContext from scheduler
- */
-static void
-attempt_connect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
-
-
-/**
- * Task that is run when hello has been sent
- *
- * @param cls the overlay connect context
- * @param tc the scheduler task context; if tc->reason =
- * GNUNET_SCHEDULER_REASON_TIMEOUT then sending HELLO failed; if
- * GNUNET_SCHEDULER_REASON_READ_READY is succeeded
- */
-static void
-rocc_hello_sent_cb (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct RequestOverlayConnectContext *rocc = cls;
-
- rocc->ohh = NULL;
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == rocc->attempt_connect_task_id);
- LOG_DEBUG ("0x%llx: HELLO of peer %4s sent to local peer with id: %u\n",
- rocc->op_id, GNUNET_i2s (&rocc->a_id), rocc->peer->id);
- if (GNUNET_SCHEDULER_REASON_TIMEOUT == tc->reason)
- {
- GNUNET_break (0);
- rocc->attempt_connect_task_id =
- GNUNET_SCHEDULER_add_now (&attempt_connect_task,
- rocc);
- return;
- }
- if (GNUNET_SCHEDULER_REASON_READ_READY != tc->reason)
- return;
- rocc->tcc.task = GNUNET_SCHEDULER_add_now (&try_connect_task, &rocc->tcc);
-}
-
-
-/**
- * Task to offer the HELLO message to the peer and ask it to connect to the peer
- * whose identity is in RequestOverlayConnectContext
- *
- * @param cls the RequestOverlayConnectContext
- * @param tc the TaskContext from scheduler
- */
-static void
-attempt_connect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct RequestOverlayConnectContext *rocc = cls;
-
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != rocc->attempt_connect_task_id);
- rocc->attempt_connect_task_id = GNUNET_SCHEDULER_NO_TASK;
- LOG_DEBUG ("0x%llx: Offering HELLO of peer %4s to local peer with id: %u\n",
- rocc->op_id, GNUNET_i2s (&rocc->a_id), rocc->peer->id);
- rocc->ohh = GNUNET_TRANSPORT_offer_hello (rocc->tcc.th, rocc->hello,
- rocc_hello_sent_cb, rocc);
- if (NULL == rocc->ohh)
- rocc->attempt_connect_task_id =
- GNUNET_SCHEDULER_add_delayed
- (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
- 100 + GNUNET_CRYPTO_random_u32
- (GNUNET_CRYPTO_QUALITY_WEAK, 500)),
- &attempt_connect_task, rocc);
-}
-
-
-/**
- * Handler for GNUNET_MESSAGE_TYPE_TESTBED_REQUESTCONNECT messages
- *
- * @param cls NULL
- * @param client identification of the client
- * @param message the actual message
- */
-static void
-handle_overlay_request_connect (void *cls, struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
-{
- const struct GNUNET_TESTBED_RequestConnectMessage *msg;
- struct RequestOverlayConnectContext *rocc;
- struct Peer *peer;
- uint32_t peer_id;
- uint16_t msize;
- uint16_t hsize;
-
- msize = ntohs (message->size);
- if (sizeof (struct GNUNET_TESTBED_RequestConnectMessage) >= msize)
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- msg = (const struct GNUNET_TESTBED_RequestConnectMessage *) message;
- if ((NULL == msg->hello) ||
- (GNUNET_MESSAGE_TYPE_HELLO != ntohs (msg->hello->type)))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- hsize = ntohs (msg->hello->size);
- if ((sizeof (struct GNUNET_TESTBED_RequestConnectMessage) + hsize) != msize)
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- peer_id = ntohl (msg->peer);
- if ((peer_id >= peer_list_size) || (NULL == (peer = peer_list[peer_id])))
- {
- GNUNET_break_op (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- if (GNUNET_YES == peer->is_remote)
- {
- struct GNUNET_MessageHeader *msg2;
-
- msg2 = GNUNET_copy_message (message);
- GNUNET_TESTBED_queue_message_ (peer->details.remote.slave->controller, msg2);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
- return;
- }
- rocc = GNUNET_malloc (sizeof (struct RequestOverlayConnectContext));
- rocc->op_id = GNUNET_ntohll (msg->operation_id);
- GNUNET_CONTAINER_DLL_insert_tail (roccq_head, roccq_tail, rocc);
- memcpy (&rocc->a_id, &msg->peer_identity,
- sizeof (struct GNUNET_PeerIdentity));
- LOG_DEBUG ("Received request for overlay connection with op_id: 0x%llx "
- "from local peer %u to peer %4s with hello size: %u\n",
- rocc->op_id,
- peer_id,
- GNUNET_i2s (&rocc->a_id),
- hsize);
- rocc->peer = peer;
- rocc->peer->reference_cnt++;
- rocc->tcc.op_id = rocc->op_id;
- rocc->tcc.th = GNUNET_TRANSPORT_connect (rocc->peer->details.local.cfg, NULL, rocc,
- NULL, &transport_connect_notify, NULL);
- if (NULL == rocc->tcc.th)
- {
- GNUNET_break (0);
- GNUNET_free (rocc);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- rocc->tcc.pid = &rocc->a_id;
- rocc->hello = GNUNET_malloc (hsize);
- memcpy (rocc->hello, msg->hello, hsize);
- rocc->attempt_connect_task_id =
- GNUNET_SCHEDULER_add_now (&attempt_connect_task, rocc);
- rocc->timeout_rocc_task_id =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT, &timeout_rocc_task, rocc);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
-}
-
-
-/**
- * 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_slave_get_config (void *cls, struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
-{
- 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;
-
- msg = (struct GNUNET_TESTBED_SlaveGetConfigurationMessage *) message;
- slave_id = ntohl (msg->slave_id);
- op_id = GNUNET_ntohll (msg->operation_id);
- if ((slave_list_size <= slave_id) || (NULL == slave_list[slave_id]))
- {
- /* FIXME: Add forwardings for this type of message here.. */
- send_operation_fail_msg (client, op_id, "Slave not found");
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
- return;
- }
- slave = slave_list[slave_id];
- if (NULL == slave->cfg)
- {
- send_operation_fail_msg (client, op_id,
- "Configuration not found (slave not started by me)");
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
- return;
+ GST_send_operation_fail_msg (client, op_id,
+ "Configuration not found (slave not started by me)");
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
}
config = GNUNET_CONFIGURATION_serialize (slave->cfg, &config_size);
- xconfig_size = GNUNET_TESTBED_compress_config_ (config, config_size,
- &xconfig);
- GNUNET_free (config);
+ 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_SLAVECONFIG);
+ 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);
- queue_message (client, &reply->header);
+ GST_queue_message (client, &reply->header);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
* iterate,
* GNUNET_NO if not.
*/
-static int
-reghost_free_iterator (void *cls,
- const struct GNUNET_HashCode * key,
+static int
+reghost_free_iterator (void *cls, const struct GNUNET_HashCode *key,
void *value)
{
struct Slave *slave = cls;
struct ForwardedOverlayConnectContext *focc;
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (slave->reghost_map,
- key, value));
+ 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);
- cleanup_focc (focc);
+ 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_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 OverlayConnectContext *occ;
- struct RequestOverlayConnectContext *rocc;
struct ForwardedOperationContext *fopc;
struct MessageQueue *mq_entry;
uint32_t id;
GNUNET_CONTAINER_DLL_remove (lcfq_head, lcfq_tail, lcfq);
GNUNET_free (lcfq);
}
- while (NULL != (occ = occq_head))
- cleanup_occ (occ);
- while (NULL != (rocc = roccq_head))
- cleanup_rocc (rocc);
+ 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 == peer_list[id]->destroy_flag);
+ * 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 == peer_list[id]->reference_cnt);
- if ( (GNUNET_NO == peer_list[id]->is_remote)
- && (GNUNET_YES == peer_list[id]->details.local.is_running))
- GNUNET_TESTING_peer_kill (peer_list[id]->details.local.peer);
+ 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 < 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 (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_wait (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])
{
struct HostRegistration *hr_entry;
-
- while (NULL != (hr_entry = slave_list[id]->hr_dll_head))
+
+ while (NULL != (hr_entry = GST_slave_list[id]->hr_dll_head))
{
- GNUNET_CONTAINER_DLL_remove (slave_list[id]->hr_dll_head,
- slave_list[id]->hr_dll_tail,
- hr_entry);
+ 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 != slave_list[id]->rhandle)
- GNUNET_TESTBED_cancel_registration (slave_list[id]->rhandle);
- (void) GNUNET_CONTAINER_multihashmap_iterate (slave_list[id]->reghost_map,
- reghost_free_iterator,
- slave_list[id]);
- GNUNET_CONTAINER_multihashmap_destroy (slave_list[id]->reghost_map);
- if (NULL != slave_list[id]->cfg)
- GNUNET_CONFIGURATION_destroy (slave_list[id]->cfg);
- 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);
- GNUNET_free (slave_list[id]);
+ 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]);
}
- GNUNET_free_non_null (slave_list);
- 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_SERVER_client_drop (master_context->client);
- 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);
+ 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_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 */
- if (NULL != hello_cache)
- GNUNET_assert
- (GNUNET_CONTAINER_multihashmap_size (hello_cache) <= hello_cache_size);
- while (NULL != lru_hcache_head)
- hello_cache_remove (lru_hcache_head);
- if (NULL != hello_cache)
- {
- GNUNET_assert (0 == GNUNET_CONTAINER_multihashmap_size (hello_cache));
- GNUNET_CONTAINER_multihashmap_destroy (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");
/* should not be needed as we're terminated by failure to read
{
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)},
- {&handle_overlay_request_connect, NULL, GNUNET_MESSAGE_TYPE_TESTBED_REQUESTCONNECT,
- 0},
- {handle_slave_get_config, NULL, GNUNET_MESSAGE_TYPE_TESTBED_GETSLAVECONFIG,
+ {&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))
+ 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_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",
- "HELLO_CACHE_SIZE",
- &num));
- hello_cache_size = (unsigned int) num;
- GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string
- (cfg, "testbed", "HOSTNAME", &hostname));
+ "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, GNUNET_NO);
- if (1 < hello_cache_size)
- hello_cache = GNUNET_CONTAINER_multihashmap_create (hello_cache_size / 2,
- GNUNET_YES);
shutdown_task_id =
GNUNET_SCHEDULER_add_delayed_with_priority (GNUNET_TIME_UNIT_FOREVER_REL,
GNUNET_SCHEDULER_PRIORITY_IDLE,
projects / oweals / gnunet.git / blobdiff