diff options
-rw-r--r-- | doc/man/gnunet-nat.1 | 9 | ||||
-rw-r--r-- | src/nat/gnunet-nat.c | 6 | ||||
-rw-r--r-- | 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 | |||
@@ -39,10 +39,6 @@ Assuming we are listening at ADDRESS for connection reversal requests. | |||
39 | Ask the peer at ADDRESS for connection reversal, using the local address for the target address of the reversal. | 39 | Ask the peer at ADDRESS for connection reversal, using the local address for the target address of the reversal. |
40 | 40 | ||
41 | .B | 41 | .B |
42 | .IP "\-L, \-\-listen" | ||
43 | Listen for connection reversal requests. | ||
44 | |||
45 | .B | ||
46 | .IP "\-p PORT, \-\-port=PORT" | 42 | .IP "\-p PORT, \-\-port=PORT" |
47 | Use PORT as our external port for advertising for incoming requests. | 43 | Use PORT as our external port for advertising for incoming requests. |
48 | 44 | ||
@@ -62,6 +58,11 @@ Use UDP. | |||
62 | .IP "\-w, \-\-write" | 58 | .IP "\-w, \-\-write" |
63 | Write configuration to configuration file, useful in combination with autoconfiguration (\-a). | 59 | Write configuration to configuration file, useful in combination with autoconfiguration (\-a). |
64 | 60 | ||
61 | .B | ||
62 | .IP "\-W, \-\-watch" | ||
63 | Watch for connection reversal requests. | ||
64 | |||
65 | |||
65 | .SH BUGS | 66 | .SH BUGS |
66 | Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org> | 67 | Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org> |
67 | 68 | ||
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 | */ |