*/
static unsigned int query_type;
+/**
+ * The key used in the DHT
+ */
+struct GNUNET_HashCode key;
+
/**
* The key for the query
*/
*/
static int verbose;
+/**
+ * Use DHT demultixplex_everywhere
+ */
+static int demultixplex_everywhere;
+
/**
* Handle to the DHT
*/
switch (success)
{
case GNUNET_OK:
- FPRINTF (stderr, "%s", _("PUT request sent!\n"));
+ FPRINTF (stderr, "%s `%s'!\n", _("PUT request sent with key"), GNUNET_h2s_full(&key));
break;
case GNUNET_NO:
FPRINTF (stderr, "%s", _("Timeout sending PUT request!\n"));
{
struct GNUNET_TIME_Relative timeout;
struct GNUNET_TIME_Absolute expiration;
- GNUNET_HashCode key;
cfg = c;
- if ((query_key == NULL) || (data == NULL))
+ if ((NULL == query_key) || (NULL == data))
{
FPRINTF (stderr, "%s", _("Must provide KEY and DATA for DHT put!\n"));
ret = 1;
return;
}
- dht_handle = GNUNET_DHT_connect (cfg, 1);
- if (dht_handle == NULL)
+ if (NULL == (dht_handle = GNUNET_DHT_connect (cfg, 1)))
{
FPRINTF (stderr, _("Could not connect to %s service!\n"), "DHT");
ret = 1;
return;
}
- else if (verbose)
- FPRINTF (stderr, _("Connected to %s service!\n"), "DHT");
-
- if (query_type == GNUNET_BLOCK_TYPE_ANY) /* Type of data not set */
+ if (GNUNET_BLOCK_TYPE_ANY == query_type) /* Type of data not set */
query_type = GNUNET_BLOCK_TYPE_TEST;
GNUNET_CRYPTO_hash (query_key, strlen (query_key), &key);
GNUNET_TIME_relative_to_absolute (GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS,
expiration_seconds));
-
if (verbose)
FPRINTF (stderr, _("Issuing put request for `%s' with data `%s'!\n"),
query_key, data);
- GNUNET_DHT_put (dht_handle, &key, replication, GNUNET_DHT_RO_NONE, query_type,
+ GNUNET_DHT_put (dht_handle, &key, replication,
+ (demultixplex_everywhere) ? GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE : GNUNET_DHT_RO_NONE,
+ query_type,
strlen (data), data, expiration, timeout, &message_sent_cont,
NULL);
{'k', "key", "KEY",
gettext_noop ("the query key"),
1, &GNUNET_GETOPT_set_string, &query_key},
+ {'x', "demultiplex", NULL,
+ gettext_noop ("use DHT's demultiplex everywhere option"),
+ 0, &GNUNET_GETOPT_set_one, &demultixplex_everywhere},
{'r', "replication", "LEVEL",
gettext_noop ("how many replicas to create"),
1, &GNUNET_GETOPT_set_uint, &replication},