changes

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

diff --git a/src/transport/test_plugin_transport_udp.c b/src/transport/test_plugin_transport_udp.c
index f297a05c101d20cd99fa65263386b2897563594e..8fbd2ab9cd47a475bee828d8825ec9f80fda679c 100644 (file)
--- a/src/transport/test_plugin_transport_udp.c
+++ b/src/transport/test_plugin_transport_udp.c
@@ -35,7 +35,7 @@
 #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"
 
 #define VERBOSE GNUNET_NO
@@ -89,21 +89,16 @@ static int ok;
  * Initialize Environment for this plugin
  */
 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
-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)
 {
 }
 
@@ -118,8 +113,7 @@ static void
 unload_plugins (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   GNUNET_assert (NULL ==
-                 GNUNET_PLUGIN_unload ("libgnunet_plugin_transport_udp",
-                                       api));
+                 GNUNET_PLUGIN_unload ("libgnunet_plugin_transport_udp", api));
   if (my_private_key != NULL)
     GNUNET_CRYPTO_rsa_key_free (my_private_key);
 
@@ -146,10 +140,9 @@ test_validation ()
   soaddr.sin_port = htons (2368 /* FIXME: get from config! */ );
   soaddr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
 
-  api->check_address(api->cls,
-      &soaddr, sizeof (soaddr));
+  api->check_address (api->cls, &soaddr, sizeof (soaddr));
 
-  unload_plugins(env.cls, env.cfg);
+  unload_plugins (env.cls, env.cfg);
 }
 
 
@@ -171,9 +164,8 @@ setup_plugin_environment ()
  * @param c configuration to use
  */
 static void
-run (void *cls,
-     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;
@@ -182,35 +174,31 @@ run (void *cls,
   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 !=
-       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)
-    {
-      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_hash (&my_public_key,
-                      sizeof (my_public_key), &my_identity.hashPubKey);
+  GNUNET_CRYPTO_hash (&my_public_key, sizeof (my_public_key),
+                      &my_identity.hashPubKey);
 
   /* load plugins... */
   setup_plugin_environment ();
@@ -220,12 +208,12 @@ run (void *cls,
   api = GNUNET_PLUGIN_load (libname, &env);
   GNUNET_free (libname);
   if (api == NULL)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _("Failed to load transport plugin for udp\n"));
-      /* FIXME: set some error code for main */
-      return;
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Failed to load transport plugin for udp\n"));
+    /* FIXME: set some error code for main */
+    return;
+  }
   test_validation ();
 }
 
@@ -244,6 +232,7 @@ main (int argc, char *const *argv)
     GNUNET_GETOPT_OPTION_END
   };
   int ret;
+
   char *const argv_prog[] = {
     "test_plugin_transport",
     "-c",
@@ -264,11 +253,10 @@ main (int argc, char *const *argv)
 #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;
 }