/**
* User supplied timeout value (in seconds)
*/
-static unsigned long long timeout_request = 5;
+static struct GNUNET_TIME_Relative timeout_request = { 60000 };
/**
* Be verbose
/**
- * Callback called on each request going through the DHT.
+ * Callback called on each GET request 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 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.
+ */
+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)
+{
+ FPRINTF (stdout, "Result %d, operation: %s, type %d\n Key: %s\n ",
+ result_count,
+ "GET",
+ type,
+ GNUNET_h2s_full(key));
+ result_count++;
+}
+
+/**
+ * Callback called on each GET reply going through the DHT.
+ *
+ * @param cls Closure.
+ * @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, "Result %d, operation: %s, type %d:\n Key: %s\n %.*s\n",
result_count,
+ "GET_RESP",
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, "Result %d, operation: %s, type %d:\n Key: %s\n %.*s\n",
+ result_count,
+ "PUT",
+ type,
+ GNUNET_h2s_full(key),
+ (unsigned int) size,
+ (char *) data);
+ result_count++;
+}
/**
* Main function that will be run by the scheduler.
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;
block_type = GNUNET_BLOCK_TYPE_TEST;
if (query_key != NULL) {
- key = GNUNET_malloc (sizeof(GNUNET_HashCode));
+ key = GNUNET_malloc (sizeof(struct 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);
- }
- else
+ if (verbose)
{
- timeout = GNUNET_TIME_UNIT_FOREVER_REL;
- if (verbose)
- FPRINTF (stderr, "Monitoring indefinitely (close with Ctrl+C)\n");
+ if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value != timeout_request.rel_value)
+ FPRINTF (stderr, "Monitoring for %s\n",
+ GNUNET_TIME_relative_to_string (timeout_request));
+ else
+ FPRINTF (stderr, "%s", "Monitoring indefinitely (close with Ctrl+C)\n");
}
- GNUNET_SCHEDULER_add_delayed (timeout, &cleanup_task, NULL);
+ GNUNET_SCHEDULER_add_delayed (timeout_request, &cleanup_task, 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);
+ monitor_handle = GNUNET_DHT_monitor_start (dht_handle,
+ block_type,
+ key,
+ &get_callback,
+ &get_resp_callback,
+ &put_callback,
+ NULL);
if (verbose)
- FPRINTF (stderr, "MONITOR started!\n");
+ FPRINTF (stderr, "%s", "MONITOR started!\n");
GNUNET_free_non_null (key);
}
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 to execute? default 60s, use \"forever\" to monitor forever"),
+ 1, &GNUNET_GETOPT_set_relative_time, &timeout_request},
{'V', "verbose", NULL,
gettext_noop ("be verbose (print progress information)"),
0, &GNUNET_GETOPT_set_one, &verbose},
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",
gettext_noop