aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-12-16 12:30:12 +0100
committerChristian Grothoff <christian@grothoff.org>2016-12-16 12:30:12 +0100
commita1e76003ca590ea8d3e9387da35d87419417abb8 (patch)
treecce29fa2258686fdf0ba6a120df7ec7470af3206
parentf5db4fd9c3225e242633d6545f7b764767a938c1 (diff)
downloadgnunet-a1e76003ca590ea8d3e9387da35d87419417abb8.tar.gz
gnunet-a1e76003ca590ea8d3e9387da35d87419417abb8.zip
disambiguate option flag -l
-rw-r--r--doc/man/gnunet-nat.12
-rw-r--r--src/nat/gnunet-nat.c2
-rw-r--r--src/nat/nat_api.c1
3 files changed, 2 insertions, 3 deletions
diff --git a/doc/man/gnunet-nat.1 b/doc/man/gnunet-nat.1
index bfd1e5bcf..a43223fa8 100644
--- a/doc/man/gnunet-nat.1
+++ b/doc/man/gnunet-nat.1
@@ -31,7 +31,7 @@ Use the configuration file FILENAME.
31Assume that ADDRESS is the globally visible address of the peer. 31Assume that ADDRESS is the globally visible address of the peer.
32 32
33.B 33.B
34.IP "\-l ADDRESS, \-\-local=ADDRESS" 34.IP "\-i ADDRESS, \-\-in=ADDRESS"
35Assuming we are listening at ADDRESS for connection reversal requests. 35Assuming we are listening at ADDRESS for connection reversal requests.
36 36
37.B 37.B
diff --git a/src/nat/gnunet-nat.c b/src/nat/gnunet-nat.c
index 07e65141b..10921150d 100644
--- a/src/nat/gnunet-nat.c
+++ b/src/nat/gnunet-nat.c
@@ -610,7 +610,7 @@ main (int argc,
610 {'e', "external", "ADDRESS", 610 {'e', "external", "ADDRESS",
611 gettext_noop ("which external IP and port should be used to test"), 611 gettext_noop ("which external IP and port should be used to test"),
612 GNUNET_YES, &GNUNET_GETOPT_set_string, &extern_addr }, 612 GNUNET_YES, &GNUNET_GETOPT_set_string, &extern_addr },
613 {'l', "local", "ADDRESS", 613 {'i', "in", "ADDRESS",
614 gettext_noop ("which IP and port are we locally using to listen to for connection reversals"), 614 gettext_noop ("which IP and port are we locally using to listen to for connection reversals"),
615 GNUNET_YES, &GNUNET_GETOPT_set_string, &local_addr }, 615 GNUNET_YES, &GNUNET_GETOPT_set_string, &local_addr },
616 {'r', "remote", "ADDRESS", 616 {'r', "remote", "ADDRESS",
diff --git a/src/nat/nat_api.c b/src/nat/nat_api.c
index 798da0ea6..58ed3e675 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,
445 nh->reversal_callback = reversal_callback; 445 nh->reversal_callback = reversal_callback;
446 nh->callback_cls = callback_cls; 446 nh->callback_cls = callback_cls;
447 do_connect (nh); 447 do_connect (nh);
448 GNUNET_break (0);
449 return nh; 448 return nh;
450} 449}
451 450