stuff

[oweals/gnunet.git] / src / transport / test_transport_api_multiaddress.c

diff --git a/src/transport/test_transport_api_multiaddress.c b/src/transport/test_transport_api_multiaddress.c
index 69f5ded4e863a587c98179aa96e8ddc1b286e7c8..b2ac507d28e3b367b90460383bf1efc881963c31 100644 (file)
--- a/src/transport/test_transport_api_multiaddress.c
+++ b/src/transport/test_transport_api_multiaddress.c
@@ -101,11 +101,11 @@ exchange_hello_last (void *cls,
 {
   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 (message != NULL);
   GNUNET_assert (GNUNET_OK ==
                  GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
                                       message, &me->id));
@@ -216,69 +216,22 @@ setup_peer (struct PeerContext *p,
 
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
   if (GNUNET_CONFIGURATION_have_value (p->cfg,"PATHS", "SERVICEHOME"))
-      GNUNET_CONFIGURATION_get_value_string (p->cfg, "PATHS", "SERVICEHOME", &p->servicehome);
-  GNUNET_DISK_directory_remove (p->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",
                                         "gnunet-service-arm",
 #if VERBOSE_ARM
-
-                                        if (is_https)
-                                          {
-                                            struct stat sbuf;
-                                            if (0 == stat (cert_file_p1, &sbuf ))
-                                              {
-                                                if (0 == remove(cert_file_p1))
-                                                  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                                                              "Successfully removed existing certificate file `%s'\n",cert_file_p1);
-                                                else
-                                                  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                                                              "Failed to remove certfile `%s'\n",cert_file_p1);
-                                              }
-
-                                            if (0 == stat (key_file_p1, &sbuf ))
-                                              {
-                                                if (0 == remove(key_file_p1))
-                                                  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                                                              "Successfully removed private key file `%s'\n",key_file_p1);
-                                                else
-                                                  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                                                              "Failed to private key file `%s'\n",key_file_p1);
-                                              }
-
-                                            if (0 == stat (cert_file_p2, &sbuf ))
-                                              {
-                                                if (0 == remove(cert_file_p2))
-                                                  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                                                              "Successfully removed existing certificate file `%s'\n",cert_file_p2);
-                                                else
-                                                  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                                                              "Failed to remove certfile `%s'\n",cert_file_p2);
-                                              }
-
-                                            if (0 == stat (key_file_p2, &sbuf ))
-                                              {
-                                                if (0 == remove(key_file_p2))
-                                                  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                                                              "Successfully removed private key file `%s'\n",key_file_p2);
-                                                else
-                                                  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                                                              "Failed to private key file `%s'\n",key_file_p2);
-                                              }
-                                            GNUNET_free(key_file_p1);
-                                            GNUNET_free(key_file_p2);
-                                            GNUNET_free(cert_file_p1);
-                                            GNUNET_free(cert_file_p2);
-                                          }                                 "-L", "DEBUG",
+                                        "-L", "DEBUG",
 #endif
                                         "-c", cfgname, NULL);
 #endif
-
-
-  if (GNUNET_CONFIGURATION_have_value (p->cfg,"PATHS", "SERVICEHOME"))
-      GNUNET_CONFIGURATION_get_value_string (p->cfg, "PATHS", "SERVICEHOME", &p->servicehome);
-
   p->th = GNUNET_TRANSPORT_connect (p->cfg,
                                     NULL, p,
                                     NULL,
@@ -351,13 +304,16 @@ check ()
   stop_arm (&p1);
   stop_arm (&p2);
 
-  if ((p1.servicehome != NULL) && (p2.servicehome != NULL))
-  {
-    GNUNET_DISK_directory_remove (p1.servicehome);
-    GNUNET_DISK_directory_remove (p2.servicehome);
-    GNUNET_free(p1.servicehome);
-    GNUNET_free(p2.servicehome);
-  }
+  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;
 }