/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009 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
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.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @file namestore/test_namestore_api_zone_to_name.c
* @brief testcase for zone to name translation
*/
#include "platform.h"
-#include "gnunet_common.h"
#include "gnunet_namestore_service.h"
#include "gnunet_testing_lib.h"
#include "namestore.h"
-#include "gnunet_signatures.h"
#define RECORDS 5
static struct GNUNET_NAMESTORE_Handle * nsh;
-static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
+static struct GNUNET_SCHEDULER_Task * endbadly_task;
-static struct GNUNET_CRYPTO_EccPrivateKey * privkey;
+static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey;
-static struct GNUNET_CRYPTO_EccPublicKey pubkey;
+static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
static struct GNUNET_TIME_Absolute expire;
static char * s_name;
-static struct GNUNET_CRYPTO_EccSignature *s_signature;
+static struct GNUNET_CRYPTO_EcdsaSignature *s_signature;
static int res;
+static char *directory;
/**
* 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)
+endbadly (void *cls)
{
if (nsh != NULL)
GNUNET_NAMESTORE_disconnect (nsh);
nsh = NULL;
if (privkey != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey);
+ GNUNET_free (privkey);
privkey = NULL;
res = 1;
}
static void
-end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+end (void *cls)
{
- if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
+ if (endbadly_task != NULL)
{
GNUNET_SCHEDULER_cancel (endbadly_task);
- endbadly_task = GNUNET_SCHEDULER_NO_TASK;
+ endbadly_task = NULL;
}
if (privkey != NULL)
- GNUNET_CRYPTO_ecc_key_free (privkey);
+ GNUNET_free (privkey);
privkey = NULL;
if (nsh != NULL)
GNUNET_NAMESTORE_disconnect (nsh);
static void
zone_to_name_proc (void *cls,
- const struct GNUNET_CRYPTO_EccPublicKey *zone_key,
+ const struct GNUNET_CRYPTO_EcdsaPublicKey *zone_key,
struct GNUNET_TIME_Absolute expire,
const char *n,
unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_EccSignature *signature)
+ const struct GNUNET_GNSRECORD_Data *rd,
+ const struct GNUNET_CRYPTO_EcdsaSignature *signature)
{
int fail = GNUNET_NO;
fail = GNUNET_YES;
GNUNET_break (0);
}
- if ((zone_key == NULL) || (0 != memcmp (zone_key, &pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicKey))))
+ if ((zone_key == NULL) || (0 != memcmp (zone_key, &pubkey, sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey))))
{
fail = GNUNET_YES;
GNUNET_break (0);
else
{
res = 1;
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to put records for name `%s'\n", name);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to put records for name `%s'\n", name);
GNUNET_SCHEDULER_add_now(&end, NULL);
}
}
{
struct GNUNET_TIME_Absolute et;
+ directory = NULL;
+ GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME", &directory);
+ GNUNET_DISK_directory_remove (directory);
+
endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL);
- GNUNET_asprintf(&s_name, "dummy");
+ GNUNET_asprintf (&s_name, "dummy");
/* load privat key */
char *hostkey_file;
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_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Using zonekey file `%s'\n",
+ hostkey_file);
+ privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
GNUNET_free (hostkey_file);
GNUNET_assert (privkey != NULL);
/* get public key */
- GNUNET_CRYPTO_ecc_key_get_public(privkey, &pubkey);
+ GNUNET_CRYPTO_ecdsa_key_get_public(privkey, &pubkey);
/* zone hash */
- GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicKey), &s_zone);
+ GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey), &s_zone);
GNUNET_CRYPTO_short_hash (s_name, strlen (s_name) + 1, &s_zone_value);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using PKEY `%s' \n", GNUNET_NAMESTORE_short_h2s (&s_zone_value));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Using PKEY `%s' \n",
+ GNUNET_NAMESTORE_short_h2s (&s_zone_value));
- struct GNUNET_NAMESTORE_RecordData rd;
+ struct GNUNET_GNSRECORD_Data rd;
rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us;
- rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+ rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
rd.data_size = sizeof (struct GNUNET_CRYPTO_ShortHashCode);
rd.data = GNUNET_malloc(sizeof (struct GNUNET_CRYPTO_ShortHashCode));
+ rd.flags = 0;
memcpy ((char *) rd.data, &s_zone_value, sizeof (struct GNUNET_CRYPTO_ShortHashCode));
nsh = GNUNET_NAMESTORE_connect (cfg);
GNUNET_break (NULL != nsh);
main (int argc, char *argv[])
{
res = 1;
- if (0 !=
- GNUNET_TESTING_service_run ("test-namestore-api-zone-to-name",
- "namestore",
- "test_namestore_api.conf",
- &run,
- NULL))
- return 1;
+ if (0 !=
+ GNUNET_TESTING_peer_run ("test-namestore-api-zone-to-name",
+ "test_namestore_api.conf",
+ &run,
+ NULL))
+ {
+ res = 1;
+ }
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
return res;
}