* @file datastore/gnunet-service-datastore.c
* @brief Management for the datastore for files stored on a GNUnet node
* @author Christian Grothoff
- *
- * TODO:
- * quota management code:
- * - track storage use
- * - track reservations
- * - refuse above-quota
- * - content expiration job
- * - near-quota low-priority content discard job
*/
#include "platform.h"
*/
#define MAX_PENDING 1024
+/**
+ * How long are we at most keeping "expired" content
+ * past the expiration date in the database?
+ */
+#define MAX_EXPIRE_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
+
+
/**
* Our datastore plugin.
/**
* Number of bytes (still) reserved.
*/
- uint64_t size;
+ uint64_t amount;
/**
* Number of items (still) reserved.
*/
- uint64_t items;
+ uint64_t entries;
/**
* Reservation identifier.
*/
static unsigned long long quota;
+/**
+ * How much space are we using for the cache?
+ * (space available for insertions that will be
+ * instantly reclaimed by discarding less
+ * important content --- or possibly whatever
+ * we just inserted into the "cache").
+ */
+static unsigned long long cache_size;
+
+/**
+ * How much space have we currently reserved?
+ */
+static unsigned long long reserved;
+
+/**
+ * Identity of the task that is used to delete
+ * expired content.
+ */
+static GNUNET_SCHEDULER_TaskIdentifier expired_kill_task;
+
+/**
+ * Our configuration.
+ */
+const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+/**
+ * Our scheduler.
+ */
+struct GNUNET_SCHEDULER_Handle *sched;
/**
* Function called once the transmit operation has
typedef void (*TransmitContinuation)(void *cls,
int status);
+
struct TransmitCallbackContext
{
/**
};
+/**
+ * Task that is used to remove expired entries from
+ * the datastore. This task will schedule itself
+ * again automatically to always delete all expired
+ * content quickly.
+ *
+ * @param cls not used
+ * @param tc task context
+ */
+static void
+delete_expired (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc);
+
+
+/**
+ * Iterate over the expired items stored in the datastore.
+ * Delete all expired items; once we have processed all
+ * expired items, re-schedule the "delete_expired" task.
+ *
+ * @param cls not used
+ * @param next_cls closure to pass to the "next" function.
+ * @param key key for the content
+ * @param size number of bytes in data
+ * @param data content stored
+ * @param type type of the content
+ * @param priority priority of the content
+ * @param anonymity anonymity-level for the content
+ * @param expiration expiration time for the content
+ * @param uid unique identifier for the datum;
+ * maybe 0 if no unique identifier is available
+ *
+ * @return GNUNET_SYSERR to abort the iteration, GNUNET_OK to continue
+ * (continue on call to "next", of course),
+ * GNUNET_NO to delete the item and continue (if supported)
+ */
+static int
+expired_processor (void *cls,
+ void *next_cls,
+ const GNUNET_HashCode * key,
+ uint32_t size,
+ const void *data,
+ uint32_t type,
+ uint32_t priority,
+ uint32_t anonymity,
+ struct GNUNET_TIME_Absolute
+ expiration,
+ uint64_t uid)
+{
+ struct GNUNET_TIME_Absolute now;
+
+ expired_kill_task = GNUNET_SCHEDULER_NO_TASK;
+ if (key == NULL)
+ {
+ expired_kill_task
+ = GNUNET_SCHEDULER_add_delayed (sched,
+ GNUNET_NO,
+ GNUNET_SCHEDULER_PRIORITY_IDLE,
+ GNUNET_SCHEDULER_NO_TASK,
+ MAX_EXPIRE_DELAY,
+ &delete_expired,
+ NULL);
+ return GNUNET_SYSERR;
+ }
+ now = GNUNET_TIME_absolute_get ();
+ if (expiration.value > now.value)
+ {
+ /* finished processing */
+ plugin->api->next_request (next_cls, GNUNET_YES);
+ return GNUNET_SYSERR;
+ }
+ plugin->api->next_request (next_cls, GNUNET_NO);
+#if DEBUG_DATASTORE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Deleting content that expired %llu ms ago\n",
+ (unsigned long long) (now.value - expiration.value));
+#endif
+ GNUNET_CONTAINER_bloomfilter_remove (filter,
+ key);
+ return GNUNET_NO; /* delete */
+}
+
+
+/**
+ * Task that is used to remove expired entries from
+ * the datastore. This task will schedule itself
+ * again automatically to always delete all expired
+ * content quickly.
+ *
+ * @param cls not used
+ * @param tc task context
+ */
+static void
+delete_expired (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ plugin->api->iter_ascending_expiration (plugin->api->cls,
+ 0,
+ &expired_processor,
+ NULL);
+}
+
+
+/**
+ * An iterator over a set of items stored in the datastore.
+ *
+ * @param cls closure
+ * @param next_cls closure to pass to the "next" function.
+ * @param key key for the content
+ * @param size number of bytes in data
+ * @param data content stored
+ * @param type type of the content
+ * @param priority priority of the content
+ * @param anonymity anonymity-level for the content
+ * @param expiration expiration time for the content
+ * @param uid unique identifier for the datum;
+ * maybe 0 if no unique identifier is available
+ *
+ * @return GNUNET_SYSERR to abort the iteration, GNUNET_OK to continue
+ * (continue on call to "next", of course),
+ * GNUNET_NO to delete the item and continue (if supported)
+ */
+static int
+manage (void *cls,
+ void *next_cls,
+ const GNUNET_HashCode * key,
+ uint32_t size,
+ const void *data,
+ uint32_t type,
+ uint32_t priority,
+ uint32_t anonymity,
+ struct GNUNET_TIME_Absolute
+ expiration,
+ uint64_t uid)
+{
+ unsigned long long *need = cls;
+
+ if (NULL == key)
+ {
+ GNUNET_free (need);
+ return GNUNET_SYSERR;
+ }
+ if (size + GNUNET_DATASTORE_ENTRY_OVERHEAD > *need)
+ *need = 0;
+ else
+ *need -= size + GNUNET_DATASTORE_ENTRY_OVERHEAD;
+ plugin->api->next_request (next_cls,
+ (0 == *need) ? GNUNET_YES : GNUNET_NO);
+#if DEBUG_DATASTORE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Deleting %llu bytes of low-priority content (still trying to recover %llu bytes)\n",
+ size + GNUNET_DATASTORE_ENTRY_OVERHEAD,
+ *need);
+#endif
+ GNUNET_CONTAINER_bloomfilter_remove (filter,
+ key);
+ return GNUNET_NO;
+}
+
+
+/**
+ * Manage available disk space by running tasks
+ * that will discard content if necessary. This
+ * function will be run whenever a request for
+ * "need" bytes of storage could only be satisfied
+ * by eating into the "cache" (and we want our cache
+ * space back).
+ *
+ * @param need number of bytes of content that were
+ * placed into the "cache" (and hence the
+ * number of bytes that should be removed).
+ */
+static void
+manage_space (unsigned long long need)
+{
+ unsigned long long *n;
+
+#if DEBUG_DATASTORE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Asked to recover %llu bytes of cache space\n",
+ need);
+#endif
+ n = GNUNET_malloc (sizeof(unsigned long long));
+ *n = need;
+ plugin->api->iter_low_priority (plugin->api->cls,
+ 0,
+ &manage,
+ n);
+}
+
+
/**
* Function called to notify a client about the socket
* begin ready to queue more data. "buf" will be
msize = ntohs(tcc->msg->size);
if (size == 0)
{
+#if DEBUG_DATASTORE
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Transmission failed.\n");
+#endif
if (tcc->tc != NULL)
tcc->tc (tcc->tc_cls, GNUNET_SYSERR);
if (GNUNET_YES == tcc->end)
- GNUNET_SERVER_receive_done (tcc->client, GNUNET_SYSERR);
+ {
+ GNUNET_SERVER_receive_done (tcc->client, GNUNET_SYSERR);
+ }
GNUNET_free (tcc->msg);
GNUNET_free (tcc);
return 0;
if (tcc->tc != NULL)
tcc->tc (tcc->tc_cls, GNUNET_OK);
if (GNUNET_YES == tcc->end)
- GNUNET_SERVER_receive_done (tcc->client, GNUNET_OK);
+ {
+ GNUNET_SERVER_receive_done (tcc->client, GNUNET_OK);
+ }
+ else
+ {
+#if DEBUG_DATASTORE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Response transmitted, more pending!\n");
+#endif
+ }
GNUNET_free (tcc->msg);
GNUNET_free (tcc);
return msize;
*
* @param client target of the message
* @param msg message to transmit, will be freed!
+ * @param tc function to call afterwards
+ * @param tc_cls closure for tc
* @param end is this the last response (and we should
* signal the server completion accodingly after
* transmitting this message)?
{
GNUNET_break (0);
if (GNUNET_YES == end)
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ {
+#if DEBUG_DATASTORE
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Disconnecting client.\n");
+#endif
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ }
if (NULL != tc)
tc (tc_cls, GNUNET_SYSERR);
GNUNET_free (msg);
struct StatusMessage *sm;
size_t slen;
+#if DEBUG_DATASTORE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Transmitting `%s' message with value %d and message `%s'\n",
+ "STATUS",
+ code,
+ msg != NULL ? msg : "(none)");
+#endif
slen = (msg == NULL) ? 0 : strlen(msg) + 1;
sm = GNUNET_malloc (sizeof(struct StatusMessage) + slen);
sm->header.size = htons(sizeof(struct StatusMessage) + slen);
sm->header.type = htons(GNUNET_MESSAGE_TYPE_DATASTORE_STATUS);
sm->status = htonl(code);
- memcpy (&sm[1], msg, slen);
+ if (slen > 0)
+ memcpy (&sm[1], msg, slen);
transmit (client, &sm->header, NULL, NULL, GNUNET_YES);
}
* Function called once the transmit operation has
* either failed or succeeded.
*
- * @param cls closure
+ * @param next_cls closure for calling "next_request" callback
* @param status GNUNET_OK on success, GNUNET_SYSERR on error
*/
static void
uint32_t priority,
uint32_t anonymity,
struct GNUNET_TIME_Absolute
- expiration, unsigned long long uid)
+ expiration, uint64_t uid)
{
struct GNUNET_SERVER_Client *client = cls;
struct GNUNET_MessageHeader *end;
if (key == NULL)
{
/* transmit 'DATA_END' */
+#if DEBUG_DATASTORE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Transmitting `%s' message\n",
+ "DATA_END");
+#endif
end = GNUNET_malloc (sizeof(struct GNUNET_MessageHeader));
end->size = htons(sizeof(struct GNUNET_MessageHeader));
end->type = htons(GNUNET_MESSAGE_TYPE_DATASTORE_DATA_END);
dm->uid = GNUNET_htonll(uid);
dm->key = *key;
memcpy (&dm[1], data, size);
+#if DEBUG_DATASTORE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Transmitting `%s' message\n",
+ "DATA");
+#endif
transmit (client, &dm->header, &get_next, next_cls, GNUNET_NO);
return GNUNET_OK;
}
*/
static void
handle_reserve (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
{
const struct ReserveMessage *msg = (const struct ReserveMessage*) message;
struct ReservationList *e;
+ unsigned long long used;
+ unsigned long long req;
+ uint64_t amount;
+ uint32_t entries;
- /* FIXME: check if we have that much space... */
+#if DEBUG_DATASTORE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Processing `%s' request\n",
+ "RESERVE");
+#endif
+ amount = GNUNET_ntohll(msg->amount);
+ entries = ntohl(msg->entries);
+ used = plugin->api->get_size (plugin->api->cls) + reserved;
+ req = amount + ((unsigned long long) GNUNET_DATASTORE_ENTRY_OVERHEAD) * entries;
+ if (used + req > quota)
+ {
+ if (quota < used)
+ used = quota; /* cheat a bit for error message (to avoid negative numbers) */
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Insufficient space (%llu bytes are available) to satisfy `%s' request for %llu bytes\n"),
+ quota - used,
+ "RESERVE",
+ req);
+ if (cache_size < req)
+ {
+ /* TODO: document this in the FAQ; essentially, if this
+ message happens, the insertion request could be blocked
+ by less-important content from migration because it is
+ larger than 1/8th of the overall available space, and
+ we only reserve 1/8th for "fresh" insertions */
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("The requested amount (%llu bytes) is larger than the cache size (%llu bytes)\n"),
+ req,
+ cache_size);
+ transmit_status (client, 0,
+ gettext_noop ("Insufficient space to satisfy request and "
+ "requested amount is larger than cache size"));
+ }
+ else
+ {
+ transmit_status (client, 0,
+ gettext_noop ("Insufficient space to satisfy request"));
+ }
+ return;
+ }
+ reserved += req;
e = GNUNET_malloc (sizeof(struct ReservationList));
e->next = reservations;
reservations = e;
e->client = client;
- e->size = GNUNET_ntohll(msg->size);
- e->items = GNUNET_ntohll(msg->items);
+ e->amount = amount;
+ e->entries = entries;
e->rid = ++reservation_gen;
if (reservation_gen < 0)
reservation_gen = 0; /* wrap around */
struct ReservationList *pos;
struct ReservationList *prev;
struct ReservationList *next;
-
int rid = ntohl(msg->rid);
+ unsigned long long rem;
+
+#if DEBUG_DATASTORE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Processing `%s' request\n",
+ "RELEASE_RESERVE");
+#endif
next = reservations;
prev = NULL;
while (NULL != (pos = next))
reservations = next;
else
prev->next = next;
- /* FIXME: released remaining reserved space! */
+ rem = pos->amount + ((unsigned long long) GNUNET_DATASTORE_ENTRY_OVERHEAD) * pos->entries;
+ GNUNET_assert (reserved >= rem);
+ reserved -= rem;
+#if DEBUG_DATASTORE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Returning %llu remaining reserved bytes to storage pool\n",
+ rem);
+#endif
GNUNET_free (pos);
transmit_status (client, GNUNET_OK, NULL);
return;
}
prev = pos;
- pos = next;
}
- transmit_status (client, GNUNET_SYSERR, "Could not find matching reservation");
+ GNUNET_break (0);
+ transmit_status (client, GNUNET_SYSERR, gettext_noop ("Could not find matching reservation"));
}
GNUNET_break (0);
return NULL;
}
- if (ntohl(dm->type) == 0)
- {
- GNUNET_break (0);
- return NULL;
- }
return dm;
}
char *msg;
int ret;
int rid;
+ struct ReservationList *pos;
+ uint32_t size;
+#if DEBUG_DATASTORE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Processing `%s' request\n",
+ "PUT");
+#endif
+ if (ntohl(dm->type) == 0)
+ {
+ GNUNET_break (0);
+ dm = NULL;
+ }
if (dm == NULL)
{
GNUNET_break (0);
return;
}
rid = ntohl(dm->rid);
+ size = ntohl(dm->size);
if (rid > 0)
{
- /* FIXME: find reservation, update remaining! */
+ pos = reservations;
+ while ( (NULL != pos) &&
+ (rid != pos->rid) )
+ pos = pos->next;
+ GNUNET_break (pos != NULL);
+ if (NULL != pos)
+ {
+ GNUNET_break (pos->entries > 0);
+ GNUNET_break (pos->amount > size);
+ pos->entries--;
+ pos->amount -= size;
+ reserved -= (size + GNUNET_DATASTORE_ENTRY_OVERHEAD);
+ }
}
msg = NULL;
ret = plugin->api->put (plugin->api->cls,
&dm->key,
- ntohl(dm->size),
+ size,
&dm[1],
ntohl(dm->type),
ntohl(dm->priority),
GNUNET_CONTAINER_bloomfilter_add (filter,
&dm->key);
transmit_status (client,
- GNUNET_SYSERR == ret ? GNUNET_SYSERR : GNUNET_OK,
+ (GNUNET_SYSERR == ret) ? GNUNET_SYSERR : GNUNET_OK,
msg);
GNUNET_free_non_null (msg);
+ if (quota - reserved - cache_size < plugin->api->get_size (plugin->api->cls))
+ manage_space (size + GNUNET_DATASTORE_ENTRY_OVERHEAD);
}
struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
- static struct GNUNET_TIME_Absolute zero;
const struct GetMessage *msg;
uint16_t size;
+#if DEBUG_DATASTORE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Processing `%s' request\n",
+ "GET");
+#endif
size = ntohs(message->size);
if ( (size != sizeof(struct GetMessage)) &&
(size != sizeof(struct GetMessage) - sizeof(GNUNET_HashCode)) )
&msg->key)) )
{
/* don't bother database... */
+#if DEBUG_DATASTORE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Empty result set for `%s' request.\n",
+ "GET");
+#endif
+ GNUNET_SERVER_client_keep (client);
transmit_item (client,
- NULL, NULL, 0, NULL, 0, 0, 0, zero, 0);
+ NULL, NULL, 0, NULL, 0, 0, 0,
+ GNUNET_TIME_UNIT_ZERO_ABS, 0);
return;
}
- GNUNET_SERVER_client_drop (client);
+ GNUNET_SERVER_client_keep (client);
plugin->api->get (plugin->api->cls,
((size == sizeof(struct GetMessage)) ? &msg->key : NULL),
NULL,
int ret;
char *emsg;
+#if DEBUG_DATASTORE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Processing `%s' request\n",
+ "UPDATE");
+#endif
msg = (const struct UpdateMessage*) message;
emsg = NULL;
ret = plugin->api->update (plugin->api->cls,
struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
- GNUNET_SERVER_client_drop (client);
+#if DEBUG_DATASTORE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Processing `%s' request\n",
+ "GET_RANDOM");
+#endif
+ GNUNET_SERVER_client_keep (client);
plugin->api->iter_migration_order (plugin->api->cls,
0,
&transmit_item,
uint32_t priority,
uint32_t anonymity,
struct GNUNET_TIME_Absolute
- expiration, unsigned long long uid)
+ expiration, uint64_t uid)
{
struct RemoveContext *rc = cls;
+
if (key == NULL)
{
+#if DEBUG_DATASTORE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "No further matches for `%s' request.\n",
+ "REMOVE");
+#endif
if (GNUNET_YES == rc->found)
transmit_status (rc->client, GNUNET_OK, NULL);
else
- transmit_status (rc->client, GNUNET_SYSERR, _("Content not found"));
+ transmit_status (rc->client, GNUNET_NO, _("Content not found"));
GNUNET_SERVER_client_drop (rc->client);
GNUNET_free (rc);
return GNUNET_OK; /* last item */
}
rc->found = GNUNET_YES;
- plugin->api->next_request (next_cls, GNUNET_YES);
+#if DEBUG_DATASTORE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Item %llu matches `%s' request.\n",
+ (unsigned long long) uid,
+ "REMOVE");
+#endif
GNUNET_CONTAINER_bloomfilter_remove (filter,
key);
+ plugin->api->next_request (next_cls, GNUNET_YES);
return GNUNET_NO;
}
GNUNET_HashCode vhash;
struct RemoveContext *rc;
+#if DEBUG_DATASTORE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Processing `%s' request\n",
+ "REMOVE");
+#endif
if (dm == NULL)
{
GNUNET_break (0);
struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
+#if DEBUG_DATASTORE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Processing `%s' request\n",
+ "DROP");
+#endif
plugin->api->drop (plugin->api->cls);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
* Load the datastore plugin.
*/
static struct DatastorePlugin *
-load_plugin (struct GNUNET_CONFIGURATION_Handle *cfg,
- struct GNUNET_SCHEDULER_Handle *sched)
+load_plugin ()
{
struct DatastorePlugin *ret;
char *libname;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Loading `%s' datastore plugin\n"), name);
GNUNET_asprintf (&libname, "libgnunet_plugin_datastore_%s", name);
- ret->short_name = GNUNET_strdup (name);
+ ret->short_name = name;
ret->lib_name = libname;
ret->api = GNUNET_PLUGIN_load (libname, &ret->env);
if (ret->api == NULL)
{
unload_plugin (plugin);
plugin = NULL;
+ if (filter != NULL)
+ {
+ GNUNET_CONTAINER_bloomfilter_free (filter);
+ filter = NULL;
+ }
}
struct GNUNET_SERVER_Client
* client)
{
- /* FIXME */
+ struct ReservationList *pos;
+ struct ReservationList *prev;
+ struct ReservationList *next;
+
+ prev = NULL;
+ pos = reservations;
+ while (NULL != pos)
+ {
+ next = pos->next;
+ if (pos->client == client)
+ {
+ if (prev == NULL)
+ reservations = next;
+ else
+ prev->next = next;
+ reserved -= pos->amount + pos->entries * GNUNET_DATASTORE_ENTRY_OVERHEAD;
+ GNUNET_free (pos);
+ }
+ else
+ {
+ prev = pos;
+ }
+ pos = next;
+ }
}
* Process datastore requests.
*
* @param cls closure
- * @param sched scheduler to use
+ * @param s scheduler to use
* @param server the initialized server
- * @param cfg configuration to use
+ * @param c configuration to use
*/
static void
run (void *cls,
- struct GNUNET_SCHEDULER_Handle *sched,
+ struct GNUNET_SCHEDULER_Handle *s,
struct GNUNET_SERVER_Handle *server,
- struct GNUNET_CONFIGURATION_Handle *cfg)
+ const struct GNUNET_CONFIGURATION_Handle *c)
{
char *fn;
unsigned int bf_size;
+ sched = s;
+ cfg = c;
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (cfg,
"DATASTORE", "QUOTA", "a))
"DATASTORE");
return;
}
+ cache_size = quota / 8; /* Or should we make this an option? */
bf_size = quota / 32; /* 8 bit per entry, 1 bit per 32 kb in DB */
fn = NULL;
if ( (GNUNET_OK !=
_("Failed to initialize bloomfilter.\n"));
return;
}
- plugin = load_plugin (cfg, sched);
+ plugin = load_plugin ();
if (NULL == plugin)
{
GNUNET_CONTAINER_bloomfilter_free (filter);
+ filter = NULL;
return;
}
GNUNET_SERVER_disconnect_notify (server, &cleanup_reservations, NULL);
GNUNET_SERVER_add_handlers (server, handlers);
+ expired_kill_task
+ = GNUNET_SCHEDULER_add_delayed (sched,
+ GNUNET_NO,
+ GNUNET_SCHEDULER_PRIORITY_IDLE,
+ GNUNET_SCHEDULER_NO_TASK,
+ GNUNET_TIME_UNIT_ZERO,
+ &delete_expired, NULL);
GNUNET_SCHEDULER_add_delayed (sched,
GNUNET_YES,
GNUNET_SCHEDULER_PRIORITY_IDLE,
- GNUNET_SCHEDULER_NO_PREREQUISITE_TASK,
+ GNUNET_SCHEDULER_NO_TASK,
GNUNET_TIME_UNIT_FOREVER_REL,
&cleaning_task, NULL);
+
}
projects / oweals / gnunet.git / blobdiff