X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnamestore%2Ftest_namestore_api_remove.c;h=7d993d4d94aed8c35412c1505a6628d1ec2afbb6;hb=5fb272d662eca0707b1a5c7747ae476f8157d332;hp=4c83cda6372dde2cc099bcc2f7ad66aa1f28218d;hpb=3ad907429a4674efe707811c9f03281db388d73a;p=oweals%2Fgnunet.git diff --git a/src/namestore/test_namestore_api_remove.c b/src/namestore/test_namestore_api_remove.c index 4c83cda63..7d993d4d9 100644 --- a/src/namestore/test_namestore_api_remove.c +++ b/src/namestore/test_namestore_api_remove.c @@ -1,21 +1,19 @@ /* This file is part of GNUnet. - (C) 2009 Christian Grothoff (and other contributing authors) + Copyright (C) 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 - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, + 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. + Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file namestore/test_namestore_api.c @@ -24,8 +22,9 @@ #include "platform.h" #include "gnunet_namestore_service.h" #include "gnunet_testing_lib.h" +#include "gnunet_dnsparser_lib.h" -#define TEST_RECORD_TYPE 1234 +#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT #define TEST_RECORD_DATALEN 123 @@ -36,13 +35,11 @@ static struct GNUNET_NAMESTORE_Handle *nsh; -static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; - -static struct GNUNET_CRYPTO_EccPrivateKey *privkey; +static struct GNUNET_SCHEDULER_Task * endbadly_task; -static struct GNUNET_CRYPTO_EccPublicSignKey pubkey; +static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; -static struct GNUNET_HashCode derived_hash; +static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey; static int res; @@ -72,10 +69,9 @@ cleanup () * 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 (NULL != nsqe) { @@ -88,119 +84,42 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) static void -end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +end (void *cls) { cleanup (); res = 0; } -static void -name_lookup_proc (void *cls, const struct GNUNET_NAMESTORE_Block *block); - static void -remove_cont (void *cls, - int32_t success, +remove_cont (void *cls, + int32_t success, const char *emsg) { - const char *name = cls; + nsqe = NULL; if (GNUNET_YES != success) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Records could not be removed: `%s'\n"), emsg); - if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) + _("Records could not be removed: `%s'\n"), + emsg); + if (NULL != endbadly_task) GNUNET_SCHEDULER_cancel (endbadly_task); - endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); + endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, + NULL); return; } - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Records were removed, perform lookup\n"); - removed = GNUNET_YES; - nsqe = GNUNET_NAMESTORE_lookup_block (nsh, &derived_hash, - &name_lookup_proc, (void *) name); - if (NULL == nsqe) - { - GNUNET_break (0); - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Namestore cannot perform lookup for removed record\n")); - if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) - GNUNET_SCHEDULER_cancel (endbadly_task); - endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); - return; - } -} - - -static void -rd_decrypt_cb (void *cls, - unsigned int rd_count, - const struct GNUNET_NAMESTORE_RecordData *rd) -{ - const char *name = cls; - char rd_cmp_data[TEST_RECORD_DATALEN]; - - GNUNET_assert (GNUNET_NO == removed); - 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_INFO, - "Block was decrypted successfully, removing records \n"); - - nsqe = GNUNET_NAMESTORE_records_store (nsh, privkey, name, - 0, NULL, &remove_cont, (void *) name); -} - - -static void -name_lookup_proc (void *cls, - const struct GNUNET_NAMESTORE_Block *block) -{ - const char *name = cls; - nsqe = NULL; - - if (removed && (NULL == block)) - { - if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) - { - GNUNET_SCHEDULER_cancel (endbadly_task); - endbadly_task = GNUNET_SCHEDULER_NO_TASK; - } - GNUNET_SCHEDULER_add_now (&end, NULL); - return; - } - GNUNET_assert (NULL != cls); - if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) - { + if (NULL != endbadly_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)); + GNUNET_SCHEDULER_add_now (&end, NULL); } static void -put_cont (void *cls, int32_t success, +put_cont (void *cls, + int32_t success, const char *emsg) { const char *name = cls; @@ -210,9 +129,9 @@ put_cont (void *cls, int32_t success, { GNUNET_break (0); GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Namestore could not store record: `%s'\n", + "Namestore could not store record: `%s'\n", emsg); - 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; @@ -222,47 +141,29 @@ put_cont (void *cls, int32_t success, "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); - if (NULL == nsqe) - { - GNUNET_break (0); - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Namestore cannot perform lookup\n")); - if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) - GNUNET_SCHEDULER_cancel (endbadly_task); - endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); - return; - } + nsqe = GNUNET_NAMESTORE_records_store (nsh, + privkey, + name, + 0, NULL, + &remove_cont, (void *) name); } static void -run (void *cls, +run (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg, struct GNUNET_TESTING_Peer *peer) { - struct GNUNET_NAMESTORE_RecordData rd; - char *hostkey_file; + struct GNUNET_GNSRECORD_Data rd; 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); + &endbadly, + NULL); + privkey = GNUNET_CRYPTO_ecdsa_key_create (); GNUNET_assert (privkey != NULL); - GNUNET_CRYPTO_ecc_key_get_public_for_signature (privkey, &pubkey); + GNUNET_CRYPTO_ecdsa_key_get_public (privkey, + &pubkey); removed = GNUNET_NO; @@ -270,12 +171,20 @@ run (void *cls, 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); + rd.flags = 0; + 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); + nsqe = GNUNET_NAMESTORE_records_store (nsh, + privkey, + name, + 1, + &rd, + &put_cont, + (void *) name); if (NULL == nsqe) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, @@ -288,15 +197,28 @@ run (void *cls, int main (int argc, char *argv[]) { + const char *plugin_name; + char *cfg_name; + + plugin_name = GNUNET_TESTING_get_testname_from_underscore (argv[0]); + GNUNET_asprintf (&cfg_name, + "test_namestore_api_%s.conf", + plugin_name); + GNUNET_DISK_purge_cfg_dir (cfg_name, + "GNUNET_TEST_HOME"); res = 1; - if (0 != - GNUNET_TESTING_service_run ("test-namestore-api", - "namestore", - "test_namestore_api.conf", - &run, - NULL)) - return 1; + if (0 != + GNUNET_TESTING_peer_run ("test-namestore-api-remove", + cfg_name, + &run, + NULL)) + { + res = 1; + } + GNUNET_DISK_purge_cfg_dir (cfg_name, + "GNUNET_TEST_HOME"); + GNUNET_free (cfg_name); return res; } -/* end of test_namestore_api.c */ +/* end of test_namestore_api_remove.c */