move functionality of publishing namestore zone in DHT from GNS service to new zonemaster service

2 files changed, 9 insertions, 6 deletions

diff --git a/doc/man/gnunet-nat.1 b/doc/man/gnunet-nat.1
index 5bdbb21eb..a834a1d96 100644
--- a/doc/man/gnunet-nat.1
+++ b/doc/man/gnunet-nat.1
@@ -81,13 +81,15 @@ We are bound to "127.0.0.1:8080" on UDP and want to obtain all applicable IP add
 
 \fBICMP-based NAT traversal:\fR
 
-Watch for connection reversal request:
+Watch for connection reversal request (you must be bound to NAT range or to wildcard, 0.0.0.0), only works for IPv4:
 
-  # gnunet-nat FIXME
+  # gnunet-nat -Wt -i 192.168.178.12:8080
 
-Initiate connection reversal request:
+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 FIXME
+  # 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!
 
 \fBManual hole punching:\fR
 
diff --git a/doc/structure.dot b/doc/structure.dot
index 2a30c7c17..e244d20b8 100644
--- a/doc/structure.dot
+++ b/doc/structure.dot
@@ -41,8 +41,9 @@ splines = true;
   dv -> ats;
   dns -> tun;
   dns -> dnsstub;
-  gns [shape=house];
-  gns -> namestore;
+  zonemaster [shape=house];
+  zonemaster -> namestore;
+  zonemaster -> dht;
   gns -> dns;
   gns -> dht;
   gns -> block [style=dotted,color=blue];