Working version of transport service with ATS integration

all tests passing on my machine

1 files changed, 6 insertions, 24 deletions

diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index 1f9c56974..f05b3cb5d 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -82,8 +82,6 @@ static int is_http;
 
 static int is_https;
 
-static int is_multi_protocol;
-
 static  GNUNET_SCHEDULER_TaskIdentifier die_task;
 
 static char * key_file_p1;
@@ -142,7 +140,8 @@ static void
 notify_receive (void *cls,
                 const struct GNUNET_PeerIdentity *peer,
                 const struct GNUNET_MessageHeader *message,
-                const struct GNUNET_TRANSPORT_ATS_Information *ats, uint32_t ats_count)
+                const struct GNUNET_TRANSPORT_ATS_Information *ats,
+                uint32_t ats_count)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ok is (%d)!\n",
               ok);
@@ -187,7 +186,8 @@ notify_ready (void *cls, size_t size, void *buf)
 static void
 notify_connect (void *cls,
                 const struct GNUNET_PeerIdentity *peer,
-                const struct GNUNET_TRANSPORT_ATS_Information *ats, uint32_t ats_count)
+                const struct GNUNET_TRANSPORT_ATS_Information *ats,
+                uint32_t ats_count)
 {
   if (cls == &p1)
     {
@@ -346,12 +346,6 @@ run (void *cls,
   die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
                                            &end_badly, NULL);
 
-  if (is_multi_protocol)
-    {
-      setup_peer (&p1, "test_transport_api_multi_peer1.conf");
-      setup_peer (&p2, "test_transport_api_multi_peer2.conf");
-    }
-
   if (is_udp)
     {
       setup_peer (&p1, "test_transport_api_udp_peer1.conf");
@@ -567,22 +561,10 @@ main (int argc, char *argv[])
     {
       is_http = GNUNET_YES;
     }
-  else if (strstr(argv[0], "multi") != NULL)
-    {
-          is_multi_protocol = GNUNET_YES;
-    }
 
   ret = check ();
-  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");
-  }
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-1");
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-2");
   return ret;
 }