- static char *const argv[] = { "test-transport-api",
- "-c",
- "test_transport_api_data.conf",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
- NULL
- };
- static struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_END
- };
-
-#if WRITECONFIG
- setTransportOptions("test_transport_api_data.conf");
-#endif
- ok = 1;
- GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
- argv, "test-transport-api", "nohelp",
- options, &run, &ok);
- stop_arm (&p1);
- stop_arm (&p2);
-
- if (p1.servicehome != NULL)
- {
- GNUNET_DISK_directory_remove (p1.servicehome);
- GNUNET_free(p1.servicehome);
- }
- if (p2.servicehome != NULL)
- {
- GNUNET_DISK_directory_remove (p2.servicehome);
- GNUNET_free(p2.servicehome);
- }
- return ok;
+ tth = GNUNET_TRANSPORT_TESTING_init ();
+
+ timeout_task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, &end_badly, NULL);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting peer\n");
+ p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+ "test_transport_api_tcp_peer1.conf",
+ 1, ¬ify_receive, ¬ify_connect,
+ ¬ify_disconnect, &start_cb, p1);
+
+ p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+ "test_transport_api_tcp_peer2.conf",
+ 2, ¬ify_receive, ¬ify_connect,
+ ¬ify_disconnect, &start_cb, p2);
+
+ if (p1 == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer1 was not started successfully\n");
+ if (timeout_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (timeout_task);
+ timeout_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ }
+ if (p2 == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer2 was not started successfully\n");
+ if (timeout_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (timeout_task);
+ timeout_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ }