From 2dee812c480c79a04ada98bb127cba513735c4e2 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 20 Jan 2018 22:07:10 +0100 Subject: [PATCH] reactivate test, fix misc warnings --- src/gns/gnunet-gns-proxy.c | 4 +- src/include/gnunet_namestore_service.h | 2 +- src/namestore/Makefile.am | 16 +- src/namestore/namestore_api.c | 20 +- .../test_namestore_api_zone_to_name.c | 212 +++++++++++------- 5 files changed, 158 insertions(+), 96 deletions(-) diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index 25092dcf0..591dff04f 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c @@ -1150,8 +1150,8 @@ curl_check_hdr (void *buffer, size_t size, size_t nmemb, void *cls) hdr_type, hdr_val); header = GNUNET_new (struct HttpResponseHeader); - header->type = GNUNET_strndup (hdr_type, strlen (hdr_type)); - header->value = GNUNET_strndup (hdr_val, strlen (hdr_val)); + header->type = GNUNET_strdup (hdr_type); + header->value = GNUNET_strdup (hdr_val); GNUNET_CONTAINER_DLL_insert (s5r->header_head, s5r->header_tail, header); diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h index 0add8852a..6d3c07f1d 100644 --- a/src/include/gnunet_namestore_service.h +++ b/src/include/gnunet_namestore_service.h @@ -193,7 +193,7 @@ GNUNET_NAMESTORE_records_lookup (struct GNUNET_NAMESTORE_Handle *h, * Returns at most one result to the processor. * * @param h handle to the namestore - * @param zone public key of the zone to look up in, never NULL + * @param zone private key of the zone to look up in, never NULL * @param value_zone public key of the target zone (value), never NULL * @param error_cb function to call on error (i.e. disconnect) * the handle is afterwards invalid diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am index 4f710e116..a848d4b72 100644 --- a/src/namestore/Makefile.am +++ b/src/namestore/Makefile.am @@ -59,8 +59,8 @@ TESTING_TESTS = \ test_namestore_api_zone_iteration_specific_zone.nc \ test_namestore_api_zone_iteration_stop.nc \ test_namestore_api_monitoring.nc \ - test_namestore_api_monitoring_existing.nc -# test_namestore_api_zone_to_name + test_namestore_api_monitoring_existing.nc \ + test_namestore_api_zone_to_name endif # Declare .nc (NO-CONCURRENCY) as a test extension so that we can impart @@ -298,12 +298,12 @@ test_namestore_api_remove_not_existing_record_nc_LDADD = \ $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ libgnunetnamestore.la -#test_namestore_api_zone_to_name_SOURCES = \ -# test_namestore_api_zone_to_name.c -#test_namestore_api_zone_to_name_LDADD = \ -# $(top_builddir)/src/testing/libgnunettesting.la \ -# $(top_builddir)/src/util/libgnunetutil.la \ -# libgnunetnamestore.la +test_namestore_api_zone_to_name_SOURCES = \ + test_namestore_api_zone_to_name.c +test_namestore_api_zone_to_name_LDADD = \ + $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/util/libgnunetutil.la \ + libgnunetnamestore.la test_namestore_api_monitoring_nc_SOURCES = \ test_namestore_api_monitoring.c diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c index 92068cc01..a187bd250 100644 --- a/src/namestore/namestore_api.c +++ b/src/namestore/namestore_api.c @@ -405,6 +405,7 @@ check_lookup_result (void *cls, size_t name_len; size_t rd_len; + (void) cls; rd_len = ntohs (msg->rd_len); msg_len = ntohs (msg->gns_header.header.size); name_len = ntohs (msg->name_len); @@ -517,6 +518,7 @@ check_record_result (void *cls, size_t name_len; size_t rd_len; + (void) cls; rd_len = ntohs (msg->rd_len); msg_len = ntohs (msg->gns_header.header.size); name_len = ntohs (msg->name_len); @@ -656,6 +658,7 @@ check_zone_to_name_response (void *cls, size_t rd_ser_len; const char *name_tmp; + (void) cls; if (GNUNET_OK != ntohs (msg->res)) return GNUNET_OK; name_len = ntohs (msg->name_len); @@ -771,6 +774,7 @@ mq_error_handler (void *cls, { struct GNUNET_NAMESTORE_Handle *h = cls; + (void) error; force_reconnect (h); } @@ -994,6 +998,7 @@ GNUNET_NAMESTORE_records_store (struct GNUNET_NAMESTORE_Handle *h, size_t name_len; uint32_t rid; struct RecordStoreMessage *msg; + ssize_t sret; name_len = strlen (label) + 1; if (name_len > MAX_NAME_LEN) @@ -1029,11 +1034,16 @@ GNUNET_NAMESTORE_records_store (struct GNUNET_NAMESTORE_Handle *h, label, name_len); rd_ser = &name_tmp[name_len]; - GNUNET_assert (rd_ser_len == - GNUNET_GNSRECORD_records_serialize (rd_count, - rd, - rd_ser_len, - rd_ser)); + sret = GNUNET_GNSRECORD_records_serialize (rd_count, + rd, + rd_ser_len, + rd_ser); + if (0 > sret) + { + GNUNET_free (env); + return NULL; + } + GNUNET_assert (rd_ser_len == (size_t) sret); LOG (GNUNET_ERROR_TYPE_DEBUG, "Sending NAMESTORE_RECORD_STORE message for name `%s' with %u records\n", label, diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/namestore/test_namestore_api_zone_to_name.c index ca33ee280..2bc7d34a3 100644 --- a/src/namestore/test_namestore_api_zone_to_name.c +++ b/src/namestore/test_namestore_api_zone_to_name.c @@ -37,28 +37,25 @@ #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100) -static struct GNUNET_NAMESTORE_Handle * nsh; +static struct GNUNET_NAMESTORE_Handle *nsh; -static struct GNUNET_SCHEDULER_Task * endbadly_task; +static struct GNUNET_SCHEDULER_Task *endbadly_task; -static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey; +static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey; -static struct GNUNET_TIME_Absolute expire; - -static struct GNUNET_CRYPTO_ShortHashCode s_zone; - -static struct GNUNET_CRYPTO_ShortHashCode s_zone_value; +static struct GNUNET_CRYPTO_EcdsaPublicKey s_zone_value; static char * s_name; -static struct GNUNET_CRYPTO_EcdsaSignature *s_signature; - static int res; static char *directory; +static struct GNUNET_NAMESTORE_QueueEntry *qe; + + /** * Re-establish the connection to the service. * @@ -67,12 +64,8 @@ static char *directory; static void endbadly (void *cls) { - if (nsh != NULL) - GNUNET_NAMESTORE_disconnect (nsh); - nsh = NULL; - if (privkey != NULL) - GNUNET_free (privkey); - privkey = NULL; + (void) cls; + GNUNET_SCHEDULER_shutdown (); res = 1; } @@ -80,50 +73,69 @@ endbadly (void *cls) static void end (void *cls) { - if (endbadly_task != NULL) + if (NULL != qe) + { + GNUNET_NAMESTORE_cancel (qe); + qe = NULL; + } + if (NULL != endbadly_task) { GNUNET_SCHEDULER_cancel (endbadly_task); endbadly_task = NULL; } - if (privkey != NULL) + if (NULL != privkey) + { GNUNET_free (privkey); - privkey = NULL; - if (nsh != NULL) + privkey = NULL; + } + if (NULL != nsh) + { GNUNET_NAMESTORE_disconnect (nsh); - nsh = NULL; + nsh = NULL; + } } static void zone_to_name_proc (void *cls, - const struct GNUNET_CRYPTO_EcdsaPublicKey *zone_key, - struct GNUNET_TIME_Absolute expire, + const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key, const char *n, unsigned int rd_count, - const struct GNUNET_GNSRECORD_Data *rd, - const struct GNUNET_CRYPTO_EcdsaSignature *signature) + const struct GNUNET_GNSRECORD_Data *rd) { int fail = GNUNET_NO; - if ((zone_key == NULL) && (n == NULL) && (rd_count == 0) && (rd == NULL) && (signature == NULL)) + qe = NULL; + if ( (NULL == zone_key) && + (NULL == n) && + (0 == rd_count) && + (NULL == rd) ) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No result found\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "No result found\n"); res = 1; } else { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Result found: `%s'\n", n); - if ((n == NULL) || (0 != strcmp(n, s_name))) + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Result found: `%s'\n", + n); + if ( (NULL == n) || + (0 != strcmp (n, + s_name))) { fail = GNUNET_YES; GNUNET_break (0); } - if (rd_count != 1) + if (1 != rd_count) { fail = GNUNET_YES; GNUNET_break (0); } - if ((zone_key == NULL) || (0 != memcmp (zone_key, &pubkey, sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey)))) + if ( (NULL == zone_key) || + (0 != memcmp (zone_key, + privkey, + sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))) { fail = GNUNET_YES; GNUNET_break (0); @@ -133,29 +145,54 @@ zone_to_name_proc (void *cls, else res = 1; } - GNUNET_SCHEDULER_add_now(&end, NULL); + GNUNET_SCHEDULER_add_now (&end, + NULL); } static void -put_cont (void *cls, int32_t success, const char *emsg) +error_cb (void *cls) +{ + (void) cls; + qe = NULL; + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Not found!\n"); + GNUNET_SCHEDULER_shutdown (); + res = 2; +} + + +static void +put_cont (void *cls, + int32_t success, + const char *emsg) { char *name = cls; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Name store added record for `%s': %s\n", name, (success == GNUNET_OK) ? "SUCCESS" : "FAIL"); + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Name store added record for `%s': %s\n", + name, + (success == GNUNET_OK) ? "SUCCESS" : emsg); if (success == GNUNET_OK) { res = 0; - /* create initial record */ - GNUNET_NAMESTORE_zone_to_name (nsh, &s_zone, &s_zone_value, zone_to_name_proc, NULL); - + qe = GNUNET_NAMESTORE_zone_to_name (nsh, + privkey, + &s_zone_value, + &error_cb, + NULL, + &zone_to_name_proc, + NULL); } else { res = 1; GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Failed to put records for name `%s'\n", name); - GNUNET_SCHEDULER_add_now(&end, NULL); + "Failed to put records for name `%s'\n", + name); + GNUNET_SCHEDULER_add_now (&end, + NULL); } } @@ -165,57 +202,72 @@ run (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg, struct GNUNET_TESTING_Peer *peer) { - struct GNUNET_TIME_Absolute et; - + (void) cls; + (void) peer; directory = NULL; - GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME", &directory); + GNUNET_assert (GNUNET_OK == + 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); + endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, + &endbadly, + NULL); + GNUNET_SCHEDULER_add_shutdown (&end, + NULL); 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_ecdsa_key_create_from_file(hostkey_file); - GNUNET_free (hostkey_file); - GNUNET_assert (privkey != NULL); + { + char *zonekey_file; + + GNUNET_asprintf (&zonekey_file, + "zonefiles%s%s", + DIR_SEPARATOR_STR, + "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Using zonekey file `%s'\n", + zonekey_file); + privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file (zonekey_file); + GNUNET_free (zonekey_file); + } + GNUNET_assert (NULL != privkey); /* get public key */ - GNUNET_CRYPTO_ecdsa_key_get_public(privkey, &pubkey); + GNUNET_CRYPTO_ecdsa_key_get_public (privkey, + &pubkey); - /* zone hash */ - 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)); - - struct GNUNET_GNSRECORD_Data rd; - rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us; - 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; - GNUNET_memcpy ((char *) rd.data, &s_zone_value, sizeof (struct GNUNET_CRYPTO_ShortHashCode)); - nsh = GNUNET_NAMESTORE_connect (cfg); - GNUNET_break (NULL != nsh); - - expire = GNUNET_TIME_absolute_get (); - et.abs_value_us = rd.expiration_time; - s_signature = GNUNET_NAMESTORE_create_signature(privkey, et, s_name, &rd, 1); - GNUNET_NAMESTORE_record_put(nsh, &pubkey, s_name, expire, 1, &rd, s_signature, put_cont, NULL); - - GNUNET_free ((void *) rd.data); + GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, + &s_zone_value, + sizeof (s_zone_value)); + { + struct GNUNET_GNSRECORD_Data rd; + + rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us; + rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY; + rd.data_size = sizeof (s_zone_value); + rd.data = &s_zone_value; + rd.flags = 0; + + nsh = GNUNET_NAMESTORE_connect (cfg); + GNUNET_break (NULL != nsh); + GNUNET_NAMESTORE_records_store (nsh, + privkey, + s_name, + 1, + &rd, + &put_cont, + NULL); + } } - int -main (int argc, char *argv[]) +main (int argc, + char *argv[]) { + (void) argc; + (void) argv; res = 1; if (0 != GNUNET_TESTING_peer_run ("test-namestore-api-zone-to-name", @@ -227,8 +279,8 @@ main (int argc, char *argv[]) } if (NULL != directory) { - GNUNET_DISK_directory_remove (directory); - GNUNET_free (directory); + GNUNET_DISK_directory_remove (directory); + GNUNET_free (directory); } return res; } -- 2.25.1