summaryrefslogtreecommitdiff
path: root/src/nat-auto
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2017-03-15 11:51:15 +0100
committerMarcello Stanisci <marcello.stanisci@inria.fr>2017-03-15 11:51:15 +0100
commit294393abdca9f482321696e9aaec64b1a0488607 (patch)
tree59f07ac83f5b79684b916ebf410a5d72ce87f88a /src/nat-auto
parent796d0e5aa54ed99dd00fae26982a0e99f9d99f8e (diff)
Porting 'nat-auto'.
Diffstat (limited to 'src/nat-auto')
-rw-r--r--src/nat-auto/gnunet-nat-auto.c44
1 files changed, 27 insertions, 17 deletions
diff --git a/src/nat-auto/gnunet-nat-auto.c b/src/nat-auto/gnunet-nat-auto.c
index 5eb0a4be3..8b281d1ab 100644
--- a/src/nat-auto/gnunet-nat-auto.c
+++ b/src/nat-auto/gnunet-nat-auto.c
@@ -63,7 +63,7 @@ static char *section_name;
/**
* Should we run autoconfiguration?
*/
-static unsigned int do_auto;
+static int do_auto;
/**
* Handle to a NAT test operation.
@@ -339,22 +339,32 @@ int
main (int argc,
char *const argv[])
{
- static const struct GNUNET_GETOPT_CommandLineOption options[] = {
- {'a', "auto", NULL,
- gettext_noop ("run autoconfiguration"),
- GNUNET_NO, &GNUNET_GETOPT_set_one, &do_auto },
- {'S', "section", "NAME",
- gettext_noop ("section name providing the configuration for the adapter"),
- GNUNET_YES, &GNUNET_GETOPT_set_string, &section_name },
- {'t', "tcp", NULL,
- gettext_noop ("use TCP"),
- GNUNET_NO, &GNUNET_GETOPT_set_one, &use_tcp },
- {'u', "udp", NULL,
- gettext_noop ("use UDP"),
- GNUNET_NO, &GNUNET_GETOPT_set_one, &use_udp },
- {'w', "write", NULL,
- gettext_noop ("write configuration file (for autoconfiguration)"),
- GNUNET_NO, &GNUNET_GETOPT_set_one, &write_cfg },
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_OPTION_SET_ONE ('a',
+ "auto",
+ gettext_noop ("run autoconfiguration"),
+ &do_auto),
+
+ GNUNET_GETOPT_OPTION_STRING ('S',
+ "section",
+ "NAME",
+ gettext_noop ("section name providing the configuration for the adapter"),
+ &section_name),
+
+ GNUNET_GETOPT_OPTION_SET_ONE ('t',
+ "tcp",
+ gettext_noop ("use TCP"),
+ &use_tcp),
+
+ GNUNET_GETOPT_OPTION_SET_ONE ('u',
+ "udp",
+ gettext_noop ("use UDP"),
+ &use_udp),
+
+ GNUNET_GETOPT_OPTION_SET_ONE ('w',
+ "write",
+ gettext_noop ("write configuration file (for autoconfiguration)"),
+ &write_cfg),
GNUNET_GETOPT_OPTION_END
};