[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29180 - gnunet/src/namestore
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r29180 - gnunet/src/namestore |
|
Date: |
Wed, 11 Sep 2013 08:38:27 +0200 |
Author: wachs
Date: 2013-09-11 08:38:27 +0200 (Wed, 11 Sep 2013)
New Revision: 29180
Added:
gnunet/src/namestore/test_namestore_api_store.c
Removed:
gnunet/src/namestore/test_namestore_api.c
Modified:
gnunet/src/namestore/Makefile.am
Log:
- rename test according to what is tested
- added additional checks
Modified: gnunet/src/namestore/Makefile.am
===================================================================
--- gnunet/src/namestore/Makefile.am 2013-09-11 06:29:47 UTC (rev 29179)
+++ gnunet/src/namestore/Makefile.am 2013-09-11 06:38:27 UTC (rev 29180)
@@ -41,7 +41,7 @@
if HAVE_TESTING
TESTING_TESTS = \
- test_namestore_api \
+ test_namestore_api_store \
test_namestore_api_remove \
test_namestore_api_lookup
#test_namestore_api_lookup_specific_type
@@ -180,9 +180,9 @@
$(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la
-test_namestore_api_SOURCES = \
- test_namestore_api.c
-test_namestore_api_LDADD = \
+test_namestore_api_store_SOURCES = \
+ test_namestore_api_store.c
+test_namestore_api_store_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la
Deleted: gnunet/src/namestore/test_namestore_api.c
===================================================================
--- gnunet/src/namestore/test_namestore_api.c 2013-09-11 06:29:47 UTC (rev
29179)
+++ gnunet/src/namestore/test_namestore_api.c 2013-09-11 06:38:27 UTC (rev
29180)
@@ -1,219 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2012 Christian Grothoff (and other contributing authors)
-
- 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 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.
-*/
-/**
- * @file namestore/test_namestore_api.c
- * @brief testcase for namestore_api.c
- */
-#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_namestore_service.h"
-#include "gnunet_testing_lib.h"
-
-#define TEST_RECORD_TYPE 1234
-
-#define TEST_RECORD_DATALEN 123
-
-#define TEST_RECORD_DATA 'a'
-
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100)
-
-
-static struct GNUNET_NAMESTORE_Handle *nsh;
-
-static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
-
-static struct GNUNET_CRYPTO_EccPrivateKey *privkey;
-
-static struct GNUNET_CRYPTO_EccPublicKey pubkey;
-
-static int res;
-
-static struct GNUNET_NAMESTORE_QueueEntry *nsqe;
-
-
-static void
-cleanup ()
-{
- if (NULL != nsh)
- {
- GNUNET_NAMESTORE_disconnect (nsh);
- nsh = NULL;
- }
- if (NULL != privkey)
- {
- GNUNET_free (privkey);
- privkey = NULL;
- }
- GNUNET_SCHEDULER_shutdown ();
-}
-
-
-/**
- * Re-establish the connection to the service.
- *
- * @param cls handle to use to re-connect.
- * @param tc scheduler context
- */
-static void
-endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- if (NULL != nsqe)
- {
- GNUNET_NAMESTORE_cancel (nsqe);
- nsqe = NULL;
- }
- cleanup ();
- res = 1;
-}
-
-
-static void
-end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- cleanup ();
- res = 0;
-}
-
-
-static void
-rd_decrypt_cb (void *cls,
- unsigned int rd_count,
- const struct
GNUNET_NAMESTORE_RecordData *rd)
-{
- char rd_cmp_data[TEST_RECORD_DATALEN];
-
- GNUNET_assert (1 == rd_count);
- GNUNET_assert (NULL != rd);
-
- memset (rd_cmp_data, 'a', TEST_RECORD_DATALEN);
-
- GNUNET_assert (TEST_RECORD_TYPE == rd[0].record_type);
- GNUNET_assert (TEST_RECORD_DATALEN == rd[0].data_size);
- GNUNET_assert (0 == memcmp (&rd_cmp_data, rd[0].data, TEST_RECORD_DATALEN));
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Block was decrypted successfully \n");
-
- GNUNET_SCHEDULER_add_now (&end, NULL);
-}
-
-static void
-name_lookup_proc (void *cls,
- const
struct GNUNET_NAMESTORE_Block *block)
-{
- const char *name = cls;
- nsqe = NULL;
-
- GNUNET_assert (NULL != cls);
-
- if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (endbadly_task);
- endbadly_task = GNUNET_SCHEDULER_NO_TASK;
- }
-
- if (NULL == block)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Namestore returned no block\n");
- if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (endbadly_task);
- endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
- }
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Namestore returned block, decrypting \n");
- GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_block_decrypt(block,
- &pubkey, name, &rd_decrypt_cb, (void *) name));
-}
-
-static void
-put_cont (void *cls, int32_t success, const char *emsg)
-{
- const char *name = cls;
- struct GNUNET_HashCode derived_hash;
-
- GNUNET_assert (NULL != cls);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Name store added record for `%s': %s\n",
- name,
- (success == GNUNET_OK) ? "SUCCESS" : "FAIL");
-
- /* Create derived hash */
- GNUNET_NAMESTORE_query_from_private_key (privkey, name, &derived_hash);
-
- nsqe = GNUNET_NAMESTORE_lookup_block (nsh, &derived_hash,
- &name_lookup_proc, (void *) name);
-}
-
-
-static void
-run (void *cls,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- struct GNUNET_TESTING_Peer *peer)
-{
- struct GNUNET_NAMESTORE_RecordData rd;
- char *hostkey_file;
- const char * name = "dummy.dummy.gnunet";
-
- endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
- &endbadly, NULL);
- GNUNET_asprintf (&hostkey_file,
- "zonefiles%s%s",
- DIR_SEPARATOR_STR,
- "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n",
hostkey_file);
- privkey = GNUNET_CRYPTO_ecc_key_create_from_file (hostkey_file);
- GNUNET_free (hostkey_file);
- GNUNET_assert (privkey != NULL);
- GNUNET_CRYPTO_ecc_key_get_public (privkey, &pubkey);
-
-
- rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us;
- rd.record_type = TEST_RECORD_TYPE;
- rd.data_size = TEST_RECORD_DATALEN;
- rd.data = GNUNET_malloc (TEST_RECORD_DATALEN);
- memset ((char *) rd.data, 'a', TEST_RECORD_DATALEN);
-
- nsh = GNUNET_NAMESTORE_connect (cfg);
- GNUNET_break (NULL != nsh);
- nsqe = GNUNET_NAMESTORE_records_store (nsh, privkey, name,
- 1, &rd, &put_cont, (void *) name);
- GNUNET_free ((void *)rd.data);
-}
-
-
-int
-main (int argc, char *argv[])
-{
- res = 1;
- if (0 !=
- GNUNET_TESTING_service_run ("test-namestore-api",
- "namestore",
- "test_namestore_api.conf",
- &run,
- NULL))
- return 1;
- return res;
-}
-
-
-/* end of test_namestore_api.c */
Copied: gnunet/src/namestore/test_namestore_api_store.c (from rev 29178,
gnunet/src/namestore/test_namestore_api.c)
===================================================================
--- gnunet/src/namestore/test_namestore_api_store.c
(rev 0)
+++ gnunet/src/namestore/test_namestore_api_store.c 2013-09-11 06:38:27 UTC
(rev 29180)
@@ -0,0 +1,226 @@
+/*
+ This file is part of GNUnet.
+ (C) 2012 Christian Grothoff (and other contributing authors)
+
+ 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 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.
+*/
+/**
+ * @file namestore/test_namestore_api.c
+ * @brief testcase for namestore_api.c: store a record and perform a lookup
+ */
+#include "platform.h"
+#include "gnunet_common.h"
+#include "gnunet_namestore_service.h"
+#include "gnunet_testing_lib.h"
+
+#define TEST_RECORD_TYPE 1234
+
+#define TEST_RECORD_DATALEN 123
+
+#define TEST_RECORD_DATA 'a'
+
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100)
+
+
+static struct GNUNET_NAMESTORE_Handle *nsh;
+
+static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
+
+static struct GNUNET_CRYPTO_EccPrivateKey *privkey;
+
+static struct GNUNET_CRYPTO_EccPublicKey pubkey;
+
+static int res;
+
+static struct GNUNET_NAMESTORE_QueueEntry *nsqe;
+
+
+static void
+cleanup ()
+{
+ if (NULL != nsh)
+ {
+ GNUNET_NAMESTORE_disconnect (nsh);
+ nsh = NULL;
+ }
+ if (NULL != privkey)
+ {
+ GNUNET_free (privkey);
+ privkey = NULL;
+ }
+ GNUNET_SCHEDULER_shutdown ();
+}
+
+
+/**
+ * Re-establish the connection to the service.
+ *
+ * @param cls handle to use to re-connect.
+ * @param tc scheduler context
+ */
+static void
+endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ if (NULL != nsqe)
+ {
+ GNUNET_NAMESTORE_cancel (nsqe);
+ nsqe = NULL;
+ }
+ cleanup ();
+ res = 1;
+}
+
+
+static void
+end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ cleanup ();
+ res = 0;
+}
+
+
+static void
+rd_decrypt_cb (void *cls,
+ unsigned int rd_count,
+ const struct
GNUNET_NAMESTORE_RecordData *rd)
+{
+ char rd_cmp_data[TEST_RECORD_DATALEN];
+
+ GNUNET_assert (1 == rd_count);
+ GNUNET_assert (NULL != rd);
+
+ memset (rd_cmp_data, 'a', TEST_RECORD_DATALEN);
+
+ GNUNET_assert (TEST_RECORD_TYPE == rd[0].record_type);
+ GNUNET_assert (TEST_RECORD_DATALEN == rd[0].data_size);
+ GNUNET_assert (0 == memcmp (&rd_cmp_data, rd[0].data, TEST_RECORD_DATALEN));
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Block was decrypted successfully \n");
+
+ GNUNET_SCHEDULER_add_now (&end, NULL);
+}
+
+static void
+name_lookup_proc (void *cls,
+ const
struct GNUNET_NAMESTORE_Block *block)
+{
+ const char *name = cls;
+ nsqe = NULL;
+
+ GNUNET_assert (NULL != cls);
+
+ if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (endbadly_task);
+ endbadly_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+
+ if (NULL == block)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Namestore returned no block\n"));
+ if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (endbadly_task);
+ endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+ return;
+ }
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Namestore returned block, decrypting \n");
+ GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_block_decrypt(block,
+ &pubkey, name, &rd_decrypt_cb, (void *) name));
+}
+
+static void
+put_cont (void *cls, int32_t success, const char *emsg)
+{
+ const char *name = cls;
+ struct GNUNET_HashCode derived_hash;
+
+ GNUNET_assert (NULL != cls);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Name store added record for `%s': %s\n",
+ name,
+ (success == GNUNET_OK) ? "SUCCESS" : "FAIL");
+
+ /* Create derived hash */
+ GNUNET_NAMESTORE_query_from_private_key (privkey, name, &derived_hash);
+
+ nsqe = GNUNET_NAMESTORE_lookup_block (nsh, &derived_hash,
+ &name_lookup_proc, (void *) name);
+}
+
+
+static void
+run (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TESTING_Peer *peer)
+{
+ struct GNUNET_NAMESTORE_RecordData rd;
+ char *hostkey_file;
+ const char * name = "dummy.dummy.gnunet";
+
+ endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+ &endbadly, NULL);
+ GNUNET_asprintf (&hostkey_file,
+ "zonefiles%s%s",
+ DIR_SEPARATOR_STR,
+ "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n",
hostkey_file);
+ privkey = GNUNET_CRYPTO_ecc_key_create_from_file (hostkey_file);
+ GNUNET_free (hostkey_file);
+ GNUNET_assert (privkey != NULL);
+ GNUNET_CRYPTO_ecc_key_get_public (privkey, &pubkey);
+
+
+ rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us;
+ rd.record_type = TEST_RECORD_TYPE;
+ rd.data_size = TEST_RECORD_DATALEN;
+ rd.data = GNUNET_malloc (TEST_RECORD_DATALEN);
+ memset ((char *) rd.data, 'a', TEST_RECORD_DATALEN);
+
+ nsh = GNUNET_NAMESTORE_connect (cfg);
+ GNUNET_break (NULL != nsh);
+ nsqe = GNUNET_NAMESTORE_records_store (nsh, privkey, name,
+ 1, &rd, &put_cont, (void *) name);
+ if (NULL == nsqe)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Namestore cannot store no block\n"));
+ }
+
+ GNUNET_free ((void *)rd.data);
+}
+
+
+int
+main (int argc, char *argv[])
+{
+ res = 1;
+ if (0 !=
+ GNUNET_TESTING_service_run ("test-namestore-api",
+ "namestore",
+ "test_namestore_api.conf",
+ &run,
+ NULL))
+ return 1;
+ return res;
+}
+
+
+/* end of test_namestore_api.c */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29180 - gnunet/src/namestore,
gnunet <=