/*
This file is part of GNUnet.
- (C) 2011-2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011-2013 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
/**
* zone publish task
*/
-static GNUNET_SCHEDULER_TaskIdentifier zone_publish_task;
+static struct GNUNET_SCHEDULER_Task * zone_publish_task;
/**
* #GNUNET_YES if zone has never been published before
GNUNET_SERVER_notification_context_destroy (nc);
while (NULL != (clh = clh_head))
{
- GNUNET_SERVER_client_set_user_context (clh->client, (void *)NULL);
+ GNUNET_SERVER_client_set_user_context (clh->client, NULL);
GNS_resolver_lookup_cancel (clh->lookup);
GNUNET_CONTAINER_DLL_remove (clh_head, clh_tail, clh);
GNUNET_free (clh);
GNUNET_STATISTICS_destroy (statistics, GNUNET_NO);
statistics = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != zone_publish_task)
+ if (NULL != zone_publish_task)
{
GNUNET_SCHEDULER_cancel (zone_publish_task);
- zone_publish_task = GNUNET_SCHEDULER_NO_TASK;
+ zone_publish_task = NULL;
}
if (NULL != namestore_iter)
{
publish_zone_dht_next (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- zone_publish_task = GNUNET_SCHEDULER_NO_TASK;
+ zone_publish_task = NULL;
GNUNET_NAMESTORE_zone_iterator_next (namestore_iter);
}
rd_public_count = 0;
now = GNUNET_TIME_absolute_get ();
for (i=0;i<rd_count;i++)
- if (0 == (rd[i].flags & (GNUNET_GNSRECORD_RF_PRIVATE |
- GNUNET_GNSRECORD_RF_PENDING)))
+ if (0 == (rd[i].flags & GNUNET_GNSRECORD_RF_PRIVATE))
{
rd_public[rd_public_count] = rd[i];
if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION))
*
* @param cls the closure (NULL)
* @param key the private key of the authority (ours)
- * @param name the name of the records, NULL once the iteration is done
+ * @param label the name of the records, NULL once the iteration is done
* @param rd_count the number of records in @a rd
* @param rd the record data
*/
static void
put_gns_record (void *cls,
const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
- const char *name,
+ const char *label,
unsigned int rd_count,
const struct GNUNET_GNSRECORD_Data *rd)
{
struct GNUNET_GNSRECORD_Data rd_public[rd_count];
unsigned int rd_public_count;
- if (NULL == name)
+ if (NULL == label)
{
/* we're done with one iteration, calculate when to do the next one */
namestore_iter = NULL;
}
active_put = perform_dht_put (key,
- name,
+ label,
rd_public,
rd_public_count,
NULL);
publish_zone_dht_start (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- zone_publish_task = GNUNET_SCHEDULER_NO_TASK;
+ zone_publish_task = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Starting DHT zone update!\n");
GNUNET_NO);
GNUNET_free (rmsg);
GNUNET_CONTAINER_DLL_remove (clh_head, clh_tail, clh);
- GNUNET_SERVER_client_set_user_context (clh->client, (void *)NULL);
+ GNUNET_SERVER_client_set_user_context (clh->client, NULL);
GNUNET_free (clh);
GNUNET_STATISTICS_update (statistics,
"Completed lookups", 1,