aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/gnunet-service-testbed_oc.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-06-27 16:15:33 +0000
committerChristian Grothoff <christian@grothoff.org>2016-06-27 16:15:33 +0000
commitf27f46409ec33cef42379006d561d33a2ae44682 (patch)
tree0d32d879b31feb0d9aa0d19e44b41a2146cb1973 /src/testbed/gnunet-service-testbed_oc.c
parent3a4870624812ac4286624d3946981cac6aef4e67 (diff)
downloadgnunet-f27f46409ec33cef42379006d561d33a2ae44682.tar.gz
gnunet-f27f46409ec33cef42379006d561d33a2ae44682.zip
convert testbed_api to MQ (not perfect, but working)
Diffstat (limited to 'src/testbed/gnunet-service-testbed_oc.c')
-rw-r--r--src/testbed/gnunet-service-testbed_oc.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/testbed/gnunet-service-testbed_oc.c b/src/testbed/gnunet-service-testbed_oc.c
index 55dd5cad9..44f408764 100644
--- a/src/testbed/gnunet-service-testbed_oc.c
+++ b/src/testbed/gnunet-service-testbed_oc.c
@@ -1716,12 +1716,6 @@ rocc_hello_sent_cb (void *cls)
1716 rocc); 1716 rocc);
1717 return; 1717 return;
1718 } 1718 }
1719 if (GNUNET_SCHEDULER_REASON_READ_READY != tc->reason)
1720 {
1721 GNUNET_break (0);
1722 return;
1723 }
1724
1725 rocc->tcc.cgh_p2_ats = 1719 rocc->tcc.cgh_p2_ats =
1726 GST_connection_pool_get_handle (rocc->peer->id, 1720 GST_connection_pool_get_handle (rocc->peer->id,
1727 rocc->peer->details.local.cfg, 1721 rocc->peer->details.local.cfg,
@@ -1752,7 +1746,8 @@ attempt_connect_task (void *cls)
1752 rocc->ohh = 1746 rocc->ohh =
1753 GNUNET_TRANSPORT_offer_hello (rocc->tcc.th_, 1747 GNUNET_TRANSPORT_offer_hello (rocc->tcc.th_,
1754 rocc->hello, 1748 rocc->hello,
1755 rocc_hello_sent_cb, rocc); 1749 &rocc_hello_sent_cb,
1750 rocc);
1756 if (NULL == rocc->ohh) 1751 if (NULL == rocc->ohh)
1757 rocc->attempt_connect_task_id = 1752 rocc->attempt_connect_task_id =
1758 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply 1753 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply