/**
* How long at least to wait before sending another find peer request.
*/
-#define DHT_MINIMUM_FIND_PEER_INTERVAL GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 2)
+#define DHT_MINIMUM_FIND_PEER_INTERVAL GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 30)
/**
* How long at most to wait before sending another find peer request.
*/
-#define DHT_MAXIMUM_FIND_PEER_INTERVAL GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 8)
+#define DHT_MAXIMUM_FIND_PEER_INTERVAL GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 10)
/**
* How long at most to wait for transmission of a GET request to another peer?
GNUNET_CONTAINER_bloomfilter_free (peer_bf);
GNUNET_CONTAINER_bloomfilter_free (bcc.bloom);
/* schedule next round */
- newly_found_peers = 0;
next_send_time.rel_value =
- (DHT_MAXIMUM_FIND_PEER_INTERVAL.rel_value / 2) +
- GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG,
- DHT_MAXIMUM_FIND_PEER_INTERVAL.rel_value / 2);
+ DHT_MINIMUM_FIND_PEER_INTERVAL.rel_value +
+ GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
+ DHT_MAXIMUM_FIND_PEER_INTERVAL.rel_value / (newly_found_peers+1));
+ newly_found_peers = 0;
find_peer_task = GNUNET_SCHEDULER_add_delayed (next_send_time,
&send_find_peer_message,
NULL);
GNUNET_break (0);
return;
}
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Peer `%s' connected!\n",
+ GNUNET_i2s (peer));
GNUNET_STATISTICS_update (GDS_stats,
gettext_noop ("# Peers connected"), 1,
GNUNET_NO);
peer_bucket);
if ( (peer_bucket > 0) &&
(k_buckets[peer_bucket].peers_size <= bucket_size) )
+ {
ret->preference_task = GNUNET_SCHEDULER_add_now (&update_core_preference, ret);
- newly_found_peers++;
+ newly_found_peers++;
+ }
GNUNET_assert (GNUNET_OK ==
GNUNET_CONTAINER_multihashmap_put (all_known_peers,
&peer->hashPubKey, ret,
int current_bucket;
struct P2PPendingMessage *pos;
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Peer `%s' disconnected!\n",
- GNUNET_i2s (peer));
/* Check for disconnect from self message */
if (0 == memcmp (&my_identity, peer, sizeof (struct GNUNET_PeerIdentity)))
return;
GNUNET_break (0);
return;
}
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Peer `%s' disconnected!\n",
+ GNUNET_i2s (peer));
GNUNET_STATISTICS_update (GDS_stats,
gettext_noop ("# Peers connected"), -1,
GNUNET_NO);
desired_replication_level,
&targets);
if (0 == target_count)
- return;
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Not forwarding PUT for `%s' after %u hops!\n",
+ GNUNET_h2s (key),
+ hop_count);
+ return;
+ }
msize = put_path_length * sizeof (struct GNUNET_PeerIdentity) + data_size + sizeof (struct PeerPutMessage);
if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
desired_replication_level,
&targets);
if (0 == target_count)
- return;
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Not forwarding PUT for `%s' after %u hops!\n",
+ GNUNET_h2s (key),
+ hop_count);
+ return;
+ }
reply_bf_size = GNUNET_CONTAINER_bloomfilter_get_size (reply_bf);
msize = xquery_size + sizeof (struct PeerGetMessage) + reply_bf_size;
if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
if (NULL == pi)
{
/* peer disconnected in the meantime, drop reply */
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Not forwarding REPLY for `%s' due to predecessor disconnect\n",
+ GNUNET_h2s (key));
return;
}
GNUNET_STATISTICS_update (GDS_stats,
#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 30)
/* Timeout for waiting for replies to get requests */
-#define GET_TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 5)
+#define GET_TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 60)
/* Timeout for waiting for gets to complete */
-#define GET_DELAY GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1)
+#define GET_DELAY GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 50)
/* Timeout for waiting for puts to complete */
-#define PUT_DELAY GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1)
+#define PUT_DELAY GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 50)
/* If number of peers not in config file, use this number */
#define DEFAULT_NUM_PEERS 10
#define PATH_TRACKING GNUNET_YES
-/* Structs */
+
struct TestPutContext
{
*/
struct TestPutContext *next;
+ /**
+ * This is a linked list
+ */
+ struct TestPutContext *prev;
+
/**
* Handle to the first peers DHT service (via the API)
*/
uint32_t uid;
/**
- * Task for disconnecting DHT handles
+ * Task handle for processing of the put.
*/
- GNUNET_SCHEDULER_TaskIdentifier disconnect_task;
+ GNUNET_SCHEDULER_TaskIdentifier task;
};
+
struct TestGetContext
{
- /* This is a linked list */
+ /**
+ * This is a linked list
+ */
struct TestGetContext *next;
+ /**
+ * This is a linked list
+ */
+ struct TestGetContext *prev;
+
/**
* Handle to the first peers DHT service (via the API)
*/
/**
* Task for disconnecting DHT handles (and stopping GET)
*/
- GNUNET_SCHEDULER_TaskIdentifier disconnect_task;
+ GNUNET_SCHEDULER_TaskIdentifier task;
/**
* Whether or not this request has been fulfilled already.
int succeeded;
};
-/* Globals */
/**
* List of GETS to perform
*/
-struct TestGetContext *all_gets;
+static struct TestGetContext *all_gets_head;
+
+/**
+ * List of GETS to perform
+ */
+static struct TestGetContext *all_gets_tail;
/**
* List of PUTS to perform
*/
-struct TestPutContext *all_puts;
+static struct TestPutContext *all_puts_head;
+
+/**
+ * List of PUTS to perform
+ */
+static struct TestPutContext *all_puts_tail;
/**
* Handle to the set of all peers run for this test.
*/
static GNUNET_SCHEDULER_TaskIdentifier die_task;
-/* Global return value (0 for success, anything else for failure) */
+/**
+ * Global return value (0 for success, anything else for failure)
+ */
static int ok;
+
/**
* Check whether peers successfully shut down.
*/
}
}
-/**
- * Task to release DHT handles for PUT
- */
-static void
-put_disconnect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct TestPutContext *test_put = cls;
-
- test_put->disconnect_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_DHT_disconnect (test_put->dht_handle);
- test_put->dht_handle = NULL;
-}
/**
* Function scheduled to be run on the successful completion of this
static void
finish_testing (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_assert (pg != NULL);
- struct TestPutContext *test_put = all_puts;
- struct TestGetContext *test_get = all_gets;
+ struct TestPutContext *test_put;
+ struct TestGetContext *test_get;
- while (test_put != NULL)
+ die_task = GNUNET_SCHEDULER_NO_TASK;
+ while (NULL != (test_put = all_puts_head))
{
- if (test_put->disconnect_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (test_put->disconnect_task);
+ if (test_put->task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (test_put->task);
if (test_put->dht_handle != NULL)
GNUNET_DHT_disconnect (test_put->dht_handle);
- test_put = test_put->next;
+ GNUNET_CONTAINER_DLL_remove (all_puts_head,
+ all_puts_tail,
+ test_put);
+ GNUNET_free (test_put);
}
- while (test_get != NULL)
+ while (NULL != (test_get = all_gets_head))
{
- if (test_get->disconnect_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (test_get->disconnect_task);
+ if (test_get->task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (test_get->task);
if (test_get->get_handle != NULL)
GNUNET_DHT_get_stop (test_get->get_handle);
if (test_get->dht_handle != NULL)
GNUNET_DHT_disconnect (test_get->dht_handle);
- test_get = test_get->next;
+ GNUNET_CONTAINER_DLL_remove (all_gets_head,
+ all_gets_tail,
+ test_get);
+ GNUNET_free (test_get);
}
- GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
ok = 0;
+ GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
+ pg = NULL;
}
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
const char *emsg = cls;
+ struct TestPutContext *test_put;
+ struct TestGetContext *test_get;
+ die_task = GNUNET_SCHEDULER_NO_TASK;
fprintf (stderr,
"Failing test with error: `%s'!\n",
emsg);
-
- struct TestPutContext *test_put = all_puts;
- struct TestGetContext *test_get = all_gets;
-
- while (test_put != NULL)
+ while (NULL != (test_put = all_puts_head))
{
- if (test_put->disconnect_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (test_put->disconnect_task);
+ if (test_put->task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (test_put->task);
if (test_put->dht_handle != NULL)
GNUNET_DHT_disconnect (test_put->dht_handle);
- test_put = test_put->next;
+ GNUNET_CONTAINER_DLL_remove (all_puts_head,
+ all_puts_tail,
+ test_put);
+ GNUNET_free (test_put);
}
- while (test_get != NULL)
+ while (NULL != (test_get = all_gets_head))
{
- if (test_get->disconnect_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (test_get->disconnect_task);
+ if (test_get->task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (test_get->task);
if (test_get->get_handle != NULL)
GNUNET_DHT_get_stop (test_get->get_handle);
if (test_get->dht_handle != NULL)
GNUNET_DHT_disconnect (test_get->dht_handle);
- test_get = test_get->next;
+ GNUNET_CONTAINER_DLL_remove (all_gets_head,
+ all_gets_tail,
+ test_get);
+ GNUNET_free (test_get);
}
-
- GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
ok = 1;
+ GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
+ pg = NULL;
}
GNUNET_HashCode search_key; /* Key stored under */
char original_data[TEST_DATA_SIZE]; /* Made up data to store */
- test_get->disconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ test_get->task = GNUNET_SCHEDULER_NO_TASK;
memset (original_data, test_get->uid, sizeof (original_data));
GNUNET_CRYPTO_hash (original_data, TEST_DATA_SIZE, &search_key);
-
if (test_get->succeeded != GNUNET_YES)
{
gets_failed++;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Get from peer %s for key %s failed!\n",
- test_get->daemon->shortname, GNUNET_h2s (&search_key));
+ fprintf (stderr,
+ "Get from peer %s for key %s failed!\n",
+ GNUNET_i2s (&test_get->daemon->id),
+ GNUNET_h2s (&search_key));
}
GNUNET_assert (test_get->get_handle != NULL);
GNUNET_DHT_get_stop (test_get->get_handle);
fprintf (stderr,
"%llu gets succeeded, %llu gets failed!\n",
gets_completed, gets_failed);
+ GNUNET_CONTAINER_DLL_remove (all_gets_head,
+ all_gets_tail,
+ test_get);
+ GNUNET_free (test_get);
+
if ((gets_failed > 0) && (outstanding_gets == 0)) /* Had some failures */
{
- GNUNET_SCHEDULER_cancel (die_task);
- die_task =
- GNUNET_SCHEDULER_add_now (&end_badly, "not all gets succeeded");
- return;
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_add_now (&end_badly, "not all gets succeeded");
+ return;
}
if ( (gets_completed == num_peers * num_peers) &&
(outstanding_gets == 0) ) /* All gets successful */
{
GNUNET_SCHEDULER_cancel (die_task);
- //GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 5), &get_topology, NULL);
die_task = GNUNET_SCHEDULER_add_now (&finish_testing, NULL);
}
}
+
/**
* Iterator called if the GET request initiated returns a response.
*
memset (original_data, test_get->uid, sizeof (original_data));
GNUNET_CRYPTO_hash (original_data, TEST_DATA_SIZE, &search_key);
-
if (test_get->succeeded == GNUNET_YES)
return; /* Get has already been successful, probably ending now */
if ((0 != memcmp (&search_key, key, sizeof (GNUNET_HashCode))) ||
(0 != memcmp (original_data, data, sizeof (original_data))))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Key or data is not the same as was inserted!\n");
- }
- else
- {
- gets_completed++;
- test_get->succeeded = GNUNET_YES;
+ fprintf (stderr,
+ "Key or data is not the same as was inserted!\n");
+ return;
}
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received correct GET response!\n");
- GNUNET_SCHEDULER_cancel (test_get->disconnect_task);
- test_get->disconnect_task = GNUNET_SCHEDULER_add_now (&get_stop_task, test_get);
+ gets_completed++;
+ test_get->succeeded = GNUNET_YES;
+ GNUNET_SCHEDULER_cancel (test_get->task);
+ test_get->task = GNUNET_SCHEDULER_add_now (&get_stop_task, test_get);
}
GNUNET_HashCode key; /* Made up key to store data under */
char data[TEST_DATA_SIZE]; /* Made up data to store */
- if (test_get == NULL)
- return; /* End of the list */
- memset (data, test_get->uid, sizeof (data));
- GNUNET_CRYPTO_hash (data, TEST_DATA_SIZE, &key);
-
if (outstanding_gets > MAX_OUTSTANDING_GETS)
{
GNUNET_SCHEDULER_add_delayed (GET_DELAY, &do_get, test_get);
return;
}
-
+ memset (data, test_get->uid, sizeof (data));
+ GNUNET_CRYPTO_hash (data, TEST_DATA_SIZE, &key);
test_get->dht_handle = GNUNET_DHT_connect (test_get->daemon->cfg, 10);
- /* Insert the data at the first peer */
GNUNET_assert (test_get->dht_handle != NULL);
outstanding_gets++;
test_get->get_handle =
- GNUNET_DHT_get_start (test_get->dht_handle, GNUNET_TIME_UNIT_FOREVER_REL,
- GNUNET_BLOCK_TYPE_TEST, &key,
- 1, route_option, NULL, 0,
- &get_result_iterator, test_get);
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting get for uid %u from peer %s\n",
- test_get->uid, test_get->daemon->shortname);
-#endif
- test_get->disconnect_task =
- GNUNET_SCHEDULER_add_delayed (GET_TIMEOUT, &get_stop_task, test_get);
- GNUNET_SCHEDULER_add_now (&do_get, test_get->next);
+ GNUNET_DHT_get_start (test_get->dht_handle, GNUNET_TIME_UNIT_FOREVER_REL,
+ GNUNET_BLOCK_TYPE_TEST, &key,
+ 1, route_option, NULL, 0,
+ &get_result_iterator, test_get);
+ test_get->task =
+ GNUNET_SCHEDULER_add_delayed (GET_TIMEOUT, &get_stop_task, test_get);
+}
+
+
+/**
+ * Task to release DHT handles for PUT
+ */
+static void
+put_disconnect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct TestPutContext *test_put = cls;
+
+ test_put->task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_DHT_disconnect (test_put->dht_handle);
+ test_put->dht_handle = NULL;
+ GNUNET_CONTAINER_DLL_remove (all_puts_head,
+ all_puts_tail,
+ test_put);
+ GNUNET_free (test_put);
}
+
/**
* Called when the PUT request has been transmitted to the DHT service.
* Schedule the GET request for some time in the future.
put_finished (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct TestPutContext *test_put = cls;
+ unsigned long long i;
+ unsigned long long j;
+ struct TestGetContext *test_get;
outstanding_puts--;
puts_completed++;
-
- GNUNET_SCHEDULER_cancel (test_put->disconnect_task);
- test_put->disconnect_task =
+ GNUNET_SCHEDULER_cancel (test_put->task);
+ test_put->task =
GNUNET_SCHEDULER_add_now (&put_disconnect_task, test_put);
- if (puts_completed == num_peers)
- {
- GNUNET_assert (outstanding_puts == 0);
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 10), &do_get,
- all_gets);
+ if (puts_completed != num_peers)
return;
- }
+
+ GNUNET_assert (outstanding_puts == 0);
+ fprintf (stderr,
+ "Issuing %llu GETs\n",
+ num_peers * num_peers);
+ for (i = 0; i < num_peers; i++)
+ for (j = 0; j < num_peers; j++)
+ {
+ test_get = GNUNET_malloc (sizeof (struct TestGetContext));
+ test_get->uid = i;
+ test_get->daemon = GNUNET_TESTING_daemon_get (pg, j);
+ GNUNET_CONTAINER_DLL_insert (all_gets_head,
+ all_gets_tail,
+ test_get);
+ test_get->task = GNUNET_SCHEDULER_add_now (&do_get,
+ test_get);
+ }
}
+
/**
* Set up some data, and call API PUT function
*/
GNUNET_HashCode key; /* Made up key to store data under */
char data[TEST_DATA_SIZE]; /* Made up data to store */
- if (test_put == NULL)
- return; /* End of list */
-
- memset (data, test_put->uid, sizeof (data));
- GNUNET_CRYPTO_hash (data, TEST_DATA_SIZE, &key);
-
+ test_put->task = GNUNET_SCHEDULER_NO_TASK;
if (outstanding_puts > MAX_OUTSTANDING_PUTS)
{
- GNUNET_SCHEDULER_add_delayed (PUT_DELAY, &do_put, test_put);
+ test_put->task = GNUNET_SCHEDULER_add_delayed (PUT_DELAY, &do_put, test_put);
return;
}
-
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting put for uid %u from peer %s\n",
- test_put->uid, test_put->daemon->shortname);
-#endif
+ memset (data, test_put->uid, sizeof (data));
+ GNUNET_CRYPTO_hash (data, TEST_DATA_SIZE, &key);
test_put->dht_handle = GNUNET_DHT_connect (test_put->daemon->cfg, 10);
-
GNUNET_assert (test_put->dht_handle != NULL);
outstanding_puts++;
fprintf (stderr, "PUT %u at `%s'\n",
route_option, GNUNET_BLOCK_TYPE_TEST, sizeof (data), data,
GNUNET_TIME_UNIT_FOREVER_ABS, GNUNET_TIME_UNIT_FOREVER_REL,
&put_finished, test_put);
- test_put->disconnect_task =
+ test_put->task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
&put_disconnect_task, test_put);
- GNUNET_SCHEDULER_add_now (&do_put, test_put->next);
}
run_dht_test (void *cls, const char *emsg)
{
unsigned long long i;
- unsigned long long j;
struct TestPutContext *test_put;
- struct TestGetContext *test_get;
if (emsg != NULL)
{
test_put = GNUNET_malloc (sizeof (struct TestPutContext));
test_put->uid = i;
test_put->daemon = GNUNET_TESTING_daemon_get (pg, i);
- test_put->next = all_puts;
- all_puts = test_put;
+ test_put->task = GNUNET_SCHEDULER_add_now (&do_put, test_put);
+ GNUNET_CONTAINER_DLL_insert (all_puts_head,
+ all_puts_tail,
+ test_put);
}
- GNUNET_SCHEDULER_add_now (&do_put, all_puts);
-
- fprintf (stderr,
- "Issuing %llu GETs\n",
- num_peers * num_peers);
- for (i = 0; i < num_peers; i++)
- for (j = 0; j < num_peers; j++)
- {
- test_get = GNUNET_malloc (sizeof (struct TestGetContext));
- test_get->uid = i;
- test_get->daemon = GNUNET_TESTING_daemon_get (pg, j);
- test_get->next = all_gets;
- all_gets = test_get;
- }
}
&run_dht_test,
NULL,
NULL);
- if (NULL == pg)
- {
- GNUNET_break (0);
- return;
- }
+ GNUNET_assert (NULL != pg);
}
projects / oweals / gnunet.git / commitdiff