- stage_task = GNUNET_SCHEDULER_NO_TASK;
- if (GNUNET_SCHEDULER_NO_TASK != die_task)
- GNUNET_SCHEDULER_cancel (die_task);
- die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Running stage %u\n", stage);
-
- if (0 == stage)
- {
- started = GNUNET_NO;
- connected = GNUNET_NO;
- if (0 == strcmp(test_name, "test_transport_blacklisting_no_bl"))
- {
- /* Try to connect peers successfully */
- p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_blacklisting_cfg_peer1.conf", 1,
- NULL, NULL, NULL, &start_cb, NULL);
-
- p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_blacklisting_cfg_peer2.conf", 2,
- NULL, NULL, NULL, &start_cb, NULL);
- }
- else if (0 == strcmp(test_name, "test_transport_blacklisting_outbound_bl_full"))
- {
- p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_blacklisting_cfg_blp_peer1_full.conf", 1,
- NULL, NULL, NULL, &start_cb, NULL);
-
- p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_blacklisting_cfg_peer2.conf", 2,
- NULL, NULL, NULL, &start_cb, NULL);
- }
- else if (0 == strcmp(test_name, "test_transport_blacklisting_outbound_bl_plugin"))
- {
- p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_blacklisting_cfg_blp_peer1_plugin.conf", 1,
- NULL, NULL, NULL, &start_cb, NULL);
-
- p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_blacklisting_cfg_peer2.conf", 2,
- NULL, NULL, NULL, &start_cb, NULL);
- }
- else if (0 == strcmp(test_name, "test_transport_blacklisting_inbound_bl_full"))
- {
- p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_blacklisting_cfg_peer1.conf", 1,
- NULL, NULL, NULL, &start_cb, NULL);
-
- p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_blacklisting_cfg_blp_peer2_full.conf", 2,
- NULL, NULL, NULL, &start_cb, NULL);
- }
- else if (0 == strcmp(test_name, "test_transport_blacklisting_inbound_bl_plugin"))
- {
- p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_blacklisting_cfg_peer1.conf", 1,
- NULL, NULL, NULL, &start_cb, NULL);
-
- p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_blacklisting_cfg_blp_peer2_plugin.conf", 2,
- NULL, NULL, NULL, &start_cb, NULL);
- }
- else if (0 == strcmp(test_name, "test_transport_blacklisting_multiple_plugins"))
- {
- p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf", 1,
- NULL, NULL, NULL, &start_cb, NULL);
-
- p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf", 2,
- NULL, NULL, NULL, &start_cb, NULL);
- }
-
-
- if ((NULL == p1) || (NULL == p2))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to start peers\n");
- ok = 1;
- GNUNET_SCHEDULER_add_now (&end, NULL);
- }
-
- timeout_task = GNUNET_SCHEDULER_add_delayed (CONNECT_TIMEOUT, &connect_timeout, NULL);
- stage ++;
- return;
- }
-
-
- if (cc != NULL)
+ stage_task = NULL;
+ if (NULL != die_task)
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL );
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Running stage %u\n", stage);
+
+ if (0 == stage)
+ {
+ started = GNUNET_NO;
+ connected = GNUNET_NO;
+ if (0 == strcmp (test_name, "test_transport_blacklisting_no_bl"))
+ {
+ /* Try to connect peers successfully */
+ p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+ "test_transport_blacklisting_cfg_peer1.conf", 1, NULL, NULL, NULL,
+ &start_cb, NULL );
+
+ p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+ "test_transport_blacklisting_cfg_peer2.conf", 2, NULL, NULL, NULL,
+ &start_cb, NULL );
+ }
+ else if (0
+ == strcmp (test_name, "test_transport_blacklisting_outbound_bl_full"))
+ {
+ char * cfg_p1 = "test_transport_blacklisting_cfg_blp_peer1_full.conf";
+ char * cfg_p2 = "test_transport_blacklisting_cfg_blp_peer2_full.conf";
+ p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+ cfg_p1 , 1, NULL, NULL, NULL, &start_cb, NULL );
+
+ p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+ cfg_p2, 2, NULL, NULL, NULL,
+ &start_cb, NULL );
+
+ /* check if configuration contain correct blacklist entries */
+ if ((GNUNET_SYSERR == check_blacklist_config (cfg_p1, &p1->id, &p2->id)) ||
+ (GNUNET_SYSERR == check_blacklist_config (cfg_p2, &p2->id, &p1->id)) )
+ {
+ GNUNET_TRANSPORT_TESTING_stop_peer(tth, p1);
+ p1 = NULL;
+ GNUNET_TRANSPORT_TESTING_stop_peer(tth, p2);
+ p2 = NULL;
+ ok = 1;
+ GNUNET_SCHEDULER_add_now (&end, NULL );
+ }
+
+ }
+ else if (0
+ == strcmp (test_name, "test_transport_blacklisting_outbound_bl_plugin"))
+ {
+ char * cfg_p1 = "test_transport_blacklisting_cfg_blp_peer1_plugin.conf";
+ char * cfg_p2 = "test_transport_blacklisting_cfg_blp_peer2_plugin.conf";
+
+ p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+ cfg_p1, 1, NULL,
+ NULL, NULL, &start_cb, NULL );
+
+ p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+ cfg_p2, 2, NULL, NULL, NULL,
+ &start_cb, NULL );
+
+ /* check if configuration contain correct blacklist entries */
+ if ((GNUNET_SYSERR == check_blacklist_config (cfg_p1, &p1->id, &p2->id)) ||
+ (GNUNET_SYSERR == check_blacklist_config (cfg_p2, &p2->id, &p1->id)) )
+ {
+ GNUNET_TRANSPORT_TESTING_stop_peer(tth, p1);
+ p1 = NULL;
+ GNUNET_TRANSPORT_TESTING_stop_peer(tth, p2);
+ p2 = NULL;
+ ok = 1;
+ GNUNET_SCHEDULER_add_now (&end, NULL );
+ }
+ }
+ else if (0
+ == strcmp (test_name, "test_transport_blacklisting_inbound_bl_full"))
+ {
+ char * cfg_p1 = "test_transport_blacklisting_cfg_peer1.conf";
+ char * cfg_p2 = "test_transport_blacklisting_cfg_blp_peer2_full.conf";
+
+ p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+ cfg_p1, 1, NULL, NULL, NULL,
+ &start_cb, NULL );
+
+ p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+ cfg_p2, 2, NULL, NULL,
+ NULL, &start_cb, NULL );
+
+ /* check if configuration contain correct blacklist entries */
+ if ((GNUNET_SYSERR == check_blacklist_config (cfg_p2, &p2->id, &p1->id)) )
+ {
+ GNUNET_TRANSPORT_TESTING_stop_peer(tth, p1);
+ p1 = NULL;
+ GNUNET_TRANSPORT_TESTING_stop_peer(tth, p2);
+ p2 = NULL;
+ ok = 1;
+ GNUNET_SCHEDULER_add_now (&end, NULL );
+ }
+ }
+ else if (0
+ == strcmp (test_name, "test_transport_blacklisting_inbound_bl_plugin"))
+ {
+ char * cfg_p1 = "test_transport_blacklisting_cfg_peer1.conf";
+ char * cfg_p2 = "test_transport_blacklisting_cfg_blp_peer2_plugin.conf";
+
+ p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+ cfg_p1, 1, NULL, NULL, NULL,
+ &start_cb, NULL );
+
+ p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+ cfg_p2, 2, NULL, NULL,
+ NULL, &start_cb, NULL );
+
+ /* check if configuration contain correct blacklist entries */
+ if ((GNUNET_SYSERR == check_blacklist_config (cfg_p2, &p2->id, &p1->id)) )
+ {
+ GNUNET_TRANSPORT_TESTING_stop_peer(tth, p1);
+ p1 = NULL;
+ GNUNET_TRANSPORT_TESTING_stop_peer(tth, p2);
+ p2 = NULL;
+ ok = 1;
+ GNUNET_SCHEDULER_add_now (&end, NULL );
+ }
+
+ }
+ else if (0
+ == strcmp (test_name, "test_transport_blacklisting_multiple_plugins"))
+ {
+ char * cfg_p1 = "test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf";
+ char * cfg_p2 = "test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf";
+
+ p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+ cfg_p1, 1,
+ NULL, NULL, NULL, &start_cb, NULL );
+
+ p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+ cfg_p2, 2,
+ NULL, NULL, NULL, &start_cb, NULL );
+
+ /* check if configuration contain correct blacklist entries */
+ if ((GNUNET_SYSERR == check_blacklist_config (cfg_p1, &p1->id, &p2->id)) ||
+ (GNUNET_SYSERR == check_blacklist_config (cfg_p2, &p2->id, &p1->id)))
+ {
+ GNUNET_TRANSPORT_TESTING_stop_peer(tth, p1);
+ p1 = NULL;
+ GNUNET_TRANSPORT_TESTING_stop_peer(tth, p2);
+ p2 = NULL;
+ ok = 1;
+ GNUNET_SCHEDULER_add_now (&end, NULL );
+ }
+ }
+ else
+ {
+ GNUNET_break (0);
+ GNUNET_SCHEDULER_add_now (&end, NULL );
+ }
+
+ if ((NULL == p1) || (NULL == p2))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to start peers\n");
+ ok = 1;
+ GNUNET_SCHEDULER_add_now (&end, NULL );
+ }
+
+ timeout_task = GNUNET_SCHEDULER_add_delayed (CONNECT_TIMEOUT,
+ &connect_timeout, NULL );
+ stage++;
+ return;
+ }
+
+ if (cc != NULL )