/*
This file is part of GNUnet.
- (C) 2012, 2013, 2014 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2012, 2013, 2014 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
/**
* Task active during initial iteration.
*/
- GNUNET_SCHEDULER_TaskIdentifier task;
+ struct GNUNET_SCHEDULER_Task * task;
/**
* Offset of the zone iteration used to address next result of the zone
* Task run during shutdown.
*
* @param cls unused
- * @param tc unused
*/
static void
-cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+cleanup_task (void *cls)
{
struct ZoneIteration *no;
struct NamestoreClient *nc;
GNUNET_free (no);
}
GNUNET_CONTAINER_DLL_remove (client_head, client_tail, nc);
- GNUNET_SERVER_client_set_user_context (nc->client, (void *)NULL);
+ GNUNET_SERVER_client_set_user_context (nc->client, NULL);
GNUNET_free (nc);
}
GNUNET_break (NULL == GNUNET_PLUGIN_unload (db_lib_name, GSN_database));
GNUNET_CONTAINER_DLL_remove (monitor_head,
monitor_tail,
zm);
- if (GNUNET_SCHEDULER_NO_TASK != zm->task)
+ if (NULL != zm->task)
{
GNUNET_SCHEDULER_cancel (zm->task);
- zm->task = GNUNET_SCHEDULER_NO_TASK;
+ zm->task = NULL;
}
GNUNET_free (zm);
break;
res = GSN_database->lookup_records (GSN_database->cls, zone,
GNUNET_GNS_MASTERZONE_STR,
&lookup_nick_it, &nick);
- if ((NULL == nick) || (GNUNET_OK != res))
+ if ( (GNUNET_OK != res) ||
+ (NULL == nick) )
{
GNUNET_CRYPTO_ecdsa_key_get_public (zone, &pub);
GNUNET_log (GNUNET_ERROR_TYPE_INFO | GNUNET_ERROR_TYPE_BULK,
rd_ser = &name_tmp[name_len];
GNUNET_GNSRECORD_records_serialize (res_count, res, rd_ser_len, rd_ser);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending `%s' message with %u records and size %u\n",
+ "Sending `%s' message with %u records and size %zu\n",
"RECORD_RESULT",
res_count,
msg_size);
* Obtain the next datum during the zone monitor's zone intiial iteration.
*
* @param cls zone monitor that does its initial iteration
- * @param tc scheduler context
*/
static void
-monitor_next (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc);
+monitor_next (void *cls);
/**
* Obtain the next datum during the zone monitor's zone intiial iteration.
*
* @param cls zone monitor that does its initial iteration
- * @param tc scheduler context
*/
static void
-monitor_next (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+monitor_next (void *cls)
{
struct ZoneMonitor *zm = cls;
int ret;
- zm->task = GNUNET_SCHEDULER_NO_TASK;
+ zm->task = NULL;
ret = GSN_database->iterate_records (GSN_database->cls,
(0 == memcmp (&zm->zone, &zero, sizeof (zero)))
? NULL
GNUNET_SERVER_disconnect_notify (server,
&client_disconnect_notification,
NULL);
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleanup_task,
- NULL);
+ GNUNET_SCHEDULER_add_shutdown (&cleanup_task,
+ NULL);
}
}
/* end of gnunet-service-namestore.c */
-