more code cleanup

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

diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c
index c80a1e3281fbf998c74e638858f2255d22c458ad..a18175bf406da2cc1dc92977d6718111f467e192 100644 (file)
--- a/src/transport/test_transport_api_reliability.c
+++ b/src/transport/test_transport_api_reliability.c
@@ -80,6 +80,10 @@ static int is_tcp_nat;
 
 static int is_http;
 
+static int is_https;
+
+static int is_udp;
+
 static int connected;
 
 static unsigned long long total_bytes;
@@ -88,6 +92,13 @@ static struct GNUNET_TIME_Absolute start_time;
 
 static GNUNET_SCHEDULER_TaskIdentifier die_task;
 
+static char * key_file_p1;
+static char * cert_file_p1;
+
+static char * key_file_p2;
+static char * cert_file_p2;
+
+
 #if VERBOSE
 #define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
 #else
@@ -116,9 +127,11 @@ end ()
           "\nThroughput was %llu kb/s\n",
           total_bytes * 1000 / 1024 / delta);
   ok = 0;
+
 }
 
 
+
 static void
 stop_arm (struct PeerContext *p)
 {
@@ -364,7 +377,65 @@ setup_peer (struct PeerContext *p, const char *cfgname)
                                         "-c", cfgname, NULL);
 #endif
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
-  p->th = GNUNET_TRANSPORT_connect (sched, p->cfg,
+
+  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);
+                 else
+                         GNUNET_asprintf(&key_file_p1,"https.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);
+                 else
+                         GNUNET_asprintf(&cert_file_p1,"https.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);
+                 else
+                         GNUNET_asprintf(&key_file_p2,"https.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);
+                 else
+                         GNUNET_asprintf(&cert_file_p2,"https.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 (sched, p->cfg, NULL,
                                     p,
                                     &notify_receive,
                                     &notify_connect, 
@@ -444,8 +515,18 @@ run (void *cls,
     }
   else if (is_http)
     {
-      setup_peer (&p1, "test_transport_api_http_peer1.conf");
-      setup_peer (&p2, "test_transport_api_http_peer2.conf");
+      setup_peer (&p1, "test_transport_api_rel_http_peer1.conf");
+      setup_peer (&p2, "test_transport_api_rel_http_peer2.conf");
+    }
+  else if (is_https)
+    {
+      setup_peer (&p1, "test_transport_api_rel_https_peer1.conf");
+      setup_peer (&p2, "test_transport_api_rel_https_peer2.conf");
+    }
+  else if (is_udp)
+    {
+      setup_peer (&p1, "test_transport_api_udp_peer1.conf");
+      setup_peer (&p2, "test_transport_api_udp_peer2.conf");
     }
   else if (is_tcp_nat)
     {
@@ -484,6 +565,47 @@ check ()
                       options, &run, &ok);
   stop_arm (&p1);
   stop_arm (&p2);
+
+  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);
+  }
+
   return ok;
 }
 
@@ -503,10 +625,18 @@ main (int argc, char *argv[])
     {
       is_tcp = GNUNET_YES;
     }
+  else if (strstr(argv[0], "https") != NULL)
+    {
+      is_https = GNUNET_YES;
+    }
   else if (strstr(argv[0], "http") != NULL)
     {
       is_http = GNUNET_YES;
     }
+  else if (strstr(argv[0], "udp") != NULL)
+    {
+      is_udp = GNUNET_YES;
+    }
   GNUNET_log_setup ("test-transport-api-reliability",
 #if VERBOSE
                     "DEBUG",