projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-fix channel data range to make -1 legal value
[oweals/gnunet.git]
/
src
/
testbed
/
test_testbed_api_2peers_1controller.c
diff --git
a/src/testbed/test_testbed_api_2peers_1controller.c
b/src/testbed/test_testbed_api_2peers_1controller.c
index 084df100732d598cee39be08b70a8d972098ef78..18bff91e99bc398536b30991866f1b134f1b465e 100644
(file)
--- a/
src/testbed/test_testbed_api_2peers_1controller.c
+++ b/
src/testbed/test_testbed_api_2peers_1controller.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet
/*
This file is part of GNUnet
- (C) 2008--201
2
Christian Grothoff (and other contributing authors)
+ (C) 2008--201
3
Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-166,6
+166,7
@@
enum Stage
*/
static enum Stage result;
*/
static enum Stage result;
+
/**
* shortcut to exit during failure
*/
/**
* shortcut to exit during failure
*/
@@
-180,6
+181,7
@@
static enum Stage result;
} \
} while (0)
} \
} while (0)
+
/**
* Shutdown nicely
*
/**
* Shutdown nicely
*
@@
-227,7
+229,7
@@
do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
* @param emsg error message in case the operation has failed; will be NULL if
* operation has executed successfully.
*/
* @param emsg error message in case the operation has failed; will be NULL if
* operation has executed successfully.
*/
-static void
+static void
op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg);
op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg);
@@
-242,8
+244,9
@@
do_delayed_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
delayed_connect_task = GNUNET_SCHEDULER_NO_TASK;
FAIL_TEST (NULL == common_operation);
{
delayed_connect_task = GNUNET_SCHEDULER_NO_TASK;
FAIL_TEST (NULL == common_operation);
- common_operation = GNUNET_TESTBED_overlay_connect (NULL, &op_comp_cb, NULL,
- peer1.peer, peer2.peer);
+ common_operation =
+ GNUNET_TESTBED_overlay_connect (NULL, &op_comp_cb, NULL, peer1.peer,
+ peer2.peer);
}
}
@@
-255,11
+258,11
@@
do_delayed_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
* @param emsg error message in case the operation has failed; will be NULL if
* operation has executed successfully.
*/
* @param emsg error message in case the operation has failed; will be NULL if
* operation has executed successfully.
*/
-static void
+static void
op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg)
{
FAIL_TEST (common_operation == op);
op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg)
{
FAIL_TEST (common_operation == op);
- switch(result)
+ switch
(result)
{
case PEERS_STARTED:
FAIL_TEST (NULL == peer1.operation);
{
case PEERS_STARTED:
FAIL_TEST (NULL == peer1.operation);
@@
-291,16
+294,16
@@
controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
{
case GNUNET_TESTBED_ET_OPERATION_FINISHED: /* Will be reached when we destroy peers */
FAIL_TEST (PEERS_STOPPED == result);
{
case GNUNET_TESTBED_ET_OPERATION_FINISHED: /* Will be reached when we destroy peers */
FAIL_TEST (PEERS_STOPPED == result);
- FAIL_TEST (NULL == event->
details.operation_finished.
op_cls);
+ FAIL_TEST (NULL == event->op_cls);
FAIL_TEST (NULL == event->details.operation_finished.emsg);
FAIL_TEST (NULL == event->details.operation_finished.generic);
FAIL_TEST (NULL == event->details.operation_finished.emsg);
FAIL_TEST (NULL == event->details.operation_finished.generic);
- if (event->
details.operation_finished.operation
== peer1.operation)
+ if (event->
op
== peer1.operation)
{
GNUNET_TESTBED_operation_done (peer1.operation);
peer1.operation = NULL;
peer1.peer = NULL;
}
{
GNUNET_TESTBED_operation_done (peer1.operation);
peer1.operation = NULL;
peer1.peer = NULL;
}
- else if (event->
details.operation_finished.operation
== peer2.operation)
+ else if (event->
op
== peer2.operation)
{
GNUNET_TESTBED_operation_done (peer2.operation);
peer2.operation = NULL;
{
GNUNET_TESTBED_operation_done (peer2.operation);
peer2.operation = NULL;
@@
-336,7
+339,7
@@
controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
result = PEERS_STARTED;
common_operation =
GNUNET_TESTBED_overlay_connect (NULL, &op_comp_cb, NULL, peer1.peer,
result = PEERS_STARTED;
common_operation =
GNUNET_TESTBED_overlay_connect (NULL, &op_comp_cb, NULL, peer1.peer,
- peer2.peer);
+
peer2.peer);
}
break;
case GNUNET_TESTBED_ET_PEER_STOP:
}
break;
case GNUNET_TESTBED_ET_PEER_STOP:
@@
-366,14
+369,14
@@
controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
FAIL_TEST (NULL == peer2.operation);
FAIL_TEST (NULL != common_operation);
FAIL_TEST ((event->details.peer_connect.peer1 == peer1.peer) &&
FAIL_TEST (NULL == peer2.operation);
FAIL_TEST (NULL != common_operation);
FAIL_TEST ((event->details.peer_connect.peer1 == peer1.peer) &&
-
(event->details.peer_connect.peer2 == peer2.peer));
+ (event->details.peer_connect.peer2 == peer2.peer));
GNUNET_TESTBED_operation_done (common_operation);
common_operation = NULL;
result = PEERS_CONNECTED;
LOG (GNUNET_ERROR_TYPE_DEBUG, "Peers connected\n");
delayed_connect_task =
GNUNET_TESTBED_operation_done (common_operation);
common_operation = NULL;
result = PEERS_CONNECTED;
LOG (GNUNET_ERROR_TYPE_DEBUG, "Peers connected\n");
delayed_connect_task =
- GNUNET_SCHEDULER_add_delayed (TIME_REL_SECS (3),
-
&do_delayed_connect,
NULL);
+ GNUNET_SCHEDULER_add_delayed (TIME_REL_SECS (3),
&do_delayed_connect,
+ NULL);
break;
case PEERS_CONNECTED:
FAIL_TEST (NULL == peer1.operation);
break;
case PEERS_CONNECTED:
FAIL_TEST (NULL == peer1.operation);
@@
-383,8
+386,8
@@
controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
common_operation = NULL;
result = PEERS_CONNECTED_2;
LOG (GNUNET_ERROR_TYPE_DEBUG, "Peers connected again\n");
common_operation = NULL;
result = PEERS_CONNECTED_2;
LOG (GNUNET_ERROR_TYPE_DEBUG, "Peers connected again\n");
- peer1.operation = GNUNET_TESTBED_peer_stop (peer1.peer, NULL, NULL);
- peer2.operation = GNUNET_TESTBED_peer_stop (peer2.peer, NULL, NULL);
+ peer1.operation = GNUNET_TESTBED_peer_stop (
NULL,
peer1.peer, NULL, NULL);
+ peer2.operation = GNUNET_TESTBED_peer_stop (
NULL,
peer2.peer, NULL, NULL);
break;
default:
FAIL_TEST (0);
break;
default:
FAIL_TEST (0);
@@
-451,7
+454,7
@@
registration_comp (void *cls, const char *emsg)
* GNUNET_TESTBED_controller_stop() shouldn't be called in this case
*/
static void
* GNUNET_TESTBED_controller_stop() shouldn't be called in this case
*/
static void
-status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg, int status)
+status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg
_
, int status)
{
uint64_t event_mask;
{
uint64_t event_mask;
@@
-466,10
+469,10
@@
status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg, int status)
event_mask |= (1L << GNUNET_TESTBED_ET_CONNECT);
event_mask |= (1L << GNUNET_TESTBED_ET_OPERATION_FINISHED);
controller =
event_mask |= (1L << GNUNET_TESTBED_ET_CONNECT);
event_mask |= (1L << GNUNET_TESTBED_ET_OPERATION_FINISHED);
controller =
- GNUNET_TESTBED_controller_connect (
cfg,
host, event_mask, &controller_cb,
+ GNUNET_TESTBED_controller_connect (host, event_mask, &controller_cb,
NULL);
FAIL_TEST (NULL != controller);
NULL);
FAIL_TEST (NULL != controller);
- neighbour = GNUNET_TESTBED_host_create ("localhost", NULL, 0);
+ neighbour = GNUNET_TESTBED_host_create ("localhost", NULL,
cfg,
0);
FAIL_TEST (NULL != neighbour);
reg_handle =
GNUNET_TESTBED_register_host (controller, neighbour, ®istration_comp,
FAIL_TEST (NULL != neighbour);
reg_handle =
GNUNET_TESTBED_register_host (controller, neighbour, ®istration_comp,
@@
-491,10
+494,10
@@
static void
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *config)
{
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *config)
{
- host = GNUNET_TESTBED_host_create (NULL, NULL, 0);
- FAIL_TEST (NULL != host);
cfg = GNUNET_CONFIGURATION_dup (config);
cfg = GNUNET_CONFIGURATION_dup (config);
- cp = GNUNET_TESTBED_controller_start ("127.0.0.1", host, cfg, status_cb,
+ host = GNUNET_TESTBED_host_create (NULL, NULL, cfg, 0);
+ FAIL_TEST (NULL != host);
+ cp = GNUNET_TESTBED_controller_start ("127.0.0.1", host, status_cb,
NULL);
abort_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
NULL);
abort_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply