aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/gnunet-service-testbed_oc.c
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2013-02-14 16:46:58 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2013-02-14 16:46:58 +0000
commitf13b91df9b44684456a1b60db33a10f6d260f936 (patch)
tree3ec90f68bc77e104dab78077e5a234ad5616b123 /src/testbed/gnunet-service-testbed_oc.c
parent6ec800a7d58bd7e5d79adf2413732c90ba02397a (diff)
downloadgnunet-f13b91df9b44684456a1b60db33a10f6d260f936.tar.gz
gnunet-f13b91df9b44684456a1b60db33a10f6d260f936.zip
fix 2793: Testbed does not allow to set TIMEOUT for operations
Diffstat (limited to 'src/testbed/gnunet-service-testbed_oc.c')
-rw-r--r--src/testbed/gnunet-service-testbed_oc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/testbed/gnunet-service-testbed_oc.c b/src/testbed/gnunet-service-testbed_oc.c
index 9b571e3dd..8bed69f36 100644
--- a/src/testbed/gnunet-service-testbed_oc.c
+++ b/src/testbed/gnunet-service-testbed_oc.c
@@ -381,7 +381,7 @@ GST_process_next_focc (struct RegisteredHostContext *rhc)
381 GNUNET_free (focc->orig_msg); 381 GNUNET_free (focc->orig_msg);
382 focc->orig_msg = NULL; 382 focc->orig_msg = NULL;
383 fopc->timeout_task = 383 fopc->timeout_task =
384 GNUNET_SCHEDULER_add_delayed (TIMEOUT, &forwarded_overlay_connect_timeout, 384 GNUNET_SCHEDULER_add_delayed (GST_timeout, &forwarded_overlay_connect_timeout,
385 fopc); 385 fopc);
386 GNUNET_CONTAINER_DLL_insert_tail (fopcq_head, fopcq_tail, fopc); 386 GNUNET_CONTAINER_DLL_insert_tail (fopcq_head, fopcq_tail, fopc);
387} 387}
@@ -1221,7 +1221,7 @@ GST_handle_overlay_connect (void *cls, struct GNUNET_SERVER_Client *client,
1221 &GST_forwarded_operation_reply_relay, 1221 &GST_forwarded_operation_reply_relay,
1222 fopc); 1222 fopc);
1223 fopc->timeout_task = 1223 fopc->timeout_task =
1224 GNUNET_SCHEDULER_add_delayed (TIMEOUT, &GST_forwarded_operation_timeout, 1224 GNUNET_SCHEDULER_add_delayed (GST_timeout, &GST_forwarded_operation_timeout,
1225 fopc); 1225 fopc);
1226 GNUNET_CONTAINER_DLL_insert_tail (fopcq_head, fopcq_tail, fopc); 1226 GNUNET_CONTAINER_DLL_insert_tail (fopcq_head, fopcq_tail, fopc);
1227 GNUNET_SERVER_receive_done (client, GNUNET_OK); 1227 GNUNET_SERVER_receive_done (client, GNUNET_OK);
@@ -1264,7 +1264,7 @@ GST_handle_overlay_connect (void *cls, struct GNUNET_SERVER_Client *client,
1264 occ->peer2_controller = peer2_controller; 1264 occ->peer2_controller = peer2_controller;
1265 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == occ->timeout_task); 1265 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == occ->timeout_task);
1266 occ->timeout_task = 1266 occ->timeout_task =
1267 GNUNET_SCHEDULER_add_delayed (TIMEOUT, &timeout_overlay_connect, occ); 1267 GNUNET_SCHEDULER_add_delayed (GST_timeout, &timeout_overlay_connect, occ);
1268 /* Get the identity of the second peer */ 1268 /* Get the identity of the second peer */
1269 if (NULL != occ->peer2_controller) 1269 if (NULL != occ->peer2_controller)
1270 { 1270 {
@@ -1564,7 +1564,7 @@ GST_handle_remote_overlay_connect (void *cls,
1564 &cache_transport_peer_connect_notify, 1564 &cache_transport_peer_connect_notify,
1565 rocc); 1565 rocc);
1566 rocc->timeout_rocc_task_id = 1566 rocc->timeout_rocc_task_id =
1567 GNUNET_SCHEDULER_add_delayed (TIMEOUT, &timeout_rocc_task, rocc); 1567 GNUNET_SCHEDULER_add_delayed (GST_timeout, &timeout_rocc_task, rocc);
1568 GNUNET_SERVER_receive_done (client, GNUNET_OK); 1568 GNUNET_SERVER_receive_done (client, GNUNET_OK);
1569} 1569}
1570 1570