#include "gnunet-service-gns_resolver.h"
#include "gnunet-service-gns_interceptor.h"
+
/* FIXME move to proper header in include */
#define GNUNET_MESSAGE_TYPE_GNS_LOOKUP 23
#define GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT 24
#define GNUNET_MESSAGE_TYPE_GNS_GET_AUTH_RESULT 28
+#define INITIAL_ZONE_ITERATION_INTERVAL GNUNET_TIME_UNIT_MILLISECONDS
+#define MINIMUM_ZONE_ITERATION_INTERVAL GNUNET_TIME_UNIT_SECONDS
+#define DEFAULT_RECORD_PUT_INTERVAL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 4)
+#define LATE_ITERATION_SPEEDUP_FACTOR 2
+
/**
* Handle to a shorten operation from api
*/
/**
* Useful for zone update for DHT put
*/
-static int num_public_records;
+static unsigned long long num_public_records;
/**
- * update interval in seconds
+ * Last seen record count
*/
-static unsigned long long max_record_put_interval;
+static unsigned long long last_num_public_records;
-static struct GNUNET_TIME_Relative dht_max_update_interval;
+static struct GNUNET_TIME_Relative zone_iteration_interval;
/* dht update interval FIXME define? */
static struct GNUNET_TIME_Relative record_put_interval;
/* automatic pkey import for name shortening */
static int auto_import_pkey;
+/* first zone iteration is specia */
+static int first_zone_iteration;
+
/* lookup timeout */
static struct GNUNET_TIME_Relative default_lookup_timeout;
uint32_t rd_payload_length;
char* nrb_data = NULL;
size_t namelen;
+ struct GNUNET_TIME_Relative next_put_interval;
+
+
/* we're done */
if (NULL == name)
{
+ first_zone_iteration = GNUNET_NO;
+ if (0 == num_public_records)
+ {
+ /**
+ * If no records are known (startup) or none present
+ * we can safely set the interval to the value for a single
+ * record
+ */
+ zone_iteration_interval = GNUNET_TIME_relative_divide (record_put_interval,
+ 1);
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "No records in db.\n");
+ }
+ else
+ {
+ zone_iteration_interval = GNUNET_TIME_relative_divide (record_put_interval,
+ num_public_records);
+ }
+
+ zone_iteration_interval = GNUNET_TIME_relative_max (MINIMUM_ZONE_ITERATION_INTERVAL,
+ zone_iteration_interval);
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Adjusted zone iteration interval to %llus!\n",
+ zone_iteration_interval.rel_value);
+ GNUNET_STATISTICS_set (statistics,
+ "Current zone iteration interval [msec]",
+ zone_iteration_interval.rel_value,
+ GNUNET_NO);
+
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Zone iteration finished. Rescheduling put in %llus\n",
- (unsigned long long) dht_max_update_interval.rel_value / 1000LL);
+ "Zone iteration finished. Rescheduling zone iteration\n");
+
namestore_iter = NULL;
- zone_update_taskid = GNUNET_SCHEDULER_add_delayed (dht_max_update_interval,
- &update_zone_dht_start,
- NULL);
+ if (num_public_records == 0)
+ zone_update_taskid = GNUNET_SCHEDULER_add_delayed (zone_iteration_interval,
+ &update_zone_dht_start,
+ NULL);
+ else
+ zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_start, NULL);
GNUNET_STATISTICS_update (statistics,
"Number of zone iterations", 1, GNUNET_NO);
+
+ last_num_public_records = num_public_records;
+ GNUNET_STATISTICS_set (statistics,
+ "Number of public records in DHT",
+ last_num_public_records,
+ GNUNET_NO);
return;
}
namelen = strlen(name) + 1;
+
+ if (rd_count == 0)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ "No records given for name %s! Skipping...\n",
+ name);
+ zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_next,
+ NULL);
+ return;
+ }
if (signature == NULL)
{
"zone identity: %s\n", GNUNET_h2s (&zone_hash_double));
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "putting records for %s under key: %s with size %d\n",
- name, GNUNET_h2s (&xor_hash), rd_payload_length);
+ "putting %d records for %s under key: %s with size %d\n",
+ rd_count, name, GNUNET_h2s (&xor_hash), rd_payload_length);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"DHT req to %d\n", DHT_OPERATION_TIMEOUT.rel_value);
GNUNET_STATISTICS_update (statistics,
- "Record data set put into DHT", 1, GNUNET_NO);
+ "Record bytes put into DHT", rd_payload_length, GNUNET_NO);
/* FIXME: keep return value to possibly cancel? */
GNUNET_DHT_put (dht_handle, &xor_hash,
DHT_GNS_REPLICATION_LEVEL,
- GNUNET_DHT_RO_NONE,
+ GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
rd_payload_length,
(char*)nrb,
NULL); //cls for cont
num_public_records++;
+
+ if ((num_public_records > last_num_public_records)
+ && (first_zone_iteration == GNUNET_NO))
+ {
+ zone_iteration_interval = GNUNET_TIME_relative_divide (record_put_interval,
+ num_public_records);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Last record count was lower than current record count... increasing.\n");
+ next_put_interval = GNUNET_TIME_relative_divide (zone_iteration_interval,
+ LATE_ITERATION_SPEEDUP_FACTOR);
+ }
+ else
+ next_put_interval = zone_iteration_interval;
+
+ GNUNET_STATISTICS_set (statistics,
+ "Current zone iteration interval [msec]",
+ next_put_interval.rel_value,
+ GNUNET_NO);
+
/**
* Reschedule periodic put
*/
- zone_update_taskid = GNUNET_SCHEDULER_add_delayed (record_put_interval,
+ zone_update_taskid = GNUNET_SCHEDULER_add_delayed (next_put_interval,
&update_zone_dht_next,
NULL);
static void
update_zone_dht_start(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- unsigned long long interval = 0;
-
zone_update_taskid = GNUNET_SCHEDULER_NO_TASK;
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Scheduling DHT zone update!\n");
- if (0 == num_public_records)
- {
- /**
- * If no records are known (startup) or none present
- * we can safely set the interval to 1s
- */
- record_put_interval = GNUNET_TIME_relative_multiply(
- GNUNET_TIME_UNIT_SECONDS,
- 1);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "No records in db. Adjusted record put interval to 1s\n");
- GNUNET_STATISTICS_set (statistics,
- "Current PUT interval (sec)", 1,
- GNUNET_NO);
- }
- else
- {
- interval = max_record_put_interval/num_public_records;
- if (interval == 0)
- interval = 1;
- record_put_interval = GNUNET_TIME_relative_multiply(
- GNUNET_TIME_UNIT_SECONDS,
- interval);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Adjusted DHT update interval to %ds!\n",
- interval);
- GNUNET_STATISTICS_set (statistics,
- "Current PUT interval (sec)", interval,
- GNUNET_NO);
- }
-
+
/* start counting again */
num_public_records = 0;
namestore_iter = GNUNET_NAMESTORE_zone_iteration_start (namestore_handle,
return;
}
- csh = GNUNET_malloc(sizeof(struct ClientShortenHandle));
+ csh = GNUNET_malloc(sizeof (struct ClientShortenHandle));
csh->client = client;
csh->unique_id = sh_msg->id;
GNUNET_CONTAINER_DLL_insert (csh_head, csh_tail, csh);
GNUNET_STRINGS_utf8_tolower((char*)&sh_msg[1], &nameptr);
-
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "SHORTEN: Converted %s to %s\n", (char*)&sh_msg[1], nameptr);
+ GNUNET_SERVER_notification_context_add (nc, client);
+
if (strlen (name) < strlen(GNUNET_GNS_TLD)) {
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "SHORTEN: %s is too short", name);
+ "SHORTEN: %s is too short\n", name);
+ GNUNET_CONTAINER_DLL_remove (csh_head, csh_tail, csh);
send_shorten_response(csh, name);
return;
}
if (strlen (name) > MAX_DNS_NAME_LENGTH) {
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "SHORTEN: %s is too long", name);
+ "SHORTEN: %s is too long\n", name);
+ GNUNET_CONTAINER_DLL_remove (csh_head, csh_tail, csh);
send_shorten_response(csh, name);
return;
}
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%s is not our domain. Returning\n", name);
+ GNUNET_CONTAINER_DLL_remove (csh_head, csh_tail, csh);
send_shorten_response(csh, name);
return;
}
strcpy (csh->name, name);
- GNUNET_SERVER_notification_context_add (nc, client);
if (1 == ntohl(sh_msg->use_default_zone))
csh->root_zone = zone_hash; //Default zone
fprintf (stderr, "Failed to create test socket: %s\n", STRERROR (errno));
return GNUNET_SYSERR;
}
+#if WINDOWS
+ closesocket (s);
+#else
close (s);
+#endif
return GNUNET_OK;
}
run (void *cls, struct GNUNET_SERVER_Handle *server,
const struct GNUNET_CONFIGURATION_Handle *c)
{
-
+
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Initializing GNS\n");
char* keyfile;
}
- dht_max_update_interval.rel_value = GNUNET_GNS_DHT_MAX_UPDATE_INTERVAL; // yuck
+ zone_iteration_interval = INITIAL_ZONE_ITERATION_INTERVAL;
- if (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_time (c, "gns",
- "ZONE_PUT_INTERVAL",
- &dht_max_update_interval))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "DHT zone update interval: %llu\n",
- (unsigned long long) dht_max_update_interval.rel_value);
- }
-
- max_record_put_interval = 1;
+ record_put_interval = DEFAULT_RECORD_PUT_INTERVAL;
if (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_number (c, "gns",
+ GNUNET_CONFIGURATION_get_value_time (c, "gns",
"RECORD_PUT_INTERVAL",
- &max_record_put_interval))
+ &record_put_interval))
{
GNUNET_log(GNUNET_ERROR_TYPE_INFO,
"Record put interval: %llu\n",
- max_record_put_interval);
+ record_put_interval);
}
-
+
if (GNUNET_OK ==
GNUNET_CONFIGURATION_get_value_number (c, "gns",
"MAX_PARALLEL_BACKGROUND_QUERIES",
* for our records
* We have roughly an hour for all records;
*/
- record_put_interval = GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS,
- 1);
+ first_zone_iteration = GNUNET_YES;
zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_start, NULL);
GNUNET_SERVER_add_handlers (server, handlers);
projects / oweals / gnunet.git / blobdiff