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 46973e414c24ddb048e0aee7fcc7a9c44b9bc35b..671e28bfcdf045e9ad600325911be26e6412b444 100644 (file)
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -36,7 +36,7 @@
 #include "gnunet_transport_service.h"
 #include "transport.h"
 
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 #define VERBOSE_ARM GNUNET_NO
 
@@ -129,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);
@@ -166,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;
@@ -191,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,
@@ -235,7 +237,7 @@ setup_peer (struct PeerContext *p, const char *cfgname)
                  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
+                 if (key_file_p1==NULL)
                          GNUNET_asprintf(&key_file_p1,"https.key");
                  if (0 == stat (key_file_p1, &sbuf ))
                  {
@@ -246,7 +248,7 @@ setup_peer (struct PeerContext *p, const char *cfgname)
                  }
                  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
+                 if (cert_file_p1==NULL)
                          GNUNET_asprintf(&cert_file_p1,"https.cert");
                  if (0 == stat (cert_file_p1, &sbuf ))
                  {
@@ -261,7 +263,7 @@ setup_peer (struct PeerContext *p, const char *cfgname)
                  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
+                 if (key_file_p2==NULL)
                          GNUNET_asprintf(&key_file_p2,"https.key");
                  if (0 == stat (key_file_p2, &sbuf ))
                  {
@@ -272,7 +274,7 @@ setup_peer (struct PeerContext *p, const char *cfgname)
                  }
                  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
+                 if (cert_file_p2==NULL)
                          GNUNET_asprintf(&cert_file_p2,"https.cert");
                  if (0 == stat (cert_file_p2, &sbuf ))
                  {
@@ -345,7 +347,7 @@ run (void *cls,
   OKPP;
   sched = s;
   die_task = GNUNET_SCHEDULER_add_delayed (sched,
-                                          TIMEOUT, 
+                                          TIMEOUT,
                                           &end_badly, NULL);
 
   if (is_udp)
@@ -488,7 +490,7 @@ get_path_from_PATH ()
 }
 
 
-static int 
+static int
 check_gnunet_nat_server()
 {
   struct stat statbuf;
@@ -503,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;
 }
@@ -549,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)
     {