*/
static unsigned int query_type;
+/**
+ * Desired replication level
+ */
+static unsigned int replication = 5;
+
/**
* The key for the query
*/
*/
static struct GNUNET_DHT_Handle *dht_handle;
-/**
- * Global handle of the scheduler
- */
-static struct GNUNET_SCHEDULER_Handle *sched;
-
/**
* Global handle of the configuration
*/
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
if (dht_handle != NULL)
- {
- GNUNET_DHT_disconnect (dht_handle);
- dht_handle = NULL;
- }
+ {
+ GNUNET_DHT_disconnect (dht_handle);
+ dht_handle = NULL;
+ }
}
cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
if (get_handle != NULL)
- {
- GNUNET_DHT_get_stop (get_handle);
- get_handle = NULL;
- }
- GNUNET_SCHEDULER_add_now (sched, &shutdown_task, NULL);
+ {
+ GNUNET_DHT_get_stop (get_handle);
+ get_handle = NULL;
+ }
+ GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
}
* @param cls closure
* @param exp when will this value expire
* @param key key of the result
- * @param get_path NULL-terminated array of pointers
- * to the peers on reverse GET path (or NULL if not recorded)
- * @param put_path NULL-terminated array of pointers
- * to the peers on the PUT path (or NULL if not recorded)
+ * @param get_path peers on reply path (or NULL if not recorded)
+ * @param get_path_length number of entries in get_path
+ * @param put_path peers on the PUT path (or NULL if not recorded)
+ * @param put_path_length number of entries in get_path
* @param type type of the result
* @param size number of bytes in data
* @param data pointer to the result data
*/
-void
-get_result_iterator (void *cls,
- struct GNUNET_TIME_Absolute exp,
+static void
+get_result_iterator (void *cls, struct GNUNET_TIME_Absolute exp,
const GNUNET_HashCode * key,
- const struct GNUNET_PeerIdentity * const *get_path,
- const struct GNUNET_PeerIdentity * const *put_path,
- enum GNUNET_BLOCK_Type type,
- size_t size,
- const void *data)
+ const struct GNUNET_PeerIdentity *get_path,
+ unsigned int get_path_length,
+ const struct GNUNET_PeerIdentity *put_path,
+ unsigned int put_path_length,
+ enum GNUNET_BLOCK_Type type, size_t size, const void *data)
{
- fprintf (stdout, "Result %d, type %d:\n%.*s\n", result_count, type, size,
- (char *) data);
+ fprintf (stdout, "Result %d, type %d:\n%.*s\n", result_count, type,
+ (unsigned int) size, (char *) data);
result_count++;
}
* Main function that will be run by the scheduler.
*
* @param cls closure
- * @param s the scheduler to use
* @param args remaining command-line arguments
* @param cfgfile name of the configuration file used (for saving, can be NULL!)
* @param c configuration
*/
static void
-run (void *cls,
- struct GNUNET_SCHEDULER_Handle *s,
- char *const *args,
- const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c)
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *c)
{
struct GNUNET_TIME_Relative timeout;
GNUNET_HashCode key;
- sched = s;
+
cfg = c;
if (query_key == NULL)
- {
- if (verbose)
- fprintf (stderr, "Must provide key for DHT GET!\n");
- ret = 1;
- return;
- }
+ {
+ if (verbose)
+ fprintf (stderr, "Must provide key for DHT GET!\n");
+ ret = 1;
+ return;
+ }
- dht_handle = GNUNET_DHT_connect (sched, cfg, 1);
+ dht_handle = GNUNET_DHT_connect (cfg, 1);
if (dht_handle == NULL)
- {
- if (verbose)
- fprintf (stderr, "Couldn't connect to DHT service!\n");
- ret = 1;
- return;
- }
+ {
+ if (verbose)
+ fprintf (stderr, "Couldn't connect to DHT service!\n");
+ ret = 1;
+ return;
+ }
else if (verbose)
fprintf (stderr, "Connected to DHT service!\n");
+ if (query_type == GNUNET_BLOCK_TYPE_ANY) /* Type of data not set */
+ query_type = GNUNET_BLOCK_TYPE_TEST;
+
GNUNET_CRYPTO_hash (query_key, strlen (query_key), &key);
timeout =
- GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, timeout_request);
+ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, timeout_request);
absolute_timeout = GNUNET_TIME_relative_to_absolute (timeout);
if (verbose)
fprintf (stderr, "Issuing GET request for %s!\n", query_key);
- GNUNET_SCHEDULER_add_delayed (sched,
- GNUNET_TIME_absolute_get_remaining
- (absolute_timeout), &cleanup_task, NULL);
- get_handle = GNUNET_DHT_get_start (dht_handle,
- timeout,
- query_type,
- &key,
- GNUNET_DHT_RO_NONE,
- NULL, 0,
- NULL, 0,
- &get_result_iterator, NULL);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining
+ (absolute_timeout), &cleanup_task, NULL);
+ get_handle =
+ GNUNET_DHT_get_start (dht_handle, timeout, query_type, &key,
+ replication, GNUNET_DHT_RO_NONE, NULL,
+ 0, &get_result_iterator, NULL);
}
{'k', "key", "KEY",
gettext_noop ("the query key"),
1, &GNUNET_GETOPT_set_string, &query_key},
+ {'r', "replication", "LEVEL",
+ gettext_noop ("how many parallel requests (replicas) to create"),
+ 1, &GNUNET_GETOPT_set_uint, &replication},
{'t', "type", "TYPE",
gettext_noop ("the type of data to look for"),
1, &GNUNET_GETOPT_set_uint, &query_type},
main (int argc, char *const *argv)
{
return (GNUNET_OK ==
- GNUNET_PROGRAM_run (argc,
- argv,
- "gnunet-dht-get",
+ GNUNET_PROGRAM_run (argc, argv, "gnunet-dht-get",
gettext_noop
("Issue a GET request to the GNUnet DHT, prints results."),
options, &run, NULL)) ? ret : 1;