X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fdht%2Fgnunet-dht-get.c;h=345a58a13515156cb34d4de852cde1700b201b3f;hb=16d21a3a2f100e33c2aaeea12a8e4ce41d252507;hp=b807a798fa19b6d8bb044230b1276e32f52083b5;hpb=502af2167f7c218366666ca4944bd7cc54b5b19a;p=oweals%2Fgnunet.git diff --git a/src/dht/gnunet-dht-get.c b/src/dht/gnunet-dht-get.c index b807a798f..345a58a13 100644 --- a/src/dht/gnunet-dht-get.c +++ b/src/dht/gnunet-dht-get.c @@ -32,31 +32,35 @@ static unsigned int query_type; /** - * The key for the query + * Desired replication level */ -static char *query_key; +static unsigned int replication = 5; /** - * User supplied timeout value (in seconds) + * The key for the query */ -static unsigned long long timeout_request = 5; +static char *query_key; /** - * When this request should really die + * User supplied timeout value */ -struct GNUNET_TIME_Absolute absolute_timeout; +static struct GNUNET_TIME_Relative timeout_request = { 60000 }; /** * Be verbose */ static int verbose; +/** + * Use DHT demultixplex_everywhere + */ +static int demultixplex_everywhere; + /** * Handle to the DHT */ static struct GNUNET_DHT_Handle *dht_handle; - /** * Global handle of the configuration */ @@ -78,26 +82,25 @@ static unsigned int result_count; static int ret; -static void -shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) -{ - if (dht_handle != NULL) - { - GNUNET_DHT_disconnect (dht_handle); - dht_handle = NULL; - } -} - - +/** + * Task run to clean up on timeout. + * + * @param cls unused + * @param tc unused + */ static void cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - if (get_handle != NULL) + if (NULL != get_handle) { GNUNET_DHT_get_stop (get_handle); get_handle = NULL; } - GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); + if (NULL != dht_handle) + { + GNUNET_DHT_disconnect (dht_handle); + dht_handle = NULL; + } } @@ -108,24 +111,27 @@ cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) * @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, - 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) +static void +get_result_iterator (void *cls, struct GNUNET_TIME_Absolute exp, + const struct GNUNET_HashCode * key, + 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, (unsigned int) size, (char *) data); + FPRINTF (stdout, + _("Result %d, type %d:\n%.*s\n"), + result_count, type, + (unsigned int) size, (char *) data); result_count++; } @@ -139,56 +145,35 @@ get_result_iterator (void *cls, * @param c configuration */ static void -run (void *cls, - 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; + struct GNUNET_HashCode key; cfg = c; - - if (query_key == NULL) + if (NULL == query_key) { - if (verbose) - fprintf (stderr, "Must provide key for DHT GET!\n"); + FPRINTF (stderr, "%s", _("Must provide key for DHT GET!\n")); ret = 1; return; } - - dht_handle = GNUNET_DHT_connect (cfg, 1); - - if (dht_handle == NULL) + if (NULL == (dht_handle = GNUNET_DHT_connect (cfg, 1))) { - if (verbose) - fprintf (stderr, "Couldn't connect to DHT service!\n"); + FPRINTF (stderr, "%s", _("Failed to 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); - absolute_timeout = GNUNET_TIME_relative_to_absolute (timeout); - if (verbose) - fprintf (stderr, "Issuing GET request for %s!\n", query_key); - 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, - DEFAULT_GET_REPLICATION, - GNUNET_DHT_RO_NONE, - NULL, 0, - NULL, 0, &get_result_iterator, NULL); + FPRINTF (stderr, "%s `%s' \n", _("Issueing DHT GET with key"), GNUNET_h2s_full (&key)); + GNUNET_SCHEDULER_add_delayed (timeout_request, + &cleanup_task, NULL); + get_handle = + GNUNET_DHT_get_start (dht_handle, query_type, &key, replication, + (demultixplex_everywhere) ? GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE : GNUNET_DHT_RO_NONE, + NULL, 0, &get_result_iterator, NULL); } @@ -200,12 +185,18 @@ static struct GNUNET_GETOPT_CommandLineOption options[] = { {'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}, {'T', "timeout", "TIMEOUT", gettext_noop ("how long to execute this query before giving up?"), - 1, &GNUNET_GETOPT_set_ulong, &timeout_request}, + 1, &GNUNET_GETOPT_set_relative_time, &timeout_request}, + {'x', "demultiplex", NULL, + gettext_noop ("use DHT's demultiplex everywhere option"), + 0, &GNUNET_GETOPT_set_one, &demultixplex_everywhere}, {'V', "verbose", NULL, gettext_noop ("be verbose (print progress information)"), 0, &GNUNET_GETOPT_set_one, &verbose}, @@ -223,10 +214,10 @@ static struct GNUNET_GETOPT_CommandLineOption options[] = { int main (int argc, char *const *argv) { + if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) + return 2; 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;