*/
static int v4_enabled;
-/**
- * Did we finish the initial iteration over the namestore?
- * (while we do the initial iteration, we do not generate
- * DHT PUTs as there might be WAY too many of those).
- * TODO: expand namestore monitor API with a way to
- * suppress this initial iteration.
- */
-static int sync_finished;
-
/**
* Handle to the statistics service
*/
GNUNET_SERVER_notification_context_destroy (nc);
while (NULL != (clh = clh_head))
{
- GNUNET_SERVER_client_set_user_context (clh->client, NULL);
+ GNUNET_SERVER_client_set_user_context (clh->client, (void *)NULL);
GNS_resolver_lookup_cancel (clh->lookup);
GNUNET_CONTAINER_DLL_remove (clh_head, clh_tail, clh);
GNUNET_free (clh);
label,
rd_public,
rd_public_count);
+ if (NULL == block)
+ return NULL; /* whoops */
block_size = ntohl (block->purpose.size)
+ sizeof (struct GNUNET_CRYPTO_EcdsaSignature)
+ sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey);
label,
&query);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Storing record in DHT with expiration `%s'\n",
- GNUNET_STRINGS_absolute_time_to_string (expire));
+ "Storing %u record(s) for label `%s' in DHT with expiration `%s' under key %s\n",
+ rd_public_count,
+ label,
+ GNUNET_STRINGS_absolute_time_to_string (expire),
+ GNUNET_h2s (&query));
ret = GNUNET_DHT_put (dht_handle, &query,
DHT_GNS_REPLICATION_LEVEL,
GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
unsigned int rd_public_count;
struct MonitorActivity *ma;
- if (GNUNET_YES != sync_finished)
- return; /* do not do DHT PUTs on initial sync, as that may
- create far too many PUTs on startup */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received %u records for label `%s' via namestore monitor\n",
+ rd_count,
+ label);
/* filter out records that are not public, and convert to
absolute expiration time. */
rd_public_count = convert_records_for_export (rd, rd_count,
GNUNET_NO);
GNUNET_free (rmsg);
GNUNET_CONTAINER_DLL_remove (clh_head, clh_tail, clh);
- GNUNET_SERVER_client_set_user_context (clh->client, NULL);
+ GNUNET_SERVER_client_set_user_context (clh->client, (void *)NULL);
GNUNET_free (clh);
GNUNET_STATISTICS_update (statistics,
"Completed lookups", 1,
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- GNUNET_STRINGS_utf8_tolower (utf_in, &nameptr);
+ GNUNET_STRINGS_utf8_tolower (utf_in, nameptr);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
clh = GNUNET_new (struct ClientLookupHandle);
ntohl (sh_msg->type),
name,
key,
- ntohl (sh_msg->only_cached),
+ (enum GNUNET_GNS_LocalOptions) ntohs (sh_msg->options),
&send_lookup_response, clh);
GNUNET_STATISTICS_update (statistics,
"Lookup attempts",
static void
monitor_sync_event (void *cls)
{
- sync_finished = GNUNET_YES;
zone_publish_task = GNUNET_SCHEDULER_add_now (&publish_zone_dht_start,
NULL);
}
nc = GNUNET_SERVER_notification_context_create (server, 1);
zmon = GNUNET_NAMESTORE_zone_monitor_start (c,
NULL,
+ GNUNET_NO,
&handle_monitor_event,
&monitor_sync_event,
NULL);
+ GNUNET_break (NULL != zmon);
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
&shutdown_task, NULL);
}