aboutsummaryrefslogtreecommitdiff
path: root/src/transport/test_transport_api.c
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2010-12-02 13:43:38 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2010-12-02 13:43:38 +0000
commitad4cc7a5b1d6d79b4582456e136458cc36479cd7 (patch)
treefb4a9cdcdf5f2798445310fb86d31fc30e6e9f05 /src/transport/test_transport_api.c
parent4792c342d34d2d744d8b228659f0f1fa3fbde940 (diff)
downloadgnunet-ad4cc7a5b1d6d79b4582456e136458cc36479cd7.tar.gz
gnunet-ad4cc7a5b1d6d79b4582456e136458cc36479cd7.zip
Diffstat (limited to 'src/transport/test_transport_api.c')
-rw-r--r--src/transport/test_transport_api.c25
1 files changed, 23 insertions, 2 deletions
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index f05b3cb5d..5bf57b8be 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -82,6 +82,8 @@ static int is_http;
82 82
83static int is_https; 83static int is_https;
84 84
85static int is_multi_protocol;
86
85static GNUNET_SCHEDULER_TaskIdentifier die_task; 87static GNUNET_SCHEDULER_TaskIdentifier die_task;
86 88
87static char * key_file_p1; 89static char * key_file_p1;
@@ -351,6 +353,11 @@ run (void *cls,
351 setup_peer (&p1, "test_transport_api_udp_peer1.conf"); 353 setup_peer (&p1, "test_transport_api_udp_peer1.conf");
352 setup_peer (&p2, "test_transport_api_udp_peer2.conf"); 354 setup_peer (&p2, "test_transport_api_udp_peer2.conf");
353 } 355 }
356 if (is_multi_protocol)
357 {
358 setup_peer (&p1, "test_transport_api_multi_peer1.conf");
359 setup_peer (&p2, "test_transport_api_multi_peer2.conf");
360 }
354 else if (is_tcp) 361 else if (is_tcp)
355 { 362 {
356 setup_peer (&p1, "test_transport_api_tcp_peer1.conf"); 363 setup_peer (&p1, "test_transport_api_tcp_peer1.conf");
@@ -561,10 +568,24 @@ main (int argc, char *argv[])
561 { 568 {
562 is_http = GNUNET_YES; 569 is_http = GNUNET_YES;
563 } 570 }
571 else if (strstr(argv[0], "multi") != NULL)
572 {
573 is_multi_protocol = GNUNET_YES;
574 }
575
564 576
565 ret = check (); 577 ret = check ();
566 GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-1"); 578 if (is_multi_protocol)
567 GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-2"); 579 {
580 GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-multi-peer-1/");
581 GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-multi-peer-2/");
582 }
583 else
584 {
585 GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-1");
586 GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-2");
587 }
588
568 return ret; 589 return ret;
569} 590}
570 591