remove port from transport section because it was getting in the way of making sense...

[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 04cf69bb85886de4f4635410baa98e9dfa4f7283..671e28bfcdf045e9ad600325911be26e6412b444 100644 (file)
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -86,6 +86,12 @@ 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
@@ -123,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);
@@ -160,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;
@@ -185,7 +193,7 @@ notify_connect (void *cls,
     {
       GNUNET_SCHEDULER_cancel (sched, die_task);
       die_task = GNUNET_SCHEDULER_add_delayed (sched,
-                                              TIMEOUT_TRANSMIT, 
+                                              TIMEOUT_TRANSMIT,
                                               &end_badly, NULL);
 
       GNUNET_TRANSPORT_notify_transmit_ready (p1.th,
@@ -221,6 +229,63 @@ 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);
+                 if (key_file_p1==NULL)
+                         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);
+                 if (cert_file_p1==NULL)
+                         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);
+                 if (key_file_p2==NULL)
+                         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);
+                 if (cert_file_p2==NULL)
+                         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,
@@ -282,7 +347,7 @@ run (void *cls,
   OKPP;
   sched = s;
   die_task = GNUNET_SCHEDULER_add_delayed (sched,
-                                          TIMEOUT, 
+                                          TIMEOUT,
                                           &end_badly, NULL);
 
   if (is_udp)
@@ -311,10 +376,10 @@ run (void *cls,
       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");
-    }
+       {
+         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);
 
@@ -345,6 +410,46 @@ 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;
 }
 
@@ -385,7 +490,7 @@ get_path_from_PATH ()
 }
 
 
-static int 
+static int
 check_gnunet_nat_server()
 {
   struct stat statbuf;
@@ -400,8 +505,8 @@ check_gnunet_nat_server()
       return GNUNET_SYSERR;
     }
   GNUNET_free (p);
-  if ( (0 != (statbuf.st_mode & S_ISUID)) && 
-       (statbuf.st_uid == 0) )    
+  if ( (0 != (statbuf.st_mode & S_ISUID)) &&
+       (statbuf.st_uid == 0) )
     return GNUNET_YES;
   return GNUNET_NO;
 }
@@ -446,7 +551,6 @@ main (int argc, char *argv[])
   else if (strstr(argv[0], "https") != NULL)
     {
       is_https = GNUNET_YES;
-         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"HTTPS!!!!");
     }
   else if (strstr(argv[0], "http") != NULL)
     {