/*
This file is part of GNUnet.
- (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2012, 2013, 2014, 2018 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., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @brief namestore for the GNUnet naming system
* @author Matthias Wachs
* @author Christian Grothoff
+ *
+ * TODO:
+ * - run testcases, make sure everything works!
*/
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_dnsparser_lib.h"
+#include "gnunet_gns_service.h"
#include "gnunet_namecache_service.h"
#include "gnunet_namestore_service.h"
#include "gnunet_namestore_plugin.h"
+#include "gnunet_statistics_service.h"
#include "gnunet_signatures.h"
#include "namestore.h"
#define LOG_STRERROR_FILE(kind,syscall,filename) GNUNET_log_from_strerror_file (kind, "util", syscall, filename)
+/**
+ * If a monitor takes more than 1 minute to process an event, print a warning.
+ */
+#define MONITOR_STALL_WARN_DELAY GNUNET_TIME_UNIT_MINUTES
+
/**
* A namestore client
/**
* Namestore client which intiated this zone iteration
*/
- struct NamestoreClient *client;
+ struct NamestoreClient *nc;
+
+ /**
+ * The nick to add to the records
+ */
+ struct GNUNET_GNSRECORD_Data *nick;
/**
* Key of the zone we are iterating over.
*/
struct GNUNET_CRYPTO_EcdsaPrivateKey zone;
+ /**
+ * Last sequence number in the zone iteration used to address next
+ * result of the zone iteration in the store
+ *
+ * Initialy set to 0.
+ * Updated in #zone_iterate_proc()
+ */
+ uint64_t seq;
+
/**
* The operation id fot the zone iteration in the response for the client
*/
* Offset of the zone iteration used to address next result of the zone
* iteration in the store
*
- * Initialy set to 0 in handle_iteration_start
- * Incremented with by every call to handle_iteration_next
+ * Initialy set to 0 in #handle_iteration_start
+ * Incremented with by every call to #handle_iteration_next
*/
uint32_t offset;
*/
struct NamestoreClient
{
- /**
- * Next element in the DLL
- */
- struct NamestoreClient *next;
/**
- * Previous element in the DLL
+ * The client
*/
- struct NamestoreClient *prev;
+ struct GNUNET_SERVICE_Client *client;
/**
- * The client
+ * Message queue for transmission to @e client
*/
- struct GNUNET_SERVER_Client *client;
+ struct GNUNET_MQ_Handle *mq;
/**
* Head of the DLL of
/**
* 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
- * iteration in the store
+ * Task to warn about slow monitors.
+ */
+ struct GNUNET_SCHEDULER_Task *sa_wait_warning;
+
+ /**
+ * Since when are we blocked on this monitor?
+ */
+ struct GNUNET_TIME_Absolute sa_waiting_start;
+
+ /**
+ * Last sequence number in the zone iteration used to address next
+ * result of the zone iteration in the store
*
* Initialy set to 0.
- * Incremented with by every call to #handle_iteration_next
+ * Updated in #monitor_iterate_cb()
*/
- uint32_t offset;
+ uint64_t seq;
+
+ /**
+ * Current limit of how many more messages we are allowed
+ * to queue to this monitor.
+ */
+ uint64_t limit;
+
+ /**
+ * How many more requests may we receive from the iterator
+ * before it is at the limit we gave it? Will be below or
+ * equal to @e limit. The effective limit for monitor
+ * events is thus @e iteration_cnt - @e limit!
+ */
+ uint64_t iteration_cnt;
+
+ /**
+ * Are we (still) in the initial iteration pass?
+ */
+ int in_first_iteration;
+
+ /**
+ * Is there a store activity waiting for this monitor? We only raise the
+ * flag when it happens and search the DLL for the store activity when we
+ * had a limit increase. If we cannot find any waiting store activity at
+ * that time, we clear the flag again.
+ */
+ int sa_waiting;
};
/**
* Client to notify about the result.
*/
- struct GNUNET_SERVER_Client *client;
+ struct NamestoreClient *nc;
/**
* Client's request ID.
};
+/**
+ * Information for an ongoing #handle_record_store() operation.
+ * Needed as we may wait for monitors to be ready for the notification.
+ */
+struct StoreActivity
+{
+ /**
+ * Kept in a DLL.
+ */
+ struct StoreActivity *next;
+
+ /**
+ * Kept in a DLL.
+ */
+ struct StoreActivity *prev;
+
+ /**
+ * Which client triggered the store activity?
+ */
+ struct NamestoreClient *nc;
+
+ /**
+ * Copy of the original store message (as data fields in @e rd will
+ * point into it!).
+ */
+ const struct RecordStoreMessage *rsm;
+
+ /**
+ * Next zone monitor that still needs to be notified about this PUT.
+ */
+ struct ZoneMonitor *zm_pos;
+
+ /**
+ * Label nicely canonicalized (lower case).
+ */
+ char *conv_name;
+
+};
+
+
/**
* Public key of all zeros.
*/
*/
static const struct GNUNET_CONFIGURATION_Handle *GSN_cfg;
+/**
+ * Handle to the statistics service
+ */
+static struct GNUNET_STATISTICS_Handle *statistics;
+
/**
* Namecache handle.
*/
*/
static char *db_lib_name;
-/**
- * Our notification context.
- */
-static struct GNUNET_SERVER_NotificationContext *snc;
-
-/**
- * Head of the Client DLL
- */
-static struct NamestoreClient *client_head;
-
-/**
- * Tail of the Client DLL
- */
-static struct NamestoreClient *client_tail;
-
/**
* Head of cop DLL.
*/
*/
static struct ZoneMonitor *monitor_tail;
+/**
+ * Head of DLL of monitor-blocked store activities.
+ */
+static struct StoreActivity *sa_head;
+
+/**
+ * Tail of DLL of monitor-blocked store activities.
+ */
+static struct StoreActivity *sa_tail;
+
/**
* Notification context shared by all monitors.
*/
-static struct GNUNET_SERVER_NotificationContext *monitor_nc;
+static struct GNUNET_NotificationContext *monitor_nc;
+/**
+ * Optimize block insertion by caching map of private keys to
+ * public keys in memory?
+ */
+static int cache_keys;
+
+/**
+ * Use the namecache? Doing so creates additional cryptographic
+ * operations whenever we touch a record.
+ */
+static int disable_namecache;
/**
* 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;
struct CacheOperation *cop;
+ (void) cls;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Stopping namestore service\n");
- if (NULL != snc)
- {
- GNUNET_SERVER_notification_context_destroy (snc);
- snc = NULL;
- }
while (NULL != (cop = cop_head))
{
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Aborting incomplete namecache operation\n");
GNUNET_NAMECACHE_cancel (cop->qe);
GNUNET_CONTAINER_DLL_remove (cop_head,
cop_tail,
cop);
GNUNET_free (cop);
}
- GNUNET_NAMECACHE_disconnect (namecache);
- namecache = NULL;
- while (NULL != (nc = client_head))
+ if (NULL != namecache)
{
- while (NULL != (no = nc->op_head))
- {
- GNUNET_CONTAINER_DLL_remove (nc->op_head, nc->op_tail, no);
- GNUNET_free (no);
- }
- GNUNET_CONTAINER_DLL_remove (client_head, client_tail, nc);
- GNUNET_SERVER_client_set_user_context (nc->client, NULL);
- GNUNET_free (nc);
+ GNUNET_NAMECACHE_disconnect (namecache);
+ namecache = NULL;
}
- GNUNET_break (NULL == GNUNET_PLUGIN_unload (db_lib_name, GSN_database));
+ GNUNET_break (NULL == GNUNET_PLUGIN_unload (db_lib_name,
+ GSN_database));
GNUNET_free (db_lib_name);
db_lib_name = NULL;
if (NULL != monitor_nc)
{
- GNUNET_SERVER_notification_context_destroy (monitor_nc);
+ GNUNET_notification_context_destroy (monitor_nc);
monitor_nc = NULL;
}
+ if (NULL != statistics)
+ {
+ GNUNET_STATISTICS_destroy (statistics,
+ GNUNET_NO);
+ statistics = NULL;
+ }
}
/**
- * Called whenever a client is disconnected.
- * Frees our resources associated with that client.
+ * Release memory used by @a sa.
*
- * @param cls closure
- * @param client identification of the client
+ * @param sa activity to free
*/
static void
-client_disconnect_notification (void *cls,
- struct GNUNET_SERVER_Client *client)
+free_store_activity (struct StoreActivity *sa)
{
- struct ZoneIteration *no;
- struct NamestoreClient *nc;
- struct ZoneMonitor *zm;
- struct CacheOperation *cop;
+ GNUNET_CONTAINER_DLL_remove (sa_head,
+ sa_tail,
+ sa);
+ GNUNET_free (sa->conv_name);
+ GNUNET_free (sa);
+}
- if (NULL == client)
- return;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Client %p disconnected\n",
- client);
- if (NULL == (nc = GNUNET_SERVER_client_get_user_context (client, struct NamestoreClient)))
- return;
- while (NULL != (no = nc->op_head))
+
+/**
+ * Function called with the records for the #GNUNET_GNS_EMPTY_LABEL_AT
+ * label in the zone. Used to locate the #GNUNET_GNSRECORD_TYPE_NICK
+ * record, which (if found) is then copied to @a cls for future use.
+ *
+ * @param cls a `struct GNUNET_GNSRECORD_Data **` for storing the nick (if found)
+ * @param seq sequence number of the record
+ * @param private_key the private key of the zone (unused)
+ * @param label should be #GNUNET_GNS_EMPTY_LABEL_AT
+ * @param rd_count number of records in @a rd
+ * @param rd records stored under @a label in the zone
+ */
+static void
+lookup_nick_it (void *cls,
+ uint64_t seq,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *private_key,
+ const char *label,
+ unsigned int rd_count,
+ const struct GNUNET_GNSRECORD_Data *rd)
+{
+ struct GNUNET_GNSRECORD_Data **res = cls;
+
+ (void) private_key;
+ (void) seq;
+ if (0 != strcmp (label, GNUNET_GNS_EMPTY_LABEL_AT))
{
- GNUNET_CONTAINER_DLL_remove (nc->op_head, nc->op_tail, no);
- GNUNET_free (no);
+ GNUNET_break (0);
+ return;
}
- GNUNET_CONTAINER_DLL_remove (client_head, client_tail, nc);
- GNUNET_free (nc);
- for (zm = monitor_head; NULL != zm; zm = zm->next)
+ for (unsigned int c = 0; c < rd_count; c++)
{
- if (client == zm->nc->client)
+ if (GNUNET_GNSRECORD_TYPE_NICK == rd[c].record_type)
{
- GNUNET_CONTAINER_DLL_remove (monitor_head,
- monitor_tail,
- zm);
- if (GNUNET_SCHEDULER_NO_TASK != zm->task)
- {
- GNUNET_SCHEDULER_cancel (zm->task);
- zm->task = GNUNET_SCHEDULER_NO_TASK;
- }
- GNUNET_free (zm);
- break;
+ (*res) = GNUNET_malloc (rd[c].data_size + sizeof (struct GNUNET_GNSRECORD_Data));
+ (*res)->data = &(*res)[1];
+ GNUNET_memcpy ((void *) (*res)->data,
+ rd[c].data,
+ rd[c].data_size);
+ (*res)->data_size = rd[c].data_size;
+ (*res)->expiration_time = rd[c].expiration_time;
+ (*res)->flags = rd[c].flags;
+ (*res)->record_type = GNUNET_GNSRECORD_TYPE_NICK;
+ return;
}
}
- for (cop = cop_head; NULL != cop; cop = cop->next)
- if (client == cop->client)
- cop->client = NULL;
+ (*res) = NULL;
}
/**
- * Add a client to our list of active clients, if it is not yet
- * in there.
+ * Return the NICK record for the zone (if it exists).
*
- * @param client client to add
- * @return internal namestore client structure for this client
+ * @param zone private key for the zone to look for nick
+ * @return NULL if no NICK record was found
*/
-static struct NamestoreClient *
-client_lookup (struct GNUNET_SERVER_Client *client)
+static struct GNUNET_GNSRECORD_Data *
+get_nick_record (const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone)
{
- struct NamestoreClient *nc;
+ struct GNUNET_CRYPTO_EcdsaPublicKey pub;
+ struct GNUNET_GNSRECORD_Data *nick;
+ int res;
- nc = GNUNET_SERVER_client_get_user_context (client, struct NamestoreClient);
- if (NULL != nc)
- return nc;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Client %p connected\n",
- client);
- nc = GNUNET_new (struct NamestoreClient);
- nc->client = client;
- GNUNET_SERVER_notification_context_add (snc, client);
- GNUNET_CONTAINER_DLL_insert (client_head, client_tail, nc);
- GNUNET_SERVER_client_set_user_context (client, nc);
- return nc;
+ nick = NULL;
+ res = GSN_database->lookup_records (GSN_database->cls,
+ zone,
+ GNUNET_GNS_EMPTY_LABEL_AT,
+ &lookup_nick_it,
+ &nick);
+ if ( (GNUNET_OK != res) ||
+ (NULL == nick) )
+ {
+ GNUNET_CRYPTO_ecdsa_key_get_public (zone, &pub);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
+ "No nick name set for zone `%s'\n",
+ GNUNET_GNSRECORD_z2s (&pub));
+ return NULL;
+ }
+ return nick;
}
/**
- * Generate a 'struct LookupNameResponseMessage' and send it to the
+ * Merge the nick record @a nick_rd with the rest of the
+ * record set given in @a rd2. Store the result in @a rdc_res
+ * and @a rd_res. The @a nick_rd's expiration time is set to
+ * the maximum expiration time of all of the records in @a rd2.
+ *
+ * @param nick_rd the nick record to integrate
+ * @param rd2_length length of the @a rd2 array
+ * @param rd2 array of records
+ * @param rdc_res[out] length of the resulting @a rd_res array
+ * @param rd_res[out] set to an array of records,
+ * including @a nick_rd and @a rd2;
+ * all of the variable-size 'data' fields in @a rd2 are
+ * allocated in the same chunk of memory!
+ */
+static void
+merge_with_nick_records (const struct GNUNET_GNSRECORD_Data *nick_rd,
+ unsigned int rd2_length,
+ const struct GNUNET_GNSRECORD_Data *rd2,
+ unsigned int *rdc_res,
+ struct GNUNET_GNSRECORD_Data **rd_res)
+{
+ uint64_t latest_expiration;
+ size_t req;
+ char *data;
+ size_t data_offset;
+ struct GNUNET_GNSRECORD_Data *target;
+
+ (*rdc_res) = 1 + rd2_length;
+ if (0 == 1 + rd2_length)
+ {
+ GNUNET_break (0);
+ (*rd_res) = NULL;
+ return;
+ }
+ req = sizeof (struct GNUNET_GNSRECORD_Data) + nick_rd->data_size;
+ for (unsigned int i=0; i<rd2_length; i++)
+ {
+ const struct GNUNET_GNSRECORD_Data *orig = &rd2[i];
+
+ if (req + sizeof (struct GNUNET_GNSRECORD_Data) + orig->data_size < req)
+ {
+ GNUNET_break (0);
+ (*rd_res) = NULL;
+ return;
+ }
+ req += sizeof (struct GNUNET_GNSRECORD_Data) + orig->data_size;
+ }
+ target = GNUNET_malloc (req);
+ (*rd_res) = target;
+ data = (char *) &target[1 + rd2_length];
+ data_offset = 0;
+ latest_expiration = 0;
+ for (unsigned int i=0;i<rd2_length;i++)
+ {
+ const struct GNUNET_GNSRECORD_Data *orig = &rd2[i];
+
+ if (0 != (orig->flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION))
+ {
+ if ((GNUNET_TIME_absolute_get().abs_value_us + orig->expiration_time) >
+ latest_expiration)
+ latest_expiration = orig->expiration_time;
+ }
+ else if (orig->expiration_time > latest_expiration)
+ latest_expiration = orig->expiration_time;
+ target[i] = *orig;
+ target[i].data = (void *) &data[data_offset];
+ GNUNET_memcpy (&data[data_offset],
+ orig->data,
+ orig->data_size);
+ data_offset += orig->data_size;
+ }
+ /* append nick */
+ target[rd2_length] = *nick_rd;
+ target[rd2_length].expiration_time = latest_expiration;
+ target[rd2_length].data = (void *) &data[data_offset];
+ GNUNET_memcpy (&data[data_offset],
+ nick_rd->data,
+ nick_rd->data_size);
+ data_offset += nick_rd->data_size;
+ GNUNET_assert (req ==
+ (sizeof (struct GNUNET_GNSRECORD_Data)) * (*rdc_res) + data_offset);
+}
+
+
+/**
+ * Generate a `struct LookupNameResponseMessage` and send it to the
* given client using the given notification context.
*
- * @param nc notification context to use
- * @param client client to unicast to
+ * @param nc client to unicast to
* @param request_id request ID to use
* @param zone_key zone key of the zone
* @param name name
* @param rd array of records
*/
static void
-send_lookup_response (struct GNUNET_SERVER_NotificationContext *nc,
- struct GNUNET_SERVER_Client *client,
+send_lookup_response (struct NamestoreClient *nc,
uint32_t request_id,
const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
const char *name,
unsigned int rd_count,
const struct GNUNET_GNSRECORD_Data *rd)
{
+ struct GNUNET_MQ_Envelope *env;
struct RecordResultMessage *zir_msg;
+ struct GNUNET_GNSRECORD_Data *nick;
+ struct GNUNET_GNSRECORD_Data *res;
+ unsigned int res_count;
size_t name_len;
- size_t rd_ser_len;
- size_t msg_size;
+ ssize_t rd_ser_len;
char *name_tmp;
char *rd_ser;
+ nick = get_nick_record (zone_key);
+
+ GNUNET_assert (-1 !=
+ GNUNET_GNSRECORD_records_get_size (rd_count,
+ rd));
+
+ if ( (NULL != nick) &&
+ (0 != strcmp (name,
+ GNUNET_GNS_EMPTY_LABEL_AT)))
+ {
+ nick->flags = (nick->flags | GNUNET_GNSRECORD_RF_PRIVATE) ^ GNUNET_GNSRECORD_RF_PRIVATE;
+ merge_with_nick_records (nick,
+ rd_count,
+ rd,
+ &res_count,
+ &res);
+ GNUNET_free (nick);
+ }
+ else
+ {
+ res_count = rd_count;
+ res = (struct GNUNET_GNSRECORD_Data *) rd;
+ }
+
+ GNUNET_assert (-1 !=
+ GNUNET_GNSRECORD_records_get_size (res_count,
+ res));
+
+
name_len = strlen (name) + 1;
- rd_ser_len = GNUNET_GNSRECORD_records_get_size (rd_count, rd);
- msg_size = sizeof (struct RecordResultMessage) + name_len + rd_ser_len;
- (void) client_lookup (client);
- zir_msg = GNUNET_malloc (msg_size);
- zir_msg->gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_RESULT);
- zir_msg->gns_header.header.size = htons (msg_size);
+ rd_ser_len = GNUNET_GNSRECORD_records_get_size (res_count,
+ res);
+ if (rd_ser_len < 0)
+ {
+ GNUNET_break (0);
+ GNUNET_SERVICE_client_drop (nc->client);
+ return;
+ }
+ if (rd_ser_len >= UINT16_MAX - name_len - sizeof (*zir_msg))
+ {
+ GNUNET_break (0);
+ GNUNET_SERVICE_client_drop (nc->client);
+ return;
+ }
+ env = GNUNET_MQ_msg_extra (zir_msg,
+ name_len + rd_ser_len,
+ GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_RESULT);
zir_msg->gns_header.r_id = htonl (request_id);
zir_msg->name_len = htons (name_len);
- zir_msg->rd_count = htons (rd_count);
- zir_msg->rd_len = htons (rd_ser_len);
+ zir_msg->rd_count = htons (res_count);
+ zir_msg->rd_len = htons ((uint16_t) rd_ser_len);
zir_msg->private_key = *zone_key;
name_tmp = (char *) &zir_msg[1];
- memcpy (name_tmp, name, name_len);
+ GNUNET_memcpy (name_tmp,
+ name,
+ name_len);
rd_ser = &name_tmp[name_len];
- GNUNET_GNSRECORD_records_serialize (rd_count, rd, rd_ser_len, rd_ser);
+ GNUNET_assert (rd_ser_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",
- "RECORD_RESULT",
- rd_count,
- msg_size);
- GNUNET_SERVER_notification_context_unicast (nc,
- client,
- &zir_msg->gns_header.header,
- GNUNET_NO);
- GNUNET_free (zir_msg);
+ "Sending RECORD_RESULT message with %u records\n",
+ res_count);
+ GNUNET_STATISTICS_update (statistics,
+ "Record sets sent to clients",
+ 1,
+ GNUNET_NO);
+ GNUNET_MQ_send (nc->mq,
+ env);
+ if (rd != res)
+ GNUNET_free (res);
}
* @param rid client's request ID
*/
static void
-send_store_response (struct GNUNET_SERVER_Client *client,
+send_store_response (struct NamestoreClient *nc,
int res,
uint32_t rid)
{
- struct RecordStoreResponseMessage rcr_msg;
+ struct GNUNET_MQ_Envelope *env;
+ struct RecordStoreResponseMessage *rcr_msg;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending `%s' message\n",
- "RECORD_STORE_RESPONSE");
- rcr_msg.gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE_RESPONSE);
- rcr_msg.gns_header.header.size = htons (sizeof (struct RecordStoreResponseMessage));
- rcr_msg.gns_header.r_id = htonl (rid);
- rcr_msg.op_result = htonl (res);
- GNUNET_SERVER_notification_context_unicast (snc, client,
- &rcr_msg.gns_header.header,
- GNUNET_NO);
+ "Sending RECORD_STORE_RESPONSE message\n");
+ GNUNET_STATISTICS_update (statistics,
+ "Store requests completed",
+ 1,
+ GNUNET_NO);
+ env = GNUNET_MQ_msg (rcr_msg,
+ GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE_RESPONSE);
+ rcr_msg->gns_header.r_id = htonl (rid);
+ rcr_msg->op_result = htonl (res);
+ GNUNET_MQ_send (nc->mq,
+ env);
}
GNUNET_CONTAINER_DLL_remove (cop_head,
cop_tail,
cop);
- if (NULL != cop->client)
- send_store_response (cop->client,
+ if (NULL != cop->nc)
+ send_store_response (cop->nc,
success,
cop->rid);
GNUNET_free (cop);
/**
* We just touched the plaintext information about a name in our zone;
- * refresh the corresponding (encrypted) block in the namestore.
+ * refresh the corresponding (encrypted) block in the namecache.
*
- * @param client client responsible for the request
+ * @param nc client responsible for the request, can be NULL
* @param rid request ID of the client
* @param zone_key private key of the zone
* @param name label for the records
* @param rd records stored under the given @a name
*/
static void
-refresh_block (struct GNUNET_SERVER_Client *client,
+refresh_block (struct NamestoreClient *nc,
uint32_t rid,
const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
const char *name,
struct GNUNET_GNSRECORD_Block *block;
struct CacheOperation *cop;
struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
-
- if (0 == rd_count)
- block = GNUNET_GNSRECORD_block_create (zone_key,
- GNUNET_TIME_UNIT_ZERO_ABS,
- name,
- rd, rd_count);
+ struct GNUNET_GNSRECORD_Data *nick;
+ struct GNUNET_GNSRECORD_Data *res;
+ unsigned int res_count;
+ struct GNUNET_TIME_Absolute exp_time;
+
+ nick = get_nick_record (zone_key);
+ res_count = rd_count;
+ res = (struct GNUNET_GNSRECORD_Data *) rd; /* fixme: a bit unclean... */
+ if (NULL != nick)
+ {
+ nick->flags = (nick->flags | GNUNET_GNSRECORD_RF_PRIVATE) ^ GNUNET_GNSRECORD_RF_PRIVATE;
+ merge_with_nick_records (nick,
+ rd_count,rd,
+ &res_count,
+ &res);
+ GNUNET_free (nick);
+ }
+ if (0 == res_count)
+ {
+ send_store_response (nc,
+ GNUNET_OK,
+ rid);
+ return; /* no data, no need to update cache */
+ }
+ if (GNUNET_YES == disable_namecache)
+ {
+ GNUNET_STATISTICS_update (statistics,
+ "Namecache updates skipped (NC disabled)",
+ 1,
+ GNUNET_NO);
+ send_store_response (nc,
+ GNUNET_OK,
+ rid);
+ return;
+ }
+ exp_time = GNUNET_GNSRECORD_record_get_expiration_time (res_count,
+ res);
+ if (cache_keys)
+ block = GNUNET_GNSRECORD_block_create2 (zone_key,
+ exp_time,
+ name,
+ res,
+ res_count);
else
block = GNUNET_GNSRECORD_block_create (zone_key,
- GNUNET_GNSRECORD_record_get_expiration_time (rd_count,
- rd),
+ exp_time,
name,
- rd, rd_count);
+ res,
+ res_count);
GNUNET_assert (NULL != block);
GNUNET_CRYPTO_ecdsa_key_get_public (zone_key,
&pkey);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Caching block for label `%s' in zone `%s' in namecache\n",
+ "Caching block for label `%s' with %u records and expiration %s in zone `%s' in namecache\n",
name,
+ res_count,
+ GNUNET_STRINGS_absolute_time_to_string (exp_time),
GNUNET_GNSRECORD_z2s (&pkey));
+ GNUNET_STATISTICS_update (statistics,
+ "Namecache updates pushed",
+ 1,
+ GNUNET_NO);
cop = GNUNET_new (struct CacheOperation);
- cop->client = client;
+ cop->nc = nc;
cop->rid = rid;
GNUNET_CONTAINER_DLL_insert (cop_head,
cop_tail,
}
+/**
+ * Print a warning that one of our monitors is no longer reacting.
+ *
+ * @param cls a `struct ZoneMonitor` to warn about
+ */
+static void
+warn_monitor_slow (void *cls)
+{
+ struct ZoneMonitor *zm = cls;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "No response from monitor since %s\n",
+ GNUNET_STRINGS_absolute_time_to_string (zm->sa_waiting_start));
+ zm->sa_wait_warning = GNUNET_SCHEDULER_add_delayed (MONITOR_STALL_WARN_DELAY,
+ &warn_monitor_slow,
+ zm);
+}
+
+
+/**
+ * Continue processing the @a sa.
+ *
+ * @param sa store activity to process
+ */
+static void
+continue_store_activity (struct StoreActivity *sa)
+{
+ const struct RecordStoreMessage *rp_msg = sa->rsm;
+ unsigned int rd_count;
+ size_t name_len;
+ size_t rd_ser_len;
+ uint32_t rid;
+ const char *name_tmp;
+ const char *rd_ser;
+
+ rid = ntohl (rp_msg->gns_header.r_id);
+ name_len = ntohs (rp_msg->name_len);
+ rd_count = ntohs (rp_msg->rd_count);
+ rd_ser_len = ntohs (rp_msg->rd_len);
+ name_tmp = (const char *) &rp_msg[1];
+ rd_ser = &name_tmp[name_len];
+ {
+ struct GNUNET_GNSRECORD_Data rd[GNUNET_NZL(rd_count)];
+
+ /* We did this before, must succeed again */
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_GNSRECORD_records_deserialize (rd_ser_len,
+ rd_ser,
+ rd_count,
+ rd));
+
+ for (struct ZoneMonitor *zm = sa->zm_pos;
+ NULL != zm;
+ zm = sa->zm_pos)
+ {
+ if ( (0 != memcmp (&rp_msg->private_key,
+ &zm->zone,
+ sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey))) &&
+ (0 != memcmp (&zm->zone,
+ &zero,
+ sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey))) )
+ {
+ sa->zm_pos = zm->next; /* not interesting to this monitor */
+ continue; // -- fails tests, but why not here?
+ }
+ if (zm->limit == zm->iteration_cnt)
+ {
+ zm->sa_waiting = GNUNET_YES;
+ zm->sa_waiting_start = GNUNET_TIME_absolute_get ();
+ if (NULL != zm->sa_wait_warning)
+ GNUNET_SCHEDULER_cancel (zm->sa_wait_warning);
+ zm->sa_wait_warning = GNUNET_SCHEDULER_add_delayed (MONITOR_STALL_WARN_DELAY,
+ &warn_monitor_slow,
+ zm);
+ return; /* blocked on zone monitor */
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Notifying monitor about changes under label `%s'\n",
+ sa->conv_name);
+ zm->limit--;
+ send_lookup_response (zm->nc,
+ 0,
+ &rp_msg->private_key,
+ sa->conv_name,
+ rd_count,
+ rd);
+ sa->zm_pos = zm->next;
+ }
+ /* great, done with the monitors, unpack (again) for refresh_block operation */
+ refresh_block (sa->nc,
+ rid,
+ &rp_msg->private_key,
+ sa->conv_name,
+ rd_count,
+ rd);
+ }
+ GNUNET_SERVICE_client_continue (sa->nc->client);
+ free_store_activity (sa);
+}
+
+
+/**
+ * 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 the `struct NamestoreClient` of @a client
+ */
+static void
+client_disconnect_cb (void *cls,
+ struct GNUNET_SERVICE_Client *client,
+ void *app_ctx)
+{
+ struct NamestoreClient *nc = app_ctx;
+ struct ZoneIteration *no;
+ struct CacheOperation *cop;
+
+ (void) cls;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Client %p disconnected\n",
+ client);
+ for (struct ZoneMonitor *zm = monitor_head; NULL != zm; zm = zm->next)
+ {
+ struct StoreActivity *san;
+
+ if (nc != zm->nc)
+ continue;
+ GNUNET_CONTAINER_DLL_remove (monitor_head,
+ monitor_tail,
+ zm);
+ if (NULL != zm->task)
+ {
+ GNUNET_SCHEDULER_cancel (zm->task);
+ zm->task = NULL;
+ }
+ if (NULL != zm->sa_wait_warning)
+ {
+ GNUNET_SCHEDULER_cancel (zm->sa_wait_warning);
+ zm->sa_wait_warning = NULL;
+ }
+ for (struct StoreActivity *sa = sa_head; NULL != sa; sa = san)
+ {
+ san = sa->next;
+ if (zm == sa->zm_pos)
+ {
+ sa->zm_pos = zm->next;
+ /* this may free sa */
+ continue_store_activity (sa);
+ }
+ }
+ GNUNET_free (zm);
+ break;
+ }
+ for (struct StoreActivity *sa = sa_head; NULL != sa; sa = sa->next)
+ {
+ if (sa->nc == nc)
+ {
+ /* this may free sa */
+ free_store_activity (sa);
+ break; /* there can only be one per nc */
+ }
+ }
+ while (NULL != (no = nc->op_head))
+ {
+ GNUNET_CONTAINER_DLL_remove (nc->op_head,
+ nc->op_tail,
+ no);
+ GNUNET_free (no);
+ }
+ for (cop = cop_head; NULL != cop; cop = cop->next)
+ if (nc == cop->nc)
+ cop->nc = NULL;
+ GNUNET_free (nc);
+}
+
+
+/**
+ * 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 internal namestore client structure for this client
+ */
+static void *
+client_connect_cb (void *cls,
+ struct GNUNET_SERVICE_Client *client,
+ struct GNUNET_MQ_Handle *mq)
+{
+ struct NamestoreClient *nc;
+
+ (void) cls;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Client %p connected\n",
+ client);
+ nc = GNUNET_new (struct NamestoreClient);
+ nc->client = client;
+ nc->mq = mq;
+ return nc;
+}
+
+
+/**
+ * Closure for #lookup_it().
+ */
struct RecordLookupContext
{
+
+ /**
+ * FIXME.
+ */
const char *label;
+ /**
+ * FIXME.
+ */
+ char *res_rd;
+
+ /**
+ * FIXME.
+ */
+ struct GNUNET_GNSRECORD_Data *nick;
+
+ /**
+ * FIXME.
+ */
int found;
+ /**
+ * FIXME.
+ */
unsigned int res_rd_count;
- size_t rd_ser_len;
-
- char *res_rd;
+ /**
+ * FIXME.
+ */
+ ssize_t rd_ser_len;
};
-static void lookup_it (void *cls,
- const struct GNUNET_CRYPTO_EcdsaPrivateKey *private_key,
- const char *label,
- unsigned int rd_count,
- const struct GNUNET_GNSRECORD_Data *rd)
+
+/**
+ * FIXME.
+ *
+ * @param seq sequence number of the record
+ */
+static void
+lookup_it (void *cls,
+ uint64_t seq,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *private_key,
+ const char *label,
+ unsigned int rd_count,
+ const struct GNUNET_GNSRECORD_Data *rd)
{
struct RecordLookupContext *rlc = cls;
- if (0 == strcmp (label, rlc->label))
+ (void) private_key;
+ (void) seq;
+ if (0 != strcmp (label,
+ rlc->label))
+ return;
+ rlc->found = GNUNET_YES;
+ if (0 == rd_count)
+ {
+ rlc->rd_ser_len = 0;
+ rlc->res_rd_count = 0;
+ rlc->res_rd = NULL;
+ return;
+ }
+ if ( (NULL != rlc->nick) &&
+ (0 != strcmp (label,
+ GNUNET_GNS_EMPTY_LABEL_AT)) )
{
- rlc->found = GNUNET_YES;
- if (0 != rd_count)
+ /* Merge */
+ struct GNUNET_GNSRECORD_Data *rd_res;
+ unsigned int rdc_res;
+
+ rd_res = NULL;
+ rdc_res = 0;
+ rlc->nick->flags = (rlc->nick->flags | GNUNET_GNSRECORD_RF_PRIVATE) ^ GNUNET_GNSRECORD_RF_PRIVATE;
+ merge_with_nick_records (rlc->nick,
+ rd_count,
+ rd,
+ &rdc_res,
+ &rd_res);
+ rlc->rd_ser_len = GNUNET_GNSRECORD_records_get_size (rdc_res,
+ rd_res);
+ if (rlc->rd_ser_len < 0)
{
- rlc->rd_ser_len = GNUNET_GNSRECORD_records_get_size (rd_count, rd);
- rlc->res_rd_count = rd_count;
- rlc->res_rd = GNUNET_malloc (rlc->rd_ser_len);
- GNUNET_GNSRECORD_records_serialize (rd_count, rd, rlc->rd_ser_len , rlc->res_rd);
+ GNUNET_break (0);
+ GNUNET_free (rd_res);
+ rlc->found = GNUNET_NO;
+ rlc->rd_ser_len = 0;
+ return;
}
- else
+ rlc->res_rd_count = rdc_res;
+ rlc->res_rd = GNUNET_malloc (rlc->rd_ser_len);
+ if (rlc->rd_ser_len !=
+ GNUNET_GNSRECORD_records_serialize (rdc_res,
+ rd_res,
+ rlc->rd_ser_len,
+ rlc->res_rd))
{
- rlc->rd_ser_len = 0;
+ GNUNET_break (0);
+ GNUNET_free (rlc->res_rd);
+ rlc->res_rd = NULL;
rlc->res_rd_count = 0;
+ rlc->rd_ser_len = 0;
+ GNUNET_free (rd_res);
+ rlc->found = GNUNET_NO;
+ return;
+ }
+ GNUNET_free (rd_res);
+ GNUNET_free (rlc->nick);
+ rlc->nick = NULL;
+ }
+ else
+ {
+ rlc->rd_ser_len = GNUNET_GNSRECORD_records_get_size (rd_count,
+ rd);
+ if (rlc->rd_ser_len < 0)
+ {
+ GNUNET_break (0);
+ rlc->found = GNUNET_NO;
+ rlc->rd_ser_len = 0;
+ return;
+ }
+ rlc->res_rd_count = rd_count;
+ rlc->res_rd = GNUNET_malloc (rlc->rd_ser_len);
+ if (rlc->rd_ser_len !=
+ GNUNET_GNSRECORD_records_serialize (rd_count,
+ rd,
+ rlc->rd_ser_len,
+ rlc->res_rd))
+ {
+ GNUNET_break (0);
+ GNUNET_free (rlc->res_rd);
rlc->res_rd = NULL;
+ rlc->res_rd_count = 0;
+ rlc->rd_ser_len = 0;
+ rlc->found = GNUNET_NO;
+ return;
}
}
}
/**
* Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP message
*
- * @param cls unused
- * @param client client sending the message
- * @param message message of type 'struct RecordCreateMessage'
+ * @param cls client sending the message
+ * @param ll_msg message of type `struct LabelLookupMessage`
+ * @return #GNUNET_OK if @a ll_msg is well-formed
*/
-static void
-handle_record_lookup (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+static int
+check_record_lookup (void *cls,
+ const struct LabelLookupMessage *ll_msg)
{
- const struct LabelLookupMessage *ll_msg;
- struct LabelLookupResponseMessage *llr_msg;
- struct RecordLookupContext rlc;
- const char *name_tmp;
- char *res_name;
uint32_t name_len;
size_t src_size;
- size_t res_size;
- int offset;
- int res;
-
- if (ntohs (message->size) < sizeof (struct LabelLookupMessage))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
+ const char *name_tmp;
- ll_msg = (const struct LabelLookupMessage *) message;
+ (void) cls;
name_len = ntohl (ll_msg->label_len);
- src_size = ntohs (message->size);
-
- if (name_len != src_size - sizeof (struct LabelLookupMessage))
+ src_size = ntohs (ll_msg->gns_header.header.size);
+ if (name_len != src_size - sizeof (struct LabelLookupMessage))
{
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
+ return GNUNET_SYSERR;
}
name_tmp = (const char *) &ll_msg[1];
if ('\0' != name_tmp[name_len -1])
{
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
+ return GNUNET_SYSERR;
}
+ return GNUNET_OK;
+}
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received `%s' message for name `%s'\n",
- "NAMESTORE_RECORD_LOOKUP", name_tmp);
+/**
+ * Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP message
+ *
+ * @param cls client sending the message
+ * @param ll_msg message of type `struct LabelLookupMessage`
+ */
+static void
+handle_record_lookup (void *cls,
+ const struct LabelLookupMessage *ll_msg)
+{
+ struct NamestoreClient *nc = cls;
+ struct GNUNET_MQ_Envelope *env;
+ struct LabelLookupResponseMessage *llr_msg;
+ struct RecordLookupContext rlc;
+ const char *name_tmp;
+ char *res_name;
+ char *conv_name;
+ uint32_t name_len;
+ int res;
- rlc.label = name_tmp;
- rlc.found = GNUNET_NO;
- rlc.res_rd_count = 0;
- rlc.rd_ser_len = 0;
- rlc.res_rd = NULL;
+ name_len = ntohl (ll_msg->label_len);
+ name_tmp = (const char *) &ll_msg[1];
+ GNUNET_SERVICE_client_continue (nc->client);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received NAMESTORE_RECORD_LOOKUP message for name `%s'\n",
+ name_tmp);
- offset = 0;
- do
+ conv_name = GNUNET_GNSRECORD_string_to_lowercase (name_tmp);
+ if (NULL == conv_name)
{
- /* changee this call */
- res = GSN_database->iterate_records (GSN_database->cls,
- &ll_msg->zone, offset, &lookup_it, &rlc);
- offset++;
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Error converting name `%s'\n",
+ name_tmp);
+ GNUNET_SERVICE_client_drop (nc->client);
+ return;
}
- while ((GNUNET_NO == rlc.found) && (GNUNET_OK == res));
-
- res_size = sizeof (struct LabelLookupResponseMessage) + name_len + rlc.rd_ser_len;
- llr_msg = GNUNET_malloc (res_size);
- llr_msg->gns_header.header.size = htons (res_size);
- llr_msg->gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP_RESPONSE);
+ rlc.label = conv_name;
+ rlc.found = GNUNET_NO;
+ rlc.res_rd_count = 0;
+ rlc.res_rd = NULL;
+ rlc.rd_ser_len = 0;
+ rlc.nick = get_nick_record (&ll_msg->zone);
+ res = GSN_database->lookup_records (GSN_database->cls,
+ &ll_msg->zone,
+ conv_name,
+ &lookup_it,
+ &rlc);
+ GNUNET_free (conv_name);
+ env = GNUNET_MQ_msg_extra (llr_msg,
+ name_len + rlc.rd_ser_len,
+ GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP_RESPONSE);
llr_msg->gns_header.r_id = ll_msg->gns_header.r_id;
llr_msg->private_key = ll_msg->zone;
llr_msg->name_len = htons (name_len);
llr_msg->rd_count = htons (rlc.res_rd_count);
llr_msg->rd_len = htons (rlc.rd_ser_len);
res_name = (char *) &llr_msg[1];
- memcpy (&llr_msg[1], name_tmp, name_len);
- memcpy (&res_name[name_len], rlc.res_rd, rlc.rd_ser_len);
-
- GNUNET_SERVER_notification_context_unicast (snc, client, &llr_msg->gns_header.header,
- GNUNET_NO);
-
+ if ((GNUNET_YES == rlc.found) && (GNUNET_OK == res))
+ llr_msg->found = ntohs (GNUNET_YES);
+ else
+ llr_msg->found = ntohs (GNUNET_NO);
+ GNUNET_memcpy (&llr_msg[1],
+ name_tmp,
+ name_len);
+ GNUNET_memcpy (&res_name[name_len],
+ rlc.res_rd,
+ rlc.rd_ser_len);
+ GNUNET_MQ_send (nc->mq,
+ env);
GNUNET_free_non_null (rlc.res_rd);
- GNUNET_free (llr_msg);
}
/**
- * Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE message
+ * Checks a #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE message
*
- * @param cls unused
- * @param client client sending the message
- * @param message message of type 'struct RecordCreateMessage'
+ * @param cls client sending the message
+ * @param rp_msg message of type `struct RecordStoreMessage`
+ * @return #GNUNET_OK if @a rp_msg is well-formed
*/
-static void
-handle_record_store (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+static int
+check_record_store (void *cls,
+ const struct RecordStoreMessage *rp_msg)
{
- const struct RecordStoreMessage *rp_msg;
size_t name_len;
size_t msg_size;
size_t msg_size_exp;
size_t rd_ser_len;
- uint32_t rid;
const char *name_tmp;
- char *conv_name;
- const char *rd_ser;
- unsigned int rd_count;
- int res;
- struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
- struct ZoneMonitor *zm;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received `%s' message\n",
- "NAMESTORE_RECORD_STORE");
- if (ntohs (message->size) < sizeof (struct RecordStoreMessage))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- rp_msg = (const struct RecordStoreMessage *) message;
- rid = ntohl (rp_msg->gns_header.r_id);
+ (void) cls;
name_len = ntohs (rp_msg->name_len);
- msg_size = ntohs (message->size);
- rd_count = ntohs (rp_msg->rd_count);
+ msg_size = ntohs (rp_msg->gns_header.header.size);
rd_ser_len = ntohs (rp_msg->rd_len);
- GNUNET_break (0 == ntohs (rp_msg->reserved));
msg_size_exp = sizeof (struct RecordStoreMessage) + name_len + rd_ser_len;
if (msg_size != msg_size_exp)
{
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
+ return GNUNET_SYSERR;
}
- if ((0 == name_len) || (name_len > MAX_NAME_LEN))
+ if ( (0 == name_len) ||
+ (name_len > MAX_NAME_LEN) )
{
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
+ return GNUNET_SYSERR;
}
name_tmp = (const char *) &rp_msg[1];
- rd_ser = &name_tmp[name_len];
if ('\0' != name_tmp[name_len -1])
{
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
+ return GNUNET_SYSERR;
}
- (void) client_lookup (client);
+ return GNUNET_OK;
+}
+
+
+/**
+ * Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE message
+ *
+ * @param cls client sending the message
+ * @param rp_msg message of type `struct RecordStoreMessage`
+ */
+static void
+handle_record_store (void *cls,
+ const struct RecordStoreMessage *rp_msg)
+{
+ struct NamestoreClient *nc = cls;
+ size_t name_len;
+ size_t rd_ser_len;
+ uint32_t rid;
+ const char *name_tmp;
+ char *conv_name;
+ const char *rd_ser;
+ unsigned int rd_count;
+ int res;
+ struct StoreActivity *sa;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received NAMESTORE_RECORD_STORE message\n");
+ rid = ntohl (rp_msg->gns_header.r_id);
+ name_len = ntohs (rp_msg->name_len);
+ rd_count = ntohs (rp_msg->rd_count);
+ rd_ser_len = ntohs (rp_msg->rd_len);
+ GNUNET_break (0 == ntohs (rp_msg->reserved));
+ name_tmp = (const char *) &rp_msg[1];
+ rd_ser = &name_tmp[name_len];
{
- struct GNUNET_GNSRECORD_Data rd[rd_count];
+ struct GNUNET_GNSRECORD_Data rd[GNUNET_NZL(rd_count)];
if (GNUNET_OK !=
- GNUNET_GNSRECORD_records_deserialize (rd_ser_len, rd_ser, rd_count, rd))
+ GNUNET_GNSRECORD_records_deserialize (rd_ser_len,
+ rd_ser,
+ rd_count,
+ rd))
{
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVICE_client_drop (nc->client);
return;
}
/* Extracting and converting private key */
- GNUNET_CRYPTO_ecdsa_key_get_public (&rp_msg->private_key,
- &pubkey);
conv_name = GNUNET_GNSRECORD_string_to_lowercase (name_tmp);
if (NULL == conv_name)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Error converting name `%s'\n", name_tmp);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ "Error converting name `%s'\n",
+ name_tmp);
+ GNUNET_SERVICE_client_drop (nc->client);
return;
}
+ GNUNET_STATISTICS_update (statistics,
+ "Well-formed store requests received",
+ 1,
+ GNUNET_NO);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Creating %u records for name `%s' in zone `%s'\n",
+ "Creating %u records for name `%s'\n",
(unsigned int) rd_count,
- conv_name,
- GNUNET_GNSRECORD_z2s (&pubkey));
-
+ conv_name);
if ( (0 == rd_count) &&
(GNUNET_NO ==
- GSN_database->iterate_records (GSN_database->cls,
- &rp_msg->private_key, 0, NULL, 0)) )
+ GSN_database->lookup_records (GSN_database->cls,
+ &rp_msg->private_key,
+ conv_name,
+ NULL,
+ 0)) )
{
/* This name does not exist, so cannot be removed */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
}
else
{
+ /* remove "NICK" records, unless this is for the
+ #GNUNET_GNS_EMPTY_LABEL_AT label */
+ struct GNUNET_GNSRECORD_Data rd_clean[GNUNET_NZL(rd_count)];
+ unsigned int rd_clean_off;
+
+ rd_clean_off = 0;
+ for (unsigned int i=0;i<rd_count;i++)
+ {
+ rd_clean[rd_clean_off] = rd[i];
+ if ( (0 == strcmp (GNUNET_GNS_EMPTY_LABEL_AT,
+ conv_name)) ||
+ (GNUNET_GNSRECORD_TYPE_NICK != rd[i].record_type) )
+ rd_clean_off++;
+ }
res = GSN_database->store_records (GSN_database->cls,
&rp_msg->private_key,
conv_name,
- rd_count, rd);
- if (GNUNET_OK == res)
- {
- for (zm = monitor_head; NULL != zm; zm = zm->next)
- {
- if ( (0 == memcmp (&rp_msg->private_key, &zm->zone,
- sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey))) ||
- (0 == memcmp (&zm->zone,
- &zero,
- sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey))) )
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Notifying monitor about changes under label `%s'\n",
- conv_name);
- send_lookup_response (monitor_nc,
- zm->nc->client,
- 0,
- &rp_msg->private_key,
- conv_name,
- rd_count, rd);
- }
- else
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Monitor is for another zone\n");
- }
- if (NULL == monitor_head)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "No monitors active\n");
- }
- else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Error storing record: %d\n",
- res);
- }
+ rd_clean_off,
+ rd_clean);
}
- if (GNUNET_OK == res)
+
+ if (GNUNET_OK != res)
{
- refresh_block (client, rid,
- &rp_msg->private_key,
- conv_name,
- rd_count, rd);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ /* store not successful, not need to tell monitors */
+ send_store_response (nc,
+ res,
+ rid);
+ GNUNET_SERVICE_client_continue (nc->client);
GNUNET_free (conv_name);
return;
}
- GNUNET_free (conv_name);
+
+ sa = GNUNET_malloc (sizeof (struct StoreActivity) +
+ ntohs (rp_msg->gns_header.header.size));
+ GNUNET_CONTAINER_DLL_insert (sa_head,
+ sa_tail,
+ sa);
+ sa->nc = nc;
+ sa->rsm = (const struct RecordStoreMessage *) &sa[1];
+ GNUNET_memcpy (&sa[1],
+ rp_msg,
+ ntohs (rp_msg->gns_header.header.size));
+ sa->zm_pos = monitor_head;
+ sa->conv_name = conv_name;
+ continue_store_activity (sa);
}
- send_store_response (client, res, rid);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
* Zone to name iterator
*
* @param cls struct ZoneToNameCtx *
+ * @param seq sequence number of the record
* @param zone_key the zone key
* @param name name
* @param rd_count number of records in @a rd
*/
static void
handle_zone_to_name_it (void *cls,
+ uint64_t seq,
const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
const char *name,
unsigned int rd_count,
const struct GNUNET_GNSRECORD_Data *rd)
{
struct ZoneToNameCtx *ztn_ctx = cls;
+ struct GNUNET_MQ_Envelope *env;
struct ZoneToNameResponseMessage *ztnr_msg;
int16_t res;
size_t name_len;
- size_t rd_ser_len;
+ ssize_t rd_ser_len;
size_t msg_size;
char *name_tmp;
char *rd_tmp;
+ (void) seq;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Found result for zone-to-name lookup: `%s'\n",
name);
res = GNUNET_YES;
name_len = (NULL == name) ? 0 : strlen (name) + 1;
- rd_ser_len = GNUNET_GNSRECORD_records_get_size (rd_count, rd);
+ rd_ser_len = GNUNET_GNSRECORD_records_get_size (rd_count,
+ rd);
+ if (rd_ser_len < 0)
+ {
+ GNUNET_break (0);
+ ztn_ctx->success = GNUNET_SYSERR;
+ return;
+ }
msg_size = sizeof (struct ZoneToNameResponseMessage) + name_len + rd_ser_len;
- if (msg_size >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+ if (msg_size >= GNUNET_MAX_MESSAGE_SIZE)
{
GNUNET_break (0);
ztn_ctx->success = GNUNET_SYSERR;
return;
}
- ztnr_msg = GNUNET_malloc (msg_size);
- ztnr_msg->gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME_RESPONSE);
+ env = GNUNET_MQ_msg_extra (ztnr_msg,
+ name_len + rd_ser_len,
+ GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME_RESPONSE);
ztnr_msg->gns_header.header.size = htons (msg_size);
ztnr_msg->gns_header.r_id = htonl (ztn_ctx->rid);
ztnr_msg->res = htons (res);
ztnr_msg->name_len = htons (name_len);
ztnr_msg->zone = *zone_key;
name_tmp = (char *) &ztnr_msg[1];
- if (NULL != name)
- memcpy (name_tmp, name, name_len);
+ GNUNET_memcpy (name_tmp,
+ name,
+ name_len);
rd_tmp = &name_tmp[name_len];
- GNUNET_GNSRECORD_records_serialize (rd_count, rd, rd_ser_len, rd_tmp);
+ GNUNET_assert (rd_ser_len ==
+ GNUNET_GNSRECORD_records_serialize (rd_count,
+ rd,
+ rd_ser_len,
+ rd_tmp));
ztn_ctx->success = GNUNET_OK;
- GNUNET_SERVER_notification_context_unicast (snc, ztn_ctx->nc->client,
- &ztnr_msg->gns_header.header,
- GNUNET_NO);
- GNUNET_free (ztnr_msg);
+ GNUNET_MQ_send (ztn_ctx->nc->mq,
+ env);
}
/**
* Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME message
*
- * @param cls unused
- * @param client client sending the message
- * @param message message of type 'struct ZoneToNameMessage'
+ * @param cls client client sending the message
+ * @param ztn_msg message of type 'struct ZoneToNameMessage'
*/
static void
handle_zone_to_name (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+ const struct ZoneToNameMessage *ztn_msg)
{
- struct NamestoreClient *nc;
- const struct ZoneToNameMessage *ztn_msg;
+ struct NamestoreClient *nc = cls;
struct ZoneToNameCtx ztn_ctx;
- struct ZoneToNameResponseMessage ztnr_msg;
+ struct GNUNET_MQ_Envelope *env;
+ struct ZoneToNameResponseMessage *ztnr_msg;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received `%s' message\n",
- "ZONE_TO_NAME");
- ztn_msg = (const struct ZoneToNameMessage *) message;
- nc = client_lookup (client);
+ "Received ZONE_TO_NAME message\n");
ztn_ctx.rid = ntohl (ztn_msg->gns_header.r_id);
ztn_ctx.nc = nc;
ztn_ctx.success = GNUNET_NO;
/* internal error, hang up instead of signalling something
that might be wrong */
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVICE_client_drop (nc->client);
return;
}
if (GNUNET_NO == ztn_ctx.success)
/* no result found, send empty response */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Found no result for zone-to-name lookup.\n");
- memset (&ztnr_msg, 0, sizeof (ztnr_msg));
- ztnr_msg.gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME_RESPONSE);
- ztnr_msg.gns_header.header.size = htons (sizeof (ztnr_msg));
- ztnr_msg.gns_header.r_id = ztn_msg->gns_header.r_id;
- ztnr_msg.res = htons (GNUNET_NO);
- GNUNET_SERVER_notification_context_unicast (snc,
- client,
- &ztnr_msg.gns_header.header,
- GNUNET_NO);
+ env = GNUNET_MQ_msg (ztnr_msg,
+ GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME_RESPONSE);
+ ztnr_msg->gns_header.r_id = ztn_msg->gns_header.r_id;
+ ztnr_msg->res = htons (GNUNET_NO);
+ GNUNET_MQ_send (nc->mq,
+ env);
}
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVICE_client_continue (nc->client);
}
-/**
- * Zone iteration processor result
- */
-enum ZoneIterationResult
-{
- /**
- * Iteration start.
- */
- IT_START = 0,
-
- /**
- * Found records,
- * Continue to iterate with next iteration_next call
- */
- IT_SUCCESS_MORE_AVAILABLE = 1,
-
- /**
- * Iteration complete
- */
- IT_SUCCESS_NOT_MORE_RESULTS_AVAILABLE = 2
-};
-
-
/**
* Context for record remove operations passed from
- * #run_zone_iteration_round to #zone_iteraterate_proc as closure
+ * #run_zone_iteration_round to #zone_iterate_proc as closure
*/
struct ZoneIterationProcResult
{
struct ZoneIteration *zi;
/**
- * Iteration result: iteration done?
- * #IT_SUCCESS_MORE_AVAILABLE: if there may be more results overall but
- * we got one for now and have sent it to the client
- * #IT_SUCCESS_NOT_MORE_RESULTS_AVAILABLE: if there are no further results,
- * #IT_START: if we are still trying to find a result.
+ * Number of results left to be returned in this iteration.
*/
- int res_iteration_finished;
+ uint64_t limit;
};
/**
* Process results for zone iteration from database
*
- * @param cls struct ZoneIterationProcResult *proc
+ * @param cls struct ZoneIterationProcResult
+ * @param seq sequence number of the record
* @param zone_key the zone key
* @param name name
* @param rd_count number of records for this name
*/
static void
zone_iterate_proc (void *cls,
- const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
- const char *name,
- unsigned int rd_count,
- const struct GNUNET_GNSRECORD_Data *rd)
+ uint64_t seq,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
+ const char *name,
+ unsigned int rd_count,
+ const struct GNUNET_GNSRECORD_Data *rd)
{
struct ZoneIterationProcResult *proc = cls;
- unsigned int i;
int do_refresh_block;
- if ((NULL == zone_key) && (NULL == name))
+ if ( (NULL == zone_key) &&
+ (NULL == name) )
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Iteration done\n");
- proc->res_iteration_finished = IT_SUCCESS_NOT_MORE_RESULTS_AVAILABLE;
return;
}
- if ((NULL == zone_key) || (NULL == name))
+ if ( (NULL == zone_key) ||
+ (NULL == name) )
+ {
+ /* what is this!? should never happen */
+ GNUNET_break (0);
+ return;
+ }
+ if (0 == proc->limit)
{
/* what is this!? should never happen */
- proc->res_iteration_finished = IT_START;
GNUNET_break (0);
return;
}
- proc->res_iteration_finished = IT_SUCCESS_MORE_AVAILABLE;
- send_lookup_response (snc,
- proc->zi->client->client,
+ proc->limit--;
+ proc->zi->seq = seq;
+ send_lookup_response (proc->zi->nc,
proc->zi->request_id,
zone_key,
name,
rd_count,
rd);
do_refresh_block = GNUNET_NO;
- for (i=0;i<rd_count;i++)
- if( (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION)) &&
- (0 == (rd[i].flags & GNUNET_GNSRECORD_RF_PENDING)) )
+ for (unsigned int i=0;i<rd_count;i++)
+ if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION))
{
do_refresh_block = GNUNET_YES;
break;
}
if (GNUNET_YES == do_refresh_block)
- refresh_block (NULL, 0,
+ refresh_block (NULL,
+ 0,
zone_key,
name,
rd_count,
rd);
-
}
* Perform the next round of the zone iteration.
*
* @param zi zone iterator to process
+ * @param limit number of results to return in one pass
*/
static void
-run_zone_iteration_round (struct ZoneIteration *zi)
+run_zone_iteration_round (struct ZoneIteration *zi,
+ uint64_t limit)
{
struct ZoneIterationProcResult proc;
- struct RecordResultMessage rrm;
- int ret;
-
- memset (&proc, 0, sizeof (proc));
+ struct GNUNET_MQ_Envelope *env;
+ struct RecordResultMessage *rrm;
+ struct GNUNET_TIME_Absolute start;
+ struct GNUNET_TIME_Relative duration;
+
+ memset (&proc,
+ 0,
+ sizeof (proc));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Asked to return up to %llu records at position %llu\n",
+ (unsigned long long) limit,
+ (unsigned long long) zi->seq);
proc.zi = zi;
- proc.res_iteration_finished = IT_START;
- while (IT_START == proc.res_iteration_finished)
- {
- if (GNUNET_SYSERR ==
- (ret = GSN_database->iterate_records (GSN_database->cls,
- (0 == memcmp (&zi->zone, &zero, sizeof (zero)))
- ? NULL
- : &zi->zone,
- zi->offset,
- &zone_iterate_proc, &proc)))
- {
- GNUNET_break (0);
- break;
- }
- if (GNUNET_NO == ret)
- proc.res_iteration_finished = IT_SUCCESS_NOT_MORE_RESULTS_AVAILABLE;
- zi->offset++;
- }
- if (IT_SUCCESS_MORE_AVAILABLE == proc.res_iteration_finished)
+ proc.limit = limit;
+ start = GNUNET_TIME_absolute_get ();
+ GNUNET_break (GNUNET_SYSERR !=
+ GSN_database->iterate_records (GSN_database->cls,
+ (0 == memcmp (&zi->zone,
+ &zero,
+ sizeof (zero)))
+ ? NULL
+ : &zi->zone,
+ zi->seq,
+ limit,
+ &zone_iterate_proc,
+ &proc));
+ duration = GNUNET_TIME_absolute_get_duration (start);
+ duration = GNUNET_TIME_relative_divide (duration,
+ limit - proc.limit);
+ GNUNET_STATISTICS_set (statistics,
+ "NAMESTORE iteration delay (μs/record)",
+ duration.rel_value_us,
+ GNUNET_NO);
+ if (0 == proc.limit)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "More results available\n");
- return; /* more results later */
+ "Returned %llu results, more results available\n",
+ (unsigned long long) limit);
+ return; /* more results later after we get the
+ #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT message */
}
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Completed iteration after %llu/%llu results\n",
+ (unsigned long long) (limit - proc.limit),
+ (unsigned long long) limit);
/* send empty response to indicate end of list */
- memset (&rrm, 0, sizeof (rrm));
- rrm.gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_RESULT);
- rrm.gns_header.header.size = htons (sizeof (rrm));
- rrm.gns_header.r_id = htonl (zi->request_id);
- GNUNET_SERVER_notification_context_unicast (snc,
- zi->client->client,
- &rrm.gns_header.header,
- GNUNET_NO);
- GNUNET_CONTAINER_DLL_remove (zi->client->op_head,
- zi->client->op_tail,
+ env = GNUNET_MQ_msg (rrm,
+ GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_RESULT);
+ rrm->gns_header.r_id = htonl (zi->request_id);
+ GNUNET_MQ_send (zi->nc->mq,
+ env);
+ GNUNET_CONTAINER_DLL_remove (zi->nc->op_head,
+ zi->nc->op_tail,
zi);
GNUNET_free (zi);
}
/**
* Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_START message
*
- * @param cls unused
- * @param client the client sending the message
- * @param message message of type 'struct ZoneIterationStartMessage'
+ * @param cls the client sending the message
+ * @param zis_msg message from the client
*/
static void
handle_iteration_start (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+ const struct ZoneIterationStartMessage *zis_msg)
{
- const struct ZoneIterationStartMessage *zis_msg;
- struct NamestoreClient *nc;
+ struct NamestoreClient *nc = cls;
struct ZoneIteration *zi;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "ZONE_ITERATION_START");
- if (NULL == (nc = client_lookup (client)))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- zis_msg = (const struct ZoneIterationStartMessage *) message;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received ZONE_ITERATION_START message\n");
zi = GNUNET_new (struct ZoneIteration);
zi->request_id = ntohl (zis_msg->gns_header.r_id);
zi->offset = 0;
- zi->client = nc;
+ zi->nc = nc;
zi->zone = zis_msg->zone;
- GNUNET_CONTAINER_DLL_insert (nc->op_head, nc->op_tail, zi);
- run_zone_iteration_round (zi);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+
+ GNUNET_CONTAINER_DLL_insert (nc->op_head,
+ nc->op_tail,
+ zi);
+ run_zone_iteration_round (zi,
+ 1);
+ GNUNET_SERVICE_client_continue (nc->client);
}
/**
* Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP message
*
- * @param cls unused
- * @param client GNUNET_SERVER_Client sending the message
- * @param message message of type 'struct ZoneIterationStopMessage'
+ * @param cls the client sending the message
+ * @param zis_msg message from the client
*/
static void
handle_iteration_stop (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+ const struct ZoneIterationStopMessage *zis_msg)
{
- struct NamestoreClient *nc;
+ struct NamestoreClient *nc = cls;
struct ZoneIteration *zi;
- const struct ZoneIterationStopMessage *zis_msg;
uint32_t rid;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received `%s' message\n",
- "ZONE_ITERATION_STOP");
- if (NULL == (nc = client_lookup(client)))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- zis_msg = (const struct ZoneIterationStopMessage *) message;
+ "Received ZONE_ITERATION_STOP message\n");
rid = ntohl (zis_msg->gns_header.r_id);
for (zi = nc->op_head; NULL != zi; zi = zi->next)
if (zi->request_id == rid)
if (NULL == zi)
{
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVICE_client_drop (nc->client);
return;
}
- GNUNET_CONTAINER_DLL_remove (nc->op_head, nc->op_tail, zi);
+ GNUNET_CONTAINER_DLL_remove (nc->op_head,
+ nc->op_tail,
+ zi);
GNUNET_free (zi);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVICE_client_continue (nc->client);
}
/**
* Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT message
*
- * @param cls unused
- * @param client GNUNET_SERVER_Client sending the message
- * @param message message of type 'struct ZoneIterationNextMessage'
+ * @param cls the client sending the message
+ * @param message message from the client
*/
static void
handle_iteration_next (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+ const struct ZoneIterationNextMessage *zis_msg)
{
- struct NamestoreClient *nc;
+ struct NamestoreClient *nc = cls;
struct ZoneIteration *zi;
- const struct ZoneIterationNextMessage *zis_msg;
uint32_t rid;
+ uint64_t limit;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received `%s' message\n",
- "ZONE_ITERATION_NEXT");
- if (NULL == (nc = client_lookup(client)))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- zis_msg = (const struct ZoneIterationNextMessage *) message;
+ "Received ZONE_ITERATION_NEXT message\n");
+ GNUNET_STATISTICS_update (statistics,
+ "Iteration NEXT messages received",
+ 1,
+ GNUNET_NO);
rid = ntohl (zis_msg->gns_header.r_id);
+ limit = GNUNET_ntohll (zis_msg->limit);
for (zi = nc->op_head; NULL != zi; zi = zi->next)
if (zi->request_id == rid)
break;
if (NULL == zi)
{
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVICE_client_drop (nc->client);
return;
}
- run_zone_iteration_round (zi);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ run_zone_iteration_round (zi,
+ limit);
+ GNUNET_SERVICE_client_continue (nc->client);
+}
+
+
+/**
+ * Function called when the monitor is ready for more data, and we
+ * should thus unblock PUT operations that were blocked on the
+ * monitor not being ready.
+ */
+static void
+monitor_unblock (struct ZoneMonitor *zm)
+{
+ struct StoreActivity *sa = sa_head;
+
+ while ( (NULL != sa) &&
+ (zm->limit > zm->iteration_cnt) )
+ {
+ struct StoreActivity *sn = sa->next;
+
+ if (sa->zm_pos == zm)
+ continue_store_activity (sa);
+ sa = sn;
+ }
+ if (zm->limit > zm->iteration_cnt)
+ {
+ zm->sa_waiting = GNUNET_NO;
+ if (NULL != zm->sa_wait_warning)
+ {
+ GNUNET_SCHEDULER_cancel (zm->sa_wait_warning);
+ zm->sa_wait_warning = NULL;
+ }
+ }
+ else if (GNUNET_YES == zm->sa_waiting)
+ {
+ zm->sa_waiting_start = GNUNET_TIME_absolute_get ();
+ if (NULL != zm->sa_wait_warning)
+ GNUNET_SCHEDULER_cancel (zm->sa_wait_warning);
+ zm->sa_wait_warning = GNUNET_SCHEDULER_add_delayed (MONITOR_STALL_WARN_DELAY,
+ &warn_monitor_slow,
+ zm);
+ }
}
static void
monitor_sync (struct ZoneMonitor *zm)
{
- struct GNUNET_MessageHeader sync;
-
- sync.size = htons (sizeof (struct GNUNET_MessageHeader));
- sync.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_SYNC);
- GNUNET_SERVER_notification_context_unicast (monitor_nc,
- zm->nc->client,
- &sync,
- GNUNET_NO);
+ struct GNUNET_MQ_Envelope *env;
+ struct GNUNET_MessageHeader *sync;
+
+ env = GNUNET_MQ_msg (sync,
+ GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_SYNC);
+ GNUNET_MQ_send (zm->nc->mq,
+ env);
+ /* mark iteration done */
+ zm->in_first_iteration = GNUNET_NO;
+ zm->iteration_cnt = 0;
+ if ( (zm->limit > 0) &&
+ (zm->sa_waiting) )
+ monitor_unblock (zm);
}
/**
- * Obtain the next datum during the zone monitor's zone intiial iteration.
+ * Obtain the next datum during the zone monitor's zone initial 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_iteration_next (void *cls);
/**
* A #GNUNET_NAMESTORE_RecordIterator for monitors.
*
* @param cls a 'struct ZoneMonitor *' with information about the monitor
+ * @param seq sequence number of the record
* @param zone_key zone key of the zone
* @param name name
* @param rd_count number of records in @a rd
*/
static void
monitor_iterate_cb (void *cls,
+ uint64_t seq,
const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
const char *name,
unsigned int rd_count,
{
struct ZoneMonitor *zm = cls;
- if (NULL == name)
- {
- /* finished with iteration */
- monitor_sync (zm);
- return;
- }
- send_lookup_response (monitor_nc,
- zm->nc->client,
+ zm->seq = seq;
+ GNUNET_assert (NULL != name);
+ GNUNET_STATISTICS_update (statistics,
+ "Monitor notifications sent",
+ 1,
+ GNUNET_NO);
+ zm->limit--;
+ zm->iteration_cnt--;
+ send_lookup_response (zm->nc,
0,
zone_key,
name,
rd_count,
rd);
- zm->task = GNUNET_SCHEDULER_add_now (&monitor_next, zm);
+ if ( (0 == zm->iteration_cnt) &&
+ (0 != zm->limit) )
+ {
+ /* We are done with the current iteration batch, AND the
+ client would right now accept more, so go again! */
+ GNUNET_assert (NULL == zm->task);
+ zm->task = GNUNET_SCHEDULER_add_now (&monitor_iteration_next,
+ zm);
+ }
}
/**
* Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_START message
*
- * @param cls unused
- * @param client the client sending the message
- * @param message message of type 'struct ZoneMonitorStartMessage'
+ * @param cls the client sending the message
+ * @param zis_msg message from the client
*/
static void
handle_monitor_start (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+ const struct ZoneMonitorStartMessage *zis_msg)
{
- const struct ZoneMonitorStartMessage *zis_msg;
+ struct NamestoreClient *nc = cls;
struct ZoneMonitor *zm;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received `%s' message\n",
- "ZONE_MONITOR_START");
- zis_msg = (const struct ZoneMonitorStartMessage *) message;
+ "Received ZONE_MONITOR_START message\n");
zm = GNUNET_new (struct ZoneMonitor);
- zm->offset = 0;
- zm->nc = client_lookup (client);
+ zm->nc = nc;
zm->zone = zis_msg->zone;
- GNUNET_CONTAINER_DLL_insert (monitor_head, monitor_tail, zm);
- GNUNET_SERVER_client_mark_monitor (client);
- GNUNET_SERVER_disable_receive_done_warning (client);
- GNUNET_SERVER_notification_context_add (monitor_nc,
- client);
- if (GNUNET_YES == ntohl (zis_msg->iterate_first))
- zm->task = GNUNET_SCHEDULER_add_now (&monitor_next, zm);
+ zm->limit = 1;
+ zm->in_first_iteration = (GNUNET_YES == ntohl (zis_msg->iterate_first));
+ GNUNET_CONTAINER_DLL_insert (monitor_head,
+ monitor_tail,
+ zm);
+ GNUNET_SERVICE_client_mark_monitor (nc->client);
+ GNUNET_SERVICE_client_continue (nc->client);
+ GNUNET_notification_context_add (monitor_nc,
+ nc->mq);
+ if (zm->in_first_iteration)
+ zm->task = GNUNET_SCHEDULER_add_now (&monitor_iteration_next,
+ zm);
else
monitor_sync (zm);
}
/**
- * Obtain the next datum during the zone monitor's zone intiial iteration.
+ * Obtain the next datum during the zone monitor's zone initial 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_iteration_next (void *cls)
{
struct ZoneMonitor *zm = cls;
int ret;
- zm->task = GNUNET_SCHEDULER_NO_TASK;
+ zm->task = NULL;
+ GNUNET_assert (0 == zm->iteration_cnt);
+ if (zm->limit > 16)
+ zm->iteration_cnt = zm->limit / 2; /* leave half for monitor events */
+ else
+ zm->iteration_cnt = zm->limit; /* use it all */
ret = GSN_database->iterate_records (GSN_database->cls,
- (0 == memcmp (&zm->zone, &zero, sizeof (zero)))
+ (0 == memcmp (&zm->zone,
+ &zero,
+ sizeof (zero)))
? NULL
: &zm->zone,
- zm->offset++,
- &monitor_iterate_cb, zm);
+ zm->seq,
+ zm->iteration_cnt,
+ &monitor_iterate_cb,
+ zm);
if (GNUNET_SYSERR == ret)
{
- GNUNET_SERVER_client_disconnect (zm->nc->client);
+ GNUNET_SERVICE_client_drop (zm->nc->client);
return;
}
if (GNUNET_NO == ret)
}
+/**
+ * Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_NEXT message
+ *
+ * @param cls the client sending the message
+ * @param nm message from the client
+ */
+static void
+handle_monitor_next (void *cls,
+ const struct ZoneMonitorNextMessage *nm)
+{
+ struct NamestoreClient *nc = cls;
+ struct ZoneMonitor *zm;
+ uint64_t inc;
+
+ inc = GNUNET_ntohll (nm->limit);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received ZONE_MONITOR_NEXT message with limit %llu\n",
+ (unsigned long long) inc);
+ for (zm = monitor_head; NULL != zm; zm = zm->next)
+ if (zm->nc == nc)
+ break;
+ if (NULL == zm)
+ {
+ GNUNET_break (0);
+ GNUNET_SERVICE_client_drop (nc->client);
+ return;
+ }
+ GNUNET_SERVICE_client_continue (nc->client);
+ if (zm->limit + inc < zm->limit)
+ {
+ GNUNET_break (0);
+ GNUNET_SERVICE_client_drop (nc->client);
+ return;
+ }
+ zm->limit += inc;
+ if ( (zm->in_first_iteration) &&
+ (zm->limit == inc) )
+ {
+ /* We are still iterating, and the previous iteration must
+ have stopped due to the client's limit, so continue it! */
+ GNUNET_assert (NULL == zm->task);
+ zm->task = GNUNET_SCHEDULER_add_now (&monitor_iteration_next,
+ zm);
+ }
+ GNUNET_assert (zm->iteration_cnt <= zm->limit);
+ if ( (zm->limit > zm->iteration_cnt) &&
+ (zm->sa_waiting) )
+ {
+ monitor_unblock (zm);
+ }
+ else if (GNUNET_YES == zm->sa_waiting)
+ {
+ if (NULL != zm->sa_wait_warning)
+ GNUNET_SCHEDULER_cancel (zm->sa_wait_warning);
+ zm->sa_waiting_start = GNUNET_TIME_absolute_get ();
+ zm->sa_wait_warning = GNUNET_SCHEDULER_add_delayed (MONITOR_STALL_WARN_DELAY,
+ &warn_monitor_slow,
+ zm);
+ }
+}
+
+
/**
* Process namestore requests.
*
* @param cls closure
- * @param server the initialized server
* @param cfg configuration to use
+ * @param service the initialized service
*/
static void
-run (void *cls, struct GNUNET_SERVER_Handle *server,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_SERVICE_Handle *service)
{
- static const struct GNUNET_SERVER_MessageHandler handlers[] = {
- {&handle_record_store, NULL,
- GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE, 0},
- {&handle_record_lookup, NULL,
- GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP, 0},
- {&handle_zone_to_name, NULL,
- GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME, sizeof (struct ZoneToNameMessage) },
- {&handle_iteration_start, NULL,
- GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_START, sizeof (struct ZoneIterationStartMessage) },
- {&handle_iteration_next, NULL,
- GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT, sizeof (struct ZoneIterationNextMessage) },
- {&handle_iteration_stop, NULL,
- GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP, sizeof (struct ZoneIterationStopMessage) },
- {&handle_monitor_start, NULL,
- GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_START, sizeof (struct ZoneMonitorStartMessage) },
- {NULL, NULL, 0, 0}
- };
char *database;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting namestore service\n");
+ (void) cls;
+ (void) service;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting namestore service\n");
+ cache_keys = GNUNET_CONFIGURATION_get_value_yesno (cfg,
+ "namestore",
+ "CACHE_KEYS");
+ disable_namecache = GNUNET_CONFIGURATION_get_value_yesno (cfg,
+ "namecache",
+ "DISABLE");
GSN_cfg = cfg;
- monitor_nc = GNUNET_SERVER_notification_context_create (server, 1);
- namecache = GNUNET_NAMECACHE_connect (cfg);
+ monitor_nc = GNUNET_notification_context_create (1);
+ if (GNUNET_YES != disable_namecache)
+ {
+ namecache = GNUNET_NAMECACHE_connect (cfg);
+ GNUNET_assert (NULL != namecache);
+ }
/* Loading database plugin */
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (cfg, "namestore", "database",
+ GNUNET_CONFIGURATION_get_value_string (cfg,
+ "namestore",
+ "database",
&database))
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No database backend configured\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "No database backend configured\n");
- GNUNET_asprintf (&db_lib_name, "libgnunet_plugin_namestore_%s", database);
- GSN_database = GNUNET_PLUGIN_load (db_lib_name, (void *) GSN_cfg);
+ GNUNET_asprintf (&db_lib_name,
+ "libgnunet_plugin_namestore_%s",
+ database);
+ GSN_database = GNUNET_PLUGIN_load (db_lib_name,
+ (void *) GSN_cfg);
GNUNET_free (database);
+ statistics = GNUNET_STATISTICS_create ("namestore",
+ cfg);
+ GNUNET_SCHEDULER_add_shutdown (&cleanup_task,
+ NULL);
if (NULL == GSN_database)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Could not load database backend `%s'\n",
db_lib_name);
- GNUNET_SCHEDULER_add_now (&cleanup_task, NULL);
+ GNUNET_SCHEDULER_shutdown ();
return;
}
-
- /* Configuring server handles */
- GNUNET_SERVER_add_handlers (server, handlers);
- snc = GNUNET_SERVER_notification_context_create (server, 16);
- GNUNET_SERVER_disconnect_notify (server,
- &client_disconnect_notification,
- NULL);
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleanup_task,
- NULL);
}
/**
- * The main function for the template service.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
+ * Define "main" method using service macro.
*/
-int
-main (int argc, char *const *argv)
-{
- return (GNUNET_OK ==
- GNUNET_SERVICE_run (argc, argv, "namestore",
- GNUNET_SERVICE_OPTION_NONE, &run, NULL)) ? 0 : 1;
-}
+GNUNET_SERVICE_MAIN
+("namestore",
+ GNUNET_SERVICE_OPTION_NONE,
+ &run,
+ &client_connect_cb,
+ &client_disconnect_cb,
+ NULL,
+ GNUNET_MQ_hd_var_size (record_store,
+ GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE,
+ struct RecordStoreMessage,
+ NULL),
+ GNUNET_MQ_hd_var_size (record_lookup,
+ GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP,
+ struct LabelLookupMessage,
+ NULL),
+ GNUNET_MQ_hd_fixed_size (zone_to_name,
+ GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME,
+ struct ZoneToNameMessage,
+ NULL),
+ GNUNET_MQ_hd_fixed_size (iteration_start,
+ GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_START,
+ struct ZoneIterationStartMessage,
+ NULL),
+ GNUNET_MQ_hd_fixed_size (iteration_next,
+ GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT,
+ struct ZoneIterationNextMessage,
+ NULL),
+ GNUNET_MQ_hd_fixed_size (iteration_stop,
+ GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP,
+ struct ZoneIterationStopMessage,
+ NULL),
+ GNUNET_MQ_hd_fixed_size (monitor_start,
+ GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_START,
+ struct ZoneMonitorStartMessage,
+ NULL),
+ GNUNET_MQ_hd_fixed_size (monitor_next,
+ GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_NEXT,
+ struct ZoneMonitorNextMessage,
+ NULL),
+ GNUNET_MQ_handler_end ());
-/* end of gnunet-service-namestore.c */
+/* end of gnunet-service-namestore.c */
projects / oweals / gnunet.git / blobdiff