fix bad free

[oweals/gnunet.git] / src / testing / test_testing_peerstartup.c

diff --git a/src/testing/test_testing_peerstartup.c b/src/testing/test_testing_peerstartup.c
index 7f78827f659d0651e8f3474bc45b89b853954620..5ffdb950ad789d887347ffab2f15088bcb9c5aec 100644 (file)
--- a/src/testing/test_testing_peerstartup.c
+++ b/src/testing/test_testing_peerstartup.c
@@ -1,38 +1,39 @@
 /*
       This file is part of GNUnet
-      (C) 2008, 2009, 2012 Christian Grothoff (and other contributing authors)
+      Copyright (C) 2008, 2009, 2012 GNUnet e.V.
 
-      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 3, or (at your
-      option) any later version.
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
 
       GNUnet is distributed in the hope that it will be useful, but
       WITHOUT ANY WARRANTY; without even the implied warranty of
       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      General Public License for more details.
-
-      You should have received a copy of the GNU General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
-      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-      Boston, MA 02111-1307, USA.
+      Affero General Public License for more details.
+     
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  * @file testing/test_testing_new_peerstartup.c
  * @brief test case for testing peer startup and shutdown using new testing
- *          library 
+ *          library
  * @author Sree Harsha Totakura
  */
 
 #include "platform.h"
-#include "gnunet_configuration_lib.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
 
 #define LOG(kind,...)                           \
   GNUNET_log (kind, __VA_ARGS__)
 
+/**
+ * The status of the test
+ */
+int status;
 
 /**
  * The testing context
@@ -43,7 +44,7 @@ struct TestingContext
    * The testing system
    */
   struct GNUNET_TESTING_System *system;
-  
+
   /**
    * The peer which has been started by the testing system
    */
@@ -60,17 +61,22 @@ struct TestingContext
  * Task for shutdown
  *
  * @param cls the testing context
- * @param tc the tast context
  */
 static void
-do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown (void *cls)
 {
   struct TestingContext *test_ctx = cls;
-  
-  GNUNET_assert (GNUNET_OK == GNUNET_TESTING_peer_stop (test_ctx->peer));
-  GNUNET_TESTING_peer_destroy (test_ctx->peer);
-  GNUNET_CONFIGURATION_destroy (test_ctx->cfg);
-  GNUNET_TESTING_system_destroy (test_ctx->system, GNUNET_YES);
+
+  GNUNET_assert (NULL != test_ctx);
+  if (NULL != test_ctx->peer)
+  {
+    (void) GNUNET_TESTING_peer_stop (test_ctx->peer);
+    GNUNET_TESTING_peer_destroy (test_ctx->peer);
+  }
+  if (NULL != test_ctx->cfg)
+    GNUNET_CONFIGURATION_destroy (test_ctx->cfg);
+  if (NULL != test_ctx->system)
+    GNUNET_TESTING_system_destroy (test_ctx->system, GNUNET_YES);
   GNUNET_free (test_ctx);
 }
 
@@ -82,27 +88,35 @@ static void
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  struct GNUNET_TESTING_System *system;
-  struct GNUNET_TESTING_Peer *peer;
-  struct GNUNET_CONFIGURATION_Handle *new_cfg;
   struct TestingContext *test_ctx;
   char *emsg;
   struct GNUNET_PeerIdentity id;
-    
-  system = GNUNET_TESTING_system_create ("test-gnunet-testing",
-                                         "127.0.0.1", NULL);
-  GNUNET_assert (NULL != system);
-  new_cfg = GNUNET_CONFIGURATION_dup (cfg);
+
+  test_ctx = GNUNET_new (struct TestingContext);
+  test_ctx->system =
+      GNUNET_TESTING_system_create ("test-gnunet-testing",
+                                    "127.0.0.1", NULL, NULL);
   emsg = NULL;
-  peer = GNUNET_TESTING_peer_configure (system, new_cfg, 0, &id, &emsg);
-  GNUNET_assert (NULL != peer);
-  GNUNET_assert (NULL == emsg);
-  GNUNET_assert (GNUNET_OK == GNUNET_TESTING_peer_start (peer));
-  test_ctx = GNUNET_malloc (sizeof (struct TestingContext));
-  test_ctx->system = system;
-  test_ctx->peer = peer;
-  test_ctx->cfg = new_cfg;
+  if (NULL == test_ctx->system)
+    goto end;
+  test_ctx->cfg = GNUNET_CONFIGURATION_dup (cfg);
+  test_ctx->peer =
+      GNUNET_TESTING_peer_configure (test_ctx->system,
+                                     test_ctx->cfg,
+                                     0, &id, &emsg);
+  if (NULL == test_ctx->peer)
+  {
+    if (NULL != emsg)
+      printf ("Test failed upon error: %s", emsg);
+    goto end;
+  }
+  if (GNUNET_OK != GNUNET_TESTING_peer_start (test_ctx->peer))
+    goto end;
+  status = GNUNET_OK;
+
+ end:
   GNUNET_SCHEDULER_add_now (&do_shutdown, test_ctx);
+  GNUNET_free_non_null (emsg);
 }
 
 
@@ -112,13 +126,14 @@ int main (int argc, char *argv[])
     GNUNET_GETOPT_OPTION_END
   };
 
+  status = GNUNET_SYSERR;
   if (GNUNET_OK !=
       GNUNET_PROGRAM_run (argc, argv,
-                          "test_testing_new_peerstartup",
+                          "test_testing_peerstartup",
                           "test case for peerstartup using new testing library",
                           options, &run, NULL))
     return 1;
-  return 0;
+  return (GNUNET_OK == status) ? 0 : 1;
 }
 
 /* end of test_testing_peerstartup.c */