improving code and build system to be in line with gnunet access control model for...

[oweals/gnunet.git] / src / dht / gnunet-dht-put.c

diff --git a/src/dht/gnunet-dht-put.c b/src/dht/gnunet-dht-put.c
index 4a752ea24bae353517e03af9e53fe53f25a79f28..ef5ae5ea758d42e06bebab2499896f06600bf934 100644 (file)
--- a/src/dht/gnunet-dht-put.c
+++ b/src/dht/gnunet-dht-put.c
@@ -46,6 +46,11 @@ static unsigned long long timeout_request = 5;
  */
 static unsigned long long expiration_seconds = 3600;
 
+/**
+ * Desired replication level.
+ */
+static unsigned int replication = 5;
+
 /**
  * Be verbose
  */
@@ -92,7 +97,7 @@ void
 message_sent_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   if (verbose)
-    fprintf (stderr, _("PUT request sent!\n"));
+    FPRINTF (stderr, "%s",  _("PUT request sent!\n"));
   GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
 }
 
@@ -116,7 +121,7 @@ run (void *cls, char *const *args, const char *cfgfile,
 
   if ((query_key == NULL) || (data == NULL))
   {
-    fprintf (stderr, _("Must provide KEY and DATA for DHT put!\n"));
+    FPRINTF (stderr, "%s",  _("Must provide KEY and DATA for DHT put!\n"));
     ret = 1;
     return;
   }
@@ -124,12 +129,12 @@ run (void *cls, char *const *args, const char *cfgfile,
   dht_handle = GNUNET_DHT_connect (cfg, 1);
   if (dht_handle == NULL)
   {
-    fprintf (stderr, _("Could not connect to %s service!\n"), "DHT");
+    FPRINTF (stderr, _("Could not connect to %s service!\n"), "DHT");
     ret = 1;
     return;
   }
   else if (verbose)
-    fprintf (stderr, _("Connected to %s service!\n"), "DHT");
+    FPRINTF (stderr, _("Connected to %s service!\n"), "DHT");
 
   if (query_type == GNUNET_BLOCK_TYPE_ANY)      /* Type of data not set */
     query_type = GNUNET_BLOCK_TYPE_TEST;
@@ -144,11 +149,11 @@ run (void *cls, char *const *args, const char *cfgfile,
                                          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, DEFAULT_PUT_REPLICATION, GNUNET_DHT_RO_NONE,
-                  query_type, strlen (data), data, expiration, timeout,
-                  &message_sent_cont, NULL);
+  GNUNET_DHT_put (dht_handle, &key, replication, GNUNET_DHT_RO_NONE, query_type,
+                  strlen (data), data, expiration, timeout, &message_sent_cont,
+                  NULL);
 
 }
 
@@ -157,21 +162,24 @@ run (void *cls, char *const *args, const char *cfgfile,
  * 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},
+  {'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},