fixing coverity 10464: Resource leak

[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 6882f919c341df192599f07793b9391a6d0334a8..d2d03daa7b37b9dd89ff6a1d6378086b3866c356 100644 (file)
--- a/src/transport/test_plugin_transport.c
+++ b/src/transport/test_plugin_transport.c
@@ -43,10 +43,12 @@
 #define WAIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
 
+#define HOSTKEY_FILE "test_plugin_hostkey.ecc"
+
 /**
  * Our public key.
  */
-static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded my_public_key;
+static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded my_public_key;
 
 /**
  * Our identity.
@@ -56,7 +58,7 @@ static struct GNUNET_PeerIdentity my_identity;
 /**
  * Our private key.
  */
-static struct GNUNET_CRYPTO_RsaPrivateKey *my_private_key;
+static struct GNUNET_CRYPTO_EccPrivateKey *my_private_key;
 
 /**
  * Our configuration.
@@ -96,7 +98,7 @@ struct GNUNET_HELPER_Handle *suid_helper;
 /**
  * Timeout task
  */
-static GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+static GNUNET_SCHEDULER_TaskIdentifier timeout_endbadly;
 
 /**
  * Timeout task
@@ -120,6 +122,8 @@ struct AddressWrapper *tail;
 
 unsigned int addresses_reported;
 
+unsigned int pretty_printers_running;
+
 /**
  * Did the test pass or fail?
  */
@@ -147,10 +151,10 @@ end ()
   int c = 0;
   ok = 0;
 
-  if (GNUNET_SCHEDULER_NO_TASK != timeout_task)
+  if (GNUNET_SCHEDULER_NO_TASK != timeout_endbadly)
   {
-      GNUNET_SCHEDULER_cancel (timeout_task);
-      timeout_task = GNUNET_SCHEDULER_NO_TASK;
+      GNUNET_SCHEDULER_cancel (timeout_endbadly);
+      timeout_endbadly = GNUNET_SCHEDULER_NO_TASK;
   }
   if (NULL != api)
       GNUNET_PLUGIN_unload (libname, api);
@@ -159,7 +163,7 @@ end ()
   {
       w = head;
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Plugin did not remove address `%s' \n"), w->addrstring);
+                 "Plugin did not remove address `%s'\n", w->addrstring);
       GNUNET_CONTAINER_DLL_remove (head, tail, w);
       c ++;
       GNUNET_free (w->addr);
@@ -170,7 +174,7 @@ end ()
   {
     GNUNET_break (0);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              _("Plugin did not remove %u addresses \n"), c);
+               "Plugin did not remove %u addresses \n", c);
     ok = 1;
   }
 
@@ -182,7 +186,7 @@ end ()
 
   if (NULL != suid_helper)
   {
-    GNUNET_HELPER_stop (suid_helper);
+    GNUNET_HELPER_stop (suid_helper, GNUNET_NO);
     suid_helper = NULL;
   }
 }
@@ -193,17 +197,25 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct AddressWrapper *w;
   int c = 0;
-  timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  timeout_endbadly = GNUNET_SCHEDULER_NO_TASK;
   if (GNUNET_SCHEDULER_NO_TASK != timeout_wait)
   {
       GNUNET_SCHEDULER_cancel (timeout_wait);
       timeout_wait = GNUNET_SCHEDULER_NO_TASK;
   }
 
+  if (pretty_printers_running > 0)
+  {
+      timeout_endbadly = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_SECONDS, &end_badly, &ok);
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                 "Have pending calls to pretty_printer ... deferring shutdown\n");
+      return;
+  }
+
   if (NULL != cls)
   {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Test took too long to execute, timeout .... \n"));
+                 "Test took too long to execute, timeout .... \n");
   }
 
   if (NULL != libname)
@@ -218,7 +230,7 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   {
       w = head;
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Plugin did not remove address `%s' \n"), w->addrstring);
+                 "Plugin did not remove address `%s'\n", w->addrstring);
       GNUNET_CONTAINER_DLL_remove (head, tail, w);
       c ++;
       GNUNET_free (w->addr);
@@ -229,7 +241,7 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   {
     GNUNET_break (0);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              _("Plugin did not remove %u addresses \n"), c);
+               "Plugin did not remove %u addresses\n", c);
   }
 
   if (NULL != stats)
@@ -240,7 +252,7 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   if (NULL != suid_helper)
   {
-    GNUNET_HELPER_stop (suid_helper);
+    GNUNET_HELPER_stop (suid_helper, GNUNET_NO);
     suid_helper = NULL;
   }
 
@@ -254,7 +266,7 @@ wait_end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   timeout_wait = GNUNET_SCHEDULER_NO_TASK;
   if (0 == addresses_reported)
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-              _("Plugin did not report any addresses, could not check address conversion functions\n"));
+               "Plugin did not report any addresses, could not check address conversion functions\n");
   end ();
 }
 
