diff options
| author | Christian Grothoff <christian@grothoff.org> | 2018-04-26 15:39:50 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2018-04-26 15:39:50 +0200 |
| commit | 1b21e0b643f37675683b09b9e528721cb7df74e5 (patch) | |
| tree | faec39247d6a83f93d289190e2e37ba98b6159ae /src/namestore | |
| parent | c15e7951180d954ca584a95206543e8997b3a7d4 (diff) | |
misc bugfixes
Diffstat (limited to 'src/namestore')
| -rw-r--r-- | src/namestore/gnunet-zoneimport.c | 15 | ||||
| -rw-r--r-- | src/namestore/namestore_api.c | 3 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/namestore/gnunet-zoneimport.c b/src/namestore/gnunet-zoneimport.c index 779df695b7..6622a76765 100644 --- a/src/namestore/gnunet-zoneimport.c +++ b/src/namestore/gnunet-zoneimport.c @@ -1438,7 +1438,6 @@ queue (const char *hostname) return; } - pending++; hlen = strlen (hostname) + 1; req = GNUNET_malloc (sizeof (struct Request) + hlen); req->zone = zone; @@ -1503,7 +1502,13 @@ iterate_zones (void *cls) static struct Zone *last; (void) cls; - zone_it = NULL; + if (NULL != zone_it) + { + zone_it = NULL; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Finished iteration over zone `%s'!\n", + last->domain); + } GNUNET_assert (NULL != zone_tail); if (zone_tail == last) { @@ -1515,15 +1520,15 @@ iterate_zones (void *cls) NULL); GNUNET_CONTAINER_multihashmap_destroy (ns_pending); ns_pending = NULL; - GNUNET_assert (NULL == t); - t = GNUNET_SCHEDULER_add_now (&process_queue, - NULL); return; } if (NULL == last) last = zone_head; else last = last->next; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Starting iteration over zone `%s'!\n", + last->domain); ns_iterator_trigger_next = 1; zone_it = GNUNET_NAMESTORE_zone_iteration_start (ns, &last->key, diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c index 65d3d75d0f..ab356838b7 100644 --- a/src/namestore/namestore_api.c +++ b/src/namestore/namestore_api.c @@ -1293,7 +1293,8 @@ GNUNET_NAMESTORE_zone_iterator_next (struct GNUNET_NAMESTORE_ZoneIterator *it, struct GNUNET_MQ_Envelope *env; LOG (GNUNET_ERROR_TYPE_DEBUG, - "Sending ZONE_ITERATION_NEXT message\n"); + "Sending ZONE_ITERATION_NEXT message with limit %llu\n", + (unsigned long long) limit); env = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT); msg->gns_header.r_id = htonl (it->op_id); |