[GNUnet-SVN] r30439 - gnunet/src/namestore

[gnunet]

Author: wachs
Date: 2013-10-28 16:17:49 +0100 (Mon, 28 Oct 2013)
New Revision: 30439

Modified:
   gnunet/src/namestore/gnunet-namestore-fcfsd.c
Log:
replace iteration with lookup


Modified: gnunet/src/namestore/gnunet-namestore-fcfsd.c
===================================================================
--- gnunet/src/namestore/gnunet-namestore-fcfsd.c       2013-10-28 14:50:02 UTC 
(rev 30438)
+++ gnunet/src/namestore/gnunet-namestore-fcfsd.c       2013-10-28 15:17:49 UTC 
(rev 30439)
@@ -566,7 +566,7 @@
   request->qe = NULL;
   if (NULL == label)
   {
-    request->zi = NULL;
+
     if (GNUNET_OK !=
         GNUNET_CRYPTO_ecdsa_public_key_from_string (request->public_key,
                                                     strlen 
(request->public_key),
@@ -584,14 +584,7 @@
                                                  request);
     return;
   }
-  if (0 != strcmp (label,
-                   request->domain_name))
-  {
-    GNUNET_NAMESTORE_zone_iterator_next (request->zi);
-    return;
-  }
-  GNUNET_NAMESTORE_zone_iteration_stop (request->zi);
-  request->zi = NULL;
+  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"),
@@ -716,11 +709,11 @@
                                 request, connection);
          }
          request->phase = RP_LOOKUP;
-          /* FIXME: would be nice to have a more efficient API for this */
-         request->zi = GNUNET_NAMESTORE_zone_iteration_start (ns,
-                                                               &fcfs_zone_pkey,
-                                                               
&lookup_block_processor,
-                                                               request);
+         request->qe = GNUNET_NAMESTORE_records_lookup (ns,
+                                                       &fcfs_zone_pkey,
+                                                       request->domain_name,
+                                                       &lookup_block_processor,
+                                                       request);
          break;
        case RP_LOOKUP:
          break;