projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clean up zone iteration logic
[oweals/gnunet.git]
/
src
/
namestore
/
test_namestore_api_store_update.c
diff --git
a/src/namestore/test_namestore_api_store_update.c
b/src/namestore/test_namestore_api_store_update.c
index edc11067d14895d42cb835c34015db7fdb1d2aa1..ed5a399bd2f562c96a72358f79d2f574484356b9 100644
(file)
--- a/
src/namestore/test_namestore_api_store_update.c
+++ b/
src/namestore/test_namestore_api_store_update.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2012, 2013 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
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
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., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA.
+ Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA.
*/
/**
* @file namestore/test_namestore_api_store_update.c
*/
/**
* @file namestore/test_namestore_api_store_update.c
@@
-47,7
+47,7
@@
static struct GNUNET_NAMESTORE_Handle *nsh;
static struct GNUNET_NAMECACHE_Handle *nch;
static struct GNUNET_NAMECACHE_Handle *nch;
-static
GNUNET_SCHEDULER_TaskIdentifier
endbadly_task;
+static
struct GNUNET_SCHEDULER_Task *
endbadly_task;
static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey;
static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey;
@@
-63,6
+63,7
@@
static struct GNUNET_NAMECACHE_QueueEntry *ncqe;
static const char *name = "dummy";
static const char *name = "dummy";
+static char *directory;
static void
cleanup ()
static void
cleanup ()
@@
-90,11
+91,9
@@
cleanup ()
* Re-establish the connection to the service.
*
* @param cls handle to use to re-connect.
* Re-establish the connection to the service.
*
* @param cls handle to use to re-connect.
- * @param tc scheduler context
*/
static void
*/
static void
-endbadly (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+endbadly (void *cls)
{
if (NULL != nsqe)
{
{
if (NULL != nsqe)
{
@@
-112,8
+111,7
@@
endbadly (void *cls,
static void
static void
-end (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+end (void *cls)
{
cleanup ();
res = 0;
{
cleanup ();
res = 0;
@@
-147,7
+145,7
@@
rd_decrypt_cb (void *cls,
"Block was decrypted successfully, updating record \n");
rd_new.flags = GNUNET_GNSRECORD_RF_NONE;
"Block was decrypted successfully, updating record \n");
rd_new.flags = GNUNET_GNSRECORD_RF_NONE;
- rd_new.expiration_time = GNUNET_TIME_absolute_get().abs_value_us;
+ rd_new.expiration_time = GNUNET_TIME_absolute_get().abs_value_us
+ 1000000000
;
rd_new.record_type = TEST_RECORD_TYPE2;
rd_new.data_size = TEST_RECORD_DATALEN2;
rd_new.data = GNUNET_malloc (TEST_RECORD_DATALEN2);
rd_new.record_type = TEST_RECORD_TYPE2;
rd_new.data_size = TEST_RECORD_DATALEN2;
rd_new.data = GNUNET_malloc (TEST_RECORD_DATALEN2);
@@
-167,7
+165,7
@@
rd_decrypt_cb (void *cls,
GNUNET_assert (0 == memcmp (&rd_cmp_data, rd[0].data, TEST_RECORD_DATALEN2));
GNUNET_SCHEDULER_cancel (endbadly_task);
GNUNET_assert (0 == memcmp (&rd_cmp_data, rd[0].data, TEST_RECORD_DATALEN2));
GNUNET_SCHEDULER_cancel (endbadly_task);
- endbadly_task =
GNUNET_SCHEDULER_NO_TASK
;
+ endbadly_task =
NULL
;
GNUNET_SCHEDULER_add_now (&end, NULL);
}
}
GNUNET_SCHEDULER_add_now (&end, NULL);
}
}
@@
-186,7
+184,7
@@
name_lookup_proc (void *cls,
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Namecache returned no block for `%s'\n"),
name);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Namecache returned no block for `%s'\n"),
name);
- if (endbadly_task !=
GNUNET_SCHEDULER_NO_TASK
)
+ if (endbadly_task !=
NULL
)
GNUNET_SCHEDULER_cancel (endbadly_task);
endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
return;
GNUNET_SCHEDULER_cancel (endbadly_task);
endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
return;
@@
-231,6
+229,11
@@
run (void *cls,
struct GNUNET_GNSRECORD_Data rd;
char *hostkey_file;
struct GNUNET_GNSRECORD_Data rd;
char *hostkey_file;
+ directory = NULL;
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME", &directory));
+ GNUNET_DISK_directory_remove (directory);
+
update_performed = GNUNET_NO;
endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&endbadly, NULL);
update_performed = GNUNET_NO;
endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&endbadly, NULL);
@@
-245,7
+248,7
@@
run (void *cls,
GNUNET_CRYPTO_ecdsa_key_get_public (privkey, &pubkey);
rd.flags = GNUNET_GNSRECORD_RF_NONE;
GNUNET_CRYPTO_ecdsa_key_get_public (privkey, &pubkey);
rd.flags = GNUNET_GNSRECORD_RF_NONE;
- rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us;
+ rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us
+ 1000000000
;
rd.record_type = TEST_RECORD_TYPE;
rd.data_size = TEST_RECORD_DATALEN;
rd.data = GNUNET_malloc (TEST_RECORD_DATALEN);
rd.record_type = TEST_RECORD_TYPE;
rd.data_size = TEST_RECORD_DATALEN;
rd.data = GNUNET_malloc (TEST_RECORD_DATALEN);
@@
-271,14
+274,20
@@
run (void *cls,
int
main (int argc, char *argv[])
{
int
main (int argc, char *argv[])
{
- GNUNET_DISK_directory_remove ("/tmp/test-gnunet-namestore/");
res = 1;
if (0 !=
GNUNET_TESTING_peer_run ("test-namestore-api-store-update",
"test_namestore_api.conf",
&run,
NULL))
res = 1;
if (0 !=
GNUNET_TESTING_peer_run ("test-namestore-api-store-update",
"test_namestore_api.conf",
&run,
NULL))
- return 1;
+ {
+ res = 1;
+ }
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
return res;
}
return res;
}