/*
This file is part of GNUnet
- Copyright (C) 2004-2014 GNUnet e.V.
+ Copyright (C) 2004-2014, 2016 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
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- 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., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ Affero General Public License for more details.
*/
/**
*/
#define MAX_PENDING 1024
+/**
+ * Limit size of bloom filter to 2 GB.
+ */
+#define MAX_BF_SIZE ((uint32_t) (1LL << 31))
+
/**
* How long are we at most keeping "expired" content
* past the expiration date in the database?
*/
static char *quota_stat_name;
+/**
+ * Task to timeout stat GET.
+ */
+static struct GNUNET_SCHEDULER_Task *stat_timeout_task;
+
/**
* After how many payload-changing operations
* do we sync our statistics?
/**
* Client that made the reservation.
*/
- struct GNUNET_SERVER_Client *client;
+ struct GNUNET_SERVICE_Client *client;
/**
* Number of bytes (still) reserved.
* Identity of the task that is used to delete
* expired content.
*/
-static struct GNUNET_SCHEDULER_Task * expired_kill_task;
+static struct GNUNET_SCHEDULER_Task *expired_kill_task;
/**
* Minimum time that content should have to not be discarded instantly
}
-/**
- * Context for transmitting replies to clients.
- */
-struct TransmitCallbackContext
-{
-
- /**
- * We keep these in a doubly-linked list (for cleanup).
- */
- struct TransmitCallbackContext *next;
-
- /**
- * We keep these in a doubly-linked list (for cleanup).
- */
- struct TransmitCallbackContext *prev;
-
- /**
- * The message that we're asked to transmit.
- */
- struct GNUNET_MessageHeader *msg;
-
- /**
- * Handle for the transmission request.
- */
- struct GNUNET_SERVER_TransmitHandle *th;
-
- /**
- * Client that we are transmitting to.
- */
- struct GNUNET_SERVER_Client *client;
-
-};
-
-
-/**
- * Head of the doubly-linked list (for cleanup).
- */
-static struct TransmitCallbackContext *tcc_head;
-
-/**
- * Tail of the doubly-linked list (for cleanup).
- */
-static struct TransmitCallbackContext *tcc_tail;
-
/**
* Have we already cleaned up the TCCs and are hence no longer
* willing (or able) to transmit anything to anyone?
/**
* Handle to our server.
*/
-static struct GNUNET_SERVER_Handle *server;
+static struct GNUNET_SERVICE_Handle *service;
/**
* Task that is used to remove expired entries from
* content quickly.
*
* @param cls not used
- * @param tc task context
*/
static void
-delete_expired (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc);
+delete_expired (void *cls);
/**
* @param type type of the content
* @param priority priority of the content
* @param anonymity anonymity-level for the content
+ * @param replication replication-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
enum GNUNET_BLOCK_Type type,
uint32_t priority,
uint32_t anonymity,
+ uint32_t replication,
struct GNUNET_TIME_Absolute expiration,
uint64_t uid)
{
struct GNUNET_TIME_Absolute now;
- if (key == NULL)
+ if (NULL == key)
{
expired_kill_task =
GNUNET_SCHEDULER_add_delayed_with_priority (MAX_EXPIRE_DELAY,
* content quickly.
*
* @param cls not used
- * @param tc task context
*/
static void
-delete_expired (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+delete_expired (void *cls)
{
expired_kill_task = NULL;
- plugin->api->get_expiration (plugin->api->cls, &expired_processor, NULL);
+ plugin->api->get_expiration (plugin->api->cls,
+ &expired_processor,
+ NULL);
}
* @param type type of the content
* @param priority priority of the content
* @param anonymity anonymity-level for the content
+ * @param replication replication-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
+ * @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)
+ * #GNUNET_NO to delete the item and continue (if supported)
*/
static int
-quota_processor (void *cls, const struct GNUNET_HashCode * key, uint32_t size,
- const void *data, enum GNUNET_BLOCK_Type type,
- uint32_t priority, uint32_t anonymity,
- struct GNUNET_TIME_Absolute expiration, uint64_t uid)
+quota_processor (void *cls,
+ const struct GNUNET_HashCode *key,
+ uint32_t size,
+ const void *data,
+ enum GNUNET_BLOCK_Type type,
+ uint32_t priority,
+ uint32_t anonymity,
+ uint32_t replication,
+ struct GNUNET_TIME_Absolute expiration,
+ uint64_t uid)
{
unsigned long long *need = cls;
unsigned long long last;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Asked to free up %llu bytes of cache space\n", need);
+ "Asked to free up %llu bytes of cache space\n",
+ need);
last = 0;
while ((need > 0) && (last != need))
{
last = need;
- plugin->api->get_expiration (plugin->api->cls, "a_processor, &need);
- }
-}
-
-
-/**
- * Function called to notify a client about the socket
- * begin ready to queue more data. "buf" will be
- * NULL and "size" zero if the socket was closed for
- * writing in the meantime.
- *
- * @param cls closure
- * @param size number of bytes available in buf
- * @param buf where the callee should write the message
- * @return number of bytes written to buf
- */
-static size_t
-transmit_callback (void *cls, size_t size, void *buf)
-{
- struct TransmitCallbackContext *tcc = cls;
- size_t msize;
-
- tcc->th = NULL;
- GNUNET_CONTAINER_DLL_remove (tcc_head, tcc_tail, tcc);
- msize = ntohs (tcc->msg->size);
- if (size == 0)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Transmission to client failed!\n"));
- GNUNET_SERVER_receive_done (tcc->client, GNUNET_SYSERR);
- GNUNET_SERVER_client_drop (tcc->client);
- GNUNET_free (tcc->msg);
- GNUNET_free (tcc);
- return 0;
+ plugin->api->get_expiration (plugin->api->cls,
+ "a_processor,
+ &need);
}
- GNUNET_assert (size >= msize);
- memcpy (buf, tcc->msg, msize);
- GNUNET_SERVER_receive_done (tcc->client, GNUNET_OK);
- GNUNET_SERVER_client_drop (tcc->client);
- GNUNET_free (tcc->msg);
- GNUNET_free (tcc);
- return msize;
-}
-
-
-/**
- * Transmit the given message to the client.
- *
- * @param client target of the message
- * @param msg message to transmit, will be freed!
- */
-static void
-transmit (struct GNUNET_SERVER_Client *client, struct GNUNET_MessageHeader *msg)
-{
- struct TransmitCallbackContext *tcc;
-
- if (GNUNET_YES == cleaning_done)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Shutdown in progress, aborting transmission.\n"));
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- GNUNET_free (msg);
- return;
- }
- tcc = GNUNET_new (struct TransmitCallbackContext);
- tcc->msg = msg;
- tcc->client = client;
- if (NULL ==
- (tcc->th =
- GNUNET_SERVER_notify_transmit_ready (client, ntohs (msg->size),
- GNUNET_TIME_UNIT_FOREVER_REL,
- &transmit_callback, tcc)))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- GNUNET_free (msg);
- GNUNET_free (tcc);
- return;
- }
- GNUNET_SERVER_client_keep (client);
- GNUNET_CONTAINER_DLL_insert (tcc_head, tcc_tail, tcc);
}
* @param msg optional error message (can be NULL)
*/
static void
-transmit_status (struct GNUNET_SERVER_Client *client, int code, const char *msg)
+transmit_status (struct GNUNET_SERVICE_Client *client,
+ int code,
+ const char *msg)
{
+ struct GNUNET_MQ_Envelope *env;
struct StatusMessage *sm;
size_t slen;
"Transmitting `%s' message with value %d and message `%s'\n",
"STATUS", code, msg != NULL ? msg : "(none)");
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);
+ env = GNUNET_MQ_msg_extra (sm,
+ slen,
+ GNUNET_MESSAGE_TYPE_DATASTORE_STATUS);
sm->status = htonl (code);
sm->min_expiration = GNUNET_TIME_absolute_hton (min_expiration);
- if (slen > 0)
- memcpy (&sm[1], msg, slen);
- transmit (client, &sm->header);
+ GNUNET_memcpy (&sm[1],
+ msg,
+ slen);
+ GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client),
+ env);
}
* Function that will transmit the given datastore entry
* to the client.
*
- * @param cls closure, pointer to the client (of type GNUNET_SERVER_Client).
+ * @param cls closure, pointer to the client (of type `struct GNUNET_SERVICE_Client`).
* @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 replication replication-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,
- * GNUNET_NO to delete the item and continue (if supported)
+ * @return #GNUNET_SYSERR to abort the iteration, #GNUNET_OK to continue,
+ * #GNUNET_NO to delete the item and continue (if supported)
*/
static int
-transmit_item (void *cls, const struct GNUNET_HashCode * key, uint32_t size,
- const void *data, enum GNUNET_BLOCK_Type type, uint32_t priority,
- uint32_t anonymity, struct GNUNET_TIME_Absolute expiration,
+transmit_item (void *cls,
+ const struct GNUNET_HashCode *key,
+ uint32_t size,
+ const void *data,
+ enum GNUNET_BLOCK_Type type,
+ uint32_t priority,
+ uint32_t anonymity,
+ uint32_t replication,
+ struct GNUNET_TIME_Absolute expiration,
uint64_t uid)
{
- struct GNUNET_SERVER_Client *client = cls;
+ struct GNUNET_SERVICE_Client *client = cls;
+ struct GNUNET_MQ_Envelope *env;
struct GNUNET_MessageHeader *end;
struct DataMessage *dm;
- if (key == NULL)
+ if (NULL == key)
{
/* transmit 'DATA_END' */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmitting `%s' message\n",
- "DATA_END");
- end = GNUNET_new (struct GNUNET_MessageHeader);
- end->size = htons (sizeof (struct GNUNET_MessageHeader));
- end->type = htons (GNUNET_MESSAGE_TYPE_DATASTORE_DATA_END);
- transmit (client, end);
- GNUNET_SERVER_client_drop (client);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Transmitting DATA_END message\n");
+ env = GNUNET_MQ_msg (end,
+ GNUNET_MESSAGE_TYPE_DATASTORE_DATA_END);
+ GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client),
+ env);
return GNUNET_OK;
}
GNUNET_assert (sizeof (struct DataMessage) + size <
- GNUNET_SERVER_MAX_MESSAGE_SIZE);
- dm = GNUNET_malloc (sizeof (struct DataMessage) + size);
- dm->header.size = htons (sizeof (struct DataMessage) + size);
- dm->header.type = htons (GNUNET_MESSAGE_TYPE_DATASTORE_DATA);
+ GNUNET_MAX_MESSAGE_SIZE);
+ env = GNUNET_MQ_msg_extra (dm,
+ size,
+ GNUNET_MESSAGE_TYPE_DATASTORE_DATA);
dm->rid = htonl (0);
dm->size = htonl (size);
dm->type = htonl (type);
dm->priority = htonl (priority);
dm->anonymity = htonl (anonymity);
- dm->replication = htonl (0);
- dm->reserved = htonl (0);
+ dm->replication = htonl (replication);
dm->expiration = GNUNET_TIME_absolute_hton (expiration);
dm->uid = GNUNET_htonll (uid);
dm->key = *key;
- memcpy (&dm[1], data, size);
+ GNUNET_memcpy (&dm[1],
+ data,
+ size);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Transmitting `%s' message for `%s' of type %u with expiration %s (in: %s)\n",
- "DATA", GNUNET_h2s (key), type,
+ "Transmitting DATA message for `%s' of type %u with expiration %s (in: %s)\n",
+ GNUNET_h2s (key),
+ type,
GNUNET_STRINGS_absolute_time_to_string (expiration),
GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining (expiration),
GNUNET_YES));
gettext_noop ("# results found"),
1,
GNUNET_NO);
- transmit (client, &dm->header);
- GNUNET_SERVER_client_drop (client);
+ GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client),
+ env);
return GNUNET_OK;
}
/**
* Handle RESERVE-message.
*
- * @param cls closure
- * @param client identification of the client
+ * @param cls identification of the client
* @param message the actual message
*/
static void
-handle_reserve (void *cls, struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+handle_reserve (void *cls,
+ const struct ReserveMessage *msg)
{
/**
* Static counter to produce reservation identifiers.
*/
static int reservation_gen;
-
- const struct ReserveMessage *msg = (const struct ReserveMessage *) message;
+ struct GNUNET_SERVICE_Client *client = cls;
struct ReservationList *e;
unsigned long long used;
unsigned long long req;
amount = GNUNET_ntohll (msg->amount);
entries = ntohl (msg->entries);
used = payload + reserved;
- req =
- amount + ((unsigned long long) GNUNET_DATASTORE_ENTRY_OVERHEAD) * entries;
+ 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);
+ _("Insufficient space (%llu bytes are available) to satisfy RESERVE request for %llu bytes\n"),
+ quota - used,
+ req);
if (cache_size < req)
{
/* TODO: document this in the FAQ; essentially, if this
* 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,
+ _("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,
+ transmit_status (client,
+ 0,
gettext_noop ("Insufficient space to satisfy request"));
}
+ GNUNET_SERVICE_client_continue (client);
return;
}
reserved += req;
e->rid = ++reservation_gen;
if (reservation_gen < 0)
reservation_gen = 0; /* wrap around */
- transmit_status (client, e->rid, NULL);
+ transmit_status (client,
+ e->rid,
+ NULL);
+ GNUNET_SERVICE_client_continue (client);
}
/**
* Handle RELEASE_RESERVE-message.
*
- * @param cls closure
- * @param client identification of the client
+ * @param cls identification of the client
* @param message the actual message
*/
static void
handle_release_reserve (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+ const struct ReleaseReserveMessage *msg)
{
- const struct ReleaseReserveMessage *msg =
- (const struct ReleaseReserveMessage *) message;
+ struct GNUNET_SERVICE_Client *client = cls;
struct ReservationList *pos;
struct ReservationList *prev;
struct ReservationList *next;
"Returning %llu remaining reserved bytes to storage pool\n",
rem);
GNUNET_free (pos);
- transmit_status (client, GNUNET_OK, NULL);
+ transmit_status (client,
+ GNUNET_OK,
+ NULL);
+ GNUNET_SERVICE_client_continue (client);
return;
}
prev = pos;
}
GNUNET_break (0);
- transmit_status (client, GNUNET_SYSERR,
+ transmit_status (client,
+ GNUNET_SYSERR,
gettext_noop ("Could not find matching reservation"));
+ GNUNET_SERVICE_client_continue (client);
}
/**
* Check that the given message is a valid data message.
*
- * @return NULL if the message is not well-formed, otherwise the message
+ * @param dm message to check
+ * @return #GNUNET_SYSERR is not well-formed, otherwise #GNUNET_OK
*/
-static const struct DataMessage *
-check_data (const struct GNUNET_MessageHeader *message)
+static int
+check_data (const struct DataMessage *dm)
{
uint16_t size;
uint32_t dsize;
- const struct DataMessage *dm;
- size = ntohs (message->size);
- if (size < sizeof (struct DataMessage))
- {
- GNUNET_break (0);
- return NULL;
- }
- dm = (const struct DataMessage *) message;
+ size = ntohs (dm->header.size);
dsize = ntohl (dm->size);
if (size != dsize + sizeof (struct DataMessage))
{
GNUNET_break (0);
- return NULL;
+ return GNUNET_SYSERR;
}
- return dm;
+ return GNUNET_OK;
}
-/**
- * Context for a PUT request used to see if the content is
- * already present.
- */
-struct PutContext
-{
- /**
- * Client to notify on completion.
- */
- struct GNUNET_SERVER_Client *client;
-
-#if ! HAVE_UNALIGNED_64_ACCESS
- void *reserved;
-#endif
-
- /* followed by the 'struct DataMessage' */
-};
-
-
/**
* Put continuation.
*
* @param cls closure
* @param key key for the item stored
* @param size size of the item stored
- * @param status #GNUNET_OK or #GNUNET_SYSERROR
+ * @param status #GNUNET_OK if inserted, #GNUNET_NO if updated,
+ * or #GNUNET_SYSERROR if error
* @param msg error message on error
*/
static void
put_continuation (void *cls,
- const struct GNUNET_HashCode *key,
- uint32_t size,
+ const struct GNUNET_HashCode *key,
+ uint32_t size,
int status,
- const char *msg)
+ const char *msg)
{
- struct PutContext *pc = cls;
+ struct GNUNET_SERVICE_Client *client = cls;
if (GNUNET_OK == status)
{
gettext_noop ("# bytes stored"),
size,
GNUNET_YES);
- GNUNET_CONTAINER_bloomfilter_add (filter, key);
+ GNUNET_CONTAINER_bloomfilter_add (filter,
+ key);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Successfully stored %u bytes under key `%s'\n",
- size, GNUNET_h2s (key));
+ size,
+ GNUNET_h2s (key));
}
- transmit_status (pc->client, status, msg);
- GNUNET_SERVER_client_drop (pc->client);
- GNUNET_free (pc);
+ transmit_status (client,
+ GNUNET_SYSERR == status ? GNUNET_SYSERR : GNUNET_OK,
+ msg);
if (quota - reserved - cache_size < payload)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
/**
- * Actually put the data message.
+ * Verify PUT-message.
*
- * @param pc put context
- */
-static void
-execute_put (struct PutContext *pc)
-{
- const struct DataMessage *dm;
-
- dm = (const struct DataMessage *) &pc[1];
- plugin->api->put (plugin->api->cls, &dm->key, ntohl (dm->size), &dm[1],
- ntohl (dm->type), ntohl (dm->priority),
- ntohl (dm->anonymity), ntohl (dm->replication),
- GNUNET_TIME_absolute_ntoh (dm->expiration),
- &put_continuation, pc);
-}
-
-
-/**
- *
- * @param cls closure
- * @param status #GNUNET_OK or #GNUNET_SYSERR
- * @param msg error message on error
- */
-static void
-check_present_continuation (void *cls,
- int status,
- const char *msg)
-{
- struct GNUNET_SERVER_Client *client = cls;
-
- transmit_status (client, GNUNET_NO, NULL);
- GNUNET_SERVER_client_drop (client);
-}
-
-
-/**
- * Function that will check if the given datastore entry
- * matches the put and if none match executes the put.
- *
- * @param cls closure, pointer to the client (of type `struct PutContext`).
- * @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_OK usually
- * #GNUNET_NO to delete the item
+ * @param cls identification of the client
+ * @param message the actual message
+ * @return #GNUNET_OK if @a dm is well-formed
*/
static int
-check_present (void *cls,
- const struct GNUNET_HashCode *key,
- uint32_t size,
- const void *data,
- enum GNUNET_BLOCK_Type type,
- uint32_t priority,
- uint32_t anonymity,
- struct GNUNET_TIME_Absolute expiration,
- uint64_t uid)
+check_put (void *cls,
+ const struct DataMessage *dm)
{
- struct PutContext *pc = cls;
- const struct DataMessage *dm;
-
- dm = (const struct DataMessage *) &pc[1];
- if (key == NULL)
- {
- execute_put (pc);
- return GNUNET_OK;
- }
- if ( (GNUNET_BLOCK_TYPE_FS_DBLOCK == type) ||
- (GNUNET_BLOCK_TYPE_FS_IBLOCK == type) ||
- ( (size == ntohl (dm->size)) &&
- (0 == memcmp (&dm[1], data, size)) ) )
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Result already present in datastore\n");
- /* FIXME: change API to allow increasing 'replication' counter */
- if ((ntohl (dm->priority) > 0) ||
- (GNUNET_TIME_absolute_ntoh (dm->expiration).abs_value_us >
- expiration.abs_value_us))
- plugin->api->update (plugin->api->cls,
- uid,
- (int32_t) ntohl (dm->priority),
- GNUNET_TIME_absolute_ntoh (dm->expiration),
- &check_present_continuation,
- pc->client);
- else
- {
- transmit_status (pc->client, GNUNET_NO, NULL);
- GNUNET_SERVER_client_drop (pc->client);
- }
- GNUNET_free (pc);
- }
- else
+ if (GNUNET_OK != check_data (dm))
{
- execute_put (pc);
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
}
return GNUNET_OK;
}
/**
* Handle PUT-message.
*
- * @param cls closure
- * @param client identification of the client
+ * @param cls identification of the client
* @param message the actual message
*/
static void
handle_put (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+ const struct DataMessage *dm)
{
- const struct DataMessage *dm = check_data (message);
+ struct GNUNET_SERVICE_Client *client = cls;
int rid;
struct ReservationList *pos;
- struct PutContext *pc;
- struct GNUNET_HashCode vhash;
uint32_t size;
- if ((dm == NULL) || (ntohl (dm->type) == 0))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Processing PUT request for `%s' of type %u\n",
GNUNET_h2s (&dm->key),
- ntohl (dm->type));
+ (uint32_t) ntohl (dm->type));
rid = ntohl (dm->rid);
size = ntohl (dm->size);
if (rid > 0)
GNUNET_NO);
}
}
- pc = GNUNET_malloc (sizeof (struct PutContext) + size +
- sizeof (struct DataMessage));
- pc->client = client;
- GNUNET_SERVER_client_keep (client);
- memcpy (&pc[1], dm, size + sizeof (struct DataMessage));
- if (GNUNET_YES == GNUNET_CONTAINER_bloomfilter_test (filter, &dm->key))
- {
- GNUNET_CRYPTO_hash (&dm[1], size, &vhash);
- plugin->api->get_key (plugin->api->cls,
- 0,
- &dm->key,
- &vhash,
- ntohl (dm->type),
- &check_present,
- pc);
- return;
- }
- execute_put (pc);
+ bool absent = GNUNET_NO == GNUNET_CONTAINER_bloomfilter_test (filter,
+ &dm->key);
+ plugin->api->put (plugin->api->cls,
+ &dm->key,
+ absent,
+ ntohl (dm->size),
+ &dm[1],
+ ntohl (dm->type),
+ ntohl (dm->priority),
+ ntohl (dm->anonymity),
+ ntohl (dm->replication),
+ GNUNET_TIME_absolute_ntoh (dm->expiration),
+ &put_continuation,
+ client);
+ GNUNET_SERVICE_client_continue (client);
}
/**
- * Handle GET-message.
+ * Handle #GNUNET_MESSAGE_TYPE_DATASTORE_GET-message.
*
- * @param cls closure
- * @param client identification of the client
- * @param message the actual message
+ * @param cls identification of the client
+ * @param msg the actual message
*/
static void
handle_get (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+ const struct GetMessage *msg)
{
- const struct GetMessage *msg;
- uint16_t size;
+ struct GNUNET_SERVICE_Client *client = cls;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Processing GET request of type %u\n",
+ (uint32_t) ntohl (msg->type));
+ GNUNET_STATISTICS_update (stats,
+ gettext_noop ("# GET requests received"),
+ 1,
+ GNUNET_NO);
+ plugin->api->get_key (plugin->api->cls,
+ GNUNET_ntohll (msg->next_uid),
+ msg->random,
+ NULL,
+ ntohl (msg->type),
+ &transmit_item,
+ client);
+ GNUNET_SERVICE_client_continue (client);
+}
+
+
+/**
+ * Handle #GNUNET_MESSAGE_TYPE_DATASTORE_GET_KEY-message.
+ *
+ * @param cls closure
+ * @param msg the actual message
+ */
+static void
+handle_get_key (void *cls,
+ const struct GetKeyMessage *msg)
+{
+ struct GNUNET_SERVICE_Client *client = cls;
- size = ntohs (message->size);
- if ((size != sizeof (struct GetMessage)) &&
- (size != sizeof (struct GetMessage) - sizeof (struct GNUNET_HashCode)))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- msg = (const struct GetMessage *) message;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Processing GET request for `%s' of type %u\n",
GNUNET_h2s (&msg->key),
- ntohl (msg->type));
+ (uint32_t) ntohl (msg->type));
GNUNET_STATISTICS_update (stats,
- gettext_noop ("# GET requests received"),
+ gettext_noop ("# GET KEY requests received"),
1,
GNUNET_NO);
- GNUNET_SERVER_client_keep (client);
- if ( (size == sizeof (struct GetMessage)) &&
- (GNUNET_YES != GNUNET_CONTAINER_bloomfilter_test (filter, &msg->key)) )
+ if (GNUNET_YES !=
+ GNUNET_CONTAINER_bloomfilter_test (filter,
+ &msg->key))
{
/* don't bother database... */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
("# requests filtered by bloomfilter"),
1,
GNUNET_NO);
- transmit_item (client, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS,
+ transmit_item (client,
+ NULL, 0, NULL, 0, 0, 0, 0,
+ GNUNET_TIME_UNIT_ZERO_ABS,
0);
+ GNUNET_SERVICE_client_continue (client);
return;
}
- plugin->api->get_key (plugin->api->cls, GNUNET_ntohll (msg->offset),
- ((size ==
- sizeof (struct GetMessage)) ? &msg->key : NULL), NULL,
- ntohl (msg->type), &transmit_item, client);
-}
-
-
-/**
- * Function called with the result of an update operation.
- *
- * @param cls closure
- * @param status #GNUNET_OK or #GNUNET_SYSERR
- * @param msg error message on error
- */
-static void
-update_continuation (void *cls,
- int status,
- const char *msg)
-{
- struct GNUNET_SERVER_Client *client = cls;
-
- transmit_status (client, status, msg);
- GNUNET_SERVER_client_drop (client);
-}
-
-
-/**
- * Handle UPDATE-message.
- *
- * @param cls closure
- * @param client identification of the client
- * @param message the actual message
- */
-static void
-handle_update (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
-{
- const struct UpdateMessage *msg;
-
- GNUNET_STATISTICS_update (stats,
- gettext_noop ("# UPDATE requests received"),
- 1,
- GNUNET_NO);
- msg = (const struct UpdateMessage *) message;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Processing UPDATE request for %llu\n",
- (unsigned long long) GNUNET_ntohll (msg->uid));
- GNUNET_SERVER_client_keep (client);
- plugin->api->update (plugin->api->cls,
- GNUNET_ntohll (msg->uid),
- (int32_t) ntohl (msg->priority),
- GNUNET_TIME_absolute_ntoh (msg->expiration),
- &update_continuation, client);
+ plugin->api->get_key (plugin->api->cls,
+ GNUNET_ntohll (msg->next_uid),
+ msg->random,
+ &msg->key,
+ ntohl (msg->type),
+ &transmit_item,
+ client);
+ GNUNET_SERVICE_client_continue (client);
}
/**
* Handle GET_REPLICATION-message.
*
- * @param cls closure
- * @param client identification of the client
+ * @param cls identification of the client
* @param message the actual message
*/
static void
handle_get_replication (void *cls,
- struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
+ struct GNUNET_SERVICE_Client *client = cls;
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Processing `%s' request\n",
- "GET_REPLICATION");
+ "Processing GET_REPLICATION request\n");
GNUNET_STATISTICS_update (stats,
gettext_noop ("# GET REPLICATION requests received"),
1,
GNUNET_NO);
- GNUNET_SERVER_client_keep (client);
plugin->api->get_replication (plugin->api->cls,
- &transmit_item, client);
+ &transmit_item,
+ client);
+ GNUNET_SERVICE_client_continue (client);
}
/**
* Handle GET_ZERO_ANONYMITY-message.
*
- * @param cls closure
- * @param client identification of the client
+ * @param cls client identification of the client
* @param message the actual message
*/
static void
handle_get_zero_anonymity (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+ const struct GetZeroAnonymityMessage *msg)
{
- const struct GetZeroAnonymityMessage *msg =
- (const struct GetZeroAnonymityMessage *) message;
+ struct GNUNET_SERVICE_Client *client = cls;
enum GNUNET_BLOCK_Type type;
type = (enum GNUNET_BLOCK_Type) ntohl (msg->type);
if (type == GNUNET_BLOCK_TYPE_ANY)
{
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVICE_client_drop (client);
return;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Processing `%s' request\n",
- "GET_ZERO_ANONYMITY");
+ "Processing GET_ZERO_ANONYMITY request\n");
GNUNET_STATISTICS_update (stats,
gettext_noop ("# GET ZERO ANONYMITY requests received"),
1,
GNUNET_NO);
- GNUNET_SERVER_client_keep (client);
plugin->api->get_zero_anonymity (plugin->api->cls,
- GNUNET_ntohll (msg->offset),
+ GNUNET_ntohll (msg->next_uid),
type,
- &transmit_item, client);
+ &transmit_item,
+ client);
+ GNUNET_SERVICE_client_continue (client);
}
/**
- * Callback function that will cause the item that is passed
- * in to be deleted (by returning #GNUNET_NO).
+ * Remove continuation.
*
* @param cls closure
* @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
- * @return #GNUNET_OK to keep the item
- * #GNUNET_NO to delete the item
+ * @param status #GNUNET_OK if removed, #GNUNET_NO if not found,
+ * or #GNUNET_SYSERROR if error
+ * @param msg error message on error
*/
-static int
-remove_callback (void *cls,
- const struct GNUNET_HashCode *key,
- uint32_t size,
- const void *data,
- enum GNUNET_BLOCK_Type type,
- uint32_t priority,
- uint32_t anonymity,
- struct GNUNET_TIME_Absolute expiration,
- uint64_t uid)
+static void
+remove_continuation (void *cls,
+ const struct GNUNET_HashCode *key,
+ uint32_t size,
+ int status,
+ const char *msg)
{
- struct GNUNET_SERVER_Client *client = cls;
+ struct GNUNET_SERVICE_Client *client = cls;
- if (NULL == key)
+ if (GNUNET_SYSERR == status)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "REMOVE request failed: %s.\n",
+ msg);
+ transmit_status (client,
+ GNUNET_NO,
+ msg);
+ return;
+ }
+ if (GNUNET_NO == status)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "No further matches for REMOVE request.\n");
+ "Content not found for REMOVE request.\n");
transmit_status (client,
GNUNET_NO,
_("Content not found"));
- GNUNET_SERVER_client_drop (client);
- return GNUNET_OK; /* last item */
+ return;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Item %llu matches REMOVE request for key `%s' and type %u.\n",
- (unsigned long long) uid,
- GNUNET_h2s (key),
- type);
+ "Item matches REMOVE request for key `%s'.\n",
+ GNUNET_h2s (key));
GNUNET_STATISTICS_update (stats,
gettext_noop ("# bytes removed (explicit request)"),
size,
GNUNET_YES);
- GNUNET_CONTAINER_bloomfilter_remove (filter, key);
- transmit_status (client, GNUNET_OK, NULL);
- GNUNET_SERVER_client_drop (client);
- return GNUNET_NO;
+ GNUNET_CONTAINER_bloomfilter_remove (filter,
+ key);
+ transmit_status (client,
+ GNUNET_OK,
+ NULL);
+}
+
+
+/**
+ * Verify REMOVE-message.
+ *
+ * @param cls identification of the client
+ * @param message the actual message
+ * @return #GNUNET_OK if @a dm is well-formed
+ */
+static int
+check_remove (void *cls,
+ const struct DataMessage *dm)
+{
+ if (GNUNET_OK != check_data (dm))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
}
*/
static void
handle_remove (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+ const struct DataMessage *dm)
{
- const struct DataMessage *dm = check_data (message);
- struct GNUNET_HashCode vhash;
+ struct GNUNET_SERVICE_Client *client = cls;
- if (NULL == dm)
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
GNUNET_STATISTICS_update (stats,
gettext_noop ("# REMOVE requests received"),
1, GNUNET_NO);
- GNUNET_SERVER_client_keep (client);
- GNUNET_CRYPTO_hash (&dm[1],
- ntohl (dm->size),
- &vhash);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Processing REMOVE request for `%s' of type %u\n",
- GNUNET_h2s (&dm->key),
- ntohl (dm->type));
- plugin->api->get_key (plugin->api->cls,
- 0,
- &dm->key,
- &vhash,
- (enum GNUNET_BLOCK_Type) ntohl (dm->type),
- &remove_callback, client);
+ "Processing REMOVE request for `%s'\n",
+ GNUNET_h2s (&dm->key));
+ plugin->api->remove_key (plugin->api->cls,
+ &dm->key,
+ ntohl (dm->size),
+ &dm[1],
+ &remove_continuation,
+ client);
+ GNUNET_SERVICE_client_continue (client);
}
/**
* Handle DROP-message.
*
- * @param cls closure
- * @param client identification of the client
+ * @param cls identification of the client
* @param message the actual message
*/
static void
handle_drop (void *cls,
- struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
+ struct GNUNET_SERVICE_Client *client = cls;
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Processing DROP request\n");
do_drop = GNUNET_YES;
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVICE_client_continue (client);
}
_("Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"),
(long long) payload,
(long long) -delta);
- plugin->api->estimate_size (plugin->api->cls, &payload);
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ plugin->api->estimate_size (plugin->api->cls,
+ &payload);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("New payload: %lld\n"),
(long long) payload);
sync_stats ();
payload += value;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Notification from statistics about existing payload (%llu), new payload is %llu\n",
- value, payload);
+ (unsigned long long) value,
+ (unsigned long long) payload);
return GNUNET_OK;
}
plugin_name);
ret->short_name = GNUNET_strdup (plugin_name);
ret->lib_name = libname;
- ret->api = GNUNET_PLUGIN_load (libname, &ret->env);
+ ret->api = GNUNET_PLUGIN_load (libname,
+ &ret->env);
if (NULL == ret->api)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
}
-static const struct GNUNET_SERVER_MessageHandler handlers[] = {
- {&handle_reserve, NULL, GNUNET_MESSAGE_TYPE_DATASTORE_RESERVE,
- sizeof (struct ReserveMessage)},
- {&handle_release_reserve, NULL,
- GNUNET_MESSAGE_TYPE_DATASTORE_RELEASE_RESERVE,
- sizeof (struct ReleaseReserveMessage)},
- {&handle_put, NULL, GNUNET_MESSAGE_TYPE_DATASTORE_PUT, 0},
- {&handle_update, NULL, GNUNET_MESSAGE_TYPE_DATASTORE_UPDATE,
- sizeof (struct UpdateMessage)},
- {&handle_get, NULL, GNUNET_MESSAGE_TYPE_DATASTORE_GET, 0},
- {&handle_get_replication, NULL,
- GNUNET_MESSAGE_TYPE_DATASTORE_GET_REPLICATION,
- sizeof (struct GNUNET_MessageHeader)},
- {&handle_get_zero_anonymity, NULL,
- GNUNET_MESSAGE_TYPE_DATASTORE_GET_ZERO_ANONYMITY,
- sizeof (struct GetZeroAnonymityMessage)},
- {&handle_remove, NULL, GNUNET_MESSAGE_TYPE_DATASTORE_REMOVE, 0},
- {&handle_drop, NULL, GNUNET_MESSAGE_TYPE_DATASTORE_DROP,
- sizeof (struct GNUNET_MessageHeader)},
- {NULL, NULL, 0, 0}
-};
+/**
+ * Initialization complete, start operating the service.
+ */
+static void
+begin_service ()
+{
+ GNUNET_SERVICE_resume (service);
+ expired_kill_task
+ = GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
+ &delete_expired,
+ NULL);
+}
/**
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Bloomfilter construction complete.\n"));
- GNUNET_SERVER_add_handlers (server, handlers);
- GNUNET_SERVER_resume (server);
- expired_kill_task
- = GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
- &delete_expired,
- NULL);
+ begin_service ();
return;
}
while (0 < count--)
- GNUNET_CONTAINER_bloomfilter_add (bf, key);
+ GNUNET_CONTAINER_bloomfilter_add (bf,
+ key);
}
process_stat_done (void *cls,
int success)
{
-
stat_get = NULL;
+ if (NULL != stat_timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel (stat_timeout_task);
+ stat_timeout_task = NULL;
+ }
plugin = load_plugin ();
if (NULL == plugin)
{
filter = NULL;
if (NULL != stats)
{
- GNUNET_STATISTICS_destroy (stats, GNUNET_YES);
+ GNUNET_STATISTICS_destroy (stats,
+ GNUNET_YES);
stats = NULL;
}
return;
}
+
if (GNUNET_NO == stats_worked)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Failed to obtain value from statistics service, recomputing it\n");
plugin->api->estimate_size (plugin->api->cls,
&payload);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("New payload: %lld\n"),
+ (long long) payload);
}
+
if (GNUNET_YES == refresh_bf)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
return;
}
else
+ {
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Plugin does not support get_keys function. Please fix!\n"));
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Bloomfilter construction complete.\n"));
+ }
}
+ begin_service ();
+}
- GNUNET_SERVER_add_handlers (server, handlers);
- GNUNET_SERVER_resume (server);
- expired_kill_task
- = GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
- &delete_expired,
- NULL);
+
+/**
+ * Fetching stats took to long, run without.
+ *
+ * @param cls NULL
+ */
+static void
+stat_timeout (void *cls)
+{
+ stat_timeout_task = NULL;
+ GNUNET_STATISTICS_get_cancel (stat_get);
+ process_stat_done (NULL,
+ GNUNET_NO);
}
* Task run during shutdown.
*/
static void
-cleaning_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+cleaning_task (void *cls)
{
- struct TransmitCallbackContext *tcc;
-
cleaning_done = GNUNET_YES;
- while (NULL != (tcc = tcc_head))
- {
- GNUNET_CONTAINER_DLL_remove (tcc_head, tcc_tail, tcc);
- if (tcc->th != NULL)
- {
- GNUNET_SERVER_notify_transmit_ready_cancel (tcc->th);
- GNUNET_SERVER_client_drop (tcc->client);
- }
- GNUNET_free (tcc->msg);
- GNUNET_free (tcc);
- }
if (NULL != expired_kill_task)
{
GNUNET_SCHEDULER_cancel (expired_kill_task);
expired_kill_task = NULL;
}
if (GNUNET_YES == do_drop)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Dropping database!\n");
plugin->api->drop (plugin->api->cls);
+ payload = 0;
+ last_sync++;
+ }
if (NULL != plugin)
{
unload_plugin (plugin);
GNUNET_STATISTICS_get_cancel (stat_get);
stat_get = NULL;
}
+ if (NULL != stat_timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel (stat_timeout_task);
+ stat_timeout_task = NULL;
+ }
GNUNET_free_non_null (plugin_name);
plugin_name = NULL;
if (last_sync > 0)
sync_stats ();
if (NULL != stats)
{
- GNUNET_STATISTICS_destroy (stats, GNUNET_YES);
+ GNUNET_STATISTICS_destroy (stats,
+ GNUNET_YES);
stats = NULL;
}
GNUNET_free (quota_stat_name);
/**
- * Function that removes all active reservations made
- * by the given client and releases the space for other
- * requests.
+ * Add a client to our list of active clients.
+ *
+ * @param cls NULL
+ * @param client client to add
+ * @param mq message queue for @a client
+ * @return @a client
+ */
+static void *
+client_connect_cb (void *cls,
+ struct GNUNET_SERVICE_Client *client,
+ struct GNUNET_MQ_Handle *mq)
+{
+ return client;
+}
+
+
+/**
+ * Called whenever a client is disconnected.
+ * Frees our resources associated with that client.
*
* @param cls closure
* @param client identification of the client
+ * @param app_ctx must match @a client
*/
static void
-cleanup_reservations (void *cls,
- struct GNUNET_SERVER_Client *client)
+client_disconnect_cb (void *cls,
+ struct GNUNET_SERVICE_Client *client,
+ void *app_ctx)
{
struct ReservationList *pos;
struct ReservationList *prev;
struct ReservationList *next;
- if (NULL == client)
- return;
+ GNUNET_assert (app_ctx == client);
prev = NULL;
pos = reservations;
while (NULL != pos)
gettext_noop ("# reserved"),
reserved,
GNUNET_NO);
+
}
* Process datastore requests.
*
* @param cls closure
- * @param serv the initialized server
+ * @param serv the initialized service
* @param c configuration to use
*/
static void
run (void *cls,
- struct GNUNET_SERVER_Handle *serv,
- const struct GNUNET_CONFIGURATION_Handle *c)
+ const struct GNUNET_CONFIGURATION_Handle *c,
+ struct GNUNET_SERVICE_Handle *serv)
{
char *fn;
char *pfn;
unsigned int bf_size;
- server = serv;
+ service = serv;
cfg = c;
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg,
"DATABASE",
&plugin_name))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("No `%s' specified for `%s' in configuration!\n"),
- "DATABASE",
- "DATASTORE");
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+ "DATABASE",
+ "DATASTORE");
return;
}
GNUNET_asprintf ("a_stat_name,
_("# bytes used in file-sharing datastore `%s'"),
plugin_name);
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_size (cfg, "DATASTORE", "QUOTA", "a))
+ GNUNET_CONFIGURATION_get_value_size (cfg,
+ "DATASTORE",
+ "QUOTA",
+ "a))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("No `%s' specified for `%s' in configuration!\n"),
- "QUOTA",
- "DATASTORE");
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+ "QUOTA",
+ "DATASTORE");
return;
}
- stats = GNUNET_STATISTICS_create ("datastore", cfg);
- GNUNET_STATISTICS_set (stats, gettext_noop ("# quota"), quota, GNUNET_NO);
+ stats = GNUNET_STATISTICS_create ("datastore",
+ cfg);
+ GNUNET_STATISTICS_set (stats,
+ gettext_noop ("# quota"),
+ quota,
+ GNUNET_NO);
cache_size = quota / 8; /* Or should we make this an option? */
- GNUNET_STATISTICS_set (stats, gettext_noop ("# cache size"), cache_size,
+ GNUNET_STATISTICS_set (stats,
+ gettext_noop ("# cache size"),
+ cache_size,
GNUNET_NO);
- if (quota / (32 * 1024LL) > (1 << 31))
- bf_size = (1 << 31); /* absolute limit: ~2 GB, beyond that BF just won't help anyway */
+ if (quota / (32 * 1024LL) > MAX_BF_SIZE)
+ bf_size = MAX_BF_SIZE;
else
bf_size = quota / (32 * 1024LL); /* 8 bit per entry, 1 bit per 32 kb in DB */
fn = NULL;
}
else
{
- filter = GNUNET_CONTAINER_bloomfilter_init (NULL, bf_size, 5); /* approx. 3% false positives at max use */
+ filter = GNUNET_CONTAINER_bloomfilter_init (NULL,
+ bf_size,
+ 5); /* approx. 3% false positives at max use */
refresh_bf = GNUNET_YES;
}
GNUNET_free_non_null (fn);
_("Failed to initialize bloomfilter.\n"));
if (NULL != stats)
{
- GNUNET_STATISTICS_destroy (stats, GNUNET_YES);
+ GNUNET_STATISTICS_destroy (stats,
+ GNUNET_YES);
stats = NULL;
}
return;
}
- GNUNET_SERVER_suspend (server);
+ GNUNET_SERVICE_suspend (service);
stat_get =
GNUNET_STATISTICS_get (stats,
"datastore",
quota_stat_name,
- GNUNET_TIME_UNIT_SECONDS,
&process_stat_done,
&process_stat_in,
NULL);
if (NULL == stat_get)
- process_stat_done (NULL, GNUNET_SYSERR);
- GNUNET_SERVER_disconnect_notify (server,
- &cleanup_reservations,
- NULL);
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &cleaning_task,
- NULL);
+ process_stat_done (NULL,
+ GNUNET_SYSERR);
+ else
+ stat_timeout_task
+ = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+ &stat_timeout,
+ NULL);
+ GNUNET_SCHEDULER_add_shutdown (&cleaning_task,
+ NULL);
}
/**
- * The main function for the datastore service.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc,
- char *const *argv)
-{
- int ret;
-
- ret =
- (GNUNET_OK ==
- GNUNET_SERVICE_run (argc, argv, "datastore",
- GNUNET_SERVICE_OPTION_NONE,
- &run, NULL)) ? 0 : 1;
- return ret;
-}
+ * Define "main" method using service macro.
+ */
+GNUNET_SERVICE_MAIN
+("datastore",
+ GNUNET_SERVICE_OPTION_NONE,
+ &run,
+ &client_connect_cb,
+ &client_disconnect_cb,
+ NULL,
+ GNUNET_MQ_hd_fixed_size (reserve,
+ GNUNET_MESSAGE_TYPE_DATASTORE_RESERVE,
+ struct ReserveMessage,
+ NULL),
+ GNUNET_MQ_hd_fixed_size (release_reserve,
+ GNUNET_MESSAGE_TYPE_DATASTORE_RELEASE_RESERVE,
+ struct ReleaseReserveMessage,
+ NULL),
+ GNUNET_MQ_hd_var_size (put,
+ GNUNET_MESSAGE_TYPE_DATASTORE_PUT,
+ struct DataMessage,
+ NULL),
+ GNUNET_MQ_hd_fixed_size (get,
+ GNUNET_MESSAGE_TYPE_DATASTORE_GET,
+ struct GetMessage,
+ NULL),
+ GNUNET_MQ_hd_fixed_size (get_key,
+ GNUNET_MESSAGE_TYPE_DATASTORE_GET_KEY,
+ struct GetKeyMessage,
+ NULL),
+ GNUNET_MQ_hd_fixed_size (get_replication,
+ GNUNET_MESSAGE_TYPE_DATASTORE_GET_REPLICATION,
+ struct GNUNET_MessageHeader,
+ NULL),
+ GNUNET_MQ_hd_fixed_size (get_zero_anonymity,
+ GNUNET_MESSAGE_TYPE_DATASTORE_GET_ZERO_ANONYMITY,
+ struct GetZeroAnonymityMessage,
+ NULL),
+ GNUNET_MQ_hd_var_size (remove,
+ GNUNET_MESSAGE_TYPE_DATASTORE_REMOVE,
+ struct DataMessage,
+ NULL),
+ GNUNET_MQ_hd_fixed_size (drop,
+ GNUNET_MESSAGE_TYPE_DATASTORE_DROP,
+ struct GNUNET_MessageHeader,
+ NULL),
+ GNUNET_MQ_handler_end ());
/* end of gnunet-service-datastore.c */
projects / oweals / gnunet.git / blobdiff