diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-01-07 01:09:01 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-01-07 01:09:01 +0100 |
commit | 7873611e180052414e10ed5b4d3a21831a2cc1ce (patch) | |
tree | 9248a8119b5b52dd294e890da780e508752325ab | |
parent | 0371316989c99e94c5cf6e32e0cc9dd725339f11 (diff) | |
download | gnunet-7873611e180052414e10ed5b4d3a21831a2cc1ce.tar.gz gnunet-7873611e180052414e10ed5b4d3a21831a2cc1ce.zip |
was tested
-rw-r--r-- | doc/man/gnunet-nat.1 | 6 | ||||
-rw-r--r-- | src/nat/gnunet-service-nat.c | 1 | ||||
-rw-r--r-- | 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 | |||
78 | 78 | ||
79 | # gnunet-nat -Wt -i 192.168.178.12:8080 | 79 | # gnunet-nat -Wt -i 192.168.178.12:8080 |
80 | 80 | ||
81 | 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): | 81 | 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): |
82 | 82 | ||
83 | # gnunet-nat -t -r 1.2.3.4:8080 -i 2.3.4.5:8080 | 83 | # gnunet-nat -t -r 1.2.3.4:8080 -i 2.3.4.5:8080 |
84 | 84 | ||
85 | # gnunet-nat -t -r 1.2.3.4:8080 -i 0.0.0.0:8080 ### TEST THIS! | 85 | 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: |
86 | |||
87 | # gnunet-nat -t -r 1.2.3.4:8080 -i 0.0.0.0:8080 | ||
86 | 88 | ||
87 | \fBManual hole punching:\fR | 89 | \fBManual hole punching:\fR |
88 | 90 | ||
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 @@ | |||
28 | * knowledge about the local network topology. | 28 | * knowledge about the local network topology. |
29 | * | 29 | * |
30 | * TODO: | 30 | * TODO: |
31 | * - test and document (!) ICMP based NAT traversal | ||
32 | * - test manual hole punching support | 31 | * - test manual hole punching support |
33 | * - adapt existing transports to use new NAT logic | 32 | * - adapt existing transports to use new NAT logic |
34 | * - abandon legacy NAT code | 33 | * - 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, | |||
390 | "%d", | 390 | "%d", |
391 | internal_port); | 391 | internal_port); |
392 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 392 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
393 | _("Running gnunet-helper-nat-client %s %s %u\n"), | 393 | "Running gnunet-helper-nat-client %s %s %u\n", |
394 | intv4, | 394 | intv4, |
395 | remv4, | 395 | remv4, |
396 | internal_port); | 396 | internal_port); |