[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r30537 - gnunet/src/namestore
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r30537 - gnunet/src/namestore |
|
Date: |
Tue, 5 Nov 2013 20:58:52 +0100 |
Author: grothoff
Date: 2013-11-05 20:58:51 +0100 (Tue, 05 Nov 2013)
New Revision: 30537
Modified:
gnunet/src/namestore/test_namestore_api_lookup_private.c
gnunet/src/namestore/test_namestore_api_lookup_public.c
gnunet/src/namestore/test_namestore_api_monitoring.c
gnunet/src/namestore/test_namestore_api_monitoring_existing.c
gnunet/src/namestore/test_namestore_api_put.c
gnunet/src/namestore/test_namestore_api_remove.c
gnunet/src/namestore/test_namestore_api_store.c
gnunet/src/namestore/test_namestore_api_zone_iteration.c
gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
gnunet/src/namestore/test_namestore_api_zone_to_name.c
gnunet/src/namestore/test_plugin_namestore.c
Log:
-initialize flags to unproblematic value (hence usually zero)
Modified: gnunet/src/namestore/test_namestore_api_lookup_private.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_lookup_private.c 2013-11-05
19:47:10 UTC (rev 30536)
+++ gnunet/src/namestore/test_namestore_api_lookup_private.c 2013-11-05
19:58:51 UTC (rev 30537)
@@ -186,6 +186,7 @@
rd.record_type = TEST_RECORD_TYPE;
rd.data_size = TEST_RECORD_DATALEN;
rd.data = GNUNET_malloc (TEST_RECORD_DATALEN);
+ rd.flags = 0;
memset ((char *) rd.data, 'a', TEST_RECORD_DATALEN);
nsh = GNUNET_NAMESTORE_connect (cfg);
Modified: gnunet/src/namestore/test_namestore_api_lookup_public.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_lookup_public.c 2013-11-05
19:47:10 UTC (rev 30536)
+++ gnunet/src/namestore/test_namestore_api_lookup_public.c 2013-11-05
19:58:51 UTC (rev 30537)
@@ -210,6 +210,7 @@
rd.record_type = TEST_RECORD_TYPE;
rd.data_size = TEST_RECORD_DATALEN;
rd.data = GNUNET_malloc (TEST_RECORD_DATALEN);
+ rd.flags = 0;
memset ((char *) rd.data, 'a', TEST_RECORD_DATALEN);
nsh = GNUNET_NAMESTORE_connect (cfg);
Modified: gnunet/src/namestore/test_namestore_api_monitoring.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_monitoring.c 2013-11-05
19:47:10 UTC (rev 30536)
+++ gnunet/src/namestore/test_namestore_api_monitoring.c 2013-11-05
19:58:51 UTC (rev 30537)
@@ -253,6 +253,7 @@
rd[c].record_type = 1111;
rd[c].data_size = 50;
rd[c].data = GNUNET_malloc(50);
+ rd[c].flags = 0;
memset ((char *) rd[c].data, 'a', 50);
}
return rd;
Modified: gnunet/src/namestore/test_namestore_api_monitoring_existing.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_monitoring_existing.c
2013-11-05 19:47:10 UTC (rev 30536)
+++ gnunet/src/namestore/test_namestore_api_monitoring_existing.c
2013-11-05 19:58:51 UTC (rev 30537)
@@ -266,6 +266,7 @@
rd[c].record_type = 1111;
rd[c].data_size = 50;
rd[c].data = GNUNET_malloc(50);
+ rd[c].flags = 0;
memset ((char *) rd[c].data, 'a', 50);
}
return rd;
Modified: gnunet/src/namestore/test_namestore_api_put.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_put.c 2013-11-05 19:47:10 UTC
(rev 30536)
+++ gnunet/src/namestore/test_namestore_api_put.c 2013-11-05 19:58:51 UTC
(rev 30537)
@@ -124,6 +124,7 @@
rd[c].record_type = TEST_RECORD_TYPE;
rd[c].data_size = TEST_RECORD_DATALEN;
rd[c].data = GNUNET_malloc(TEST_RECORD_DATALEN);
+ rd[c].flags = 0;
memset ((char *) rd[c].data, TEST_RECORD_DATA, TEST_RECORD_DATALEN);
}
return rd;
Modified: gnunet/src/namestore/test_namestore_api_remove.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_remove.c 2013-11-05 19:47:10 UTC
(rev 30536)
+++ gnunet/src/namestore/test_namestore_api_remove.c 2013-11-05 19:58:51 UTC
(rev 30537)
@@ -171,6 +171,7 @@
rd.record_type = TEST_RECORD_TYPE;
rd.data_size = TEST_RECORD_DATALEN;
rd.data = GNUNET_malloc (TEST_RECORD_DATALEN);
+ rd.flags = 0;
memset ((char *) rd.data, 'a', TEST_RECORD_DATALEN);
nsh = GNUNET_NAMESTORE_connect (cfg);
Modified: gnunet/src/namestore/test_namestore_api_store.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_store.c 2013-11-05 19:47:10 UTC
(rev 30536)
+++ gnunet/src/namestore/test_namestore_api_store.c 2013-11-05 19:58:51 UTC
(rev 30537)
@@ -134,6 +134,7 @@
rd.record_type = TEST_RECORD_TYPE;
rd.data_size = TEST_RECORD_DATALEN;
rd.data = GNUNET_malloc (TEST_RECORD_DATALEN);
+ rd.flags = 0;
memset ((char *) rd.data, 'a', TEST_RECORD_DATALEN);
nsh = GNUNET_NAMESTORE_connect (cfg);
Modified: gnunet/src/namestore/test_namestore_api_zone_iteration.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_iteration.c 2013-11-05
19:47:10 UTC (rev 30536)
+++ gnunet/src/namestore/test_namestore_api_zone_iteration.c 2013-11-05
19:58:51 UTC (rev 30537)
@@ -330,6 +330,7 @@
rd[c].record_type = 1111;
rd[c].data_size = 50;
rd[c].data = GNUNET_malloc(50);
+ rd[c].flags = 0;
memset ((char *) rd[c].data, 'a', 50);
}
return rd;
Modified: gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
2013-11-05 19:47:10 UTC (rev 30536)
+++ gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
2013-11-05 19:58:51 UTC (rev 30537)
@@ -310,6 +310,7 @@
rd[c].record_type = 1111;
rd[c].data_size = 50;
rd[c].data = GNUNET_malloc(50);
+ rd[c].flags = 0;
memset ((char *) rd[c].data, 'a', 50);
}
return rd;
@@ -331,26 +332,26 @@
char *hostkey_file;
GNUNET_assert (nsh == cls);
- if (NULL != zone)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Expected empty zone but received zone private
key\n"));
- GNUNET_break (0);
- if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
+ if (NULL != zone)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Expected empty zone but received zone private key\n"));
+ GNUNET_break (0);
+ if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel (endbadly_task);
- endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
- return;
- }
- if ((NULL != label) || (NULL != rd) || (0 != rd_count))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Expected no zone content but received data\n"));
- GNUNET_break (0);
- if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
+ endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+ return;
+ }
+ if ((NULL != label) || (NULL != rd) || (0 != rd_count))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Expected no zone content but received data\n"));
+ GNUNET_break (0);
+ if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel (endbadly_task);
- endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
- return;
- }
+ endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+ return;
+ }
zi = NULL;
Modified: gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
2013-11-05 19:47:10 UTC (rev 30536)
+++ gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
2013-11-05 19:58:51 UTC (rev 30537)
@@ -110,11 +110,11 @@
static void
end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- if (NULL != zi)
- {
- GNUNET_NAMESTORE_zone_iteration_stop (zi);
- zi = NULL;
- }
+ if (NULL != zi)
+ {
+ GNUNET_NAMESTORE_zone_iteration_stop (zi);
+ zi = NULL;
+ }
if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
{
@@ -156,10 +156,10 @@
static void
zone_proc (void *cls,
- const struct
GNUNET_CRYPTO_EcdsaPrivateKey *zone,
- const char *label,
- unsigned int rd_count,
- const struct GNUNET_GNSRECORD_Data *rd)
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+ const char *label,
+ unsigned int rd_count,
+ const struct GNUNET_GNSRECORD_Data *rd)
{
int failed = GNUNET_NO;
if ((zone == NULL) && (label == NULL))
@@ -344,6 +344,7 @@
rd[c].record_type = 1111;
rd[c].data_size = 50;
rd[c].data = GNUNET_malloc(50);
+ rd[c].flags = 0;
memset ((char *) rd[c].data, 'a', 50);
}
return rd;
Modified: gnunet/src/namestore/test_namestore_api_zone_to_name.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_to_name.c 2013-11-05
19:47:10 UTC (rev 30536)
+++ gnunet/src/namestore/test_namestore_api_zone_to_name.c 2013-11-05
19:58:51 UTC (rev 30537)
@@ -153,7 +153,8 @@
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);
}
}
@@ -167,12 +168,14 @@
struct GNUNET_TIME_Absolute et;
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);
+ 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);
@@ -182,13 +185,16 @@
/* 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));
+ 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;
memcpy ((char *) rd.data, &s_zone_value, sizeof (struct
GNUNET_CRYPTO_ShortHashCode));
nsh = GNUNET_NAMESTORE_connect (cfg);
GNUNET_break (NULL != nsh);
Modified: gnunet/src/namestore/test_plugin_namestore.c
===================================================================
--- gnunet/src/namestore/test_plugin_namestore.c 2013-11-05 19:47:10 UTC
(rev 30536)
+++ gnunet/src/namestore/test_plugin_namestore.c 2013-11-05 19:58:51 UTC
(rev 30537)
@@ -100,7 +100,7 @@
GNUNET_assert (rd[i].data_size == id % 10);
GNUNET_assert (0 == memcmp ("Hello World", rd[i].data, id % 10));
GNUNET_assert (rd[i].record_type == 1 + (id % 13));
- GNUNET_assert (rd[i].flags == (id % 7));
+ GNUNET_assert (rd[i].flags == 0);
}
memset (&tzone_private_key, (id % 241), sizeof (tzone_private_key));
GNUNET_assert (0 == strcmp (label, tname));
@@ -134,7 +134,7 @@
rd[i].data_size = id % 10;
rd[i].expiration_time = GNUNET_TIME_relative_to_absolute
(GNUNET_TIME_UNIT_MINUTES).abs_value_us;
rd[i].record_type = 1 + (id % 13);
- rd[i].flags = (id % 7);
+ rd[i].flags = 0;
}
memset (&zone_private_key, (id % 241), sizeof (zone_private_key));
memset (&signature, (id % 243), sizeof (signature));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r30537 - gnunet/src/namestore,
gnunet <=