More fixes for #3522

[oweals/gnunet.git] / src / namestore / gnunet-namestore-fcfsd.c

diff --git a/src/namestore/gnunet-namestore-fcfsd.c b/src/namestore/gnunet-namestore-fcfsd.c
index 008e9ce1e1e6c13abd9f6ce6961e859c8128196e..5286b905667b8e79cb2ae9ec18b34fd0e94736d2 100644 (file)
--- a/src/namestore/gnunet-namestore-fcfsd.c
+++ b/src/namestore/gnunet-namestore-fcfsd.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2012-2013 Christian Grothoff (and other contributing authors)
+     (C) 2012-2014 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -151,6 +151,8 @@ struct Request
    */
   char public_key[128];
 
+  struct GNUNET_CRYPTO_EcdsaPublicKey pub;
+
 };
 
 /**
@@ -246,6 +248,16 @@ run_httpd_now ()
 }
 
 
+/**
+ * Process a record that was stored in the namestore, adding
+ * the information to the HTML.
+ *
+ * @param cls closure with the `struct ZoneinfoRequest *`
+ * @param zone_key private key of the zone; NULL on disconnect
+ * @param name label of the records; NULL on disconnect
+ * @param rd_len number of entries in @a rd array, 0 if label was deleted
+ * @param rd array of records with data to store
+ */
 static void
 iterate_cb (void *cls,
            const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
@@ -302,7 +314,12 @@ iterate_cb (void *cls,
   pkey = GNUNET_GNSRECORD_value_to_string (rd->record_type,
                                            rd->data,
                                            rd->data_size);
-
+  if (NULL == pkey)
+  {
+    GNUNET_break (0);
+    GNUNET_NAMESTORE_zone_iterator_next (zr->list_it);
+    return;
+  }
   if (bytes_free < (strlen (name) + strlen (pkey) + 40))
   {
     new_buf = GNUNET_malloc (zr->buf_len * 2);
@@ -321,7 +338,6 @@ iterate_cb (void *cls,
 }
 
 
-
 /**
  * Handler that returns FCFS zoneinfo page.
  *
@@ -515,10 +531,9 @@ zone_to_name_cb (void *cls,
 {
   struct Request *request = cls;
   struct GNUNET_GNSRECORD_Data r;
-  struct GNUNET_CRYPTO_EcdsaPublicKey pub;
-
   request->qe = NULL;
-  if (NULL != name)
+
+  if (0 != rd_count)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                _("Found existing name `%s' for the given key\n"),
@@ -527,10 +542,17 @@ zone_to_name_cb (void *cls,
     run_httpd_now ();
     return;
   }
-  GNUNET_CRYPTO_ecdsa_key_get_public (zone_key,
-                                                 &pub);
-  r.data = &pub;
-  r.data_size = sizeof (pub);
+  if (NULL == zone_key)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Error when mapping zone to name\n"));
+    request->phase = RP_FAIL;
+    run_httpd_now ();
+    return;
+  }
+
+  r.data = &request->pub;
+  r.data_size = sizeof (request->pub);
   r.expiration_time = UINT64_MAX;
   r.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
   r.flags = GNUNET_GNSRECORD_RF_NONE;
@@ -561,16 +583,15 @@ lookup_block_processor (void *cls,
                         const struct GNUNET_GNSRECORD_Data *rd)
 {
   struct Request *request = cls;
-  struct GNUNET_CRYPTO_EcdsaPublicKey pub;
 
   request->qe = NULL;
-  if (NULL == label)
+  if (0 == rd_count)
   {
 
     if (GNUNET_OK !=
         GNUNET_CRYPTO_ecdsa_public_key_from_string (request->public_key,
                                                     strlen (request->public_key),
-                                                    &pub))
+                                                    &request->pub))
     {
       GNUNET_break (0);
       request->phase = RP_FAIL;
@@ -579,12 +600,11 @@ lookup_block_processor (void *cls,
     }
     request->qe = GNUNET_NAMESTORE_zone_to_name (ns,
                                                  &fcfs_zone_pkey,
-                                                 &pub,
+                                                 &request->pub,
                                                  &zone_to_name_cb,
                                                  request);
     return;
   }
-  GNUNET_break (0 != strcmp (label, request->domain_name));
   GNUNET_break (0 != rd_count);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               _("Found %u existing records for domain `%s'\n"),
@@ -652,7 +672,7 @@ create_response (void *cls,
       request = *ptr;
       if (NULL == request)
       {
-       request = GNUNET_malloc (sizeof (struct Request));
+       request = GNUNET_new (struct Request);
        *ptr = request;
        request->pp = MHD_create_post_processor (connection, 1024,
                                                 &post_iterator, request);
@@ -966,6 +986,12 @@ run (void *cls, char *const *args, const char *cfgfile,
     }
   identity = GNUNET_IDENTITY_connect (cfg,
                                      NULL, NULL);
+  if (NULL == identity)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Failed to connect to identity\n"));
+    return;
+  }
   id_op = GNUNET_IDENTITY_get (identity, "fcfsd",
                               &identity_cb, NULL);
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,