new vision for misc options

diff --git a/contrib/defaults.conf b/contrib/defaults.conf
index b29a79361a8f4ec00b6b682081279ef6eece9f2a..af9b8f818cb41faa65652e5e6f07f22491790a1a 100644 (file)
--- a/contrib/defaults.conf
+++ b/contrib/defaults.conf
@@ -18,31 +18,39 @@ HOME = $SERVICEHOME
 [transport-tcp]
 # Use 0 to ONLY advertise as a peer behind NAT (no port binding)
 PORT = 2086
+ADVERTISED_PORT = 2086
 
-# Should we use ICMP-based NAT traversal to try connect to NATed peers?
-ALLOW_NAT = YES
-
-# Are we behind NAT and should use ICMP-based NAT traversal?
+# Are we behind NAT?
 BEHIND_NAT = YES
 
-# IP address of the interface connected to the NAT box; IPv4 dotted-decimal ONLY;
-# normal interface IP address for non-NATed peers; 
-# likely auto-detected (via interface list) if not specified (!)
-# INTERNAL_ADDRESS = 
+# Is the NAT hole-punched?
+#NEW: PUNCHED_NAT = NO
 
 # External IP address of the NAT box (if known); IPv4 dotted-decimal ONLY at this time (should allow DynDNS!)
 # normal interface IP address for non-NATed peers; 
 # possibly auto-detected (using UPnP) if possible if not specified
 # EXTERNAL_ADDRESS = 
 
+# Should we use ICMP-based NAT traversal to try connect to NATed peers
+# or, if we are behind NAT, to allow connections to us?
+ALLOW_NAT = YES
+#NEW: ENABLE_ICMP_CLIENT = YES
+#NEW: ENABLE_ICMP_SERVER = YES
+
+# Are we allowed to try UPnP/PMP?
+ENABLE_UPNP = YES
+
+# IP address of the interface connected to the NAT box; IPv4 dotted-decimal ONLY;
+# normal interface IP address for non-NATed peers; 
+# likely auto-detected (via interface list) if not specified (!)
+# INTERNAL_ADDRESS = 
+
 # Only bind to a specific IP address; if both are given, this should be idential to INTERNAL_ADDRESS
 # (but use different: this one restricts our bind!)
 # BINDTO =
 
 TIMEOUT = 300000
 
-# Are we allowed to try UPnP/PMP?
-ENABLE_UPNP = YES
 # Disable IPv6 support
 # DISABLEV6 =
 # ACCEPT_FROM =
@@ -270,7 +278,11 @@ CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-fs
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
+
 ACTIVEMIGRATION = YES
+# NEW: CONTENT_CACHING = YES
+# NEW: CONTENT_PUSHING = YES
+
 UNIXPATH = /tmp/gnunet-service-fs.sock
 # DISABLE_SOCKET_FORWARDING = NO
 # DEBUG = YES