From 7873611e180052414e10ed5b4d3a21831a2cc1ce Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 7 Jan 2017 01:09:01 +0100 Subject: [PATCH] was tested --- doc/man/gnunet-nat.1 | 6 ++++-- src/nat/gnunet-service-nat.c | 1 - src/nat/gnunet-service-nat_helper.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/man/gnunet-nat.1 b/doc/man/gnunet-nat.1 index a8a82883b..0a9053444 100644 --- a/doc/man/gnunet-nat.1 +++ b/doc/man/gnunet-nat.1 @@ -78,11 +78,13 @@ Watch for connection reversal request (you must be bound to NAT range or to wild # gnunet-nat -Wt -i 192.168.178.12:8080 -Initiate connection reversal request from peer at external IPv4 address 1.2.3.4 while we are running ourselves at 2.3.4.5:8080 (must use IPv4 addresses): +Initiate connection reversal request from peer at external IPv4 address 1.2.3.4, while we are running ourselves at 2.3.4.5:8080 (must use IPv4 addresses): # gnunet-nat -t -r 1.2.3.4:8080 -i 2.3.4.5:8080 - # gnunet-nat -t -r 1.2.3.4:8080 -i 0.0.0.0:8080 ### TEST THIS! +Initiate connection reversal request from peer at external IPv4 address 1.2.3.4, and let the kernel fill in whatever IPv4 address we happen to have: + + # gnunet-nat -t -r 1.2.3.4:8080 -i 0.0.0.0:8080 \fBManual hole punching:\fR diff --git a/src/nat/gnunet-service-nat.c b/src/nat/gnunet-service-nat.c index 95b19a55c..a8a824b48 100644 --- a/src/nat/gnunet-service-nat.c +++ b/src/nat/gnunet-service-nat.c @@ -28,7 +28,6 @@ * knowledge about the local network topology. * * TODO: - * - test and document (!) ICMP based NAT traversal * - test manual hole punching support * - adapt existing transports to use new NAT logic * - abandon legacy NAT code diff --git a/src/nat/gnunet-service-nat_helper.c b/src/nat/gnunet-service-nat_helper.c index 7e5051d65..b850c8a6b 100644 --- a/src/nat/gnunet-service-nat_helper.c +++ b/src/nat/gnunet-service-nat_helper.c @@ -390,7 +390,7 @@ GN_request_connection_reversal (const struct in_addr *internal_address, "%d", internal_port); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - _("Running gnunet-helper-nat-client %s %s %u\n"), + "Running gnunet-helper-nat-client %s %s %u\n", intv4, remv4, internal_port); -- 2.25.1