Merge branch 'master' of gnunet.org:gnunet

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

diff --git a/src/nat/nat.conf.in b/src/nat/nat.conf.in
index 88975c4244de96728340b69bdcd58fd951c5d205..87fe29d9cabf9b4edcd76974ecbab8daf5c73751 100644 (file)
--- a/src/nat/nat.conf.in
+++ b/src/nat/nat.conf.in
@@ -9,42 +9,13 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-nat.sock
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
 
-# Are we behind NAT?
-BEHIND_NAT = NO
-
-# Is the NAT hole-punched?
-PUNCHED_NAT = NO
-
 # Enable UPNP by default?
-ENABLE_UPNP = NO
-
-# Use addresses from the local network interfaces (inluding loopback, but also others)
-USE_LOCALADDR = YES
-
-# Use address obtained from a DNS lookup of our hostname
-USE_HOSTNAME = 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?
-ENABLE_ICMP_CLIENT = NO
-ENABLE_ICMP_SERVER = NO
-
-# 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 = 
+ENABLE_UPNP = YES
 
 # Disable IPv6 support
+# FIXME: move entirely to transport plugins!
 DISABLEV6 = NO
 
-# Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8)
-RETURN_LOCAL_ADDRESSES = NO
-
 # How often do we query the DNS resolver
 # for our hostname (to get our own IP)
 HOSTNAME_DNS_FREQUENCY = 20 min