[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r30924 - gnunet/src/namestore
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r30924 - gnunet/src/namestore |
|
Date: |
Thu, 28 Nov 2013 09:10:19 +0100 |
Author: wachs
Date: 2013-11-28 09:10:19 +0100 (Thu, 28 Nov 2013)
New Revision: 30924
Removed:
gnunet/src/namestore/test_namestore_api_put.c
Modified:
gnunet/src/namestore/Makefile.am
gnunet/src/namestore/namestore_api.c
gnunet/src/namestore/test_namestore_api_lookup_nick.c
gnunet/src/namestore/test_namestore_api_lookup_private.c
gnunet/src/namestore/test_namestore_api_lookup_public.c
gnunet/src/namestore/test_namestore_api_lookup_shadow.c
gnunet/src/namestore/test_namestore_api_lookup_shadow_filter.c
gnunet/src/namestore/test_namestore_api_monitoring.c
gnunet/src/namestore/test_namestore_api_monitoring_existing.c
gnunet/src/namestore/test_namestore_api_remove.c
gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
gnunet/src/namestore/test_namestore_api_store.c
gnunet/src/namestore/test_namestore_api_store_update.c
gnunet/src/namestore/test_namestore_api_zone_iteration.c
gnunet/src/namestore/test_namestore_api_zone_iteration_nick.c
gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
gnunet/src/namestore/test_namestore_api_zone_to_name.c
Log:
- Tests did not clean up: TEST_HOME with namestore db was not removed after test
Therefore test_namestore_api_remove_not_existing_record passed when executed on
a clean system,
but failed if ran after a previous test adding a record
- remove unused file namestore/test_namestore_api_put.c
Modified: gnunet/src/namestore/Makefile.am
===================================================================
--- gnunet/src/namestore/Makefile.am 2013-11-28 07:42:18 UTC (rev 30923)
+++ gnunet/src/namestore/Makefile.am 2013-11-28 08:10:19 UTC (rev 30924)
@@ -237,14 +237,6 @@
$(top_builddir)/src/namecache/libgnunetnamecache.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la
-test_namestore_api_put_SOURCES = \
- test_namestore_api_put.c
-test_namestore_api_put_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/namestore/libgnunetnamestore.la
-
test_namestore_api_remove_SOURCES = \
test_namestore_api_remove.c
test_namestore_api_remove_LDADD = \
Modified: gnunet/src/namestore/namestore_api.c
===================================================================
--- gnunet/src/namestore/namestore_api.c 2013-11-28 07:42:18 UTC (rev
30923)
+++ gnunet/src/namestore/namestore_api.c 2013-11-28 08:10:19 UTC (rev
30924)
@@ -266,8 +266,9 @@
const char *emsg;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Received `%s'\n",
- "RECORD_STORE_RESPONSE");
+ "Received `%s' with result %i\n",
+ "RECORD_STORE_RESPONSE",
+ ntohl (msg->op_result));
/* TODO: add actual error message from namestore to response... */
res = ntohl (msg->op_result);
if (GNUNET_SYSERR == res)
Modified: gnunet/src/namestore/test_namestore_api_lookup_nick.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_lookup_nick.c 2013-11-28
07:42:18 UTC (rev 30923)
+++ gnunet/src/namestore/test_namestore_api_lookup_nick.c 2013-11-28
08:10:19 UTC (rev 30924)
@@ -52,6 +52,8 @@
//static const char * name = "dummy.dummy.gnunet";
static const char * name = "d";
+static char *directory;
+
static void
cleanup ()
{
@@ -66,6 +68,11 @@
GNUNET_free (privkey);
privkey = NULL;
}
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
GNUNET_SCHEDULER_shutdown ();
}
@@ -267,6 +274,9 @@
{
char *hostkey_file;
+ directory = NULL;
+ GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME",
&directory);
+
endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&endbadly, NULL);
GNUNET_asprintf (&hostkey_file,
Modified: gnunet/src/namestore/test_namestore_api_lookup_private.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_lookup_private.c 2013-11-28
07:42:18 UTC (rev 30923)
+++ gnunet/src/namestore/test_namestore_api_lookup_private.c 2013-11-28
08:10:19 UTC (rev 30924)
@@ -48,6 +48,8 @@
//static const char * name = "dummy.dummy.gnunet";
static const char * name = "d";
+static char *directory;
+
static void
cleanup ()
{
@@ -61,6 +63,11 @@
GNUNET_free (privkey);
privkey = NULL;
}
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
GNUNET_SCHEDULER_shutdown ();
}
@@ -170,6 +177,9 @@
struct GNUNET_GNSRECORD_Data rd;
char *hostkey_file;
+ directory = NULL;
+ GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME",
&directory);
+
endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&endbadly, NULL);
GNUNET_asprintf (&hostkey_file,
Modified: gnunet/src/namestore/test_namestore_api_lookup_public.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_lookup_public.c 2013-11-28
07:42:18 UTC (rev 30923)
+++ gnunet/src/namestore/test_namestore_api_lookup_public.c 2013-11-28
08:10:19 UTC (rev 30924)
@@ -51,6 +51,7 @@
static struct GNUNET_NAMECACHE_QueueEntry *ncqe;
+static char *directory;
static void
cleanup ()
@@ -70,6 +71,11 @@
GNUNET_free (privkey);
privkey = NULL;
}
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
GNUNET_SCHEDULER_shutdown ();
}
@@ -193,6 +199,9 @@
char *hostkey_file;
const char * name = "dummy.dummy.gnunet";
+ directory = NULL;
+ GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME",
&directory);
+
endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&endbadly, NULL);
GNUNET_asprintf (&hostkey_file,
Modified: gnunet/src/namestore/test_namestore_api_lookup_shadow.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_lookup_shadow.c 2013-11-28
07:42:18 UTC (rev 30923)
+++ gnunet/src/namestore/test_namestore_api_lookup_shadow.c 2013-11-28
08:10:19 UTC (rev 30924)
@@ -53,6 +53,7 @@
static struct GNUNET_NAMECACHE_QueueEntry *ncqe;
+static char *directory;
static void
cleanup ()
@@ -72,6 +73,11 @@
GNUNET_free (privkey);
privkey = NULL;
}
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
GNUNET_SCHEDULER_shutdown ();
}
@@ -225,6 +231,9 @@
char *hostkey_file;
const char * name = "dummy.dummy.gnunet";
+ directory = NULL;
+ GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME",
&directory);
+
endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&endbadly, NULL);
GNUNET_asprintf (&hostkey_file,
Modified: gnunet/src/namestore/test_namestore_api_lookup_shadow_filter.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_lookup_shadow_filter.c
2013-11-28 07:42:18 UTC (rev 30923)
+++ gnunet/src/namestore/test_namestore_api_lookup_shadow_filter.c
2013-11-28 08:10:19 UTC (rev 30924)
@@ -66,6 +66,8 @@
static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
+static char *directory;
+
static void
cleanup ()
{
@@ -84,6 +86,11 @@
GNUNET_free (privkey);
privkey = NULL;
}
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
GNUNET_SCHEDULER_shutdown ();
}
@@ -291,6 +298,9 @@
{
char *hostkey_file;
+ directory = NULL;
+ GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME",
&directory);
+
endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&endbadly, NULL);
GNUNET_asprintf (&hostkey_file,
Modified: gnunet/src/namestore/test_namestore_api_monitoring.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_monitoring.c 2013-11-28
07:42:18 UTC (rev 30923)
+++ gnunet/src/namestore/test_namestore_api_monitoring.c 2013-11-28
08:10:19 UTC (rev 30924)
@@ -56,6 +56,7 @@
struct GNUNET_NAMESTORE_QueueEntry * ns_ops[3];
+static char *directory;
static void
do_shutdown ()
@@ -118,6 +119,11 @@
GNUNET_free (privkey2);
privkey2 = NULL;
}
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
}
@@ -269,6 +275,9 @@
res = 1;
+ directory = NULL;
+ GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME",
&directory);
+
GNUNET_asprintf(&hostkey_file,
"zonefiles%s%s",
DIR_SEPARATOR_STR,
Modified: gnunet/src/namestore/test_namestore_api_monitoring_existing.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_monitoring_existing.c
2013-11-28 07:42:18 UTC (rev 30923)
+++ gnunet/src/namestore/test_namestore_api_monitoring_existing.c
2013-11-28 08:10:19 UTC (rev 30924)
@@ -57,6 +57,7 @@
struct GNUNET_NAMESTORE_QueueEntry * ns_ops[3];
+static char *directory;
static void
do_shutdown ()
@@ -119,6 +120,11 @@
GNUNET_free (privkey2);
privkey2 = NULL;
}
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
}
@@ -280,6 +286,9 @@
{
char *hostkey_file;
+ directory = NULL;
+ GNUNET_CONFIGURATION_get_value_string(mycfg, "PATHS", "GNUNET_TEST_HOME",
&directory);
+
res = 1;
GNUNET_asprintf(&hostkey_file,
Deleted: gnunet/src/namestore/test_namestore_api_put.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_put.c 2013-11-28 07:42:18 UTC
(rev 30923)
+++ gnunet/src/namestore/test_namestore_api_put.c 2013-11-28 08:10:19 UTC
(rev 30924)
@@ -1,187 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2009, 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_namestore_service.h"
-#include "gnunet_testing_lib.h"
-#include "namestore.h"
-
-#define RECORDS 5
-
-#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_EcdsaPrivateKey * privkey;
-
-static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
-
-static struct GNUNET_GNSRECORD_Data *s_rd;
-
-static int res;
-
-
-/**
- * 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 (nsh != NULL)
- GNUNET_NAMESTORE_disconnect (nsh);
- nsh = NULL;
-
- if (privkey != NULL)
- {
- GNUNET_free (privkey);
- privkey = NULL;
- }
- GNUNET_SCHEDULER_shutdown ();
- res = 1;
-}
-
-
-static void
-end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (endbadly_task);
- endbadly_task = GNUNET_SCHEDULER_NO_TASK;
- }
-
- if (privkey != NULL)
- {
- GNUNET_free (privkey);
- privkey = NULL;
- }
- if (nsh != NULL)
- {
- GNUNET_NAMESTORE_disconnect (nsh);
- nsh = NULL;
- }
-}
-
-
-static void
-put_cont (void *cls, int32_t success, const char *emsg)
-{
- const char * name = cls;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Name store added record for `%s': %s\n",
- name, (success == GNUNET_OK) ? "SUCCESS" : "FAIL");
- if (success == GNUNET_OK)
- res = 0;
- else
- res = 1;
- GNUNET_SCHEDULER_add_now (&end, NULL);
-}
-
-
-static struct GNUNET_GNSRECORD_Data *
-create_record (unsigned int count)
-{
- unsigned int c;
- struct GNUNET_GNSRECORD_Data * rd;
-
- rd = GNUNET_malloc (count * sizeof (struct GNUNET_GNSRECORD_Data));
- for (c = 0; c < count; c++)
- {
- rd[c].expiration_time = GNUNET_TIME_absolute_get().abs_value_us;
- rd[c].record_type = TEST_RECORD_TYPE;
- rd[c].data_size = TEST_RECORD_DATALEN;
- rd[c].data = GNUNET_malloc(TEST_RECORD_DATALEN);
- rd[c].flags = 0;
- memset ((char *) rd[c].data, TEST_RECORD_DATA, TEST_RECORD_DATALEN);
- }
- return rd;
-}
-
-
-static void
-run (void *cls,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- struct GNUNET_TESTING_Peer *peer)
-{
- struct GNUNET_CRYPTO_EcdsaSignature *signature;
- char * s_name;
- int c;
- char *hostkey_file;
- struct GNUNET_TIME_Absolute et;
-
- endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL);
- /* load privat key */
- 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_ecdsa_key_create_from_file(hostkey_file);
- GNUNET_assert (privkey != NULL);
- GNUNET_free (hostkey_file);
- /* get public key */
- GNUNET_CRYPTO_ecdsa_key_get_public(privkey, &pubkey);
- nsh = GNUNET_NAMESTORE_connect (cfg);
- GNUNET_break (NULL != nsh);
- /* create record */
- s_name = GNUNET_GNSRECORD_string_to_lowercase ("DUMMY.dummy.gnunet");
- s_rd = create_record (RECORDS);
- et.abs_value_us = s_rd[0].expiration_time;
- signature = GNUNET_NAMESTORE_create_signature(privkey, et, s_name, s_rd,
RECORDS);
- GNUNET_break (s_rd != NULL);
- GNUNET_break (s_name != NULL);
- GNUNET_NAMESTORE_record_put (nsh, &pubkey, s_name,
- GNUNET_TIME_UNIT_FOREVER_ABS,
- RECORDS, s_rd, signature, &put_cont, (void*)
s_name);
- GNUNET_free (signature);
- for (c = 0; c < RECORDS; c++)
- GNUNET_free_non_null((void *) s_rd[c].data);
- GNUNET_free (s_rd);
- GNUNET_free (s_name);
-}
-
-
-int
-main (int argc, char *argv[])
-{
- res = 1;
- if (0 != GNUNET_TESTING_peer_run ("test-namestore-api-put",
- "test_namestore_api.conf",
- &run,
- NULL))
- return 1;
- return res;
-}
-
-/* end of test_namestore_api_put.c */
Modified: gnunet/src/namestore/test_namestore_api_remove.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_remove.c 2013-11-28 07:42:18 UTC
(rev 30923)
+++ gnunet/src/namestore/test_namestore_api_remove.c 2013-11-28 08:10:19 UTC
(rev 30924)
@@ -48,6 +48,7 @@
static struct GNUNET_NAMESTORE_QueueEntry *nsqe;
+static char *directory;
static void
cleanup ()
@@ -62,6 +63,11 @@
GNUNET_free (privkey);
privkey = NULL;
}
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
GNUNET_SCHEDULER_shutdown ();
}
@@ -153,6 +159,9 @@
char *hostkey_file;
const char * name = "dummy.dummy.gnunet";
+ directory = NULL;
+ GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME",
&directory);
+
endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&endbadly, NULL);
GNUNET_asprintf (&hostkey_file,
Modified: gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
2013-11-28 07:42:18 UTC (rev 30923)
+++ gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
2013-11-28 08:10:19 UTC (rev 30924)
@@ -46,6 +46,7 @@
static struct GNUNET_NAMESTORE_QueueEntry *nsqe;
+static char *directory;
static void
cleanup ()
@@ -60,6 +61,11 @@
GNUNET_free (privkey);
privkey = NULL;
}
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
GNUNET_SCHEDULER_shutdown ();
}
@@ -133,6 +139,9 @@
char *hostkey_file;
const char * name = "dummy.dummy.gnunet";
+ directory = NULL;
+ GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME",
&directory);
+
endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&endbadly, NULL);
GNUNET_asprintf (&hostkey_file,
Modified: gnunet/src/namestore/test_namestore_api_store.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_store.c 2013-11-28 07:42:18 UTC
(rev 30923)
+++ gnunet/src/namestore/test_namestore_api_store.c 2013-11-28 08:10:19 UTC
(rev 30924)
@@ -46,6 +46,7 @@
static struct GNUNET_NAMESTORE_QueueEntry *nsqe;
+static char *directory;
static void
cleanup ()
@@ -60,6 +61,11 @@
GNUNET_free (privkey);
privkey = NULL;
}
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
GNUNET_SCHEDULER_shutdown ();
}
@@ -117,6 +123,9 @@
char *hostkey_file;
const char * name = "dummy.dummy.gnunet";
+ directory = NULL;
+ GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME",
&directory);
+
endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&endbadly, NULL);
GNUNET_asprintf (&hostkey_file,
Modified: gnunet/src/namestore/test_namestore_api_store_update.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_store_update.c 2013-11-28
07:42:18 UTC (rev 30923)
+++ gnunet/src/namestore/test_namestore_api_store_update.c 2013-11-28
08:10:19 UTC (rev 30924)
@@ -63,6 +63,7 @@
static const char *name = "dummy";
+static char *directory;
static void
cleanup ()
@@ -82,6 +83,11 @@
GNUNET_free (privkey);
privkey = NULL;
}
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
GNUNET_SCHEDULER_shutdown ();
}
@@ -231,6 +237,9 @@
struct GNUNET_GNSRECORD_Data rd;
char *hostkey_file;
+ directory = NULL;
+ GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME",
&directory);
+
update_performed = GNUNET_NO;
endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&endbadly, NULL);
Modified: gnunet/src/namestore/test_namestore_api_zone_iteration.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_iteration.c 2013-11-28
07:42:18 UTC (rev 30923)
+++ gnunet/src/namestore/test_namestore_api_zone_iteration.c 2013-11-28
08:10:19 UTC (rev 30924)
@@ -56,7 +56,9 @@
static struct GNUNET_GNSRECORD_Data *s_rd_3;
+static char *directory;
+
/**
* Re-establish the connection to the service.
*
@@ -103,6 +105,11 @@
if (privkey2 != NULL)
GNUNET_free (privkey2);
privkey2 = NULL;
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
res = 1;
}
@@ -149,6 +156,11 @@
}
if (nsh != NULL)
GNUNET_NAMESTORE_disconnect (nsh);
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
nsh = NULL;
}
@@ -421,6 +433,9 @@
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_TESTING_Peer *peer)
{
+ directory = NULL;
+ GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME",
&directory);
+
endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT, &endbadly, NULL);
nsh = GNUNET_NAMESTORE_connect (cfg);
GNUNET_break (NULL != nsh);
Modified: gnunet/src/namestore/test_namestore_api_zone_iteration_nick.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_iteration_nick.c
2013-11-28 07:42:18 UTC (rev 30923)
+++ gnunet/src/namestore/test_namestore_api_zone_iteration_nick.c
2013-11-28 08:10:19 UTC (rev 30924)
@@ -60,6 +60,8 @@
static struct GNUNET_NAMESTORE_QueueEntry *nsqe;
+static char *directory;
+
/**
* Re-establish the connection to the service.
*
@@ -105,6 +107,11 @@
if (privkey2 != NULL)
GNUNET_free (privkey2);
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
privkey2 = NULL;
res = 1;
}
@@ -153,6 +160,11 @@
if (nsh != NULL)
GNUNET_NAMESTORE_disconnect (nsh);
nsh = NULL;
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
}
static int
@@ -431,6 +443,9 @@
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_TESTING_Peer *peer)
{
+ directory = NULL;
+ GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME",
&directory);
+
endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT, &endbadly, NULL);
nsh = GNUNET_NAMESTORE_connect (cfg);
GNUNET_break (NULL != nsh);
Modified: gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
2013-11-28 07:42:18 UTC (rev 30923)
+++ gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
2013-11-28 08:10:19 UTC (rev 30924)
@@ -56,6 +56,7 @@
static struct GNUNET_GNSRECORD_Data *s_rd_3;
+static char *directory;
/**
* Re-establish the connection to the service.
@@ -103,6 +104,12 @@
if (privkey2 != NULL)
GNUNET_free (privkey2);
privkey2 = NULL;
+
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
res = 1;
}
@@ -151,6 +158,11 @@
if (nsh != NULL)
GNUNET_NAMESTORE_disconnect (nsh);
nsh = NULL;
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
}
@@ -397,6 +409,9 @@
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_TESTING_Peer *peer)
{
+ directory = NULL;
+ GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME",
&directory);
+
endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT, &endbadly, NULL);
nsh = GNUNET_NAMESTORE_connect (cfg);
GNUNET_break (NULL != nsh);
Modified: gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
2013-11-28 07:42:18 UTC (rev 30923)
+++ gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
2013-11-28 08:10:19 UTC (rev 30924)
@@ -56,7 +56,9 @@
static struct GNUNET_GNSRECORD_Data *s_rd_3;
+static char *directory;
+
/**
* Re-establish the connection to the service.
*
@@ -103,6 +105,12 @@
if (privkey2 != NULL)
GNUNET_free (privkey2);
privkey2 = NULL;
+
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
res = 1;
}
@@ -431,6 +439,9 @@
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_TESTING_Peer *peer)
{
+ directory = NULL;
+ GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME",
&directory);
+
endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT, &endbadly, NULL);
nsh = GNUNET_NAMESTORE_connect (cfg);
GNUNET_break (NULL != nsh);
Modified: gnunet/src/namestore/test_namestore_api_zone_to_name.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_to_name.c 2013-11-28
07:42:18 UTC (rev 30923)
+++ gnunet/src/namestore/test_namestore_api_zone_to_name.c 2013-11-28
08:10:19 UTC (rev 30924)
@@ -57,6 +57,7 @@
static int res;
+static char *directory;
/**
* Re-establish the connection to the service.
@@ -72,6 +73,11 @@
nsh = NULL;
if (privkey != NULL)
GNUNET_free (privkey);
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
privkey = NULL;
res = 1;
}
@@ -90,6 +96,11 @@
privkey = NULL;
if (nsh != NULL)
GNUNET_NAMESTORE_disconnect (nsh);
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
nsh = NULL;
}
@@ -167,6 +178,9 @@
{
struct GNUNET_TIME_Absolute et;
+ directory = NULL;
+ GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME",
&directory);
+
endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL);
GNUNET_asprintf (&s_name, "dummy");
/* load privat key */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r30924 - gnunet/src/namestore,
gnunet <=