diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2013-09-09 12:22:31 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2013-09-09 12:22:31 +0000 |
commit | de547f838e21de9f847c0b357c41cbfa6ecbe967 (patch) | |
tree | 35da1aed63ed018249ec58941447bacd758adfff /src/testbed/testbed_api_testbed.c | |
parent | a3efd7521e99175689c589a128240f2c84c55c45 (diff) | |
download | gnunet-de547f838e21de9f847c0b357c41cbfa6ecbe967.tar.gz gnunet-de547f838e21de9f847c0b357c41cbfa6ecbe967.zip |
- barriers test case; more fixes
Diffstat (limited to 'src/testbed/testbed_api_testbed.c')
-rw-r--r-- | src/testbed/testbed_api_testbed.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c index b00e2825c..25054bf1d 100644 --- a/src/testbed/testbed_api_testbed.c +++ b/src/testbed/testbed_api_testbed.c | |||
@@ -1006,6 +1006,7 @@ controller_status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
1006 | 1006 | ||
1007 | if (status != GNUNET_OK) | 1007 | if (status != GNUNET_OK) |
1008 | { | 1008 | { |
1009 | rc->cproc = NULL; | ||
1009 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1010 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
1010 | _("Controller crash detected. Shutting down.\n")); | 1011 | _("Controller crash detected. Shutting down.\n")); |
1011 | GNUNET_SCHEDULER_shutdown (); | 1012 | GNUNET_SCHEDULER_shutdown (); |
@@ -1360,4 +1361,18 @@ error_cleanup: | |||
1360 | } | 1361 | } |
1361 | 1362 | ||
1362 | 1363 | ||
1364 | /** | ||
1365 | * Obtain handle to the master controller from a testbed run. The handle | ||
1366 | * returned should not be disconnected. | ||
1367 | * | ||
1368 | * @param h the testbed run handle | ||
1369 | * @return handle to the master controller | ||
1370 | */ | ||
1371 | struct GNUNET_TESTBED_Controller * | ||
1372 | GNUNET_TESTBED_run_get_controller_handle (struct GNUNET_TESTBED_RunHandle *h) | ||
1373 | { | ||
1374 | return h->c; | ||
1375 | } | ||
1376 | |||
1377 | |||
1363 | /* end of testbed_api_testbed.c */ | 1378 | /* end of testbed_api_testbed.c */ |