stuff
[oweals/gnunet.git] / src / transport / test_transport_api_unreliability.c
index b8a766c19849ac91bf6fdc85d065c8def8904b06..e7cb00274aa642fb1fb665b5a409e7fd95a0b010 100644 (file)
@@ -37,6 +37,7 @@
 #include "gnunet_transport_service.h"
 #include "gauger.h"
 #include "transport.h"
+#include "transport-testing.h"
 
 #define VERBOSE GNUNET_NO
 
@@ -49,7 +50,7 @@
  * 'MAX_PENDING' in 'gnunet-service-transport.c', otherwise
  * messages may be dropped even for a reliable transport.
  */
-#define TOTAL_MSGS (80000 * 3) /* Total messages should be divisible by 8, so we can make a nice bitmap */
+#define TOTAL_MSGS (1024 * 3) /* Total messages should be divisible by 8, so we can make a nice bitmap */
 
 /**
  * How long until we give up on transmitting the message?
 
 #define MTYPE 12345
 
-struct PeerContext
-{
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-  struct GNUNET_TRANSPORT_Handle *th;
-  struct GNUNET_PeerIdentity id;
-#if START_ARM
-  struct GNUNET_OS_Process *arm_proc;
-#endif
-};
-
 static struct PeerContext p1;
 
 static struct PeerContext p2;
@@ -88,6 +79,8 @@ static int is_udp;
 
 static int is_unix;
 
+static int is_wlan;
+
 static int connected;
 
 static unsigned long long total_bytes;
@@ -96,6 +89,10 @@ static struct GNUNET_TIME_Absolute start_time;
 
 static GNUNET_SCHEDULER_TaskIdentifier die_task;
 
+static GNUNET_SCHEDULER_TaskIdentifier tct;
+
+struct GNUNET_TRANSPORT_TransmitHandle * th_p2;
+
 static char *key_file_p1;
 static char *cert_file_p1;
 
@@ -110,13 +107,11 @@ static int msg_scheduled;
 static int msg_sent;
 static int msg_recv_expected;
 static int msg_recv;
-static struct GNUNET_TRANSPORT_TransmitHandle * transmit_handle;
 
-#if VERBOSE
-#define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
-#else
-#define OKPP do { ok++; } while (0)
-#endif
+static int p1_hello_canceled;
+static int p2_hello_canceled;
+
+static int test_failed;
 
 /**
  * Sets a bit active in the bitmap.
@@ -174,11 +169,16 @@ end ()
         }
     }
 
-  GNUNET_SCHEDULER_cancel (die_task);
+  if (GNUNET_SCHEDULER_NO_TASK != die_task)
+    GNUNET_SCHEDULER_cancel (die_task);
   die_task = GNUNET_SCHEDULER_NO_TASK;
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from transports!\n");
 #endif
+  if (th_p2 != NULL)
+    GNUNET_TRANSPORT_notify_transmit_ready_cancel(th_p2);
+  th_p2 = NULL;
+
   GNUNET_TRANSPORT_disconnect (p1.th);
   GNUNET_TRANSPORT_disconnect (p2.th);
 #if VERBOSE
@@ -217,6 +217,9 @@ end_unreliably ()
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from transports!\n");
 #endif
+  if (th_p2 != NULL)
+    GNUNET_TRANSPORT_notify_transmit_ready_cancel(th_p2);
+
   GNUNET_TRANSPORT_disconnect (p1.th);
   GNUNET_TRANSPORT_disconnect (p2.th);
 #if VERBOSE
@@ -254,19 +257,88 @@ stop_arm (struct PeerContext *p)
 }
 
 
+
+static void
+exchange_hello_last (void *cls,
+                     const struct GNUNET_MessageHeader *message)
+{
+  struct PeerContext *me = cls;
+
+  GNUNET_assert (message != NULL);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Exchanging HELLO of size %d with peer (%s)!\n", 
+             (int) GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *)message),
+             GNUNET_i2s (&me->id));
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
+                                      message, &me->id));
+  GNUNET_TRANSPORT_offer_hello (p1.th, message, NULL, NULL);
+}
+
+
+
+static void
+exchange_hello (void *cls,
+                const struct GNUNET_MessageHeader *message)
+{
+  struct PeerContext *me = cls;
+
+  GNUNET_assert (message != NULL);
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
+                                      message, &me->id));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Exchanging HELLO of size %d from peer %s!\n", 
+             (int) GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *)message),
+             GNUNET_i2s (&me->id));
+  GNUNET_TRANSPORT_offer_hello (p2.th, message, NULL, NULL);
+}
+
+
+
 static void
 end_badly (void *cls,
-          const struct GNUNET_SCHEDULER_TaskContext *tc)
+           const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                 "Reliability failed: \nLast message sent %u \nNext message scheduled %u\nLast message received %u\nMessage expected %u \n ", msg_sent, msg_scheduled, msg_recv, msg_recv_expected);
+  if (test_failed == GNUNET_NO)
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Testcase timeout\n");
+  else
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+               "Reliability failed: Last message sent %u, Next message scheduled %u, Last message received %u, Message expected %u\n",
+               msg_sent,
+               msg_scheduled,
+               msg_recv,
+               msg_recv_expected);
+  
   GNUNET_break (0);
+  if (th_p2 != NULL)
+    {
+      GNUNET_TRANSPORT_notify_transmit_ready_cancel(th_p2);
+      th_p2 = NULL;
+    }
+  if (p2_hello_canceled == GNUNET_NO)
+    {
+      GNUNET_TRANSPORT_get_hello_cancel (p2.th, &exchange_hello_last, &p2);
+      p2_hello_canceled = GNUNET_YES;
+    }
+  if (p1_hello_canceled == GNUNET_NO)
+    {
+      GNUNET_TRANSPORT_get_hello_cancel (p1.th, &exchange_hello, &p1);
+      p1_hello_canceled = GNUNET_YES;
+    }
   GNUNET_TRANSPORT_disconnect (p1.th);
   GNUNET_TRANSPORT_disconnect (p2.th);
+  if (GNUNET_SCHEDULER_NO_TASK != tct)
+    {
+      GNUNET_SCHEDULER_cancel (tct);
+      tct = GNUNET_SCHEDULER_NO_TASK;
+    }
   ok = 1;
 }
 
 
+
 struct TestMessage
 {
   struct GNUNET_MessageHeader header;
@@ -279,8 +351,6 @@ get_size (unsigned int iter)
 {
   unsigned int ret;
 
-  if (iter < 60000)
-    return iter + sizeof (struct TestMessage);
   ret = (iter * iter * iter);
   return sizeof (struct TestMessage) + (ret % 60000);
 }
@@ -313,7 +383,9 @@ notify_receive (void *cls,
                  ntohl(hdr->num), s,
                  ntohs (message->size),
                  ntohl (hdr->num));
-      GNUNET_SCHEDULER_cancel (die_task);
+      if (GNUNET_SCHEDULER_NO_TASK != die_task)
+        GNUNET_SCHEDULER_cancel (die_task);
+      test_failed = GNUNET_YES;
       die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
       return;
     }
@@ -326,7 +398,9 @@ notify_receive (void *cls,
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                  "Expected message %u with bits %u, but body did not match\n",
                  ntohl(hdr->num), (unsigned char) n);
-      GNUNET_SCHEDULER_cancel (die_task);
+      if (GNUNET_SCHEDULER_NO_TASK != die_task)
+        GNUNET_SCHEDULER_cancel (die_task);
+      test_failed = GNUNET_YES;
       die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
       return;
     }
@@ -341,10 +415,12 @@ notify_receive (void *cls,
 #endif
   n++;
   set_bit(ntohl(hdr->num));
-  if (0 == (n % (5000)))
+  if (0 == (n % (TOTAL_MSGS / 100)))
     {
       fprintf (stderr, ".");
-      GNUNET_SCHEDULER_cancel (die_task);
+      if (GNUNET_SCHEDULER_NO_TASK != die_task)
+        GNUNET_SCHEDULER_cancel (die_task);
+      test_failed = GNUNET_YES;
       die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
                                               &end_badly,
                                               NULL);
@@ -363,6 +439,8 @@ notify_ready (void *cls, size_t size, void *buf)
   unsigned int s;
   unsigned int ret;
 
+  th_p2 = NULL;
+
   if (buf == NULL)
     {
       GNUNET_break (0);
@@ -401,7 +479,7 @@ notify_ready (void *cls, size_t size, void *buf)
   while (size - ret >= s);
   if (n < TOTAL_MSGS)
   {
-    GNUNET_TRANSPORT_notify_transmit_ready (p2.th,
+    th_p2 = GNUNET_TRANSPORT_notify_transmit_ready (p2.th,
                                            &p1.id,
                                            s, 0, TIMEOUT,
                                            &notify_ready,
@@ -411,7 +489,8 @@ notify_ready (void *cls, size_t size, void *buf)
   else
     {
       GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "All messages scheduled to be sent!!\n");
-      GNUNET_SCHEDULER_cancel(die_task);
+      if (GNUNET_SCHEDULER_NO_TASK != die_task)
+        GNUNET_SCHEDULER_cancel(die_task);
       die_task = GNUNET_SCHEDULER_add_delayed (UNRELIABLE_TIMEOUT, &end_unreliably, NULL);
     }
   if (n % 5000 == 0)
@@ -425,20 +504,41 @@ notify_ready (void *cls, size_t size, void *buf)
 }
 
 
+
+static void
+notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
+{
+  connected--;
+#if VERBOSE
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Peer `%4s' disconnected (%p)!\n",
+             GNUNET_i2s (peer), cls);
+#endif
+  if (th_p2 != NULL)
+    {
+      GNUNET_TRANSPORT_notify_transmit_ready_cancel (th_p2);
+      th_p2 = NULL;
+    }
+}
+
+
+
 static void
 notify_connect (void *cls,
                 const struct GNUNET_PeerIdentity *peer,
                 const struct GNUNET_TRANSPORT_ATS_Information *ats,
                 uint32_t ats_count)
 {
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Peer `%4s' connected to us (%p)!\n", 
+             GNUNET_i2s (peer), 
+             cls);
   if (cls == &p1)
     {
       GNUNET_TRANSPORT_set_quota (p1.th,
                                  &p2.id,
                                  GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024),
-                                 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024),
-                                 GNUNET_TIME_UNIT_FOREVER_REL,
-                                 NULL, NULL);
+                                 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024));
       start_time = GNUNET_TIME_absolute_get ();
       connected++;
     }
@@ -447,47 +547,60 @@ notify_connect (void *cls,
       GNUNET_TRANSPORT_set_quota (p2.th,
                                  &p1.id,
                                  GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024),
-                                 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024),
-                                 GNUNET_TIME_UNIT_FOREVER_REL,
-                                 NULL, NULL);
+                                 GNUNET_BANDWIDTH_value_init (1024 * 1024 * 1024));
       connected++;
     }
+  if (2 == connected)
+    {
+      if (GNUNET_SCHEDULER_NO_TASK != die_task)
+       {
+         GNUNET_SCHEDULER_cancel (die_task);     
+       }
+      if (GNUNET_SCHEDULER_NO_TASK != tct)
+       {
+         GNUNET_SCHEDULER_cancel (tct);
+         tct = GNUNET_SCHEDULER_NO_TASK;
+       }
+      if (p2_hello_canceled == GNUNET_NO)
+       {
+         GNUNET_TRANSPORT_get_hello_cancel (p2.th, &exchange_hello_last, &p2);
+         p2_hello_canceled = GNUNET_YES;
+       }
+      if (p1_hello_canceled == GNUNET_NO)
+       {
+         GNUNET_TRANSPORT_get_hello_cancel (p1.th, &exchange_hello, &p1);
+         p1_hello_canceled = GNUNET_YES;
+       }
 
-  if (connected == 2)
-    {
-
-         if ((transmit_handle!=NULL) && (cls == NULL))
-                GNUNET_TRANSPORT_notify_transmit_ready_cancel(transmit_handle);
-         if ((transmit_handle!=NULL) && (cls == &transmit_handle))
-                transmit_handle=NULL;
+      die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+                                              &end_badly, NULL);
       GNUNET_TRANSPORT_notify_transmit_ready (p2.th,
                                               &p1.id,
                                               get_size (0), 0, TIMEOUT,
                                               &notify_ready,
                                               NULL);
+      
     }
-#if VERBOSE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Peer `%4s' connected to us (%p)!\n", GNUNET_i2s (peer), cls);
-#endif
-}
-
-
-static void
-notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
-{
-#if VERBOSE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Peer `%4s' disconnected (%p)!\n",
-             GNUNET_i2s (peer), cls);
-#endif
 }
 
 
 static void
 setup_peer (struct PeerContext *p, const char *cfgname)
 {
+  memset (p, 0, sizeof (*p));
   p->cfg = GNUNET_CONFIGURATION_create ();
+
+  GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
+  if (GNUNET_CONFIGURATION_have_value (p->cfg,"PATHS", "SERVICEHOME"))
+    {
+      GNUNET_assert (GNUNET_OK ==
+                    GNUNET_CONFIGURATION_get_value_string (p->cfg,
+                                                           "PATHS", "SERVICEHOME", 
+                                                           &p->servicehome));
+      GNUNET_DISK_directory_remove (p->servicehome);
+    }
+
+
 #if START_ARM
   p->arm_proc = GNUNET_OS_start_process (NULL, NULL,
                                        "gnunet-service-arm",
@@ -497,64 +610,6 @@ setup_peer (struct PeerContext *p, const char *cfgname)
 #endif
                                         "-c", cfgname, NULL);
 #endif
-  GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
-
-  if (is_https)
-  {
-         struct stat sbuf;
-         if (p==&p1)
-         {
-                 if (GNUNET_CONFIGURATION_have_value (p->cfg,
-                                                                                          "transport-https", "KEY_FILE"))
-                               GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "KEY_FILE", &key_file_p1);
-                 if (key_file_p1 == NULL)
-                         GNUNET_asprintf(&key_file_p1,"https_p1.key");
-                 if (0 == stat (key_file_p1, &sbuf ))
-                 {
-                         if (0 == remove(key_file_p1))
-                             GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Successfully removed existing private key file `%s'\n",key_file_p1);
-                         else
-                                 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to remove private key file `%s'\n",key_file_p1);
-                 }
-                 if (GNUNET_CONFIGURATION_have_value (p->cfg,"transport-https", "CERT_FILE"))
-                         GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "CERT_FILE", &cert_file_p1);
-                 if (cert_file_p1 == NULL)
-                         GNUNET_asprintf(&cert_file_p1,"https_p1.cert");
-                 if (0 == stat (cert_file_p1, &sbuf ))
-                 {
-                         if (0 == remove(cert_file_p1))
-                             GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Successfully removed existing certificate file `%s'\n",cert_file_p1);
-                         else
-                                 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to remove existing certificate file `%s'\n",cert_file_p1);
-                 }
-         }
-         else if (p==&p2)
-         {
-                 if (GNUNET_CONFIGURATION_have_value (p->cfg,
-                                                                                          "transport-https", "KEY_FILE"))
-                               GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "KEY_FILE", &key_file_p2);
-                 if (key_file_p2 == NULL)
-                         GNUNET_asprintf(&key_file_p2,"https_p2.key");
-                 if (0 == stat (key_file_p2, &sbuf ))
-                 {
-                         if (0 == remove(key_file_p2))
-                             GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Successfully removed existing private key file `%s'\n",key_file_p2);
-                         else
-                                 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to remove private key file `%s'\n",key_file_p2);
-                 }
-                 if (GNUNET_CONFIGURATION_have_value (p->cfg,"transport-https", "CERT_FILE"))
-                         GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "CERT_FILE", &cert_file_p2);
-                 if (cert_file_p2 == NULL)
-                         GNUNET_asprintf(&cert_file_p2,"https_p2.cert");
-                 if (0 == stat (cert_file_p2, &sbuf ))
-                 {
-                         if (0 == remove(cert_file_p2))
-                             GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Successfully removed existing certificate file `%s'\n",cert_file_p2);
-                         else
-                                 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to remove existing certificate file `%s'\n",cert_file_p2);
-                 }
-         }
-  }
 
   p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL,
                                     p,
@@ -564,69 +619,6 @@ setup_peer (struct PeerContext *p, const char *cfgname)
   GNUNET_assert (p->th != NULL);
 }
 
-static size_t
-notify_ready_connect (void *cls, size_t size, void *buf)
-{
-  return 0;
-}
-
-static void
-exchange_hello_last (void *cls,
-                     const struct GNUNET_MessageHeader *message)
-{
-  struct PeerContext *me = cls;
-  transmit_handle = NULL;
-  GNUNET_TRANSPORT_get_hello_cancel (p2.th, &exchange_hello_last, me);
-#if VERBOSE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Exchanging HELLO with peer (%p)!\n", cls);
-#endif
-  GNUNET_assert (ok >= 3);
-  OKPP;
-  GNUNET_assert (message != NULL);
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
-                                      message, &me->id));
-
-  GNUNET_assert(NULL != (transmit_handle = GNUNET_TRANSPORT_notify_transmit_ready (p2.th,
-                                          &p1.id,
-                                          sizeof (struct GNUNET_MessageHeader), 0,
-                                          TIMEOUT,
-                                          &notify_ready_connect,
-                                          &transmit_handle)));
-
-  /* both HELLOs exchanged, get ready to test transmission! */
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Finished exchanging HELLOs, now waiting for transmission!\n");
-}
-
-
-static void
-exchange_hello (void *cls,
-                const struct GNUNET_MessageHeader *message)
-{
-  struct PeerContext *me = cls;
-
-  GNUNET_TRANSPORT_get_hello_cancel (p1.th, &exchange_hello, me);
-#if VERBOSE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Exchanging HELLO with peer (%p)!\n", cls);
-#endif
-  GNUNET_assert (ok >= 2);
-  OKPP;
-  GNUNET_assert (message != NULL);
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
-                                      message, &me->id));
-
-#if VERBOSE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received HELLO size %d\n",
-             GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *)message));
-#endif
-  GNUNET_TRANSPORT_offer_hello (p2.th, message, NULL, NULL);
-  GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2);
-}
 
 /**
  * Return the actual path to a file found in the current
@@ -739,13 +731,29 @@ check_gnunet_nat_binary(char *binary)
 #endif
 }
 
+
+static void
+try_connect (void *cls,
+            const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Asking peers to connect...\n");
+  GNUNET_TRANSPORT_try_connect (p2.th,
+                               &p1.id);
+  GNUNET_TRANSPORT_try_connect (p1.th,
+                               &p2.id);
+  tct = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+                                     &try_connect,
+                                     NULL);
+}
+
+
+
 static void
 run (void *cls,
      char *const *args,
      const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  GNUNET_assert (ok == 1);
-  OKPP;
   die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
                                           &end_badly,
                                           NULL);
@@ -779,18 +787,27 @@ run (void *cls,
       setup_peer (&p1, "test_transport_api_tcp_nat_peer1.conf");
       setup_peer (&p2, "test_transport_api_tcp_nat_peer2.conf");
     }
+  else if (is_wlan)
+    {
+      setup_peer (&p1, "test_transport_api_wlan_peer1.conf");
+      setup_peer (&p2, "test_transport_api_wlan_peer2.conf");
+    }
   else
     GNUNET_assert (0);
   GNUNET_assert(p1.th != NULL);
   GNUNET_assert(p2.th != NULL);
   GNUNET_TRANSPORT_get_hello (p1.th, &exchange_hello, &p1);
+  p1_hello_canceled = GNUNET_NO;
+  GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2);
+  p2_hello_canceled = GNUNET_NO;
+  tct = GNUNET_SCHEDULER_add_now (&try_connect, NULL);
 }
 
 
 static int
 check ()
 {
-  char *const argv[] = { "test-transport-api-reliability",
+  char *const argv[] = { "test-transport-api-unreliability",
     "-c",
     "test_transport_api_data.conf",
 #if VERBOSE
@@ -814,7 +831,7 @@ check ()
     }
 
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
-                      argv, "test-transport-api-reliability", "nohelp",
+                      argv, "test-transport-api-unreliability", "nohelp",
                       options, &run, &ok);
   stop_arm (&p1);
   stop_arm (&p2);
@@ -859,6 +876,16 @@ check ()
     GNUNET_free(cert_file_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;
 }
 
@@ -867,9 +894,8 @@ int
 main (int argc, char *argv[])
 {
   int ret;
-#ifdef MINGW
-  return GNUNET_SYSERR;
-#endif
+
+  test_failed = GNUNET_NO;
 
   GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-1");
   GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-2");
@@ -904,7 +930,11 @@ main (int argc, char *argv[])
       is_unix = GNUNET_YES;
       GNUNET_asprintf(&test_name, "unix");
     }
-  GNUNET_log_setup ("test-transport-api-reliability",
+  else if (strstr(argv[0], "wlan") != NULL)
+    {
+       is_wlan = GNUNET_YES;
+    }
+  GNUNET_log_setup ("test-transport-api-unreliability",
 #if VERBOSE
                     "DEBUG",
 #else
@@ -912,10 +942,9 @@ main (int argc, char *argv[])
 #endif
                     NULL);
   ret = check ();
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-1");
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-2");
+
   GNUNET_free_non_null(test_name);
   return ret;
 }
 
-/* end of test_transport_api_reliability.c */
+/* end of test_transport_api_unreliability.c */