X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftestbed%2Fgnunet-service-testbed_links.c;h=984e6c1a656b4211c4bb742640cad8a7cb50e9f3;hb=7a5a724a6f96baf80d2226326124aa01c58ad3fe;hp=ae984e331e9bde6143ee3d7db82f5ab4788bff2b;hpb=94b2f31f285e6483fbced750204f7464b16058e8;p=oweals%2Fgnunet.git
diff --git a/src/testbed/gnunet-service-testbed_links.c b/src/testbed/gnunet-service-testbed_links.c
index ae984e331..984e6c1a6 100644
--- a/src/testbed/gnunet-service-testbed_links.c
+++ b/src/testbed/gnunet-service-testbed_links.c
@@ -1,21 +1,19 @@
/*
This file is part of GNUnet.
- (C) 2008--2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2008--2013 GNUnet e.V.
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
*/
/**
@@ -75,10 +73,15 @@ enum LCFContextState
struct LCFContext
{
/**
- * The type of this data structure. Set this to CLOSURE_TYPE_LCF
+ * The LCFContext
+ */
+ struct LCFContext *next;
+
+ /**
+ * The LCFContext
*/
- enum ClosureType type;
-
+ struct LCFContext *prev;
+
/**
* The gateway which will pass the link message to delegated host
*/
@@ -87,29 +90,23 @@ struct LCFContext
/**
* The client which has asked to perform this operation
*/
- struct GNUNET_SERVER_Client *client;
+ struct GNUNET_SERVICE_Client *client;
/**
* Handle for operations which are forwarded while linking controllers
*/
struct GNUNET_TESTBED_Operation *op;
- /**
- * The configuration which has to be either used as a template while starting
- * the delegated controller or for connecting to the delegated controller
- */
- struct GNUNET_CONFIGURATION_Handle *cfg;
-
/**
* The timeout task
*/
- GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+ struct GNUNET_SCHEDULER_Task *timeout_task;
/**
* The id of the operation which created this context
*/
uint64_t operation_id;
-
+
/**
* should the slave controller start the delegated controller?
*/
@@ -134,35 +131,38 @@ struct LCFContext
/**
- * Structure of a queue entry in LCFContext request queue
+ * Notification context to be used to notify when connection to the neighbour's
+ * controller is opened
*/
-struct LCFContextQueue
+struct NeighbourConnectNotification
{
/**
- * The LCFContext
+ * DLL next for inclusion in neighbour's list of notification requests
*/
- struct LCFContext *lcf;
+ struct NeighbourConnectNotification *next;
/**
- * Head prt for DLL
+ * DLL prev
*/
- struct LCFContextQueue *next;
+ struct NeighbourConnectNotification *prev;
/**
- * Tail ptr for DLL
+ * The neighbour
*/
- struct LCFContextQueue *prev;
-};
-
-struct NeighbourConnectNotification
-{
- struct NeighbourConnectNotification *next;
- struct NeighbourConnectNotification *prev;
struct Neighbour *n;
+
+ /**
+ * The notification callback to call when we are connect to neighbour
+ */
GST_NeigbourConnectNotifyCallback cb;
+
+ /**
+ * The closure for the above callback
+ */
void *cb_cls;
};
-
+
+
/**
* A connected controller which is not our child
*/
@@ -172,44 +172,107 @@ struct Neighbour
* The controller handle
*/
struct GNUNET_TESTBED_Controller *controller;
-
+
/**
* Operation handle for opening a lateral connection to another controller.
* Will be NULL if the slave controller is started by this controller
*/
struct GNUNET_TESTBED_Operation *conn_op;
+ /**
+ * DLL head for the list of notification requests
+ */
struct NeighbourConnectNotification *nl_head;
+ /**
+ * DLL tail for the list of notification requests
+ */
struct NeighbourConnectNotification *nl_tail;
- GNUNET_SCHEDULER_TaskIdentifier notify_task;
+ /**
+ * Task id for the task to call notifications from the notification list
+ */
+ struct GNUNET_SCHEDULER_Task * notify_task;
+ /**
+ * How many references are present currently to this neighbour's connection
+ */
unsigned int reference_cnt;
-
+
+ /**
+ * Is the conn_op inactivated?
+ */
+ unsigned int inactive;
+
/**
* The id of the host this controller is running on
*/
uint32_t host_id;
-
- int8_t inactive;
};
+
+/**
+ * The neighbour list
+ */
static struct Neighbour **neighbour_list;
+
+/**
+ * The size of the neighbour list
+ */
static unsigned int neighbour_list_size;
+
+/**
+ * Context information for establishing a link to neighbour (Used is
+ * GST_handle_link_controllers()
+ */
struct NeighbourConnectCtxt
{
+ /**
+ * DLL next for inclusion in the corresponding context list
+ */
struct NeighbourConnectCtxt *next;
+
+ /**
+ * DLL tail
+ */
struct NeighbourConnectCtxt *prev;
+
+ /**
+ * The neighbour to whom connection should be made
+ */
struct Neighbour *n;
- struct GNUNET_SERVER_Client *client;
- GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+
+ /**
+ * The client requesting the connection
+ */
+ struct GNUNET_SERVICE_Client *client;
+
+ /**
+ * Task to be run upon timeout
+ */
+ struct GNUNET_SCHEDULER_Task *timeout_task;
+
+ /**
+ * The notification handle associated with the neighbour's connection request
+ */
struct NeighbourConnectNotification *nh;
+
+ /**
+ * The id of the link-controllers operation responsible for creating this
+ * context
+ */
uint64_t op_id;
};
+/**
+ * DLL head for the list of neighbour connect contexts
+ */
struct NeighbourConnectCtxt *ncc_head;
+
+/**
+ * DLL tail for the list of neighbour connect contexts
+ */
struct NeighbourConnectCtxt *ncc_tail;
/**
@@ -228,19 +291,19 @@ unsigned int GST_slave_list_size;
static struct Route **route_list;
/**
- * The head for the LCF queue
+ * The LCF queue
*/
-static struct LCFContextQueue *lcfq_head;
+static struct LCFContext *lcf_head;
/**
* The tail for the LCF queue
*/
-static struct LCFContextQueue *lcfq_tail;
+static struct LCFContext *lcf_tail;
/**
* The lcf_task handle
*/
-static GNUNET_SCHEDULER_TaskIdentifier lcf_proc_task_id;
+static struct GNUNET_SCHEDULER_Task * lcf_proc_task_id;
/**
* The size of the route list
@@ -257,13 +320,43 @@ static void
slave_list_add (struct Slave *slave)
{
if (slave->host_id >= GST_slave_list_size)
- GST_array_grow_large_enough (GST_slave_list, GST_slave_list_size,
+ GST_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;
}
+/**
+ * Clean up all forwarded operation overlay context matching the
+ * client given in @a cls.
+ *
+ * @param cls a `struct GNUNET_SERVICE_Client *` to match
+ * @param key unused
+ * @param value the `struct RegisteredHostContext` to search for @a cls
+ * @return #GNUNET_OK (continue iterating)
+ */
+static int
+drop_client_entries (void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
+{
+ struct GNUNET_SERVICE_Client *client = cls;
+ struct RegisteredHostContext *rhc = value;
+ struct ForwardedOverlayConnectContext *focc;
+ struct ForwardedOverlayConnectContext *foccn;
+
+ for (focc = rhc->focc_dll_head; NULL != focc; focc = foccn)
+ {
+ foccn = focc->next;
+ if (focc->client == client)
+ GST_cleanup_focc (focc);
+ }
+ return GNUNET_OK;
+}
+
+
/**
* Adds a route to the route list
*
@@ -278,6 +371,13 @@ route_list_add (struct Route *route)
route_list[route->dest] = route;
}
+
+/**
+ * Add a neighbour to the neighbour list. Grows the neighbour list
+ * automatically.
+ *
+ * @param n the neighbour to add
+ */
static void
neighbour_list_add (struct Neighbour *n)
{
@@ -295,7 +395,7 @@ void
GST_route_list_clear ()
{
unsigned int id;
-
+
for (id = 0; id < route_list_size; id++)
if (NULL != route_list[id])
GNUNET_free (route_list[id]);
@@ -310,12 +410,12 @@ GST_route_list_clear ()
* @param cls handle to the slave
* @param key current key code
* @param value value in the hash map
- * @return GNUNET_YES if we should continue to
- * iterate,
- * GNUNET_NO if not.
+ * @return #GNUNET_YES if we should continue to iterate,
+ * #GNUNET_NO if not.
*/
static int
-reghost_free_iterator (void *cls, const struct GNUNET_HashCode *key,
+reghost_free_iterator (void *cls,
+ const struct GNUNET_HashCode *key,
void *value)
{
struct Slave *slave = cls;
@@ -326,51 +426,86 @@ reghost_free_iterator (void *cls, const struct GNUNET_HashCode *key,
GNUNET_CONTAINER_multihashmap_remove (slave->reghost_map, key,
value));
while (NULL != (focc = rhc->focc_dll_head))
- {
- GNUNET_CONTAINER_DLL_remove (rhc->focc_dll_head, rhc->focc_dll_tail, focc);
GST_cleanup_focc (focc);
- }
- if (NULL != rhc->sub_op)
- GNUNET_TESTBED_operation_done (rhc->sub_op);
- if (NULL != rhc->client)
- GNUNET_SERVER_client_drop (rhc->client);
GNUNET_free (value);
return GNUNET_YES;
}
+/**
+ * Kill a #Slave object
+ *
+ * @param slave the #Slave object
+ */
+static void
+kill_slave (struct Slave *slave)
+{
+ struct HostRegistration *hr_entry;
+
+ while (NULL != (hr_entry = slave->hr_dll_head))
+ {
+ GNUNET_CONTAINER_DLL_remove (slave->hr_dll_head, slave->hr_dll_tail,
+ hr_entry);
+ GNUNET_free (hr_entry);
+ }
+ if (NULL != slave->rhandle)
+ GNUNET_TESTBED_cancel_registration (slave->rhandle);
+ GNUNET_assert (GNUNET_SYSERR !=
+ GNUNET_CONTAINER_multihashmap_iterate (slave->reghost_map,
+ reghost_free_iterator,
+ slave));
+ GNUNET_CONTAINER_multihashmap_destroy (slave->reghost_map);
+ if (NULL != slave->controller)
+ GNUNET_TESTBED_controller_disconnect (slave->controller);
+ if (NULL != slave->controller_proc)
+ {
+ LOG_DEBUG ("Stopping a slave\n");
+ GNUNET_TESTBED_controller_kill_ (slave->controller_proc);
+ }
+}
+
+
+/**
+ * Destroy a #Slave object
+ *
+ * @param slave the #Slave object
+ */
+static void
+destroy_slave (struct Slave *slave)
+{
+ if (NULL != slave->controller_proc)
+ {
+ GNUNET_TESTBED_controller_destroy_ (slave->controller_proc);
+ LOG_DEBUG ("Slave stopped\n");
+ }
+ GST_slave_list[slave->host_id] = NULL;
+ GNUNET_free (slave);
+}
+
+
/**
* Cleans up the slave list
*/
void
GST_slave_list_clear ()
{
+ struct Slave *slave;
unsigned int id;
- struct HostRegistration *hr_entry;
for (id = 0; id < GST_slave_list_size; id++)
- if (NULL != GST_slave_list[id])
- {
- while (NULL != (hr_entry = GST_slave_list[id]->hr_dll_head))
- {
- GNUNET_CONTAINER_DLL_remove (GST_slave_list[id]->hr_dll_head,
- GST_slave_list[id]->hr_dll_tail, hr_entry);
- GNUNET_free (hr_entry);
- }
- if (NULL != GST_slave_list[id]->rhandle)
- GNUNET_TESTBED_cancel_registration (GST_slave_list[id]->rhandle);
- (void)
- GNUNET_CONTAINER_multihashmap_iterate (GST_slave_list
- [id]->reghost_map,
- reghost_free_iterator,
- GST_slave_list[id]);
- GNUNET_CONTAINER_multihashmap_destroy (GST_slave_list[id]->reghost_map);
- if (NULL != GST_slave_list[id]->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]);
- }
+ {
+ slave = GST_slave_list[id];
+ if (NULL == slave)
+ continue;
+ kill_slave (slave);
+ }
+ for (id = 0; id < GST_slave_list_size; id++)
+ {
+ slave = GST_slave_list[id];
+ if (NULL == slave)
+ continue;
+ destroy_slave (slave);
+ }
GNUNET_free_non_null (GST_slave_list);
GST_slave_list = NULL;
}
@@ -414,23 +549,23 @@ GST_find_dest_route (uint32_t host_id)
* NULL if cfg is set!
*/
static void
-send_controller_link_response (struct GNUNET_SERVER_Client *client,
+send_controller_link_response (struct GNUNET_SERVICE_Client *client,
uint64_t operation_id,
- const struct GNUNET_CONFIGURATION_Handle
- *cfg,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
const char *emsg)
{
+ struct GNUNET_MQ_Envelope *env;
struct GNUNET_TESTBED_ControllerLinkResponse *msg;
char *xconfig;
size_t config_size;
- size_t xconfig_size;
+ size_t xconfig_size;
uint16_t msize;
GNUNET_assert ((NULL == cfg) || (NULL == emsg));
xconfig = NULL;
xconfig_size = 0;
config_size = 0;
- msize = sizeof (struct GNUNET_TESTBED_ControllerLinkResponse);
+ msize = 0;
if (NULL != cfg)
{
xconfig = GNUNET_TESTBED_compress_cfg_ (cfg,
@@ -440,19 +575,26 @@ send_controller_link_response (struct GNUNET_SERVER_Client *client,
}
if (NULL != emsg)
msize += strlen (emsg);
- msg = GNUNET_malloc (msize);
- msg->header.type = htons
- (GNUNET_MESSAGE_TYPE_TESTBED_LINK_CONTROLLERS_RESULT);
- msg->header.size = htons (msize);
+ env = GNUNET_MQ_msg_extra (msg,
+ msize,
+ GNUNET_MESSAGE_TYPE_TESTBED_LINK_CONTROLLERS_RESULT);
if (NULL == emsg)
msg->success = htons (GNUNET_YES);
msg->operation_id = GNUNET_htonll (operation_id);
msg->config_size = htons ((uint16_t) config_size);
if (NULL != xconfig)
- memcpy (&msg[1], xconfig, xconfig_size);
+ {
+ GNUNET_memcpy (&msg[1],
+ xconfig,
+ xconfig_size);
+ GNUNET_free (xconfig);
+ }
if (NULL != emsg)
- memcpy (&msg[1], emsg, strlen (emsg));
- GST_queue_message (client, &msg->header);
+ GNUNET_memcpy (&msg[1],
+ emsg,
+ strlen (emsg));
+ GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client),
+ env);
}
@@ -460,10 +602,9 @@ send_controller_link_response (struct GNUNET_SERVER_Client *client,
* The Link Controller forwarding task
*
* @param cls the LCFContext
- * @param tc the Task context from scheduler
*/
static void
-lcf_proc_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+lcf_proc_task (void *cls);
/**
@@ -473,11 +614,12 @@ lcf_proc_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
* @param emsg the error message; NULL if host registration is successful
*/
static void
-lcf_proc_cc (void *cls, const char *emsg)
+lcf_proc_cc (void *cls,
+ const char *emsg)
{
struct LCFContext *lcf = cls;
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == lcf_proc_task_id);
+ GNUNET_assert (NULL == lcf_proc_task_id);
switch (lcf->state)
{
case INIT:
@@ -498,10 +640,12 @@ lcf_proc_cc (void *cls, const char *emsg)
return;
registration_error:
- LOG (GNUNET_ERROR_TYPE_WARNING, "Host registration failed with message: %s\n",
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Host registration failed with message: %s\n",
emsg);
lcf->state = FINISHED;
- lcf_proc_task_id = GNUNET_SCHEDULER_add_now (&lcf_proc_task, lcf);
+ lcf_proc_task_id = GNUNET_SCHEDULER_add_now (&lcf_proc_task,
+ lcf);
}
@@ -509,33 +653,32 @@ registration_error:
* The Link Controller forwarding task
*
* @param cls the LCFContext
- * @param tc the Task context from scheduler
*/
static void
-lcf_proc_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+lcf_proc_task (void *cls);
/**
* Task to free resources when forwarded link controllers has been timedout
*
* @param cls the LCFContext
- * @param tc the task context from scheduler
*/
static void
-lcf_forwarded_operation_timeout (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+lcf_forwarded_operation_timeout (void *cls)
{
struct LCFContext *lcf = cls;
- lcf->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ lcf->timeout_task = NULL;
// GST_forwarded_operation_timeout (lcf->fopc, tc);
LOG (GNUNET_ERROR_TYPE_WARNING,
"A forwarded controller link operation has timed out\n");
- send_controller_link_response (lcf->client, lcf->operation_id, NULL,
- "A forwarded controller link operation has "
- "timed out\n");
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == lcf_proc_task_id);
- lcf_proc_task_id = GNUNET_SCHEDULER_add_now (&lcf_proc_task, lcf);
+ send_controller_link_response (lcf->client,
+ lcf->operation_id,
+ NULL,
+ "A forwarded controller link operation has timed out\n");
+ GNUNET_assert (NULL == lcf_proc_task_id);
+ lcf_proc_task_id = GNUNET_SCHEDULER_add_now (&lcf_proc_task,
+ lcf);
}
@@ -543,15 +686,13 @@ lcf_forwarded_operation_timeout (void *cls,
* The Link Controller forwarding task
*
* @param cls the LCFContext
- * @param tc the Task context from scheduler
*/
static void
-lcf_proc_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+lcf_proc_task (void *cls)
{
struct LCFContext *lcf = cls;
- struct LCFContextQueue *lcfq;
- lcf_proc_task_id = GNUNET_SCHEDULER_NO_TASK;
+ lcf_proc_task_id = NULL;
switch (lcf->state)
{
case INIT:
@@ -588,26 +729,23 @@ lcf_proc_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
lcf->gateway->controller,
GST_host_list[lcf->delegated_host_id],
GST_host_list[lcf->slave_host_id],
- NULL,
lcf->is_subordinate);
lcf->timeout_task =
- GNUNET_SCHEDULER_add_delayed (GST_timeout, &lcf_forwarded_operation_timeout,
+ GNUNET_SCHEDULER_add_delayed (GST_timeout,
+ &lcf_forwarded_operation_timeout,
lcf);
lcf->state = FINISHED;
break;
case FINISHED:
- lcfq = lcfq_head;
- GNUNET_assert (lcfq->lcf == lcf);
- GNUNET_assert (NULL != lcf->cfg);
- GNUNET_CONFIGURATION_destroy (lcf->cfg);
- GNUNET_SERVER_client_drop (lcf->client);
- GNUNET_TESTBED_operation_done (lcf->op);
+ if (NULL != lcf->op)
+ GNUNET_TESTBED_operation_done (lcf->op);
+ GNUNET_CONTAINER_DLL_remove (lcf_head,
+ lcf_tail,
+ lcf);
GNUNET_free (lcf);
- GNUNET_CONTAINER_DLL_remove (lcfq_head, lcfq_tail, lcfq);
- GNUNET_free (lcfq);
- if (NULL != lcfq_head)
- lcf_proc_task_id =
- GNUNET_SCHEDULER_add_now (&lcf_proc_task, lcfq_head->lcf);
+ if (NULL != lcf_head)
+ lcf_proc_task_id = GNUNET_SCHEDULER_add_now (&lcf_proc_task,
+ lcf_head);
}
}
@@ -619,84 +757,47 @@ lcf_proc_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
* @param event information about the event
*/
static void
-slave_event_callback (void *cls,
- const struct GNUNET_TESTBED_EventInformation *event)
+slave_event_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
{
- struct RegisteredHostContext *rhc;
struct LCFContext *lcf;
- struct GNUNET_CONFIGURATION_Handle *cfg;
- struct GNUNET_TESTBED_Operation *old_op;
- /* We currently only get here when working on RegisteredHostContexts and
- LCFContexts */
+ /* We currently only get here when working on LCFContexts */
GNUNET_assert (GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type);
- rhc = event->op_cls;
- if (CLOSURE_TYPE_RHC == rhc->type)
- {
- GNUNET_assert (rhc->sub_op == event->op);
- switch (rhc->state)
- {
- case RHC_GET_CFG:
- cfg = event->details.operation_finished.generic;
- old_op = rhc->sub_op;
- rhc->state = RHC_LINK;
- rhc->sub_op =
- GNUNET_TESTBED_controller_link (rhc, rhc->gateway->controller,
- rhc->reg_host, rhc->host, cfg,
- GNUNET_NO);
- GNUNET_TESTBED_operation_done (old_op);
- break;
- case RHC_LINK:
- LOG_DEBUG ("OL: Linking controllers successfull\n");
- GNUNET_TESTBED_operation_done (rhc->sub_op);
- rhc->sub_op = NULL;
- rhc->state = RHC_OL_CONNECT;
- GST_process_next_focc (rhc);
- break;
- default:
- GNUNET_assert (0);
- }
- return;
- }
lcf = event->op_cls;
- if (CLOSURE_TYPE_LCF == lcf->type)
- {
- GNUNET_assert (lcf->op == event->op);
- GNUNET_assert (FINISHED == lcf->state);
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != lcf->timeout_task);
- GNUNET_SCHEDULER_cancel (lcf->timeout_task);
- if (NULL == event->details.operation_finished.emsg)
- send_controller_link_response (lcf->client, lcf->operation_id,
- GNUNET_TESTBED_host_get_cfg_
- (GST_host_list[lcf->delegated_host_id]),
- NULL);
- else
- send_controller_link_response (lcf->client, lcf->operation_id,
- NULL,
- event->details.operation_finished.emsg);
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == lcf_proc_task_id);
- lcf_proc_task_id = GNUNET_SCHEDULER_add_now (&lcf_proc_task, lcf);
- return;
- }
- GNUNET_assert (0);
+ GNUNET_assert (lcf->op == event->op);
+ GNUNET_TESTBED_operation_done (lcf->op);
+ lcf->op = NULL;
+ GNUNET_assert (FINISHED == lcf->state);
+ GNUNET_assert (NULL != lcf->timeout_task);
+ GNUNET_SCHEDULER_cancel (lcf->timeout_task);
+ if (NULL == event->details.operation_finished.emsg)
+ send_controller_link_response (lcf->client, lcf->operation_id,
+ GNUNET_TESTBED_host_get_cfg_
+ (GST_host_list[lcf->delegated_host_id]),
+ NULL);
+ else
+ send_controller_link_response (lcf->client, lcf->operation_id,
+ NULL,
+ event->details.operation_finished.emsg);
+ GNUNET_assert (NULL == lcf_proc_task_id);
+ lcf_proc_task_id = GNUNET_SCHEDULER_add_now (&lcf_proc_task, lcf);
+ return;
}
-static void
-slave_status_callback (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg,
- int status);
/**
* Callback to signal successfull startup of the controller process
*
* @param cls the handle to the slave whose status is to be found here
* @param cfg the configuration with which the controller has been started;
- * NULL if status is not GNUNET_OK
- * @param status GNUNET_OK if the startup is successfull; GNUNET_SYSERR if not,
+ * NULL if status is not #GNUNET_OK
+ * @param status #GNUNET_OK if the startup is successfull; #GNUNET_SYSERR if not,
* GNUNET_TESTBED_controller_stop() shouldn't be called in this case
*/
static void
-slave_status_callback (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg,
- int status)
+slave_status_cb (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ int status)
{
struct Slave *slave = cls;
struct LinkControllersContext *lcc;
@@ -705,8 +806,13 @@ slave_status_callback (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg,
if (GNUNET_SYSERR == status)
{
slave->controller_proc = NULL;
- GST_slave_list[slave->host_id] = NULL;
- GNUNET_free (slave);
+ /* Stop all link controller forwarding tasks since we shutdown here anyway
+ and as these tasks they depend on the operation queues which are created
+ through GNUNET_TESTBED_controller_connect() and in kill_slave() we call
+ the destructor function GNUNET_TESTBED_controller_disconnect() */
+ GST_free_lcf ();
+ kill_slave (slave);
+ destroy_slave (slave);
slave = NULL;
LOG (GNUNET_ERROR_TYPE_WARNING, "Unexpected slave shutdown\n");
GNUNET_SCHEDULER_shutdown (); /* We too shutdown */
@@ -714,7 +820,7 @@ slave_status_callback (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg,
}
slave->controller =
GNUNET_TESTBED_controller_connect (GST_host_list[slave->host_id],
- EVENT_MASK, &slave_event_callback,
+ EVENT_MASK, &slave_event_cb,
slave);
if (NULL != slave->controller)
{
@@ -724,19 +830,17 @@ slave_status_callback (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg,
{
send_controller_link_response (lcc->client, lcc->operation_id, NULL,
"Could not connect to delegated controller");
- GNUNET_TESTBED_controller_stop (slave->controller_proc);
- GST_slave_list[slave->host_id] = NULL;
- GNUNET_free (slave);
+ kill_slave (slave);
+ destroy_slave (slave);
slave = NULL;
}
-clean_lcc:
+ clean_lcc:
if (NULL != lcc)
{
if (NULL != lcc->client)
{
- GNUNET_SERVER_receive_done (lcc->client, GNUNET_OK);
- GNUNET_SERVER_client_drop (lcc->client);
+ GNUNET_SERVICE_client_continue (lcc->client);
lcc->client = NULL;
}
GNUNET_free (lcc);
@@ -745,10 +849,50 @@ clean_lcc:
slave->lcc = NULL;
}
+
+/**
+ * Trigger notification task if there are notification requests currently
+ * waiting in the given neighbour. Also activates the neighbour connect operation
+ * if it was previously inactivated so that the connection to the neighbour can
+ * be re-used
+ *
+ * @param n the neighbour
+ */
static void
-neighbour_connect_notify_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc);
+trigger_notifications (struct Neighbour *n);
+
+
+/**
+ * Task to call the notification queued in the notifications list of the given
+ * neighbour
+ *
+ * @param cls the neighbour
+ */
+static void
+neighbour_connect_notify_task (void *cls)
+{
+ struct Neighbour *n = cls;
+ struct NeighbourConnectNotification *h;
+
+ GNUNET_assert (NULL != (h = n->nl_head));
+ GNUNET_assert (NULL != n->notify_task);
+ n->notify_task = NULL;
+ GNUNET_assert (NULL != n->controller);
+ GNUNET_CONTAINER_DLL_remove (n->nl_head, n->nl_tail, h);
+ trigger_notifications (n);
+ h->cb (h->cb_cls, n->controller);
+ GNUNET_free (h);
+}
+
+/**
+ * Trigger notification task if there are notification requests currently
+ * waiting in the given neighbour. Also activates the neighbour connect operation
+ * if it was previously inactivated so that the connection to the neighbour can
+ * be re-used
+ *
+ * @param n the neighbour
+ */
static void
trigger_notifications (struct Neighbour *n)
{
@@ -757,63 +901,78 @@ trigger_notifications (struct Neighbour *n)
return;
if (NULL == n->controller)
return;
- if (GNUNET_SCHEDULER_NO_TASK != n->notify_task)
+ if (NULL != n->notify_task)
return;
- n->notify_task =
- GNUNET_SCHEDULER_add_now (&neighbour_connect_notify_task, n->nl_head);
-}
-
-static void
-neighbour_connect_notify_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct NeighbourConnectNotification *h = cls;
- struct Neighbour *n;
-
- n = h->n;
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != n->notify_task);
- n->notify_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_assert (NULL != n->controller);
- GNUNET_CONTAINER_DLL_remove (n->nl_head, n->nl_tail, h);
- trigger_notifications (n);
- if ((0 == n->reference_cnt) && (1 == n->inactive))
+ if (1 == n->inactive)
{
+ GNUNET_assert (0 == n->reference_cnt);
GNUNET_TESTBED_operation_activate_ (n->conn_op);
n->inactive = 0;
}
n->reference_cnt++;
- h->cb (h->cb_cls, n->controller);
+ n->notify_task =
+ GNUNET_SCHEDULER_add_now (&neighbour_connect_notify_task, n);
}
+
+/**
+ * Callback to be called when the neighbour connect operation is started. The
+ * connection to the neigbour is opened here and any pending notifications are
+ * trigger.
+ *
+ * @param cls the neighbour
+ */
static void
opstart_neighbour_conn (void *cls)
{
struct Neighbour *n = cls;
-
+
GNUNET_assert (NULL != n->conn_op);
GNUNET_assert (NULL == n->controller);
LOG_DEBUG ("Opening connection to controller on host %u\n", n->host_id);
n->controller = GNUNET_TESTBED_controller_connect (GST_host_list[n->host_id],
EVENT_MASK,
- &slave_event_callback,
+ &slave_event_cb,
NULL);
trigger_notifications (n);
}
+
+/**
+ * Callback to be called when the neighbour connect operation is released
+ *
+ * @param cls the neighbour
+ */
static void
oprelease_neighbour_conn (void *cls)
{
struct Neighbour *n = cls;
GNUNET_assert (0 == n->reference_cnt);
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == n->notify_task);
+ GNUNET_assert (NULL == n->notify_task);
GNUNET_assert (NULL == n->nl_head);
- LOG_DEBUG ("Closing connection to controller on host %u\n", n->host_id);
- GNUNET_TESTBED_controller_disconnect (n->controller);
- n->controller = NULL;
+ if (NULL != n->controller)
+ {
+ LOG_DEBUG ("Closing connection to controller on host %u\n", n->host_id);
+ GNUNET_TESTBED_controller_disconnect (n->controller);
+ n->controller = NULL;
+ }
n->conn_op = NULL;
+ n->inactive = 0;
}
+
+/**
+ * Try to open a connection to the given neigbour. If the connection is open
+ * already, then it is re-used. If not, the request is queued in the operation
+ * queues responsible for bounding the total number of file descriptors. The
+ * actual connection will happen when the operation queue marks the
+ * corresponding operation as active.
+ *
+ * @param n the neighbour to open a connection to
+ * @param cb the notification callback to call when the connection is opened
+ * @param cb_cls the closure for the above callback
+ */
struct NeighbourConnectNotification *
GST_neighbour_get_connection (struct Neighbour *n,
GST_NeigbourConnectNotifyCallback cb,
@@ -824,7 +983,7 @@ GST_neighbour_get_connection (struct Neighbour *n,
GNUNET_assert (NULL != cb);
LOG_DEBUG ("Attempting to get connection to controller on host %u\n",
n->host_id);
- h = GNUNET_malloc (sizeof (struct NeighbourConnectNotification));
+ h = GNUNET_new (struct NeighbourConnectNotification);
h->n = n;
h->cb = cb;
h->cb_cls = cb_cls;
@@ -842,21 +1001,50 @@ GST_neighbour_get_connection (struct Neighbour *n,
return h;
}
+
+/**
+ * Cancel the request for opening a connection to the neighbour
+ *
+ * @param h the notification handle
+ */
void
GST_neighbour_get_connection_cancel (struct NeighbourConnectNotification *h)
{
struct Neighbour *n;
-
+ int cleanup_task;
+
n = h->n;
- if ((h == n->nl_head) && (GNUNET_SCHEDULER_NO_TASK != n->notify_task))
- {
- GNUNET_SCHEDULER_cancel (n->notify_task);
- n->notify_task = GNUNET_SCHEDULER_NO_TASK;
- }
+ cleanup_task = (h == n->nl_head) ? GNUNET_YES : GNUNET_NO;
GNUNET_CONTAINER_DLL_remove (n->nl_head, n->nl_tail, h);
GNUNET_free (h);
+ if (GNUNET_NO == cleanup_task)
+ return;
+ if (NULL == n->notify_task)
+ return;
+ GNUNET_assert (0 < n->reference_cnt);
+ n->reference_cnt--;
+ GNUNET_SCHEDULER_cancel (n->notify_task);
+ n->notify_task = NULL;
+ if (NULL == n->nl_head)
+ {
+ if ( (0 == n->reference_cnt) && (0 == n->inactive) )
+ {
+ n->inactive = 1;
+ GNUNET_TESTBED_operation_inactivate_ (n->conn_op);
+ }
+ return;
+ }
+ trigger_notifications (n);
}
+
+/**
+ * Release the connection to the neighbour. The actual connection will be
+ * closed if connections to other neighbour are waiting (to maintain a bound on
+ * the total number of connections that are open).
+ *
+ * @param n the neighbour whose connection can be closed
+ */
void
GST_neighbour_release_connection (struct Neighbour *n)
{
@@ -865,25 +1053,36 @@ GST_neighbour_release_connection (struct Neighbour *n)
n->reference_cnt--;
if (0 == n->reference_cnt)
{
- GNUNET_TESTBED_operation_inactivate_ (n->conn_op);
n->inactive = 1;
+ GNUNET_TESTBED_operation_inactivate_ (n->conn_op);
}
}
+
+/**
+ * Cleanup neighbour connect contexts
+ *
+ * @param ncc the neighbour connect context to cleanup
+ */
static void
cleanup_ncc (struct NeighbourConnectCtxt *ncc)
{
if (NULL != ncc->nh)
GST_neighbour_get_connection_cancel (ncc->nh);
- if (GNUNET_SCHEDULER_NO_TASK != ncc->timeout_task)
+ if (NULL != ncc->timeout_task)
GNUNET_SCHEDULER_cancel (ncc->timeout_task);
- GNUNET_SERVER_client_drop (ncc->client);
- GNUNET_CONTAINER_DLL_remove (ncc_head, ncc_tail, ncc);
+ GNUNET_CONTAINER_DLL_remove (ncc_head,
+ ncc_tail,
+ ncc);
GNUNET_free (ncc);
}
+
+/**
+ * Cleans up the neighbour list
+ */
void
-GST_neighbour_list_clean()
+GST_neighbour_list_clean ()
{
struct Neighbour *n;
unsigned int id;
@@ -900,15 +1099,26 @@ GST_neighbour_list_clean()
GNUNET_free_non_null (neighbour_list);
}
+
+/**
+ * Get a neighbour from the neighbour list
+ *
+ * @param id the index of the neighbour in the neighbour list
+ * @return the Neighbour; NULL if the given index in invalid (index greater than
+ * the list size or neighbour at that index is NULL)
+ */
struct Neighbour *
GST_get_neighbour (uint32_t id)
{
if (neighbour_list_size <= id)
return NULL;
- else
- return neighbour_list[id];
+ return neighbour_list[id];
}
+
+/**
+ * Function to cleanup the neighbour connect contexts
+ */
void
GST_free_nccq ()
{
@@ -916,102 +1126,124 @@ GST_free_nccq ()
cleanup_ncc (ncc_head);
}
+
+/**
+ * Task to be run upon timeout while attempting to connect to the neighbour
+ *
+ * @param cls the NeighbourConnectCtxt created in GST_handle_link_controllers()
+ */
static void
-timeout_neighbour_connect (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+timeout_neighbour_connect (void *cls)
{
struct NeighbourConnectCtxt *ncc = cls;
- ncc->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- send_controller_link_response (ncc->client, ncc->op_id, NULL,
+ ncc->timeout_task = NULL;
+ send_controller_link_response (ncc->client,
+ ncc->op_id,
+ NULL,
"Could not connect to delegated controller");
cleanup_ncc (ncc);
}
+
+/**
+ * Callback called when a connection to the neighbour is made
+ *
+ * @param cls the NeighbourConnectCtxt created in GST_handle_link_controllers()
+ * @param c the handle the neighbour's controller
+ */
static void
-neighbour_connect_cb (void *cls, struct GNUNET_TESTBED_Controller *c)
+neighbour_connect_cb (void *cls,
+ struct GNUNET_TESTBED_Controller *c)
{
struct NeighbourConnectCtxt *ncc = cls;
GNUNET_SCHEDULER_cancel (ncc->timeout_task);
- ncc->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ ncc->timeout_task = NULL;
ncc->nh = NULL;
GST_neighbour_release_connection (ncc->n);
- send_controller_link_response (ncc->client, ncc->op_id, NULL, NULL);
+ send_controller_link_response (ncc->client,
+ ncc->op_id,
+ NULL,
+ NULL);
cleanup_ncc (ncc);
}
+
/**
- * Message handler for GNUNET_MESSAGE_TYPE_TESTBED_LCONTROLLERS message
+ * Function to create a neigbour and add it into the neighbour list
*
- * @param cls NULL
- * @param client identification of the client
- * @param message the actual message
+ * @param host the host of the neighbour
+ */
+struct Neighbour *
+GST_create_neighbour (struct GNUNET_TESTBED_Host *host)
+{
+ struct Neighbour *n;
+
+ n = GNUNET_new (struct Neighbour);
+ n->host_id = GNUNET_TESTBED_host_get_id_ (host);
+ neighbour_list_add (n); /* just add; connect on-demand */
+ return n;
+}
+
+
+/**
+ * Message handler for #GNUNET_MESSAGE_TYPE_TESTBED_LCONTROLLERS message
+ *
+ * @param cls identification of the client
+ * @param msg the actual message
*/
void
-GST_handle_link_controllers (void *cls, struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+handle_link_controllers (void *cls,
+ const struct GNUNET_TESTBED_ControllerLinkRequest *msg)
{
- const struct GNUNET_TESTBED_ControllerLinkRequest *msg;
- struct GNUNET_CONFIGURATION_Handle *cfg;
- struct LCFContextQueue *lcfq;
+ struct GNUNET_SERVICE_Client *client = cls;
+ struct LCFContext *lcf;
struct Route *route;
struct Route *new_route;
uint64_t op_id;
uint32_t delegated_host_id;
uint32_t slave_host_id;
- uint16_t msize;
if (NULL == GST_context)
{
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVICE_client_drop (client);
return;
}
- msize = ntohs (message->size);
- if (sizeof (struct GNUNET_TESTBED_ControllerLinkRequest) >= msize)
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- msg = (const struct GNUNET_TESTBED_ControllerLinkRequest *) message;
delegated_host_id = ntohl (msg->delegated_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);
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Trying to link ourselves\n");
+ GNUNET_SERVICE_client_drop (client);
return;
}
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);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ "Delegated host %u not registered with us\n",
+ delegated_host_id);
+ GNUNET_SERVICE_client_drop (client);
return;
}
slave_host_id = ntohl (msg->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",
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Slave host %u not registered with us\n",
slave_host_id);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVICE_client_drop (client);
return;
}
if (slave_host_id == delegated_host_id)
{
- LOG (GNUNET_ERROR_TYPE_WARNING, "Slave and delegated host are same\n");
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- cfg = GNUNET_TESTBED_extract_config_ (message); /* destroy cfg here or in lcfcontext */
- if (NULL == cfg)
- {
- GNUNET_break (0); /* Configuration parsing error */
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Slave and delegated host are same\n");
+ GNUNET_SERVICE_client_drop (client);
return;
}
op_id = GNUNET_ntohll (msg->operation_id);
@@ -1020,7 +1252,6 @@ GST_handle_link_controllers (void *cls, struct GNUNET_SERVER_Client *client,
struct Slave *slave;
struct LinkControllersContext *lcc;
-
if (1 != msg->is_subordinate)
{
struct Neighbour *n;
@@ -1030,51 +1261,53 @@ GST_handle_link_controllers (void *cls, struct GNUNET_SERVER_Client *client,
(NULL != neighbour_list[delegated_host_id]))
{
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVICE_client_drop (client);
return;
}
LOG_DEBUG ("Received request to establish a link to host %u\n",
delegated_host_id);
- n = GNUNET_malloc (sizeof (struct Neighbour));
- n->host_id = delegated_host_id;
- neighbour_list_add (n); /* just add; connect on-demand */
- ncc = GNUNET_malloc (sizeof (struct NeighbourConnectCtxt));
+ n = GST_create_neighbour (GST_host_list[delegated_host_id]);
+ ncc = GNUNET_new (struct NeighbourConnectCtxt);
ncc->n = n;
ncc->op_id = op_id;
ncc->client = client;
- GNUNET_SERVER_client_keep (client);
- ncc->nh = GST_neighbour_get_connection (n, neighbour_connect_cb, ncc);
- ncc->timeout_task = GNUNET_SCHEDULER_add_delayed (GST_timeout,
- &timeout_neighbour_connect,
- ncc);
- GNUNET_CONTAINER_DLL_insert_tail (ncc_head, ncc_tail, ncc);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ ncc->nh = GST_neighbour_get_connection (n,
+ &neighbour_connect_cb,
+ ncc);
+ ncc->timeout_task
+ = GNUNET_SCHEDULER_add_delayed (GST_timeout,
+ &timeout_neighbour_connect,
+ ncc);
+ GNUNET_CONTAINER_DLL_insert_tail (ncc_head,
+ ncc_tail,
+ ncc);
+ GNUNET_SERVICE_client_continue (client);
return;
}
- if ((delegated_host_id < GST_slave_list_size) &&
- (NULL != GST_slave_list[delegated_host_id]))
+ if ( (delegated_host_id < GST_slave_list_size) &&
+ (NULL != GST_slave_list[delegated_host_id]) )
{
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVICE_client_drop (client);
return;
}
LOG_DEBUG ("Received request to start and establish a link to host %u\n",
delegated_host_id);
- slave = GNUNET_malloc (sizeof (struct Slave));
+ slave = GNUNET_new (struct Slave);
slave->host_id = delegated_host_id;
- slave->reghost_map = GNUNET_CONTAINER_multihashmap_create (100, GNUNET_NO);
+ slave->reghost_map = GNUNET_CONTAINER_multihashmap_create (100,
+ GNUNET_NO);
slave_list_add (slave);
- lcc = GNUNET_malloc (sizeof (struct LinkControllersContext));
+ lcc = GNUNET_new (struct LinkControllersContext);
lcc->operation_id = op_id;
- GNUNET_SERVER_client_keep (client);
lcc->client = client;
slave->lcc = lcc;
- slave->controller_proc =
- GNUNET_TESTBED_controller_start (GST_context->master_ip,
+ slave->controller_proc
+ = GNUNET_TESTBED_controller_start (GST_context->master_ip,
GST_host_list[slave->host_id],
- &slave_status_callback, slave);
- GNUNET_CONFIGURATION_destroy (cfg);
- new_route = GNUNET_malloc (sizeof (struct Route));
+ &slave_status_cb,
+ slave);
+ new_route = GNUNET_new (struct Route);
new_route->dest = delegated_host_id;
new_route->thru = GST_context->host_id;
route_list_add (new_route);
@@ -1084,54 +1317,114 @@ GST_handle_link_controllers (void *cls, struct GNUNET_SERVER_Client *client,
/* Route the request */
if (slave_host_id >= route_list_size)
{
- LOG (GNUNET_ERROR_TYPE_WARNING, "No route towards slave host");
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "No route towards slave host");
+ GNUNET_SERVICE_client_drop (client);
return;
}
- lcfq = GNUNET_malloc (sizeof (struct LCFContextQueue));
- lcfq->lcf = GNUNET_malloc (sizeof (struct LCFContext));
- lcfq->lcf->type = CLOSURE_TYPE_LCF;
- lcfq->lcf->delegated_host_id = delegated_host_id;
- lcfq->lcf->slave_host_id = slave_host_id;
+ lcf = GNUNET_new (struct LCFContext);
+ lcf->delegated_host_id = delegated_host_id;
+ lcf->slave_host_id = slave_host_id;
route = GST_find_dest_route (slave_host_id);
GNUNET_assert (NULL != route); /* because we add routes carefully */
GNUNET_assert (route->dest < GST_slave_list_size);
GNUNET_assert (NULL != GST_slave_list[route->dest]);
- lcfq->lcf->cfg = cfg;
- lcfq->lcf->is_subordinate = msg->is_subordinate;
- lcfq->lcf->state = INIT;
- lcfq->lcf->operation_id = op_id;
- lcfq->lcf->gateway = GST_slave_list[route->dest];
- GNUNET_SERVER_client_keep (client);
- lcfq->lcf->client = client;
- if (NULL == lcfq_head)
+ lcf->is_subordinate = msg->is_subordinate;
+ lcf->state = INIT;
+ lcf->operation_id = op_id;
+ lcf->gateway = GST_slave_list[route->dest];
+ lcf->client = client;
+ if (NULL == lcf_head)
{
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == lcf_proc_task_id);
- GNUNET_CONTAINER_DLL_insert_tail (lcfq_head, lcfq_tail, lcfq);
- lcf_proc_task_id = GNUNET_SCHEDULER_add_now (&lcf_proc_task, lcfq->lcf);
+ GNUNET_assert (NULL == lcf_proc_task_id);
+ GNUNET_CONTAINER_DLL_insert_tail (lcf_head,
+ lcf_tail,
+ lcf);
+ lcf_proc_task_id = GNUNET_SCHEDULER_add_now (&lcf_proc_task,
+ lcf);
}
else
- GNUNET_CONTAINER_DLL_insert_tail (lcfq_head, lcfq_tail, lcfq);
+ {
+ GNUNET_CONTAINER_DLL_insert_tail (lcf_head,
+ lcf_tail,
+ lcf);
+ }
/* FIXME: Adding a new route should happen after the controllers are linked
* successfully */
if (1 != msg->is_subordinate)
{
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVICE_client_continue (client);
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_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVICE_client_drop (client);
return;
}
- new_route = GNUNET_malloc (sizeof (struct Route));
+ new_route = GNUNET_new (struct Route);
new_route->dest = delegated_host_id;
new_route->thru = route->dest;
route_list_add (new_route);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVICE_client_continue (client);
+}
+
+
+/**
+ * Clean up @a client handle if we stored any via #handle_link_controllers(),
+ * the given client disconnected.
+ *
+ * @param client the client that is history
+ */
+void
+GST_link_notify_disconnect (struct GNUNET_SERVICE_Client *client)
+{
+ struct NeighbourConnectCtxt *ncc;
+ struct NeighbourConnectCtxt *nccn;
+ struct LCFContext *lcf;
+ struct LCFContext *lcfn;
+
+ for (ncc = ncc_head; NULL != ncc; ncc = nccn)
+ {
+ nccn = ncc->next;
+ if (ncc->client == client)
+ cleanup_ncc (ncc);
+ }
+ for (unsigned int i=0;ireghost_map,
+ &drop_client_entries,
+ client);
+ lcc = slave->lcc;
+ if (NULL == lcc)
+ continue;
+ if (lcc->client == client)
+ {
+ slave->lcc = NULL;
+ GNUNET_free (lcc);
+ }
+ }
+ for (lcf = lcf_head; NULL != lcf; lcf = lcfn)
+ {
+ lcfn = lcf->next;
+ if ( (NULL != lcf) &&
+ (client == lcf->client) )
+ {
+ if (NULL != lcf->op)
+ GNUNET_TESTBED_operation_done (lcf->op);
+ GNUNET_CONTAINER_DLL_remove (lcf_head,
+ lcf_tail,
+ lcf);
+ GNUNET_free (lcf);
+ }
+ }
}
@@ -1139,26 +1432,28 @@ GST_handle_link_controllers (void *cls, struct GNUNET_SERVER_Client *client,
* Cleans up the queue used for forwarding link controllers requests
*/
void
-GST_free_lcfq ()
+GST_free_lcf ()
{
- struct LCFContextQueue *lcfq;
-
- if (NULL != lcfq_head)
+ struct LCFContext *lcf;
+
+ if (NULL != lcf_head)
{
- if (GNUNET_SCHEDULER_NO_TASK != lcf_proc_task_id)
+ if (NULL != lcf_proc_task_id)
{
GNUNET_SCHEDULER_cancel (lcf_proc_task_id);
- lcf_proc_task_id = GNUNET_SCHEDULER_NO_TASK;
+ lcf_proc_task_id = NULL;
}
}
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == lcf_proc_task_id);
- for (lcfq = lcfq_head; NULL != lcfq; lcfq = lcfq_head)
+ GNUNET_assert (NULL == lcf_proc_task_id);
+ for (lcf = lcf_head; NULL != lcf; lcf = lcf_head)
{
- GNUNET_SERVER_client_drop (lcfq->lcf->client);
- GNUNET_assert (NULL != lcfq->lcf->cfg);
- GNUNET_CONFIGURATION_destroy (lcfq->lcf->cfg);
- GNUNET_free (lcfq->lcf);
- GNUNET_CONTAINER_DLL_remove (lcfq_head, lcfq_tail, lcfq);
- GNUNET_free (lcfq);
+ if (NULL != lcf->op)
+ GNUNET_TESTBED_operation_done (lcf->op);
+ if (NULL != lcf->timeout_task)
+ GNUNET_SCHEDULER_cancel (lcf->timeout_task);
+ GNUNET_CONTAINER_DLL_remove (lcf_head,
+ lcf_tail,
+ lcf);
+ GNUNET_free (lcf);
}
}