Merge branch 'master' of ssh://gnunet.org/gnunet

[oweals/gnunet.git] / src / transport / transport.conf.in

diff --git a/src/transport/transport.conf.in b/src/transport/transport.conf.in
index 4e9f17f771460cb7fb3d23726392b3a52aabb044..2c99af000d6ca782115e623679b5e5ab2420f83b 100644 (file)
--- a/src/transport/transport.conf.in
+++ b/src/transport/transport.conf.in
@@ -4,6 +4,8 @@ AUTOSTART = @AUTOSTART@
 HOSTNAME = localhost
 BINARY = gnunet-service-transport
 # PREFIX = valgrind
+
+# Maximum number of neighbours PER PLUGIN (not in total).
 NEIGHBOUR_LIMIT = 50
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -38,7 +40,17 @@ TESTING_IGNORE_KEYS = ACCEPT_FROM;
 [transport-tcp]
 # Use 0 to ONLY advertise as a peer behind NAT (no port binding)
 PORT = 2086
+
+# Obsolete option, to be replaced by HOLE_EXTERNAL (soon)
 ADVERTISED_PORT = 2086
+
+# If we have a manually punched NAT, what is the external IP and port?
+# Can use DNS names for DynDNS-based detection of external IP.
+# Can use IPv6 addresses ([fefc::]:PORT).
+# Use "AUTO" for the hostname to automatically detect external IP.
+# Do not set if NAT is not manually punched.
+# HOLE_EXTERNAL = AUTO:2086
+
 TESTING_IGNORE_KEYS = ACCEPT_FROM;
 
 # Maximum number of open TCP connections allowed
@@ -55,8 +67,6 @@ MAX_CONNECTIONS = 128
 # Enable TCP stealth?
 TCP_STEALTH = NO
 
-# Configuration for manually punched holes in NAT.
-# HOLE_EXTERNAL = auto:2086
 
 [transport-udp]
 # Use PORT = 0 to autodetect a port available
@@ -72,8 +82,13 @@ BROADCAST_INTERVAL = 30 s
 MAX_BPS = 1000000
 TESTING_IGNORE_KEYS = ACCEPT_FROM;
 
-# Configuration for manually punched holes in NAT.
-# HOLE_EXTERNAL = auto:2086
+# If we have a manually punched NAT, what is the external IP and port?
+# Can use DNS names for DynDNS-based detection of external IP.
+# Can use IPv6 addresses ([fefc::]:PORT).
+# Use "AUTO" for the hostname to automatically detect external IP.
+# Do not set if NAT is not manually punched.
+# HOLE_EXTERNAL = AUTO:2086
+
 
 [transport-http_client]
 MAX_CONNECTIONS = 128
@@ -95,18 +110,27 @@ TESTING_IGNORE_KEYS = ACCEPT_FROM;
 # Experimental, default: NO
 # PROXY_HTTP_TUNNELING = NO
 
+
 [transport-http_server]
 #EXTERNAL_HOSTNAME = <your hostname/path>
 PORT = 1080
+
+# Obsolete option, to be replaced by HOLE_EXTERNAL (soon)
 ADVERTISED_PORT = 1080
+
+# If we have a manually punched NAT, what is the external IP and port?
+# Can use DNS names for DynDNS-based detection of external IP.
+# Can use IPv6 addresses ([fefc::]:PORT).
+# Use "AUTO" for the hostname to automatically detect external IP.
+# Do not set if NAT is not manually punched.
+# HOLE_EXTERNAL = AUTO:1080
+
 MAX_CONNECTIONS = 128
 TESTING_IGNORE_KEYS = ACCEPT_FROM;
 
 # Enable TCP stealth?
 TCP_STEALTH = NO
 
-# Configuration for manually punched holes in NAT.
-# HOLE_EXTERNAL = auto:2086
 
 [transport-https_client]
 MAX_CONNECTIONS = 128
@@ -129,7 +153,6 @@ TESTING_IGNORE_KEYS = ACCEPT_FROM;
 # PROXY_HTTP_TUNNELING = NO
 
 
-
 [transport-https_server]
 # EXTERNAL_HOSTNAME = <your hostname/path>
 # EXTERNAL_HOSTNAME_ONLY = YES
@@ -139,7 +162,17 @@ TESTING_IGNORE_KEYS = ACCEPT_FROM;
 # Does the external hostname use the same port?
 # EXTERNAL_HOSTNAME_USE_PORT = YES
 PORT = 4433
+
+# Obsolete option, to be replaced by HOLE_EXTERNAL (soon)
 ADVERTISED_PORT = 4433
+
+# If we have a manually punched NAT, what is the external IP and port?
+# Can use DNS names for DynDNS-based detection of external IP.
+# Can use IPv6 addresses ([fefc::]:PORT).
+# Use "AUTO" for the hostname to automatically detect external IP.
+# Do not set if NAT is not manually punched.
+# HOLE_EXTERNAL = AUTO:4433
+
 CRYPTO_INIT = NORMAL
 KEY_FILE = $GNUNET_DATA_HOME/transport/https.key
 CERT_FILE = $GNUNET_DATA_HOME/transport/https.cert
@@ -149,9 +182,6 @@ TESTING_IGNORE_KEYS = ACCEPT_FROM;
 # Enable TCP stealth?
 TCP_STEALTH = NO
 
-# Configuration for manually punched holes in NAT.
-# HOLE_EXTERNAL = auto:2086
-
 
 [transport-wlan]
 # Name of the interface in monitor mode (typically monX)
@@ -160,6 +190,7 @@ INTERFACE = mon0
 TESTMODE = 0
 TESTING_IGNORE_KEYS = ACCEPT_FROM;
 
+
 [transport-bluetooth]
 # Name of the interface (typically hciX)
 INTERFACE = hci0