*/
static unsigned int query_type;
+/**
+ * The key used in the DHT
+ */
+struct GNUNET_HashCode key;
+
/**
* The key for the query
*/
*/
static unsigned long long expiration_seconds = 3600;
+/**
+ * Desired replication level.
+ */
+static unsigned int replication = 5;
+
/**
* Be verbose
*/
static int verbose;
/**
- * Handle to the DHT
+ * Use DHT demultixplex_everywhere
*/
-static struct GNUNET_DHT_Handle *dht_handle;
+static int demultixplex_everywhere;
/**
- * Global handle of the scheduler
+ * Handle to the DHT
*/
-static struct GNUNET_SCHEDULER_Handle *sched;
+static struct GNUNET_DHT_Handle *dht_handle;
+
/**
* Global handle of the configuration
static void
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- if (dht_handle != NULL)
- {
- GNUNET_DHT_disconnect (dht_handle);
- dht_handle = NULL;
- }
+ if (NULL != dht_handle)
+ {
+ GNUNET_DHT_disconnect (dht_handle);
+ dht_handle = NULL;
+ }
}
/**
* Signature of the main function of a task.
*
* @param cls closure
- * @param tc context information (why was this task triggered now)
+ * @param success GNUNET_OK if the PUT was transmitted,
+ * GNUNET_NO on timeout,
+ * GNUNET_SYSERR on disconnect from service
+ * after the PUT message was transmitted
+ * (so we don't know if it was received or not)
*/
-void
-message_sent_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+static void
+message_sent_cont (void *cls, int success)
{
if (verbose)
- fprintf (stderr,
- _("PUT request sent!\n"));
- GNUNET_SCHEDULER_add_now (sched, &shutdown_task, NULL);
+ {
+ switch (success)
+ {
+ case GNUNET_OK:
+ 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"));
+ break;
+ case GNUNET_SYSERR:
+ FPRINTF (stderr, "%s", _("PUT request not confirmed!\n"));
+ break;
+ default:
+ GNUNET_break (0);
+ break;
+ }
+ }
+ GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
}
/**
* 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;
struct GNUNET_TIME_Absolute expiration;
- GNUNET_HashCode key;
- sched = s;
- cfg = c;
- if ( (query_key == NULL) || (data == NULL) )
- {
- fprintf (stderr,
- _("Must provide KEY and DATA for DHT put!\n"));
- ret = 1;
- return;
- }
+ cfg = c;
- dht_handle = GNUNET_DHT_connect (sched, cfg, 1);
- if (dht_handle == NULL)
- {
- 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 ((NULL == query_key) || (NULL == data))
+ {
+ FPRINTF (stderr, "%s", _("Must provide KEY and DATA for DHT put!\n"));
+ ret = 1;
+ return;
+ }
+
+ if (NULL == (dht_handle = GNUNET_DHT_connect (cfg, 1)))
+ {
+ FPRINTF (stderr, _("Could not connect to %s service!\n"), "DHT");
+ ret = 1;
+ return;
+ }
+ 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);
timeout =
- GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, timeout_request);
+ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, timeout_request);
expiration =
- GNUNET_TIME_relative_to_absolute (GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS,
- expiration_seconds));
-
+ 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"),
+ FPRINTF (stderr, _("Issuing put request for `%s' with data `%s'!\n"),
query_key, data);
- GNUNET_DHT_put (dht_handle,
- &key,
- GNUNET_DHT_RO_NONE,
- query_type,
- strlen (data), data,
- expiration,
- timeout,
- &message_sent_cont, NULL);
+ 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);
}
* gnunet-dht-put command line options
*/
static struct GNUNET_GETOPT_CommandLineOption options[] = {
- {'k', "key", "KEY",
- gettext_noop ("the query key"),
- 1, &GNUNET_GETOPT_set_string, &query_key},
{'d', "data", "DATA",
gettext_noop ("the data to insert under the key"),
1, &GNUNET_GETOPT_set_string, &data},
+ {'e', "expiration", "EXPIRATION",
+ gettext_noop ("how long to store this entry in the dht (in seconds)"),
+ 1, &GNUNET_GETOPT_set_ulong, &expiration_seconds},
+ {'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},
{'t', "type", "TYPE",
gettext_noop ("the type to insert data as"),
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},
- {'e', "expiration", "EXPIRATION",
- gettext_noop ("how long to store this entry in the dht (in seconds)"),
- 1, &GNUNET_GETOPT_set_ulong, &expiration_seconds},
{'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-put",
+ GNUNET_PROGRAM_run (argc, argv, "gnunet-dht-put",
gettext_noop
("Issue a PUT request to the GNUnet DHT insert DATA under KEY."),
options, &run, NULL)) ? ret : 1;