#include "platform.h"
#include "gnunet_common.h"
#include "gnunet_namestore_service.h"
+#include "namestore.h"
+#include "gnunet_signatures.h"
#define VERBOSE GNUNET_NO
static struct GNUNET_CRYPTO_RsaPrivateKey * privkey;
static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey;
-static GNUNET_HashCode zone;
-static char *name;
+struct GNUNET_CRYPTO_RsaSignature *s_signature;
+static struct GNUNET_CRYPTO_ShortHashCode s_zone;
+struct GNUNET_NAMESTORE_RecordData *s_rd;
+static char *s_name;
+
-struct GNUNET_NAMESTORE_RecordData *rd;
static int res;
if (0 != GNUNET_OS_process_kill (arm, SIGTERM))
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
GNUNET_OS_process_wait (arm);
- GNUNET_OS_process_close (arm);
+ GNUNET_OS_process_destroy (arm);
arm = NULL;
}
}
endbadly_task = GNUNET_SCHEDULER_NO_TASK;
}
+ int c;
+ for (c = 0; c < RECORDS; c++)
+ GNUNET_free_non_null((void *) s_rd[c].data);
+ GNUNET_free (s_rd);
+
if (privkey != NULL)
GNUNET_CRYPTO_rsa_key_free (privkey);
privkey = NULL;
const struct GNUNET_CRYPTO_RsaSignature *signature)
{
static int found = GNUNET_NO;
+ int c;
if (n != NULL)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Checking returned results\n");
+ if (0 != memcmp (zone_key, &pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded)))
+ {
+ GNUNET_break (0);
+ }
+
+ if (0 != memcmp (signature, s_signature, sizeof (struct GNUNET_CRYPTO_RsaSignature)))
+ {
+ GNUNET_break (0);
+ }
+
+ if (0 != strcmp(n, s_name))
+ {
+ GNUNET_break (0);
+ }
+
+ if (RECORDS != rd_count)
+ {
+ GNUNET_break (0);
+ }
+
+ for (c = 0; c < RECORDS; c++)
+ {
+ if (GNUNET_NO == GNUNET_NAMESTORE_records_cmp (&rd[c], &s_rd[c]))
+ {
+ GNUNET_break (0);
+ }
+ }
found = GNUNET_YES;
res = 0;
}
{
if (found != GNUNET_YES)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to lookup records for name `%s'\n", name);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to lookup records for name `%s'\n", s_name);
res = 1;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Lookup done for name %s'\n", name);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Lookup done for name %s'\n", s_name);
}
-
GNUNET_SCHEDULER_add_now(&end, NULL);
}
if (success == GNUNET_OK)
{
res = 0;
- GNUNET_NAMESTORE_lookup_record (nsh, &zone, name, 0, &name_lookup_proc, NULL);
+ GNUNET_NAMESTORE_lookup_record (nsh, &s_zone, name, 0, &name_lookup_proc, NULL);
}
else
{
return rd;
}
+void
+delete_existing_db (const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ char *afsdir;
+
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_filename (cfg, "namestore-sqlite",
+ "FILENAME", &afsdir))
+ {
+ if (GNUNET_OK == GNUNET_DISK_file_test (afsdir))
+ if (GNUNET_OK == GNUNET_DISK_file_test (afsdir))
+ if (GNUNET_OK == GNUNET_DISK_directory_remove(afsdir))
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Deleted existing database `%s' \n", afsdir);
+ GNUNET_free (afsdir);
+ }
+
+}
+
static void
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
+ delete_existing_db(cfg);
endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL);
- /* load privat key */
- privkey = GNUNET_CRYPTO_rsa_key_create_from_file("hostkey");
+ size_t rd_ser_len;
+
+ /* load privat key from file not included in zonekey dir */
+ privkey = GNUNET_CRYPTO_rsa_key_create_from_file("test_hostkey");
GNUNET_assert (privkey != NULL);
/* get public key */
GNUNET_CRYPTO_rsa_key_get_public(privkey, &pubkey);
- /* create random zone hash */
- GNUNET_CRYPTO_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &zone);
+ /* create record */
+ s_name = "dummy.dummy.gnunet";
+ s_rd = create_record (RECORDS);
- struct GNUNET_CRYPTO_RsaSignature signature;
+ rd_ser_len = GNUNET_NAMESTORE_records_get_size(RECORDS, s_rd);
+ char rd_ser[rd_ser_len];
+ GNUNET_NAMESTORE_records_serialize(RECORDS, s_rd, rd_ser_len, rd_ser);
+ /* sign */
+ s_signature = GNUNET_NAMESTORE_create_signature(privkey, s_rd[0].expiration, s_name, s_rd, RECORDS);
+
+ /* create random zone hash */
+ GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &s_zone);
start_arm (cfgfile);
GNUNET_assert (arm != NULL);
nsh = GNUNET_NAMESTORE_connect (cfg);
GNUNET_break (NULL != nsh);
- /* create record */
- name = "dummy.dummy.gnunet";
- rd = create_record (RECORDS);
-
- GNUNET_break (rd != NULL);
- GNUNET_break (name != NULL);
-
- GNUNET_NAMESTORE_record_put (nsh, &pubkey, name,
- GNUNET_TIME_absolute_get_forever(),
- RECORDS, rd, &signature, put_cont, name);
-
- int c;
- for (c = 0; c < RECORDS; c++)
- GNUNET_free_non_null((void *) rd[c].data);
- GNUNET_free (rd);
+ 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, s_signature, put_cont, s_name);
}
+
static int
check ()
{
int ret;
ret = check ();
-
+ GNUNET_free (s_signature);
return ret;
}