@@ -267,12 +279,12 @@ end_badly_now ()
       GNUNET_SCHEDULER_cancel (timeout_wait);
       timeout_wait = GNUNET_SCHEDULER_NO_TASK;
   }
-  if (GNUNET_SCHEDULER_NO_TASK != timeout_task)
+  if (GNUNET_SCHEDULER_NO_TASK != timeout_endbadly)
   {
-      GNUNET_SCHEDULER_cancel (timeout_task);
-      timeout_task = GNUNET_SCHEDULER_NO_TASK;
+      GNUNET_SCHEDULER_cancel (timeout_endbadly);
+      timeout_endbadly = GNUNET_SCHEDULER_NO_TASK;
   }
-  timeout_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+  timeout_endbadly = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
 }
 
 
@@ -280,8 +292,6 @@ static struct GNUNET_TIME_Relative
 env_receive (void *cls,
             const struct GNUNET_PeerIdentity *peer,
             const struct GNUNET_MessageHeader *message,
-            const struct GNUNET_ATS_Information *ats,
-            uint32_t ats_count,
             struct Session * session,
             const char *sender_address,
             uint16_t sender_address_len)
@@ -309,11 +319,13 @@ address_pretty_printer_cb (void *cls, const char *buf)
     got_reply = GNUNET_YES;
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Pretty address : `%s'\n", buf);
+    pretty_printers_running --;
   }
   else
   {
       if (GNUNET_NO == got_reply)
       {
+          pretty_printers_running --;
           GNUNET_break (0);
           end_badly_now ();
       }
@@ -337,7 +349,7 @@ env_notify_address (void *cls,
   {
       addresses_reported ++;
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  _("Adding address of length %u\n"), addrlen);
+                  "Adding address of length %u\n", addrlen);
 
       w = GNUNET_malloc (sizeof (struct AddressWrapper));
       w->addr = GNUNET_malloc (addrlen);
@@ -345,6 +357,7 @@ env_notify_address (void *cls,
       memcpy (w->addr, addr, addrlen);
       GNUNET_CONTAINER_DLL_insert(head, tail, w);
       got_reply = GNUNET_NO;
+      pretty_printers_running ++;
       api->address_pretty_printer (api->cls, plugin, addr, addrlen,
                                     GNUNET_YES, GNUNET_TIME_UNIT_MINUTES,
                                     &address_pretty_printer_cb,
@@ -355,19 +368,19 @@ env_notify_address (void *cls,
       {
           GNUNET_break (0);
           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                      _("Plugin cannot convert address to string!\n"));
+                      "Plugin cannot convert address to string!\n");
           end_badly_now();
           return;
       }
       w->addrstring = strdup (api->address_to_string (api, w->addr, w->addrlen));
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  _("Plugin added address `%s'\n"), a2s);
+                  "Plugin added address `%s'\n", a2s);
 
       if ((GNUNET_OK != api->string_to_address (api, a2s, strlen (a2s)+1, &s2a, &s2a_len)) || (NULL == s2a))
       {
           GNUNET_break (0);
           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                      _("Plugin cannot convert string to address!\n"));
+                      "Plugin cannot convert string to address!\n");
           end_badly_now();
           return;
       }
@@ -375,13 +388,13 @@ env_notify_address (void *cls,
       if (s2a_len != w->addrlen)
       {
           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                      _("Plugin creates different address length when converting address->string->address: %u != %u\n"), w->addrlen, s2a_len);
+                      "Plugin creates different address length when converting address->string->address: %u != %u\n", w->addrlen, s2a_len);
       }
       else
       {
           if (0 != memcmp (s2a, w->addr, s2a_len))
             GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                        _("Plugin creates different address length when connecting back and forth!\n"));
+                        "Plugin creates different address length when connecting back and forth!\n");
       }
       GNUNET_free (s2a);
       GNUNET_free (a2s);
@@ -389,7 +402,7 @@ env_notify_address (void *cls,
       {
           GNUNET_break (0);
           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                      _("Plugin refuses added address!\n"));
+                      "Plugin refuses added address!\n");
           end_badly_now();
           return;
       }
@@ -398,12 +411,14 @@ env_notify_address (void *cls,
           GNUNET_SCHEDULER_cancel (timeout_wait);
           timeout_wait = GNUNET_SCHEDULER_NO_TASK;
       }
+
       timeout_wait = GNUNET_SCHEDULER_add_delayed (WAIT, &wait_end, NULL);
+
   }
   else if (GNUNET_NO == add_remove)
   {
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  _("Removing address of length %u\n"), addrlen);
+                  "Removing address of length %u\n", addrlen);
 
       w = head;
       while (NULL != w)
@@ -419,7 +434,7 @@ env_notify_address (void *cls,
       {
           GNUNET_break (0);
           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                      _("Plugin removes address never added!\n"));
+                      "Plugin removes address never added!\n");
           end_badly_now();
           return;
       }
@@ -433,7 +448,7 @@ env_notify_address (void *cls,
   {
       GNUNET_break (0);
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _("Invalid operation: %u \n"), add_remove);
+                  "Invalid operation: %u\n", add_remove);
       end_badly_now ();
       return;
   }
