- fix logging to remove error messages

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

diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c
index f9539430e50fa178f40c2e54c7d3f72f4828f974..56abe2cd364ee086e071c0a2fca3f6da3dd9a955 100644 (file)
--- a/src/transport/test_plugin_transport.c
+++ b/src/transport/test_plugin_transport.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published

-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your

      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but


@@ -34,10 +34,10 @@
 #include "gnunet_protocols.h"
 #include "gnunet_program_lib.h"
 #include "gnunet_signatures.h"
 #include "gnunet_protocols.h"
 #include "gnunet_program_lib.h"
 #include "gnunet_signatures.h"

-#include "plugin_transport.h"
+#include "gnunet_transport_plugin.h"

 #include "transport.h"
 
 #include "transport.h"
 

-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_EXTRA_LOGGING

 
 /**
  * How long until we give up on transmitting the message?
 
 /**
  * How long until we give up on transmitting the message?


@@ -59,11 +59,6 @@ static struct GNUNET_PeerIdentity my_identity;
  */
 static struct GNUNET_CRYPTO_RsaPrivateKey *my_private_key;
 
  */
 static struct GNUNET_CRYPTO_RsaPrivateKey *my_private_key;
 

-/**
- * Our scheduler.
- */
-struct GNUNET_SCHEDULER_Handle *sched;
-

 /**
  * Our configuration.
  */
 /**
  * Our configuration.
  */


@@ -90,24 +85,18 @@ struct GNUNET_TRANSPORT_PluginFunctions *api;
 static int ok;
 
 /**
 static int ok;
 
 /**

- * Initialize Environment for this plugin

  */
 static void
  */
 static void

-receive (void *cls,
-         const struct GNUNET_PeerIdentity
-         *peer, const struct GNUNET_MessageHeader *message,
-        uint32_t distance,
-        const char *sender_address,
-        size_t sender_address_len)
+receive (void *cls, const struct GNUNET_PeerIdentity *peer,
+         const struct GNUNET_MessageHeader *message, uint32_t distance,
+         const char *sender_address, size_t sender_address_len)

 {
   /* do nothing */
 }
 
 void
 {
   /* do nothing */
 }
 
 void

-notify_address (void *cls,
-                const char *name,
-                const void *addr,
-                size_t addrlen, struct GNUNET_TIME_Relative expires)
+notify_address (void *cls, const char *name, const void *addr, size_t addrlen,
+                struct GNUNET_TIME_Relative expires)

 {
 }
 
 {
 }
 


@@ -122,8 +111,7 @@ static void
 unload_plugins (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   GNUNET_assert (NULL ==
 unload_plugins (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   GNUNET_assert (NULL ==

-                 GNUNET_PLUGIN_unload ("libgnunet_plugin_transport_tcp",
-                                       api));
+                 GNUNET_PLUGIN_unload ("libgnunet_plugin_transport_tcp", api));

   if (my_private_key != NULL)
     GNUNET_CRYPTO_rsa_key_free (my_private_key);
 
   if (my_private_key != NULL)
     GNUNET_CRYPTO_rsa_key_free (my_private_key);
 


@@ -134,6 +122,7 @@ static void
 unload_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_CONFIGURATION_Handle *cfg = cls;
 unload_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_CONFIGURATION_Handle *cfg = cls;

+

   unload_plugins (NULL, cfg);
 }
 
   unload_plugins (NULL, cfg);
 }
 


@@ -166,12 +155,9 @@ test_validation ()
   soaddr.sin_port = htons (2368 /* FIXME: get from config! */ );
   soaddr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
   GNUNET_assert (GNUNET_OK ==
   soaddr.sin_port = htons (2368 /* FIXME: get from config! */ );
   soaddr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
   GNUNET_assert (GNUNET_OK ==

-                api->check_address (api->cls,
-                                    &soaddr, sizeof (soaddr)));
+                 api->check_address (api->cls, &soaddr, sizeof (soaddr)));

   ok = 0;
   ok = 0;

