diff options
-rw-r--r-- | src/core/test_core_defaults.conf | 6 | ||||
-rw-r--r-- | src/nat/nat.conf.in | 31 |
2 files changed, 1 insertions, 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 @@ | |||
5 | GNUNET_TEST_HOME = /tmp/test-gnunet-core/ | 5 | GNUNET_TEST_HOME = /tmp/test-gnunet-core/ |
6 | 6 | ||
7 | [nat] | 7 | [nat] |
8 | DISABLEV6 = YES | ||
9 | ENABLE_UPNP = NO | 8 | ENABLE_UPNP = NO |
10 | BEHIND_NAT = NO | ||
11 | ALLOW_NAT = NO | ||
12 | INTERNAL_ADDRESS = 127.0.0.1 | ||
13 | EXTERNAL_ADDRESS = 127.0.0.1 | ||
14 | USE_LOCALADDR = NO | ||
15 | 9 | ||
16 | [ats] | 10 | [ats] |
17 | WAN_QUOTA_IN = 1 GB | 11 | 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 | |||
9 | UNIX_MATCH_UID = YES | 9 | UNIX_MATCH_UID = YES |
10 | UNIX_MATCH_GID = YES | 10 | UNIX_MATCH_GID = YES |
11 | 11 | ||
12 | # Are we behind NAT? | ||
13 | BEHIND_NAT = NO | ||
14 | |||
15 | # Is the NAT hole-punched? | ||
16 | PUNCHED_NAT = NO | ||
17 | |||
18 | # Enable UPNP by default? | 12 | # Enable UPNP by default? |
19 | ENABLE_UPNP = NO | 13 | ENABLE_UPNP = NO |
20 | 14 | ||
21 | # Use addresses from the local network interfaces (inluding loopback, but also others) | ||
22 | USE_LOCALADDR = YES | ||
23 | |||
24 | # Use address obtained from a DNS lookup of our hostname | ||
25 | USE_HOSTNAME = NO | ||
26 | |||
27 | # External IP address of the NAT box (if known); IPv4 dotted-decimal ONLY at this time (should allow DynDNS!) | ||
28 | # normal interface IP address for non-NATed peers; | ||
29 | # possibly auto-detected (using UPnP) if possible if not specified | ||
30 | # EXTERNAL_ADDRESS = | ||
31 | |||
32 | # Should we use ICMP-based NAT traversal to try connect to NATed peers | ||
33 | # or, if we are behind NAT, to allow connections to us? | ||
34 | ENABLE_ICMP_CLIENT = NO | ||
35 | ENABLE_ICMP_SERVER = NO | ||
36 | |||
37 | # IP address of the interface connected to the NAT box; IPv4 dotted-decimal ONLY; | ||
38 | # normal interface IP address for non-NATed peers; | ||
39 | # likely auto-detected (via interface list) if not specified (!) | ||
40 | # INTERNAL_ADDRESS = | ||
41 | |||
42 | # Disable IPv6 support | 15 | # Disable IPv6 support |
16 | # FIXME: move entirely to transport plugins! | ||
43 | DISABLEV6 = NO | 17 | DISABLEV6 = NO |
44 | 18 | ||
45 | # Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8) | ||
46 | RETURN_LOCAL_ADDRESSES = NO | ||
47 | |||
48 | # How often do we query the DNS resolver | 19 | # How often do we query the DNS resolver |
49 | # for our hostname (to get our own IP) | 20 | # for our hostname (to get our own IP) |
50 | HOSTNAME_DNS_FREQUENCY = 20 min | 21 | HOSTNAME_DNS_FREQUENCY = 20 min |