@@ -467,6 +482,18 @@ env_session_end (void *cls,
 }
 
 
+static void
+env_update_metrics (void *cls,
+         const struct GNUNET_PeerIdentity *peer,
+         const void *address,
+         uint16_t address_len,
+         struct Session *session,
+         const struct GNUNET_ATS_Information *ats,
+         uint32_t ats_count)
+{
+}
+
+
 static void
 setup_plugin_environment ()
 {
@@ -479,6 +506,7 @@ setup_plugin_environment ()
   env.receive = &env_receive;
   env.notify_address = &env_notify_address;
   env.get_address_type = &env_get_address_type;
+  env.update_address_metrics = &env_update_metrics;
   env.get_our_hello = &env_get_our_hello;
   env.session_end = &env_session_end;
 }
@@ -507,7 +535,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   char *plugin;
   char *sep;
 
-  timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, end_badly, &ok);
+  timeout_endbadly = GNUNET_SCHEDULER_add_delayed (TIMEOUT, end_badly, &ok);
 
   cfg = c;
   /* parse configuration */
@@ -516,38 +544,69 @@ run (void *cls, char *const *args, const char *cfgfile,
                                                            "NEIGHBOUR_LIMIT",
                                                            &tneigh)) ||
        (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (c,
-                                                             "GNUNETD", "HOSTKEY",
+                                                             "PEER", "PRIVATE_KEY",
                                                              &keyfile)))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Transport service is lacking key configuration settings.  Exiting.\n"));
+                "Transport service is lacking key configuration settings.  Exiting.\n");
     return;
   }
 
   if (NULL == (stats = GNUNET_STATISTICS_create ("transport", cfg)))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-               _("Could not create statistics.  Exiting.\n"));
+               "Could not create statistics.  Exiting.\n");
     end_badly_now ();
     return;
   }
 
+  if (GNUNET_OK != GNUNET_DISK_file_test (HOSTKEY_FILE))
+  {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Hostkey `%s' missing.  Exiting.\n",
+                  HOSTKEY_FILE);
+      GNUNET_free (keyfile);
+      end_badly_now ();
+      return;
+  }
+
+  if (GNUNET_OK != GNUNET_DISK_directory_create_for_file (keyfile))
+  {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Could not create a directory for hostkey `%s'.  Exiting.\n",
+                  keyfile);
+      GNUNET_free (keyfile);
+      end_badly_now ();
+      return;
+  }
+
+  if (GNUNET_OK !=  GNUNET_DISK_file_copy (HOSTKEY_FILE, keyfile))
+  {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Could not copy hostkey `%s' to destination `%s'.  Exiting.\n",
+                  HOSTKEY_FILE, keyfile);
+      GNUNET_free (keyfile);
+      end_badly_now ();
+      return;
+  }
+
+
   max_connect_per_transport = (uint32_t) tneigh;
-  my_private_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+  my_private_key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
   GNUNET_free (keyfile);
   if (NULL == my_private_key)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Transport service could not access hostkey.  Exiting.\n"));
+                "Could not access hostkey.  Exiting.\n");
     end_badly_now ();
     return;
   }
-  GNUNET_CRYPTO_rsa_key_get_public (my_private_key, &my_public_key);
+  GNUNET_CRYPTO_ecc_key_get_public (my_private_key, &my_public_key);
   GNUNET_CRYPTO_hash (&my_public_key, sizeof (my_public_key),
                       &my_identity.hashPubKey);
 
 
-  hello = GNUNET_HELLO_create(&my_public_key, NULL, NULL);
+  hello = GNUNET_HELLO_create(&my_public_key, NULL, NULL, GNUNET_NO);
 
   /* load plugins... */
   setup_plugin_environment ();
@@ -557,7 +616,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   sep = strrchr(argv[0],'.');
   if (NULL == plugin)
   {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Not a valid test name\n"));
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Not a valid test name\n");
       end_badly_now ();
       return;
   }
@@ -580,15 +639,14 @@ run (void *cls, char *const *args, const char *cfgfile,
                                        NULL);
   }
 
-
   /* Loading plugin */
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Loading transport plugin %s\n"), plugin);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Loading transport plugin %s\n", plugin);
   GNUNET_asprintf (&libname, "libgnunet_plugin_transport_%s", plugin);
   api = GNUNET_PLUGIN_load (libname, &env);
   if (api == NULL)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Failed to load transport plugin for %s\n"), plugin);
+                "Failed to load transport plugin for %s\n", plugin);
     end_badly_now ();
     return;
   }
@@ -641,6 +699,7 @@ run (void *cls, char *const *args, const char *cfgfile,
       end_badly_now ();
       return;
   }
+
 }
 
 
@@ -659,6 +718,8 @@ main (int argc, char *const *argv)
   };
   int ret;
 
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-plugin-transport");
+
   char *const argv_prog[] = {
     "test_plugin_transport",
     "-c",