-  GNUNET_SCHEDULER_add_continuation (sched,
-                                     &unload_task,
-                                     (void *) cfg,
+  GNUNET_SCHEDULER_add_continuation (&unload_task, (void *) cfg,

                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
 
                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
 


@@ -180,7 +166,6 @@ static void
 setup_plugin_environment ()
 {
   env.cfg = cfg;
 setup_plugin_environment ()
 {
   env.cfg = cfg;

-  env.sched = sched;

   env.my_identity = &my_identity;
   env.cls = &env;
   env.receive = &receive;
   env.my_identity = &my_identity;
   env.cls = &env;
   env.receive = &receive;


@@ -193,52 +178,44 @@ setup_plugin_environment ()
  * Runs the test.
  *
  * @param cls closure
  * Runs the test.
  *
  * @param cls closure

- * @param s scheduler to use

  * @param c configuration to use
  */
 static void
  * @param c configuration to use
  */
 static void

-run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *s,
-     char *const *args,
-     const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c)
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *c)

 {
   unsigned long long tneigh;
   char *keyfile;
   char *libname;
 
 {
   unsigned long long tneigh;
   char *keyfile;
   char *libname;
 

-  sched = s;

   cfg = c;
   /* parse configuration */
   if ((GNUNET_OK !=
   cfg = c;
   /* parse configuration */
   if ((GNUNET_OK !=

-       GNUNET_CONFIGURATION_get_value_number (c,
-                                              "TRANSPORT",
-                                              "NEIGHBOUR_LIMIT",
+       GNUNET_CONFIGURATION_get_value_number (c, "TRANSPORT", "NEIGHBOUR_LIMIT",

                                               &tneigh)) ||
       (GNUNET_OK !=
                                               &tneigh)) ||
       (GNUNET_OK !=

-       GNUNET_CONFIGURATION_get_value_filename (c,
-                                                "GNUNETD",
-                                                "HOSTKEY", &keyfile)))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _
-                  ("Transport service is lacking key configuration settings.  Exiting.\n"));
-      GNUNET_SCHEDULER_shutdown (s);
-      return;
-    }
+       GNUNET_CONFIGURATION_get_value_filename (c, "GNUNETD", "HOSTKEY",
+                                                &keyfile)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _
+                ("Transport service is lacking key configuration settings.  Exiting.\n"));
+    GNUNET_SCHEDULER_shutdown (s);
+    return;
+  }

   max_connect_per_transport = (uint32_t) tneigh;
   my_private_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
   GNUNET_free (keyfile);
   if (my_private_key == NULL)
   max_connect_per_transport = (uint32_t) tneigh;
   my_private_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
   GNUNET_free (keyfile);
   if (my_private_key == NULL)

-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _
-                  ("Transport service could not access hostkey.  Exiting.\n"));
-      GNUNET_SCHEDULER_shutdown (s);
-      return;
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Transport service could not access hostkey.  Exiting.\n"));
+    GNUNET_SCHEDULER_shutdown (s);
+    return;
+  }

   GNUNET_CRYPTO_rsa_key_get_public (my_private_key, &my_public_key);
   GNUNET_CRYPTO_rsa_key_get_public (my_private_key, &my_public_key);

-  GNUNET_CRYPTO_hash (&my_public_key,
-                      sizeof (my_public_key), &my_identity.hashPubKey);
+  GNUNET_CRYPTO_hash (&my_public_key, sizeof (my_public_key),
+                      &my_identity.hashPubKey);

 
 
 
 
 
 


@@ -250,12 +227,12 @@ run (void *cls,
   api = GNUNET_PLUGIN_load (libname, &env);
   GNUNET_free (libname);
   if (api == NULL)
   api = GNUNET_PLUGIN_load (libname, &env);
   GNUNET_free (libname);
   if (api == NULL)

-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _("Failed to load transport plugin for tcp\n"));
-      /* FIXME: set some error code for main */
-      return;
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Failed to load transport plugin for tcp\n"));
+    /* FIXME: set some error code for main */
+    return;
+  }

   test_validation ();
 }
 
   test_validation ();
 }
 


@@ -274,6 +251,7 @@ main (int argc, char *const *argv)
     GNUNET_GETOPT_OPTION_END
   };
   int ret;
     GNUNET_GETOPT_OPTION_END
   };
   int ret;

+

   char *const argv_prog[] = {
     "test_plugin_transport",
     "-c",
   char *const argv_prog[] = {
     "test_plugin_transport",
     "-c",


@@ -294,11 +272,10 @@ main (int argc, char *const *argv)
 #endif
                     NULL);
   ok = 1;                       /* set to fail */
 #endif
                     NULL);
   ok = 1;                       /* set to fail */

-  ret = (GNUNET_OK ==
-         GNUNET_PROGRAM_run (5,
-                             argv_prog,
-                             "test-plugin-transport",
-                             "testcase", options, &run, NULL)) ? ok : 1;
+  ret =
+      (GNUNET_OK ==
+       GNUNET_PROGRAM_run (5, argv_prog, "test-plugin-transport", "testcase",
+                           options, &run, NULL)) ? ok : 1;

   GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-plugin-transport");
   return ret;
 }
   GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-plugin-transport");
   return ret;
 }