X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fdht%2Fgnunet-dht-monitor.c;h=6ec29030d3f76c0ef2fab6a5b760c7fb3a99219e;hb=391cab6592e846c432644a55678b5b805cd39b7a;hp=ab2e1a240a13956ce89ef45bbe1e22b45f6e1515;hpb=f47b063560515b6138b89e4d07fed09fac69eacf;p=oweals%2Fgnunet.git diff --git a/src/dht/gnunet-dht-monitor.c b/src/dht/gnunet-dht-monitor.c index ab2e1a240..6ec29030d 100644 --- a/src/dht/gnunet-dht-monitor.c +++ b/src/dht/gnunet-dht-monitor.c @@ -39,7 +39,7 @@ static char *query_key; /** * User supplied timeout value (in seconds) */ -static unsigned long long timeout_request = 5; +static struct GNUNET_TIME_Relative timeout_request = { 60000 }; /** * Be verbose @@ -73,17 +73,22 @@ static int ret; /** - * Function called on shutdown, disconnects from DHT if necessary. + * Stop monitoring request and start shutdown * * @param cls closure (unused) * @param tc Task Context */ static void -shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { if (verbose) - FPRINTF (stderr, "%s", "Shutting down!\n"); - if (dht_handle != NULL) + FPRINTF (stderr, "%s", "Cleaning up!\n"); + if (NULL != monitor_handle) + { + GNUNET_DHT_monitor_stop (monitor_handle); + monitor_handle = NULL; + } + if (NULL != dht_handle) { GNUNET_DHT_disconnect (dht_handle); dht_handle = NULL; @@ -92,59 +97,105 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) /** - * Stop monitoring request and start shutdown + * Callback called on each GET request going through the DHT. * - * @param cls closure (unused) - * @param tc Task Context + * @param cls Closure. + * @param options Options, for instance RecordRoute, DemultiplexEverywhere. + * @param type The type of data in the request. + * @param hop_count Hop count so far. + * @param path_length number of entries in path (or 0 if not recorded). + * @param path peers on the GET path (or NULL if not recorded). + * @param desired_replication_level Desired replication level. + * @param key Key of the requested data. */ -static void -cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +void +get_callback (void *cls, + enum GNUNET_DHT_RouteOption options, + enum GNUNET_BLOCK_Type type, + uint32_t hop_count, + uint32_t desired_replication_level, + unsigned int path_length, + const struct GNUNET_PeerIdentity *path, + const struct GNUNET_HashCode * key) { - if (verbose) - FPRINTF (stderr, "%s", "Cleaning up!\n"); - if (monitor_handle != NULL) - { - GNUNET_DHT_monitor_stop (monitor_handle); - monitor_handle = NULL; - } - GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); + FPRINTF (stdout, "GET #%u: type %d, key `%s'\n", + result_count, + (int) type, + GNUNET_h2s_full(key)); + result_count++; } /** - * Callback called on each request going through the DHT. + * Callback called on each GET reply going through the DHT. * * @param cls Closure. - * @param mtype Type of the DHT message monitored. - * @param exp When will this value expire. - * @param key Key of the result/request. - * @param get_path Peers on reply path (or NULL if not recorded). + * @param type The type of data in the result. + * @param get_path Peers on GET 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 desired_replication_level Desired replication level. - * @param type Type of the result/request. + * @param exp Expiration time of the data. + * @param key Key of the data. * @param data Pointer to the result data. * @param size Number of bytes in data. */ void -monitor_callback (void *cls, - uint16_t mtype, - struct GNUNET_TIME_Absolute exp, - const 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, - uint32_t desired_replication_level, - enum GNUNET_DHT_RouteOption options, - enum GNUNET_BLOCK_Type type, - const void *data, - size_t size) +get_resp_callback (void *cls, + enum GNUNET_BLOCK_Type type, + const struct GNUNET_PeerIdentity *get_path, + unsigned int get_path_length, + const struct GNUNET_PeerIdentity *put_path, + unsigned int put_path_length, + struct GNUNET_TIME_Absolute exp, + const struct GNUNET_HashCode * key, + const void *data, + size_t size) { - FPRINTF (stdout, "Result %d, type %d:\n%.*s\n", + FPRINTF (stdout, + "RESPONSE #%u: type %d, key `%s', data `%.*s'\n", result_count, - type, + (int) type, + GNUNET_h2s_full (key), + (unsigned int) size, + (char *) data); + result_count++; +} + + +/** + * Callback called on each PUT request going through the DHT. + * + * @param cls Closure. + * @param options Options, for instance RecordRoute, DemultiplexEverywhere. + * @param type The type of data in the request. + * @param hop_count Hop count so far. + * @param path_length number of entries in path (or 0 if not recorded). + * @param path peers on the PUT path (or NULL if not recorded). + * @param desired_replication_level Desired replication level. + * @param exp Expiration time of the data. + * @param key Key under which data is to be stored. + * @param data Pointer to the data carried. + * @param size Number of bytes in data. + */ +void +put_callback (void *cls, + enum GNUNET_DHT_RouteOption options, + enum GNUNET_BLOCK_Type type, + uint32_t hop_count, + uint32_t desired_replication_level, + unsigned int path_length, + const struct GNUNET_PeerIdentity *path, + struct GNUNET_TIME_Absolute exp, + const struct GNUNET_HashCode * key, + const void *data, + size_t size) +{ + FPRINTF (stdout, + "PUT %u: type %d, key `%s', data `%.*s'\n", + result_count, + (int) type, + GNUNET_h2s_full(key), (unsigned int) size, (char *) data); result_count++; @@ -163,61 +214,48 @@ static void 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; + struct GNUNET_HashCode hc; cfg = c; - dht_handle = GNUNET_DHT_connect (cfg, 1); - - if (dht_handle == NULL) + if (NULL == (dht_handle = GNUNET_DHT_connect (cfg, 1))) { - if (verbose) - FPRINTF (stderr, "%s", "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, "%s", "Connected to DHT service!\n"); - - if (block_type == GNUNET_BLOCK_TYPE_ANY) /* Type of data not set */ + if (GNUNET_BLOCK_TYPE_ANY == block_type) /* Type of data not set */ block_type = GNUNET_BLOCK_TYPE_TEST; - - if (query_key != NULL) { - key = GNUNET_malloc (sizeof(GNUNET_HashCode)); - GNUNET_CRYPTO_hash (query_key, strlen (query_key), key); - } - else - key = NULL; - - if (0 != timeout_request) - { - timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, - timeout_request); - if (verbose) - FPRINTF (stderr, "Monitoring for %llus\n", timeout_request); - } + if (NULL != query_key) + { + key = &hc; + if (GNUNET_OK != + GNUNET_CRYPTO_hash_from_string (query_key, key)) + GNUNET_CRYPTO_hash (query_key, strlen (query_key), key); + } else - { - timeout = GNUNET_TIME_UNIT_FOREVER_REL; - if (verbose) - FPRINTF (stderr, "Monitoring indefinitely (close with Ctrl+C)\n"); - } - - GNUNET_SCHEDULER_add_delayed (timeout, &cleanup_task, NULL); + { + key = NULL; + } if (verbose) - FPRINTF (stderr, "Issuing MONITOR request for %s!\n", query_key); - monitor_handle = GNUNET_DHT_monitor_start (dht_handle, block_type, key, - &monitor_callback, NULL); - if (verbose) - FPRINTF (stderr, "MONITOR started!\n"); - GNUNET_free_non_null (key); - + FPRINTF (stderr, + "Monitoring for %s\n", + GNUNET_STRINGS_relative_time_to_string (timeout_request, GNUNET_NO)); + GNUNET_SCHEDULER_add_delayed (timeout_request, &cleanup_task, NULL); + monitor_handle = GNUNET_DHT_monitor_start (dht_handle, + block_type, + key, + &get_callback, + &get_resp_callback, + &put_callback, + NULL); } /** - * gnunet-dht-get command line options + * gnunet-dht-monitor command line options */ static struct GNUNET_GETOPT_CommandLineOption options[] = { {'k', "key", "KEY", @@ -227,8 +265,8 @@ static struct GNUNET_GETOPT_CommandLineOption options[] = { gettext_noop ("the type of data to look for"), 1, &GNUNET_GETOPT_set_uint, &block_type}, {'T', "timeout", "TIMEOUT", - gettext_noop ("how long to execute? 0 = forever"), - 1, &GNUNET_GETOPT_set_ulong, &timeout_request}, + gettext_noop ("how long should the monitor command run"), + 1, &GNUNET_GETOPT_set_relative_time, &timeout_request}, {'V', "verbose", NULL, gettext_noop ("be verbose (print progress information)"), 0, &GNUNET_GETOPT_set_one, &verbose}, @@ -246,8 +284,11 @@ 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-monitor", gettext_noop ("Prints all packets that go through the DHT."), options, &run, NULL)) ? ret : 1;