From fef8c5c79d628ac0823fdae238fd0b70a1f1eb94 Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Wed, 15 Mar 2017 21:03:50 +0100 Subject: porting. --- src/cadet/gnunet-cadet.c | 72 ++++++++++++++-------- src/dht/gnunet-dht-get.c | 5 +- src/dns/gnunet-dns-monitor.c | 21 ++++--- src/dns/gnunet-dns-redirector.c | 22 ++++--- src/identity/gnunet-identity.c | 54 ++++++++++------ src/namecache/gnunet-namecache.c | 20 +++--- src/namestore/gnunet-namestore.c | 125 +++++++++++++++++++++++++------------- src/regex/gnunet-regex-profiler.c | 49 ++++++++++----- src/set/gnunet-set-profiler.c | 86 +++++++++++++++++--------- 9 files changed, 294 insertions(+), 160 deletions(-) (limited to 'src') diff --git a/src/cadet/gnunet-cadet.c b/src/cadet/gnunet-cadet.c index 1556f7d86..57eeac735 100644 --- a/src/cadet/gnunet-cadet.c +++ b/src/cadet/gnunet-cadet.c @@ -920,32 +920,54 @@ main (int argc, { int res; const char helpstr[] = "Create tunnels and retrieve info about CADET's status."; - static const struct GNUNET_GETOPT_CommandLineOption options[] = { + struct GNUNET_GETOPT_CommandLineOption options[] = { /* I would use the terminology 'circuit' here... --lynX */ - {'C', "connection", "CONNECTION_ID", - gettext_noop ("Provide information about a particular connection"), - GNUNET_YES, &GNUNET_GETOPT_set_string, &conn_id}, - {'e', "echo", NULL, - gettext_noop ("Activate echo mode"), - GNUNET_NO, &GNUNET_GETOPT_set_one, &echo}, - {'d', "dump", NULL, - gettext_noop ("Dump debug information to STDERR"), - GNUNET_NO, &GNUNET_GETOPT_set_one, &dump}, - {'o', "open-port", "SHARED_SECRET", - gettext_noop ("Listen for connections using a shared secret among sender and recipient"), - GNUNET_YES, &GNUNET_GETOPT_set_string, &listen_port}, - {'p', "peer", "PEER_ID", - gettext_noop ("Provide information about a patricular peer"), - GNUNET_YES, &GNUNET_GETOPT_set_string, &peer_id}, - {'P', "peers", NULL, - gettext_noop ("Provide information about all peers"), - GNUNET_NO, &GNUNET_GETOPT_set_one, &request_peers}, - {'t', "tunnel", "TUNNEL_ID", - gettext_noop ("Provide information about a particular tunnel"), - GNUNET_YES, &GNUNET_GETOPT_set_string, &tunnel_id}, - {'T', "tunnels", NULL, - gettext_noop ("Provide information about all tunnels"), - GNUNET_NO, &GNUNET_GETOPT_set_one, &request_tunnels}, + GNUNET_GETOPT_OPTION_STRING ('C', + "connection", + "CONNECTION_ID", + gettext_noop ("Provide information about a particular connection"), + &conn_id), + + GNUNET_GETOPT_OPTION_SET_ONE ('e', + "echo", + gettext_noop ("Activate echo mode"), + &echo), + + GNUNET_GETOPT_OPTION_SET_ONE ('d', + "dump", + gettext_noop ("Dump debug information to STDERR"), + &dump), + + GNUNET_GETOPT_OPTION_STRING ('o', + "open-port", + "SHARED_SECRET", + gettext_noop ("Listen for connections using a shared secret among sender and recipient"), + &listen_port), + + + GNUNET_GETOPT_OPTION_STRING ('p', + "peer", + "PEER_ID", + gettext_noop ("Provide information about a patricular peer"), + &peer_id), + + + GNUNET_GETOPT_OPTION_SET_ONE ('P', + "peers", + gettext_noop ("Provide information about all peers"), + &request_peers), + + GNUNET_GETOPT_OPTION_STRING ('t', + "tunnel", + "TUNNEL_ID", + gettext_noop ("Provide information about a particular tunnel"), + &tunnel_id), + + + GNUNET_GETOPT_OPTION_SET_ONE ('T', + "tunnels", + gettext_noop ("Provide information about all tunnels"), + &request_tunnels), GNUNET_GETOPT_OPTION_END }; diff --git a/src/dht/gnunet-dht-get.c b/src/dht/gnunet-dht-get.c index 812e62b17..67f0ce76d 100644 --- a/src/dht/gnunet-dht-get.c +++ b/src/dht/gnunet-dht-get.c @@ -269,10 +269,7 @@ main (int argc, char *const *argv) gettext_noop ("use DHT's demultiplex everywhere option"), &demultixplex_everywhere), - GNUNET_GETOPT_OPTION_SET_ONE ('V', - "verbose", - gettext_noop ("be verbose (print progress information)"), - &verbose), + GNUNET_GETOPT_OPTION_VERBOSE (&verbose), GNUNET_GETOPT_OPTION_END }; diff --git a/src/dns/gnunet-dns-monitor.c b/src/dns/gnunet-dns-monitor.c index 5e6f90555..2436931fb 100644 --- a/src/dns/gnunet-dns-monitor.c +++ b/src/dns/gnunet-dns-monitor.c @@ -52,7 +52,7 @@ static int ret; /** * Selected level of verbosity. */ -static int verbosity; +static unsigned int verbosity; /** @@ -346,13 +346,18 @@ run (void *cls, char *const *args, const char *cfgfile, int main (int argc, char *const *argv) { - static const struct GNUNET_GETOPT_CommandLineOption options[] = { - {'i', "inbound-only", NULL, - gettext_noop ("only monitor DNS queries"), - 0, &GNUNET_GETOPT_set_one, &inbound_only}, - {'o', "outbound-only", NULL, - gettext_noop ("only monitor DNS replies"), - 0, &GNUNET_GETOPT_set_one, &outbound_only}, + struct GNUNET_GETOPT_CommandLineOption options[] = { + + GNUNET_GETOPT_OPTION_SET_ONE ('i', + "inbound-only", + gettext_noop ("only monitor DNS queries"), + &inbound_only), + + GNUNET_GETOPT_OPTION_SET_ONE ('o', + "outbound-only", + gettext_noop ("only monitor DNS queries"), + &outbound_only), + GNUNET_GETOPT_OPTION_VERBOSE (&verbosity), GNUNET_GETOPT_OPTION_END }; diff --git a/src/dns/gnunet-dns-redirector.c b/src/dns/gnunet-dns-redirector.c index 89929815a..0469af732 100644 --- a/src/dns/gnunet-dns-redirector.c +++ b/src/dns/gnunet-dns-redirector.c @@ -52,7 +52,7 @@ static int ret; /** * Selected level of verbosity. */ -static int verbosity; +static unsigned int verbosity; /** @@ -230,13 +230,19 @@ run (void *cls, char *const *args, const char *cfgfile, int main (int argc, char *const *argv) { - static const struct GNUNET_GETOPT_CommandLineOption options[] = { - {'4', "ipv4", "IPV4", - gettext_noop ("set A records"), - 1, &GNUNET_GETOPT_set_string, &n4}, - {'6', "ipv4", "IPV6", - gettext_noop ("set AAAA records"), - 1, &GNUNET_GETOPT_set_string, &n6}, + struct GNUNET_GETOPT_CommandLineOption options[] = { + GNUNET_GETOPT_OPTION_STRING ('4', + "ipv4", + "IPV4", + gettext_noop ("set A records"), + &n4), + + GNUNET_GETOPT_OPTION_STRING ('6', + "ipv4", + "IPV6", + gettext_noop ("set AAAA records"), + &n6), + GNUNET_GETOPT_OPTION_VERBOSE (&verbosity), GNUNET_GETOPT_OPTION_END }; diff --git a/src/identity/gnunet-identity.c b/src/identity/gnunet-identity.c index 8c8485249..5c457ef5d 100644 --- a/src/identity/gnunet-identity.c +++ b/src/identity/gnunet-identity.c @@ -349,25 +349,41 @@ run (void *cls, int main (int argc, char *const *argv) { - static const struct GNUNET_GETOPT_CommandLineOption options[] = { - {'C', "create", "NAME", - gettext_noop ("create ego NAME"), - 1, &GNUNET_GETOPT_set_string, &create_ego}, - {'D', "delete", "NAME", - gettext_noop ("delete ego NAME "), - 1, &GNUNET_GETOPT_set_string, &delete_ego}, - {'d', "display", NULL, - gettext_noop ("display all egos"), - 0, &GNUNET_GETOPT_set_one, &list}, - {'e', "ego", "NAME", - gettext_noop ("set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"), - 1, &GNUNET_GETOPT_set_string, &set_ego}, - {'m', "monitor", NULL, - gettext_noop ("run in monitor mode egos"), - 0, &GNUNET_GETOPT_set_one, &monitor}, - {'s', "set", "SUBSYSTEM", - gettext_noop ("set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"), - 1, &GNUNET_GETOPT_set_string, &set_subsystem}, + struct GNUNET_GETOPT_CommandLineOption options[] = { + GNUNET_GETOPT_OPTION_STRING ('C', + "create", + "NAME", + gettext_noop ("create ego NAME"), + &create_ego), + + GNUNET_GETOPT_OPTION_STRING ('D', + "delete", + "NAME", + gettext_noop ("delete ego NAME "), + &delete_ego), + + GNUNET_GETOPT_OPTION_SET_ONE ('d', + "display", + gettext_noop ("display all egos"), + &list), + + GNUNET_GETOPT_OPTION_STRING ('e', + "ego", + "NAME", + gettext_noop ("set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"), + &set_ego), + + GNUNET_GETOPT_OPTION_SET_ONE ('m', + "monitor", + gettext_noop ("run in monitor mode egos"), + &monitor), + + GNUNET_GETOPT_OPTION_STRING ('s', + "set", + "SUBSYSTEM", + gettext_noop ("set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"), + &set_subsystem), + GNUNET_GETOPT_OPTION_END }; int res; diff --git a/src/namecache/gnunet-namecache.c b/src/namecache/gnunet-namecache.c index 490197b1e..2410c9b3c 100644 --- a/src/namecache/gnunet-namecache.c +++ b/src/namecache/gnunet-namecache.c @@ -225,13 +225,19 @@ run (void *cls, char *const *args, const char *cfgfile, int main (int argc, char *const *argv) { - static const struct GNUNET_GETOPT_CommandLineOption options[] = { - {'n', "name", "NAME", - gettext_noop ("name of the record to add/delete/display"), 1, - &GNUNET_GETOPT_set_string, &name}, - {'z', "zone", "PKEY", - gettext_noop ("spezifies the public key of the zone to look in"), 1, - &GNUNET_GETOPT_set_string, &pkey}, + struct GNUNET_GETOPT_CommandLineOption options[] = { + GNUNET_GETOPT_OPTION_STRING ('n', + "name", + "NAME", + gettext_noop ("name of the record to add/delete/display"), + &name), + + GNUNET_GETOPT_OPTION_STRING ('z', + "zone", + "PKEY", + gettext_noop ("spezifies the public key of the zone to look in"), + &pkey), + GNUNET_GETOPT_OPTION_END }; diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c index 457e77022..2ce3741f8 100644 --- a/src/namestore/gnunet-namestore.c +++ b/src/namestore/gnunet-namestore.c @@ -1130,49 +1130,88 @@ main (int argc, is_public = -1; is_shadow = -1; - static const struct GNUNET_GETOPT_CommandLineOption options[] = { - {'a', "add", NULL, - gettext_noop ("add record"), 0, - &GNUNET_GETOPT_set_one, &add}, - {'d', "delete", NULL, - gettext_noop ("delete record"), 0, - &GNUNET_GETOPT_set_one, &del}, - {'D', "display", NULL, - gettext_noop ("display records"), 0, - &GNUNET_GETOPT_set_one, &list}, - {'e', "expiration", "TIME", - gettext_noop ("expiration time for record to use (for adding only), \"never\" is possible"), 1, - &GNUNET_GETOPT_set_string, &expirationstring}, - {'i', "nick", "NICKNAME", - gettext_noop ("set the desired nick name for the zone"), 1, - &GNUNET_GETOPT_set_string, &nickstring}, - {'m', "monitor", NULL, - gettext_noop ("monitor changes in the namestore"), 0, - &GNUNET_GETOPT_set_one, &monitor}, - {'n', "name", "NAME", - gettext_noop ("name of the record to add/delete/display"), 1, - &GNUNET_GETOPT_set_string, &name}, - {'r', "reverse", "PKEY", - gettext_noop ("determine our name for the given PKEY"), 1, - &GNUNET_GETOPT_set_string, &reverse_pkey}, - {'t', "type", "TYPE", - gettext_noop ("type of the record to add/delete/display"), 1, - &GNUNET_GETOPT_set_string, &typestring}, - {'u', "uri", "URI", - gettext_noop ("URI to import into our zone"), 1, - &GNUNET_GETOPT_set_string, &uri}, - {'V', "value", "VALUE", - gettext_noop ("value of the record to add/delete"), 1, - &GNUNET_GETOPT_set_string, &value}, - {'p', "public", NULL, - gettext_noop ("create or list public record"), 0, - &GNUNET_GETOPT_set_one, &is_public}, - {'s', "shadow", NULL, - gettext_noop ("create shadow record (only valid if all other records of the same type have expired"), 0, - &GNUNET_GETOPT_set_one, &is_shadow}, - {'z', "zone", "EGO", - gettext_noop ("name of the ego controlling the zone"), 1, - &GNUNET_GETOPT_set_string, &ego_name}, + struct GNUNET_GETOPT_CommandLineOption options[] = { + + GNUNET_GETOPT_OPTION_SET_ONE ('a', + "add", + gettext_noop ("add record"), + &add), + + GNUNET_GETOPT_OPTION_SET_ONE ('d', + "delete", + gettext_noop ("delete record"), + &del), + + GNUNET_GETOPT_OPTION_SET_ONE ('D', + "display", + gettext_noop ("display records"), + &list), + + GNUNET_GETOPT_OPTION_STRING ('e', + "expiration", + "TIME", + gettext_noop ("expiration time for record to use (for adding only), \"never\" is possible"), + &expirationstring), + + GNUNET_GETOPT_OPTION_STRING ('i', + "nick", + "NICKNAME", + gettext_noop ("set the desired nick name for the zone"), + &nickstring), + + GNUNET_GETOPT_OPTION_SET_ONE ('m', + "monitor", + gettext_noop ("monitor changes in the namestore"), + &monitor), + + GNUNET_GETOPT_OPTION_STRING ('n', + "name", + "NAME", + gettext_noop ("name of the record to add/delete/display"), + &name), + + GNUNET_GETOPT_OPTION_STRING ('r', + "reverse", + "PKEY", + gettext_noop ("determine our name for the given PKEY"), + &reverse_pkey), + + + + GNUNET_GETOPT_OPTION_STRING ('t', + "type", + "TYPE", + gettext_noop ("type of the record to add/delete/display"), + &typestring), + + GNUNET_GETOPT_OPTION_STRING ('u', + "uri", + "URI", + gettext_noop ("URI to import into our zone"), + &uri), + + GNUNET_GETOPT_OPTION_STRING ('V', + "value", + "VALUE", + gettext_noop ("value of the record to add/delete"), + &value), + + GNUNET_GETOPT_OPTION_SET_ONE ('p', + "public", + gettext_noop ("create or list public record"), + &is_public), + + GNUNET_GETOPT_OPTION_SET_ONE ('s', + "shadow", + gettext_noop ("create shadow record (only valid if all other records of the same type have expired"), + &is_shadow), + + GNUNET_GETOPT_OPTION_STRING ('z', + "zone", + "EGO", + gettext_noop ("name of the ego controlling the zone"), + &ego_name), + GNUNET_GETOPT_OPTION_END }; diff --git a/src/regex/gnunet-regex-profiler.c b/src/regex/gnunet-regex-profiler.c index dfbcd388a..71f3580f8 100644 --- a/src/regex/gnunet-regex-profiler.c +++ b/src/regex/gnunet-regex-profiler.c @@ -1477,22 +1477,39 @@ run (void *cls, int main (int argc, char *const *argv) { - static const struct GNUNET_GETOPT_CommandLineOption options[] = { - {'o', "output-file", "FILENAME", - gettext_noop ("name of the file for writing statistics"), - GNUNET_YES, &GNUNET_GETOPT_set_string, &data_filename}, - {'t', "matching-timeout", "TIMEOUT", - gettext_noop ("wait TIMEOUT before ending the experiment"), - GNUNET_YES, &GNUNET_GETOPT_set_relative_time, &search_timeout_time}, - {'p', "policy-dir", "DIRECTORY", - gettext_noop ("directory with policy files"), - GNUNET_YES, &GNUNET_GETOPT_set_filename, &policy_dir}, - {'s', "strings-file", "FILENAME", - gettext_noop ("name of file with input strings"), - GNUNET_YES, &GNUNET_GETOPT_set_filename, &strings_file}, - {'H', "hosts-file", "FILENAME", - gettext_noop ("name of file with hosts' names"), - GNUNET_YES, &GNUNET_GETOPT_set_filename, &hosts_file}, + struct GNUNET_GETOPT_CommandLineOption options[] = { + + GNUNET_GETOPT_OPTION_FILENAME ('o', + "output-file", + "FILENAME", + gettext_noop ("name of the file for writing statistics"), + &data_filename), + + GNUNET_GETOPT_OPTION_SET_RELATIVE_TIME ('t', + "matching-timeout", + "TIMEOUT", + gettext_noop ("wait TIMEOUT before ending the experiment"), + &search_timeout_time), + + GNUNET_GETOPT_OPTION_FILENAME ('p', + "policy-dir", + "DIRECTORY", + gettext_noop ("directory with policy files"), + &policy_dir), + + + GNUNET_GETOPT_OPTION_FILENAME ('s', + "strings-file", + "FILENAME", + gettext_noop ("name of file with input strings"), + &strings_file), + + GNUNET_GETOPT_OPTION_FILENAME ('H', + "hosts-file", + "FILENAME", + gettext_noop ("name of file with hosts' names"), + &hosts_file), + GNUNET_GETOPT_OPTION_END }; int ret; diff --git a/src/set/gnunet-set-profiler.c b/src/set/gnunet-set-profiler.c index 8404b191c..349bce6ea 100644 --- a/src/set/gnunet-set-profiler.c +++ b/src/set/gnunet-set-profiler.c @@ -59,8 +59,8 @@ static struct GNUNET_PeerIdentity local_peer; static struct GNUNET_SET_ListenHandle *set_listener; static int byzantine; -static int force_delta; -static int force_full; +static unsigned int force_delta; +static unsigned int force_full; static unsigned int element_size = 32; /** @@ -426,34 +426,60 @@ pre_run (void *cls, char *const *args, const char *cfgfile, int main (int argc, char **argv) { - static const struct GNUNET_GETOPT_CommandLineOption options[] = { - { 'A', "num-first", NULL, - gettext_noop ("number of values"), - GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_a }, - { 'B', "num-second", NULL, - gettext_noop ("number of values"), - GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_b }, - { 'b', "byzantine", NULL, - gettext_noop ("use byzantine mode"), - GNUNET_NO, &GNUNET_GETOPT_set_one, &byzantine }, - { 'f', "force-full", NULL, - gettext_noop ("force sending full set"), - GNUNET_NO, &GNUNET_GETOPT_set_uint, &force_full }, - { 'd', "force-delta", NULL, - gettext_noop ("number delta operation"), - GNUNET_NO, &GNUNET_GETOPT_set_uint, &force_delta }, - { 'C', "num-common", NULL, - gettext_noop ("number of values"), - GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_c }, - { 'x', "operation", NULL, - gettext_noop ("operation to execute"), - GNUNET_YES, &GNUNET_GETOPT_set_string, &op_str }, - { 'w', "element-size", NULL, - gettext_noop ("element size"), - GNUNET_YES, &GNUNET_GETOPT_set_uint, &element_size }, - { 's', "statistics", NULL, - gettext_noop ("write statistics to file"), - GNUNET_YES, &GNUNET_GETOPT_set_filename, &statistics_filename }, + struct GNUNET_GETOPT_CommandLineOption options[] = { + GNUNET_GETOPT_OPTION_SET_UINT ('A', + "num-first", + NULL, + gettext_noop ("number of values"), + &num_a), + + GNUNET_GETOPT_OPTION_SET_UINT ('B', + "num-second", + NULL, + gettext_noop ("number of values"), + &num_b), + + GNUNET_GETOPT_OPTION_SET_ONE ('b', + "byzantine", + gettext_noop ("use byzantine mode"), + &byzantine), + + GNUNET_GETOPT_OPTION_SET_UINT ('f', + "force-full", + NULL, + gettext_noop ("force sending full set"), + &force_full), + + GNUNET_GETOPT_OPTION_SET_UINT ('d', + "force-delta", + NULL, + gettext_noop ("number delta operation"), + &force_delta), + + GNUNET_GETOPT_OPTION_SET_UINT ('C', + "num-common", + NULL, + gettext_noop ("number of values"), + &num_c), + + GNUNET_GETOPT_OPTION_STRING ('x', + "operation", + NULL, + gettext_noop ("operation to execute"), + &op_str), + + GNUNET_GETOPT_OPTION_SET_UINT ('w', + "element-size", + NULL, + gettext_noop ("element size"), + &element_size), + + GNUNET_GETOPT_OPTION_FILENAME ('s', + "statistics", + "FILENAME", + gettext_noop ("write statistics to file"), + &statistics_filename), + GNUNET_GETOPT_OPTION_END }; GNUNET_PROGRAM_run2 (argc, argv, "gnunet-set-profiler", -- cgit v1.2.3