3 files changed, 26 insertions, 15 deletions

diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c
index 9c91e1975..e98fe30db 100644
--- a/src/namestore/gnunet-service-namestore.c
+++ b/src/namestore/gnunet-service-namestore.c
@@ -526,6 +526,7 @@ refresh_block (struct GNUNET_SERVER_Client *client,
 {
   struct GNUNET_GNSRECORD_Block *block;
   struct CacheOperation *cop;
+  struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
 
   if (0 == rd_count)
     block = GNUNET_GNSRECORD_block_create (zone_key,
@@ -538,8 +539,12 @@ refresh_block (struct GNUNET_SERVER_Client *client,
                                                                                         rd),
                                            name,
                                            rd, rd_count);
+  GNUNET_CRYPTO_ecdsa_key_get_public (zone_key,
+                                      &pkey);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Caching block in namecache\n");
+              "Caching block for label `%s' in zone `%s' in namecache\n",
+              name,
+              GNUNET_GNSRECORD_z2s (&pkey));
   cop = GNUNET_new (struct CacheOperation);
   cop->client = client;
   cop->rid = rid;
@@ -675,7 +680,6 @@ handle_record_store (void *cls,
                                   conv_name,
                                   rd_count, rd);
       }
-      GNUNET_free (conv_name);
     }
     if (GNUNET_OK == res)
     {
@@ -684,8 +688,10 @@ handle_record_store (void *cls,
                      conv_name,
                      rd_count, rd);
       GNUNET_SERVER_receive_done (client, GNUNET_OK);
+      GNUNET_free (conv_name);
       return;
     }
+    GNUNET_free (conv_name);
   }
   send_store_response (client, res, rid);
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
diff --git a/src/namestore/test_namestore_api_store.c b/src/namestore/test_namestore_api_store.c
index d5583862c..424c826b7 100644
--- a/src/namestore/test_namestore_api_store.c
+++ b/src/namestore/test_namestore_api_store.c
@@ -102,6 +102,8 @@ put_cont (void *cls, int32_t success, const char *emsg)
               "Name store added record for `%s': %s\n",
               name,
               (success == GNUNET_OK) ? "SUCCESS" : "FAIL");
+  GNUNET_SCHEDULER_cancel (endbadly_task);
+  endbadly_task = GNUNET_SCHEDULER_NO_TASK;
   GNUNET_SCHEDULER_add_now (&end, NULL);
 }
 
diff --git a/src/namestore/test_namestore_api_store_update.c b/src/namestore/test_namestore_api_store_update.c
index b2506f874..edc11067d 100644
--- a/src/namestore/test_namestore_api_store_update.c
+++ b/src/namestore/test_namestore_api_store_update.c
@@ -61,7 +61,7 @@ static struct GNUNET_NAMESTORE_QueueEntry *nsqe;
 
 static struct GNUNET_NAMECACHE_QueueEntry *ncqe;
 
-static const char * name = "dummy.dummy.gnunet";
+static const char *name = "dummy";
 
 
 static void
@@ -166,6 +166,8 @@ rd_decrypt_cb (void *cls,
     GNUNET_assert (TEST_RECORD_DATALEN2 == rd[0].data_size);
     GNUNET_assert (0 == memcmp (&rd_cmp_data, rd[0].data, TEST_RECORD_DATALEN2));
 
+    GNUNET_SCHEDULER_cancel (endbadly_task);
+    endbadly_task = GNUNET_SCHEDULER_NO_TASK;
     GNUNET_SCHEDULER_add_now (&end, NULL);
   }
 }
@@ -179,16 +181,11 @@ name_lookup_proc (void *cls,
 
   ncqe = NULL;
   GNUNET_assert (NULL != cls);
-  if (endbadly_task != GNUNET_SCHEDULER_NO_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"));
+                _("Namecache returned no block for `%s'\n"),
+                name);
     if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
       GNUNET_SCHEDULER_cancel (endbadly_task);
     endbadly_task =  GNUNET_SCHEDULER_add_now (&endbadly, NULL);
@@ -196,7 +193,7 @@ name_lookup_proc (void *cls,
   }
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Namestore returned block, decrypting \n");
+              "Namecache returned block, decrypting \n");
   GNUNET_assert (GNUNET_OK == GNUNET_GNSRECORD_block_decrypt(block,
                 &pubkey, name, &rd_decrypt_cb, (void *) name));
 }
@@ -215,7 +212,12 @@ put_cont (void *cls, int32_t success, const char *emsg)
               name,
               (success == GNUNET_OK) ? "SUCCESS" : "FAIL");
   /* Create derived hash */
-  GNUNET_GNSRECORD_query_from_private_key (privkey, name, &derived_hash);
+  GNUNET_GNSRECORD_query_from_private_key (privkey,
+                                           name,
+                                           &derived_hash);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Looking in namecache for `%s'\n",
+              GNUNET_h2s (&derived_hash));
   ncqe = GNUNET_NAMECACHE_lookup_block (nch, &derived_hash,
                                         &name_lookup_proc, (void *) name);
 }
@@ -253,14 +255,15 @@ run (void *cls,
   GNUNET_break (NULL != nsh);
   nch = GNUNET_NAMECACHE_connect (cfg);
   GNUNET_break (NULL != nch);
-  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,
               _("Namestore cannot store no block\n"));
   }
-
   GNUNET_free ((void *)rd.data);
 }