summaryrefslogtreecommitdiff
path: root/src/dht
diff options
context:
space:
mode:
Diffstat (limited to 'src/dht')
-rw-r--r--src/dht/gnunet-dht-get.c12
-rw-r--r--src/dht/gnunet-dht-monitor.c8
-rw-r--r--src/dht/gnunet-dht-put.c16
-rw-r--r--src/dht/gnunet_dht_profiler.c16
4 files changed, 26 insertions, 26 deletions
diff --git a/src/dht/gnunet-dht-get.c b/src/dht/gnunet-dht-get.c
index 67f0ce76d..e361df336 100644
--- a/src/dht/gnunet-dht-get.c
+++ b/src/dht/gnunet-dht-get.c
@@ -239,37 +239,37 @@ main (int argc, char *const *argv)
struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_STRING ('k',
+ GNUNET_GETOPT_option_string ('k',
"key",
"KEY",
gettext_noop ("the query key"),
&query_key),
- GNUNET_GETOPT_OPTION_SET_UINT ('r',
+ GNUNET_GETOPT_option_uint ('r',
"replication",
"LEVEL",
gettext_noop ("how many parallel requests (replicas) to create"),
&replication),
- GNUNET_GETOPT_OPTION_SET_UINT ('t',
+ GNUNET_GETOPT_option_uint ('t',
"type",
"TYPE",
gettext_noop ("the type of data to look for"),
&query_type),
- GNUNET_GETOPT_OPTION_SET_RELATIVE_TIME ('T',
+ GNUNET_GETOPT_option_relative_time ('T',
"timeout",
"TIMEOUT",
gettext_noop ("how long to execute this query before giving up?"),
&timeout_request),
- GNUNET_GETOPT_OPTION_SET_ONE ('x',
+ GNUNET_GETOPT_option_flag ('x',
"demultiplex",
gettext_noop ("use DHT's demultiplex everywhere option"),
&demultixplex_everywhere),
- GNUNET_GETOPT_OPTION_VERBOSE (&verbose),
+ GNUNET_GETOPT_option_verbose (&verbose),
GNUNET_GETOPT_OPTION_END
};
diff --git a/src/dht/gnunet-dht-monitor.c b/src/dht/gnunet-dht-monitor.c
index e4e8c46a1..b7360bbab 100644
--- a/src/dht/gnunet-dht-monitor.c
+++ b/src/dht/gnunet-dht-monitor.c
@@ -292,25 +292,25 @@ main (int argc, char *const *argv)
{
struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_STRING ('k',
+ GNUNET_GETOPT_option_string ('k',
"key",
"KEY",
gettext_noop ("the query key"),
&query_key),
- GNUNET_GETOPT_OPTION_SET_UINT ('t',
+ GNUNET_GETOPT_option_uint ('t',
"type",
"TYPE",
gettext_noop ("the type of data to look for"),
&block_type),
- GNUNET_GETOPT_OPTION_SET_RELATIVE_TIME ('T',
+ GNUNET_GETOPT_option_relative_time ('T',
"timeout",
"TIMEOUT",
gettext_noop ("how long should the monitor command run"),
&timeout_request),
- GNUNET_GETOPT_OPTION_SET_ONE ('V',
+ GNUNET_GETOPT_option_flag ('V',
"verbose",
gettext_noop ("be verbose (print progress information)"),
&verbose),
diff --git a/src/dht/gnunet-dht-put.c b/src/dht/gnunet-dht-put.c
index bf88e5ded..f183fe588 100644
--- a/src/dht/gnunet-dht-put.c
+++ b/src/dht/gnunet-dht-put.c
@@ -204,47 +204,47 @@ main (int argc, char *const *argv)
struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_STRING ('d',
+ GNUNET_GETOPT_option_string ('d',
"data",
"DATA",
gettext_noop ("the data to insert under the key"),
&data),
- GNUNET_GETOPT_OPTION_SET_RELATIVE_TIME ('e',
+ GNUNET_GETOPT_option_relative_time ('e',
"expiration",
"EXPIRATION",
gettext_noop ("how long to store this entry in the dht (in seconds)"),
&expiration),
- GNUNET_GETOPT_OPTION_STRING ('k',
+ GNUNET_GETOPT_option_string ('k',
"key",
"KEY",
gettext_noop ("the query key"),
&query_key),
- GNUNET_GETOPT_OPTION_SET_ONE ('x',
+ GNUNET_GETOPT_option_flag ('x',
"demultiplex",
gettext_noop ("use DHT's demultiplex everywhere option"),
&demultixplex_everywhere),
- GNUNET_GETOPT_OPTION_SET_UINT ('r',
+ GNUNET_GETOPT_option_uint ('r',
"replication",
"LEVEL",
gettext_noop ("how many replicas to create"),
&replication),
- GNUNET_GETOPT_OPTION_SET_ONE ('R',
+ GNUNET_GETOPT_option_flag ('R',
"record",
gettext_noop ("use DHT's record route option"),
&record_route),
- GNUNET_GETOPT_OPTION_SET_UINT ('t',
+ GNUNET_GETOPT_option_uint ('t',
"type",
"TYPE",
gettext_noop ("the type to insert data as"),
&query_type),
- GNUNET_GETOPT_OPTION_VERBOSE (&verbose),
+ GNUNET_GETOPT_option_verbose (&verbose),
GNUNET_GETOPT_OPTION_END
};
diff --git a/src/dht/gnunet_dht_profiler.c b/src/dht/gnunet_dht_profiler.c
index f65141640..a8807bea8 100644
--- a/src/dht/gnunet_dht_profiler.c
+++ b/src/dht/gnunet_dht_profiler.c
@@ -1182,49 +1182,49 @@ main (int argc, char *const *argv)
int rc;
struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_SET_UINT ('n',
+ GNUNET_GETOPT_option_uint ('n',
"peers",
"COUNT",
gettext_noop ("number of peers to start"),
&num_peers),
- GNUNET_GETOPT_OPTION_SET_UINT ('s',
+ GNUNET_GETOPT_option_uint ('s',
"searches",
"COUNT",
gettext_noop ("maximum number of times we try to search for successor circle formation (0 for R5N)"),
&max_searches),
- GNUNET_GETOPT_OPTION_STRING ('H',
+ GNUNET_GETOPT_option_string ('H',
"hosts",
"FILENAME",
gettext_noop ("name of the file with the login information for the testbed"),
&hosts_file),
- GNUNET_GETOPT_OPTION_SET_RELATIVE_TIME ('D',
+ GNUNET_GETOPT_option_relative_time ('D',
"delay",
"DELAY",
gettext_noop ("delay between rounds for collecting statistics (default: 30 sec)"),
&delay_stats),
- GNUNET_GETOPT_OPTION_SET_RELATIVE_TIME ('P',
+ GNUNET_GETOPT_option_relative_time ('P',
"PUT-delay",
"DELAY",
gettext_noop ("delay to start doing PUTs (default: 1 sec)"),
&delay_put),
- GNUNET_GETOPT_OPTION_SET_RELATIVE_TIME ('G',
+ GNUNET_GETOPT_option_relative_time ('G',
"GET-delay",
"DELAY",
gettext_noop ("delay to start doing GETs (default: 5 min)"),
&delay_get),
- GNUNET_GETOPT_OPTION_SET_UINT ('r',
+ GNUNET_GETOPT_option_uint ('r',
"replication",
"DEGREE",
gettext_noop ("replication degree for DHT PUTs"),
&replication),
- GNUNET_GETOPT_OPTION_SET_RELATIVE_TIME ('t',
+ GNUNET_GETOPT_option_relative_time ('t',
"timeout",
"TIMEOUT",
gettext_noop ("timeout for DHT PUT and GET requests (default: 1 min)"),