[GNUnet-SVN] r13872 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2010-12-02 14:43:38 +0100 (Thu, 02 Dec 2010)
New Revision: 13872

Modified:
   gnunet/src/transport/test_transport_api.c
Log:


Modified: gnunet/src/transport/test_transport_api.c
===================================================================
--- gnunet/src/transport/test_transport_api.c   2010-12-02 13:30:05 UTC (rev 
13871)
+++ gnunet/src/transport/test_transport_api.c   2010-12-02 13:43:38 UTC (rev 
13872)
@@ -82,6 +82,8 @@
 
 static int is_https;
 
+static int is_multi_protocol;
+
 static  GNUNET_SCHEDULER_TaskIdentifier die_task;
 
 static char * key_file_p1;
@@ -351,6 +353,11 @@
       setup_peer (&p1, "test_transport_api_udp_peer1.conf");
       setup_peer (&p2, "test_transport_api_udp_peer2.conf");
     }
+  if (is_multi_protocol)
+    {
+      setup_peer (&p1, "test_transport_api_multi_peer1.conf");
+      setup_peer (&p2, "test_transport_api_multi_peer2.conf");
+    }
   else if (is_tcp)
     {
       setup_peer (&p1, "test_transport_api_tcp_peer1.conf");
@@ -561,10 +568,24 @@
     {
       is_http = GNUNET_YES;
     }
+  else if (strstr(argv[0], "multi") != NULL)
+    {
+       is_multi_protocol = GNUNET_YES;
+    }
 
+
   ret = check ();
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-1");
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-2");
+  if (is_multi_protocol)
+  {
+         GNUNET_DISK_directory_remove 
("/tmp/test-gnunetd-transport-multi-peer-1/");
+         GNUNET_DISK_directory_remove 
("/tmp/test-gnunetd-transport-multi-peer-2/");
+  }
+  else
+  {
+         GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-1");
+         GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-2");
+  }
+
   return ret;
 }