X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftestbed%2Fgnunet-service-testbed_links.c;h=a2692e8a6f6625c61c40fc5e0579bac3c72f5c2e;hb=29e6158507a0758192075ac6ece7ba8e75ddc49a;hp=766c47471342f36919a906324d521bfc23cd8e59;hpb=9b254cc0bcac0e9a167008fea2270351c5f5e62a;p=oweals%2Fgnunet.git diff --git a/src/testbed/gnunet-service-testbed_links.c b/src/testbed/gnunet-service-testbed_links.c index 766c47471..a2692e8a6 100644 --- a/src/testbed/gnunet-service-testbed_links.c +++ b/src/testbed/gnunet-service-testbed_links.c @@ -1,6 +1,6 @@ /* 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 @@ -14,8 +14,8 @@ 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. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /** @@ -92,7 +92,7 @@ struct LCFContext /** * The timeout task */ - GNUNET_SCHEDULER_TaskIdentifier timeout_task; + struct GNUNET_SCHEDULER_Task * timeout_task; /** * The id of the operation which created this context @@ -206,7 +206,7 @@ struct Neighbour /** * Task id for the task to call notifications from the notification list */ - GNUNET_SCHEDULER_TaskIdentifier notify_task; + struct GNUNET_SCHEDULER_Task * notify_task; /** * How many references are present currently to this neighbour's connection @@ -265,7 +265,7 @@ struct NeighbourConnectCtxt /** * Task to be run upon timeout */ - GNUNET_SCHEDULER_TaskIdentifier timeout_task; + struct GNUNET_SCHEDULER_Task * timeout_task; /** * The notification handle associated with the neighbour's connection request @@ -317,7 +317,7 @@ static struct LCFContextQueue *lcfq_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 @@ -585,10 +585,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); /** @@ -602,7 +601,7 @@ 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: @@ -634,32 +633,29 @@ 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); + GNUNET_assert (NULL == lcf_proc_task_id); lcf_proc_task_id = GNUNET_SCHEDULER_add_now (&lcf_proc_task, lcf); } @@ -668,15 +664,14 @@ 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: @@ -753,7 +748,7 @@ slave_event_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event) GNUNET_TESTBED_operation_done (lcf->op); lcf->op = NULL; GNUNET_assert (FINISHED == lcf->state); - GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != lcf->timeout_task); + 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, @@ -764,7 +759,7 @@ slave_event_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event) 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); + GNUNET_assert (NULL == lcf_proc_task_id); lcf_proc_task_id = GNUNET_SCHEDULER_add_now (&lcf_proc_task, lcf); return; } @@ -852,18 +847,16 @@ trigger_notifications (struct Neighbour *n); * neighbour * * @param cls the neighbour - * @param tc scheduler task context */ static void -neighbour_connect_notify_task (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +neighbour_connect_notify_task (void *cls) { struct Neighbour *n = cls; struct NeighbourConnectNotification *h; GNUNET_assert (NULL != (h = n->nl_head)); - GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != n->notify_task); - n->notify_task = GNUNET_SCHEDULER_NO_TASK; + 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); @@ -888,7 +881,7 @@ 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; if (1 == n->inactive) { @@ -936,7 +929,7 @@ 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); if (NULL != n->controller) { @@ -970,7 +963,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; @@ -1006,12 +999,12 @@ GST_neighbour_get_connection_cancel (struct NeighbourConnectNotification *h) GNUNET_free (h); if (GNUNET_NO == cleanup_task) return; - if (GNUNET_SCHEDULER_NO_TASK == n->notify_task) + if (NULL == n->notify_task) return; GNUNET_assert (0 < n->reference_cnt); n->reference_cnt--; GNUNET_SCHEDULER_cancel (n->notify_task); - n->notify_task = GNUNET_SCHEDULER_NO_TASK; + n->notify_task = NULL; if (NULL == n->nl_head) { if ( (0 == n->reference_cnt) && (0 == n->inactive) ) @@ -1056,7 +1049,7 @@ 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); @@ -1118,15 +1111,13 @@ GST_free_nccq () * Task to be run upon timeout while attempting to connect to the neighbour * * @param cls the NeighbourConnectCtxt created in GST_handle_link_controllers() - * @param tc the scheduler task context */ 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; + ncc->timeout_task = NULL; send_controller_link_response (ncc->client, ncc->op_id, NULL, "Could not connect to delegated controller"); cleanup_ncc (ncc); @@ -1145,7 +1136,7 @@ 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); @@ -1163,7 +1154,7 @@ GST_create_neighbour (struct GNUNET_TESTBED_Host *host) { struct Neighbour *n; - n = GNUNET_malloc (sizeof (struct Neighbour)); + 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; @@ -1249,7 +1240,7 @@ GST_handle_link_controllers (void *cls, struct GNUNET_SERVER_Client *client, LOG_DEBUG ("Received request to establish a link to host %u\n", delegated_host_id); n = GST_create_neighbour (GST_host_list[delegated_host_id]); - ncc = GNUNET_malloc (sizeof (struct NeighbourConnectCtxt)); + ncc = GNUNET_new (struct NeighbourConnectCtxt); ncc->n = n; ncc->op_id = op_id; ncc->client = client; @@ -1271,11 +1262,11 @@ GST_handle_link_controllers (void *cls, struct GNUNET_SERVER_Client *client, } 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_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; @@ -1284,7 +1275,7 @@ GST_handle_link_controllers (void *cls, struct GNUNET_SERVER_Client *client, GNUNET_TESTBED_controller_start (GST_context->master_ip, GST_host_list[slave->host_id], &slave_status_cb, slave); - new_route = GNUNET_malloc (sizeof (struct Route)); + new_route = GNUNET_new (struct Route); new_route->dest = delegated_host_id; new_route->thru = GST_context->host_id; route_list_add (new_route); @@ -1298,8 +1289,8 @@ GST_handle_link_controllers (void *cls, struct GNUNET_SERVER_Client *client, GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); return; } - lcfq = GNUNET_malloc (sizeof (struct LCFContextQueue)); - lcfq->lcf = GNUNET_malloc (sizeof (struct LCFContext)); + lcfq = GNUNET_new (struct LCFContextQueue); + lcfq->lcf = GNUNET_new (struct LCFContext); lcfq->lcf->delegated_host_id = delegated_host_id; lcfq->lcf->slave_host_id = slave_host_id; route = GST_find_dest_route (slave_host_id); @@ -1314,7 +1305,7 @@ GST_handle_link_controllers (void *cls, struct GNUNET_SERVER_Client *client, lcfq->lcf->client = client; if (NULL == lcfq_head) { - GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == lcf_proc_task_id); + GNUNET_assert (NULL == 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); } @@ -1335,7 +1326,7 @@ GST_handle_link_controllers (void *cls, struct GNUNET_SERVER_Client *client, GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); 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); @@ -1354,20 +1345,20 @@ GST_free_lcfq () if (NULL != lcfq_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); + GNUNET_assert (NULL == lcf_proc_task_id); for (lcfq = lcfq_head; NULL != lcfq; lcfq = lcfq_head) { lcf = lcfq->lcf; GNUNET_SERVER_client_drop (lcf->client); if (NULL != lcf->op) GNUNET_TESTBED_operation_done (lcf->op); - if (GNUNET_SCHEDULER_NO_TASK != lcf->timeout_task) + if (NULL != lcf->timeout_task) GNUNET_SCHEDULER_cancel (lcf->timeout_task); GNUNET_free (lcf); GNUNET_CONTAINER_DLL_remove (lcfq_head, lcfq_tail, lcfq);