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

[gnunet]

Author: wachs
Date: 2012-03-15 14:47:51 +0100 (Thu, 15 Mar 2012)
New Revision: 20531

Modified:
   gnunet/src/namestore/gnunet-service-namestore.c
   gnunet/src/namestore/namestore_api.c
Log:
- fixes


Modified: gnunet/src/namestore/gnunet-service-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-service-namestore.c     2012-03-15 13:42:56 UTC 
(rev 20530)
+++ gnunet/src/namestore/gnunet-service-namestore.c     2012-03-15 13:47:51 UTC 
(rev 20531)
@@ -183,8 +183,8 @@
     LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "fcntl", filename);
   GNUNET_assert (GNUNET_YES == GNUNET_DISK_file_close (fd));
 
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-       _("Stored zonekey for zone `%s' in file `%s'\n"),GNUNET_h2s(&c->zone), 
c->filename);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+       _("Stored zonekey for zone `%s' in file `%s'\n"), GNUNET_h2s(&c->zone), 
c->filename);
   return GNUNET_OK;
 }
 
@@ -1470,7 +1470,7 @@
     memcpy (name_tmp, name, name_len);
     memcpy (rd_tmp, rd_ser, rd_ser_len);
 
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending empty `%s' message with size 
%u\n", "ZONE_ITERATION_RESPONSE", msg_size);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message with size 
%u\n", "ZONE_ITERATION_RESPONSE", msg_size);
     GNUNET_SERVER_notification_context_unicast (snc, nc->client, (const struct 
GNUNET_MessageHeader *) zir_msg, GNUNET_NO);
     GNUNET_free (zir_msg);
   }

Modified: gnunet/src/namestore/namestore_api.c
===================================================================
--- gnunet/src/namestore/namestore_api.c        2012-03-15 13:42:56 UTC (rev 
20530)
+++ gnunet/src/namestore/namestore_api.c        2012-03-15 13:47:51 UTC (rev 
20531)
@@ -1544,7 +1544,16 @@
 
   GNUNET_assert (NULL != it);
   h = it->h;
+  struct GNUNET_NAMESTORE_ZoneIterator *tmp = it->h->z_head;
 
+  while (tmp != NULL)
+  {
+    if (tmp == it)
+      break;
+    tmp = tmp->next;
+  }
+  GNUNET_assert (NULL != tmp);
+
   /* set msg_size*/
   msg_size = sizeof (struct ZoneIterationNextMessage);
   pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
@@ -1578,7 +1587,16 @@
   struct PendingMessage *pe;
   size_t msg_size = 0;
   struct GNUNET_NAMESTORE_Handle *h = it->h;
+  struct GNUNET_NAMESTORE_ZoneIterator *tmp = it->h->z_head;
 
+  while (tmp != NULL)
+  {
+    if (tmp == it)
+      break;
+    tmp = tmp->next;
+  }
+  GNUNET_assert (NULL != tmp);
+
   /* set msg_size*/
   msg_size = sizeof (struct ZoneIterationStopMessage);
   pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);