From df3c092ec36c40ffdc1738c4b95dc33725e812e6 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 9 Jan 2017 08:59:53 +0100 Subject: [PATCH] eliminate dead NAT options --- src/core/test_core_defaults.conf | 6 ------ src/nat/nat.conf.in | 31 +------------------------------ 2 files changed, 1 insertion(+), 36 deletions(-) diff --git a/src/core/test_core_defaults.conf b/src/core/test_core_defaults.conf index eb9a1c379..4c956987c 100644 --- a/src/core/test_core_defaults.conf +++ b/src/core/test_core_defaults.conf @@ -5,13 +5,7 @@ GNUNET_TEST_HOME = /tmp/test-gnunet-core/ [nat] -DISABLEV6 = YES ENABLE_UPNP = NO -BEHIND_NAT = NO -ALLOW_NAT = NO -INTERNAL_ADDRESS = 127.0.0.1 -EXTERNAL_ADDRESS = 127.0.0.1 -USE_LOCALADDR = NO [ats] WAN_QUOTA_IN = 1 GB diff --git a/src/nat/nat.conf.in b/src/nat/nat.conf.in index 88975c424..19d11c2ad 100644 --- 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 = - # 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 -- 2.25.1