REST: nothing triggers rest

[oweals/gnunet.git] / src / my / test_my.c

diff --git a/src/my/test_my.c b/src/my/test_my.c
index 4bea101caeaf036afc2a3c53eaf7d1861fec00ad..556d2baa26cbc862712d04078db5b85aa1f0e1f0 100644 (file)
--- a/src/my/test_my.c
+++ b/src/my/test_my.c
@@ -2,20 +2,20 @@
      This file is part of GNUnet
      Copyright (C) 2016 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.
+     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/>.
 
-     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., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file my/test_my.c
@@ -103,7 +103,10 @@ run_queries (struct GNUNET_MYSQL_Context *context)
   if (NULL == statements_handle_insert)
   {
     fprintf (stderr, "Failed to prepared statement INSERT\n");
-     return 1;
+    GNUNET_CRYPTO_rsa_signature_free (sig);
+    GNUNET_CRYPTO_rsa_private_key_free (priv);
+    GNUNET_CRYPTO_rsa_public_key_free (pub);
+    return 1;
   }
 
   struct GNUNET_MY_QueryParam params_insert[] = {
@@ -126,6 +129,9 @@ run_queries (struct GNUNET_MYSQL_Context *context)
                                           params_insert))
   {
       fprintf (stderr, "Failed to execute prepared statement INSERT\n");
+      GNUNET_CRYPTO_rsa_signature_free (sig);
+      GNUNET_CRYPTO_rsa_private_key_free (priv);
+      GNUNET_CRYPTO_rsa_public_key_free (pub);
       return 1;
   }
 
@@ -147,6 +153,9 @@ run_queries (struct GNUNET_MYSQL_Context *context)
   if (NULL == statements_handle_select)
   {
     fprintf(stderr, "Failed to prepared statement SELECT\n");
+    GNUNET_CRYPTO_rsa_signature_free (sig);
+    GNUNET_CRYPTO_rsa_private_key_free (priv);
+    GNUNET_CRYPTO_rsa_public_key_free (pub);
     return 1;
   }
 
@@ -159,6 +168,9 @@ run_queries (struct GNUNET_MYSQL_Context *context)
                                             params_select))
   {
     fprintf (stderr, "Failed to execute prepared statement SELECT\n");
+    GNUNET_CRYPTO_rsa_signature_free (sig);
+    GNUNET_CRYPTO_rsa_private_key_free (priv);
+    GNUNET_CRYPTO_rsa_public_key_free (pub);
     return 1;
   }
 
@@ -225,7 +237,7 @@ run_queries (struct GNUNET_MYSQL_Context *context)
 
 
 int
-main (int argc, const char * const argv[])
+main (int argc, const char *const argv[])
 {
   struct GNUNET_CONFIGURATION_Handle *config;
   struct GNUNET_MYSQL_Context *context;
@@ -236,14 +248,15 @@ main (int argc, const char * const argv[])
                     NULL);
 
   config = GNUNET_CONFIGURATION_create ();
-  if (GNUNET_OK != GNUNET_CONFIGURATION_parse (config, "test_my.conf"))
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_parse (config, "test_my.conf"))
   {
     fprintf (stderr, "Failed to parse configuaration\n");
     return 1;
   }
 
   context = GNUNET_MYSQL_context_create (config,
-                                        "datastore-mysql");
+                                         "datastore-mysql");
   if (NULL == context)
   {
     fprintf(stderr, "Failed to connect to database\n");
@@ -251,29 +264,30 @@ main (int argc, const char * const argv[])
   }
 
   (void) GNUNET_MYSQL_statement_run (context,
-                                    "DROP TABLE test_my2;");
-
-  if (GNUNET_OK != GNUNET_MYSQL_statement_run (context,
-                                              "CREATE TABLE IF NOT EXISTS test_my2("
-                                              " pub BLOB NOT NULL"
-                                              ",sig BLOB NOT NULL"
-                                              ",abs_time BIGINT NOT NULL"
-                                              ",forever BIGINT NOT NULL"
-                                              ",abs_time_nbo BIGINT NOT NULL"
-                                              ",hash BLOB NOT NULL CHECK(LENGTH(hash)=64)"
-                                              ",vsize BLOB NOT NULL"
-                                              ",str BLOB NOT NULL"
-                                              ",u16 SMALLINT NOT NULL"
-                                              ",u32 INT NOT NULL"
-                                              ",u64 BIGINT NOT NULL"
-                                              ")"))
+                                     "DROP TABLE test_my2;");
+
+  if (GNUNET_OK !=
+      GNUNET_MYSQL_statement_run (context,
+                                  "CREATE TABLE IF NOT EXISTS test_my2("
+                                  " pub BLOB NOT NULL"
+                                  ",sig BLOB NOT NULL"
+                                  ",abs_time BIGINT NOT NULL"
+                                  ",forever BIGINT NOT NULL"
+                                  ",abs_time_nbo BIGINT NOT NULL"
+                                  ",hash BLOB NOT NULL CHECK(LENGTH(hash)=64)"
+                                  ",vsize BLOB NOT NULL"
+                                  ",str BLOB NOT NULL"
+                                  ",u16 SMALLINT NOT NULL"
+                                  ",u32 INT NOT NULL"
+                                  ",u64 BIGINT NOT NULL"
+                                  ")"))
   {
     fprintf (stderr,
-            "Failed to create table \n");
+            "Failed to create table. Database likely not setup correctly.\n");
     GNUNET_MYSQL_statements_invalidate (context);
     GNUNET_MYSQL_context_destroy (context);
 
-    return 1;
+    return 77;
   }
 
   ret = run_queries (context);