moving NAT options into their own section

1 files changed, 24 insertions, 13 deletions

diff --git a/contrib/defaults.conf b/contrib/defaults.conf
index 0d1bffab9..6c467f895 100644
--- a/contrib/defaults.conf
+++ b/contrib/defaults.conf
@@ -21,11 +21,7 @@ MAX_OUTSTANDING_CONNECTIONS = 50
 [client]
 HOME = $SERVICEHOME
 
-[transport-tcp]
-# Use 0 to ONLY advertise as a peer behind NAT (no port binding)
-PORT = 2086
-ADVERTISED_PORT = 2086
-
+[nat]
 # Are we behind NAT?
 BEHIND_NAT = YES
 
@@ -54,29 +50,44 @@ ENABLE_ICMP_SERVER = YES
 # (but use different: this one restricts our bind!)
 # BINDTO =
 
+# Disable IPv6 support
+DISABLEV6 = NO
+
+
+[transport-tcp]
+# Use 0 to ONLY advertise as a peer behind NAT (no port binding)
+PORT = 2086
+ADVERTISED_PORT = 2086
+
 TIMEOUT = 300000
 
-# Disable IPv6 support
-# DISABLEV6 =
+# Allow use of loopback address
+USE_LOCALADDR = NO
+
 # ACCEPT_FROM =
 # ACCEPT_FROM6 =
 # REJECT_FROM =
 # REJECT_FROM6 =
 
+
 [transport-udp]
 PORT = 2086
-# BEHIND_NAT = 
-# BINDTO = 
-# ALLOW_NAT = 
-# ONLY_NAT_ADDRESSES = 
-# INTERNAL_ADDRESS = 
-# EXTERNAL_ADDRESS = 
+
+# Allow use of loopback address
+USE_LOCALADDR = NO
+
 
 [transport-http]
 PORT = 1080
+# Allow use of loopback address
+USE_LOCALADDR = NO
+
 
 [transport-https]
 PORT = 4433
+# Allow use of loopback address
+USE_LOCALADDR = NO
+
 
 [transport-wlan]
 # Name of the interface in monitor mode (typically monX)