[GNUnet-SVN] [gnunet] branch master updated: disambiguate option flag -l

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new a1e7600  disambiguate option flag -l
a1e7600 is described below

commit a1e76003ca590ea8d3e9387da35d87419417abb8
Author: Christian Grothoff <address@hidden>
AuthorDate: Fri Dec 16 12:30:12 2016 +0100

    disambiguate option flag -l
---
 doc/man/gnunet-nat.1 | 2 +-
 src/nat/gnunet-nat.c | 2 +-
 src/nat/nat_api.c    | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/doc/man/gnunet-nat.1 b/doc/man/gnunet-nat.1
index bfd1e5b..a43223f 100644
--- a/doc/man/gnunet-nat.1
+++ b/doc/man/gnunet-nat.1
@@ -31,7 +31,7 @@ Use the configuration file FILENAME.
 Assume that ADDRESS is the globally visible address of the peer.
 
 .B
-.IP "\-l ADDRESS,  \-\-local=ADDRESS"
+.IP "\-i ADDRESS,  \-\-in=ADDRESS"
 Assuming we are listening at ADDRESS for connection reversal requests.
 
 .B
diff --git a/src/nat/gnunet-nat.c b/src/nat/gnunet-nat.c
index 07e6514..1092115 100644
--- a/src/nat/gnunet-nat.c
+++ b/src/nat/gnunet-nat.c
@@ -610,7 +610,7 @@ main (int argc,
     {'e', "external", "ADDRESS",
      gettext_noop ("which external IP and port should be used to test"),
      GNUNET_YES, &GNUNET_GETOPT_set_string, &extern_addr },
-    {'l', "local", "ADDRESS",
+    {'i', "in", "ADDRESS",
      gettext_noop ("which IP and port are we locally using to listen to for 
connection reversals"),
      GNUNET_YES, &GNUNET_GETOPT_set_string, &local_addr },
     {'r', "remote", "ADDRESS",
diff --git a/src/nat/nat_api.c b/src/nat/nat_api.c
index 798da0e..58ed3e6 100644
--- a/src/nat/nat_api.c
+++ b/src/nat/nat_api.c
@@ -445,7 +445,6 @@ GNUNET_NAT_register (const struct 
GNUNET_CONFIGURATION_Handle *cfg,
   nh->reversal_callback = reversal_callback;
   nh->callback_cls = callback_cls;
   do_connect (nh);
-  GNUNET_break (0);
   return nh;
 }
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden