diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-06-25 06:24:01 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-06-25 06:24:01 +0000 |
commit | 8a3016481ba6aeb36de3950a56e641dda53ca544 (patch) | |
tree | 0c5468ec6e5d2165ad5931940e0b8439d09398de /contrib/defaults.conf | |
parent | b6d4eeb39fd0cd41df164bd0959f58b08aa45e83 (diff) | |
download | gnunet-8a3016481ba6aeb36de3950a56e641dda53ca544.tar.gz gnunet-8a3016481ba6aeb36de3950a56e641dda53ca544.zip |
the big NAT change
Diffstat (limited to 'contrib/defaults.conf')
-rw-r--r-- | contrib/defaults.conf | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/contrib/defaults.conf b/contrib/defaults.conf index 2c2cd7a77..4c21158c8 100644 --- a/contrib/defaults.conf +++ b/contrib/defaults.conf | |||
@@ -31,6 +31,9 @@ PUNCHED_NAT = NO | |||
31 | # Disable UPNP by default until it gets cleaner! | 31 | # Disable UPNP by default until it gets cleaner! |
32 | ENABLE_UPNP = NO | 32 | ENABLE_UPNP = NO |
33 | 33 | ||
34 | # Use addresses from the local network interfaces (inluding loopback, but also others) | ||
35 | USE_LOCALADDR = YES | ||
36 | |||
34 | # External IP address of the NAT box (if known); IPv4 dotted-decimal ONLY at this time (should allow DynDNS!) | 37 | # External IP address of the NAT box (if known); IPv4 dotted-decimal ONLY at this time (should allow DynDNS!) |
35 | # normal interface IP address for non-NATed peers; | 38 | # normal interface IP address for non-NATed peers; |
36 | # possibly auto-detected (using UPnP) if possible if not specified | 39 | # possibly auto-detected (using UPnP) if possible if not specified |
@@ -58,12 +61,8 @@ ADVERTISED_PORT = 2086 | |||
58 | # Maximum number of open TCP connections allowed | 61 | # Maximum number of open TCP connections allowed |
59 | MAX_CONNECTIONS = 128 | 62 | MAX_CONNECTIONS = 128 |
60 | 63 | ||
61 | # After how long do we drop inactive connections? | ||
62 | TIMEOUT = 5000 | 64 | TIMEOUT = 5000 |
63 | 65 | ||
64 | # Allow use of loopback address | ||
65 | USE_LOCALADDR = NO | ||
66 | |||
67 | # ACCEPT_FROM = | 66 | # ACCEPT_FROM = |
68 | # ACCEPT_FROM6 = | 67 | # ACCEPT_FROM6 = |
69 | # REJECT_FROM = | 68 | # REJECT_FROM = |
@@ -74,20 +73,13 @@ USE_LOCALADDR = NO | |||
74 | [transport-udp] | 73 | [transport-udp] |
75 | PORT = 2086 | 74 | PORT = 2086 |
76 | 75 | ||
77 | # Allow use of loopback address | ||
78 | USE_LOCALADDR = NO | ||
79 | |||
80 | 76 | ||
81 | [transport-http] | 77 | [transport-http] |
82 | PORT = 1080 | 78 | PORT = 1080 |
83 | # Allow use of loopback address | ||
84 | USE_LOCALADDR = NO | ||
85 | 79 | ||
86 | 80 | ||
87 | [transport-https] | 81 | [transport-https] |
88 | PORT = 4433 | 82 | PORT = 4433 |
89 | # Allow use of loopback address | ||
90 | USE_LOCALADDR = NO | ||
91 | 83 | ||
92 | 84 | ||
93 | [transport-wlan] | 85 | [transport-wlan] |