aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-12-18 08:18:16 +0100
committerChristian Grothoff <christian@grothoff.org>2016-12-18 08:18:16 +0100
commitb671c7b7d192d7b87d5553ad6f32ac8ac6791780 (patch)
treeba190fa0e6ba240f5768c96fce6376b0d3a81388 /src
parent28e8a15dd1092cee6938e0c12c1763737612a08f (diff)
downloadgnunet-b671c7b7d192d7b87d5553ad6f32ac8ac6791780.tar.gz
gnunet-b671c7b7d192d7b87d5553ad6f32ac8ac6791780.zip
disambiguate -L option to gnunet-nat
Diffstat (limited to 'src')
-rw-r--r--src/nat/gnunet-nat.c6
-rw-r--r--src/nat/gnunet-service-nat.c3
2 files changed, 5 insertions, 4 deletions
diff --git a/src/nat/gnunet-nat.c b/src/nat/gnunet-nat.c
index f3e26ffb1..d04a9337a 100644
--- a/src/nat/gnunet-nat.c
+++ b/src/nat/gnunet-nat.c
@@ -693,9 +693,6 @@ main (int argc,
693 {'r', "remote", "ADDRESS", 693 {'r', "remote", "ADDRESS",
694 gettext_noop ("which remote IP and port should be asked for connection reversal"), 694 gettext_noop ("which remote IP and port should be asked for connection reversal"),
695 GNUNET_YES, &GNUNET_GETOPT_set_string, &remote_addr }, 695 GNUNET_YES, &GNUNET_GETOPT_set_string, &remote_addr },
696 {'L', "listen", NULL,
697 gettext_noop ("listen for connection reversal requests"),
698 GNUNET_NO, &GNUNET_GETOPT_set_one, &listen_reversal },
699 {'p', "port", NULL, 696 {'p', "port", NULL,
700 gettext_noop ("port to use to advertise"), 697 gettext_noop ("port to use to advertise"),
701 GNUNET_YES, &GNUNET_GETOPT_set_uint, &adv_port }, 698 GNUNET_YES, &GNUNET_GETOPT_set_uint, &adv_port },
@@ -711,6 +708,9 @@ main (int argc,
711 {'w', "write", NULL, 708 {'w', "write", NULL,
712 gettext_noop ("write configuration file (for autoconfiguration)"), 709 gettext_noop ("write configuration file (for autoconfiguration)"),
713 GNUNET_NO, &GNUNET_GETOPT_set_one, &write_cfg }, 710 GNUNET_NO, &GNUNET_GETOPT_set_one, &write_cfg },
711 {'W', "watch", NULL,
712 gettext_noop ("watch for connection reversal requests"),
713 GNUNET_NO, &GNUNET_GETOPT_set_one, &listen_reversal },
714 GNUNET_GETOPT_OPTION_END 714 GNUNET_GETOPT_OPTION_END
715 }; 715 };
716 716
diff --git a/src/nat/gnunet-service-nat.c b/src/nat/gnunet-service-nat.c
index af4017402..bf3867ff2 100644
--- a/src/nat/gnunet-service-nat.c
+++ b/src/nat/gnunet-service-nat.c
@@ -29,7 +29,8 @@
29 * 29 *
30 * TODO: 30 * TODO:
31 * - TEST UPnPC/PMP-based NAT traversal 31 * - TEST UPnPC/PMP-based NAT traversal
32 * - implement STUN processing to classify NAT 32 * - implement STUN processing to classify NAT;
33 * basically, open port & try different methods.
33 * - implement "more" autoconfig 34 * - implement "more" autoconfig
34 * - implement NEW logic for external IP detection 35 * - implement NEW logic for external IP detection
35 */ 36 */