From b671c7b7d192d7b87d5553ad6f32ac8ac6791780 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 18 Dec 2016 08:18:16 +0100
Subject: [PATCH] disambiguate -L option to gnunet-nat

---
 doc/man/gnunet-nat.1         | 9 +++++----
 src/nat/gnunet-nat.c         | 6 +++---
 src/nat/gnunet-service-nat.c | 3 ++-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/doc/man/gnunet-nat.1 b/doc/man/gnunet-nat.1
index 9cc8b1237..14b8e1509 100644
--- a/doc/man/gnunet-nat.1
+++ b/doc/man/gnunet-nat.1
@@ -38,10 +38,6 @@ Assuming we are listening at ADDRESS for connection reversal requests.
 .IP "\-r ADDRESS,  \-\-remote=ADDRESS"
 Ask the peer at ADDRESS for connection reversal, using the local address for the target address of the reversal.
 
-.B
-.IP "\-L,  \-\-listen"
-Listen for connection reversal requests.  
-
 .B
 .IP "\-p PORT,  \-\-port=PORT"
 Use PORT as our external port for advertising for incoming requests.
@@ -62,6 +58,11 @@ Use UDP.
 .IP "\-w,  \-\-write"
 Write configuration to configuration file, useful in combination with autoconfiguration (\-a).
 
+.B
+.IP "\-W,  \-\-watch"
+Watch for connection reversal requests.  
+
+
 .SH BUGS
 Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
 
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,
     {'r', "remote", "ADDRESS",
      gettext_noop ("which remote IP and port should be asked for connection reversal"),
      GNUNET_YES, &GNUNET_GETOPT_set_string, &remote_addr },
-    {'L', "listen", NULL,
-     gettext_noop ("listen for connection reversal requests"),
-     GNUNET_NO, &GNUNET_GETOPT_set_one, &listen_reversal },
     {'p', "port", NULL,
      gettext_noop ("port to use to advertise"),
      GNUNET_YES, &GNUNET_GETOPT_set_uint, &adv_port },
@@ -711,6 +708,9 @@ main (int argc,
     {'w', "write", NULL,
      gettext_noop ("write configuration file (for autoconfiguration)"),
      GNUNET_NO, &GNUNET_GETOPT_set_one, &write_cfg },
+    {'W', "watch", NULL,
+     gettext_noop ("watch for connection reversal requests"),
+     GNUNET_NO, &GNUNET_GETOPT_set_one, &listen_reversal },
    GNUNET_GETOPT_OPTION_END
   };
 
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 @@
  *
  * TODO:
  * - TEST UPnPC/PMP-based NAT traversal
- * - implement STUN processing to classify NAT
+ * - implement STUN processing to classify NAT;
+ *   basically, open port & try different methods.
  * - implement "more" autoconfig
  * - implement NEW logic for external IP detection
  */
-- 
2.25.1