more code cleanup

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

diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index 8a1129bbd1dd8e39758d257f39c6597c310c7f91..7e08ebd4b64be6e6301d0a55029f7002688c9b29 100644 (file)
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
+     (C) 2009, 2010 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -50,7 +50,7 @@
 /**
  * How long until we give up on transmitting the message?
  */
-#define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
+#define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
 
 #define MTYPE 12345
 
@@ -82,8 +82,16 @@ static int is_udp_nat;
 
 static int is_http;
 
+static int is_https;
+
 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
@@ -121,6 +129,7 @@ stop_arm (struct PeerContext *p)
 static void
 end_badly ()
 {
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from transports!\n");
   GNUNET_break (0);
   GNUNET_TRANSPORT_disconnect (p1.th);
   GNUNET_TRANSPORT_disconnect (p2.th);
@@ -158,10 +167,11 @@ notify_ready (void *cls, size_t size, void *buf)
   struct GNUNET_MessageHeader *hdr;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Transmitting message to peer (%p) - %u!\n", cls, size);
+              "Transmitting message to peer (%p) - %u!\n", cls, sizeof (struct GNUNET_MessageHeader));
   GNUNET_assert (size >= 256);
   GNUNET_assert (ok == 4);
   OKPP;
+
   if (buf != NULL)
   {
     hdr = buf;
@@ -219,8 +229,65 @@ setup_peer (struct PeerContext *p, const char *cfgname)
 #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);
+                 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,
-                                    p,
+                                    NULL, p,
                                     &notify_receive,
                                     &notify_connect, &notify_disconnect);
   GNUNET_assert (p->th != NULL);
@@ -269,6 +336,7 @@ exchange_hello (void *cls,
   GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2);
 }
 
+
 static void
 run (void *cls,
      struct GNUNET_SCHEDULER_Handle *s,
@@ -278,7 +346,6 @@ run (void *cls,
   GNUNET_assert (ok == 1);
   OKPP;
   sched = s;
-
   die_task = GNUNET_SCHEDULER_add_delayed (sched,
                                           TIMEOUT, 
                                           &end_badly, NULL);
@@ -308,7 +375,11 @@ run (void *cls,
       setup_peer (&p1, "test_transport_api_http_peer1.conf");
       setup_peer (&p2, "test_transport_api_http_peer2.conf");
     }
-
+  else if (is_https)
+       {
+         setup_peer (&p1, "test_transport_api_https_peer1.conf");
+         setup_peer (&p2, "test_transport_api_https_peer2.conf");
+       }
   GNUNET_assert(p1.th != NULL);
   GNUNET_assert(p2.th != NULL);
 
@@ -318,8 +389,7 @@ run (void *cls,
 static int
 check ()
 {
-
-  char *const argv[] = { "test-transport-api",
+  static char *const argv[] = { "test-transport-api",
     "-c",
     "test_transport_api_data.conf",
 #if VERBOSE
@@ -327,21 +397,59 @@ check ()
 #endif
     NULL
   };
+  static struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
 
 #if WRITECONFIG
   setTransportOptions("test_transport_api_data.conf");
 #endif
-
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-
   ok = 1;
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
                       argv, "test-transport-api", "nohelp",
                       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;
 }
 
@@ -374,13 +482,10 @@ get_path_from_PATH ()
       pos = end + 1;
     }
   sprintf (buf, "%s/%s", pos, "gnunet-nat-server");
+  GNUNET_free (path);
   if (GNUNET_DISK_file_test (buf) == GNUNET_YES)
-    {
-      GNUNET_free (path);
-      return buf;
-    }
+    return buf;
   GNUNET_free (buf);
-  GNUNET_free (path);
   return NULL;
 }
 
@@ -443,6 +548,10 @@ main (int argc, char *argv[])
     {
       is_udp = GNUNET_YES;
     }
+  else if (strstr(argv[0], "https") != NULL)
+    {
+      is_https = GNUNET_YES;
+    }
   else if (strstr(argv[0], "http") != NULL)
     {
       is_http = GNUNET_YES;