diff options
author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2017-03-15 11:51:15 +0100 |
---|---|---|
committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2017-03-15 11:51:15 +0100 |
commit | 294393abdca9f482321696e9aaec64b1a0488607 (patch) | |
tree | 59f07ac83f5b79684b916ebf410a5d72ce87f88a /src/nat-auto | |
parent | 796d0e5aa54ed99dd00fae26982a0e99f9d99f8e (diff) | |
download | gnunet-294393abdca9f482321696e9aaec64b1a0488607.tar.gz gnunet-294393abdca9f482321696e9aaec64b1a0488607.zip |
Porting 'nat-auto'.
Diffstat (limited to 'src/nat-auto')
-rw-r--r-- | src/nat-auto/gnunet-nat-auto.c | 44 |
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; | |||
63 | /** | 63 | /** |
64 | * Should we run autoconfiguration? | 64 | * Should we run autoconfiguration? |
65 | */ | 65 | */ |
66 | static unsigned int do_auto; | 66 | static int do_auto; |
67 | 67 | ||
68 | /** | 68 | /** |
69 | * Handle to a NAT test operation. | 69 | * Handle to a NAT test operation. |
@@ -339,22 +339,32 @@ int | |||
339 | main (int argc, | 339 | main (int argc, |
340 | char *const argv[]) | 340 | char *const argv[]) |
341 | { | 341 | { |
342 | static const struct GNUNET_GETOPT_CommandLineOption options[] = { | 342 | struct GNUNET_GETOPT_CommandLineOption options[] = { |
343 | {'a', "auto", NULL, | 343 | GNUNET_GETOPT_OPTION_SET_ONE ('a', |
344 | gettext_noop ("run autoconfiguration"), | 344 | "auto", |
345 | GNUNET_NO, &GNUNET_GETOPT_set_one, &do_auto }, | 345 | gettext_noop ("run autoconfiguration"), |
346 | {'S', "section", "NAME", | 346 | &do_auto), |
347 | gettext_noop ("section name providing the configuration for the adapter"), | 347 | |
348 | GNUNET_YES, &GNUNET_GETOPT_set_string, §ion_name }, | 348 | GNUNET_GETOPT_OPTION_STRING ('S', |
349 | {'t', "tcp", NULL, | 349 | "section", |
350 | gettext_noop ("use TCP"), | 350 | "NAME", |
351 | GNUNET_NO, &GNUNET_GETOPT_set_one, &use_tcp }, | 351 | gettext_noop ("section name providing the configuration for the adapter"), |
352 | {'u', "udp", NULL, | 352 | §ion_name), |
353 | gettext_noop ("use UDP"), | 353 | |
354 | GNUNET_NO, &GNUNET_GETOPT_set_one, &use_udp }, | 354 | GNUNET_GETOPT_OPTION_SET_ONE ('t', |
355 | {'w', "write", NULL, | 355 | "tcp", |
356 | gettext_noop ("write configuration file (for autoconfiguration)"), | 356 | gettext_noop ("use TCP"), |
357 | GNUNET_NO, &GNUNET_GETOPT_set_one, &write_cfg }, | 357 | &use_tcp), |
358 | |||
359 | GNUNET_GETOPT_OPTION_SET_ONE ('u', | ||
360 | "udp", | ||
361 | gettext_noop ("use UDP"), | ||
362 | &use_udp), | ||
363 | |||
364 | GNUNET_GETOPT_OPTION_SET_ONE ('w', | ||
365 | "write", | ||
366 | gettext_noop ("write configuration file (for autoconfiguration)"), | ||
367 | &write_cfg), | ||
358 | GNUNET_GETOPT_OPTION_END | 368 | GNUNET_GETOPT_OPTION_END |
359 | }; | 369 | }; |
360 | 370 | ||