diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-01-07 13:05:27 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-01-07 13:05:27 +0100 |
commit | fe7e93cbcc20631e611c1a5505a03d00e73e0cc2 (patch) | |
tree | 661a57b75982f22041bd15d300a439bcce097a37 /src/transport/transport.conf.in | |
parent | 76b387ae68024934ccd92daa34659ada17dc3955 (diff) | |
download | gnunet-fe7e93cbcc20631e611c1a5505a03d00e73e0cc2.tar.gz gnunet-fe7e93cbcc20631e611c1a5505a03d00e73e0cc2.zip |
fixing uninit sin_addr; now successfully tested external hole punching support in new NAT code; documenting options to be used in the future
Diffstat (limited to 'src/transport/transport.conf.in')
-rw-r--r-- | src/transport/transport.conf.in | 40 |
1 files changed, 38 insertions, 2 deletions
diff --git a/src/transport/transport.conf.in b/src/transport/transport.conf.in index 4e9f17f77..7b5413bbe 100644 --- a/src/transport/transport.conf.in +++ b/src/transport/transport.conf.in | |||
@@ -38,7 +38,17 @@ TESTING_IGNORE_KEYS = ACCEPT_FROM; | |||
38 | [transport-tcp] | 38 | [transport-tcp] |
39 | # Use 0 to ONLY advertise as a peer behind NAT (no port binding) | 39 | # Use 0 to ONLY advertise as a peer behind NAT (no port binding) |
40 | PORT = 2086 | 40 | PORT = 2086 |
41 | |||
42 | # Obsolete option, to be replaced by HOLE_EXTERNAL (soon) | ||
41 | ADVERTISED_PORT = 2086 | 43 | ADVERTISED_PORT = 2086 |
44 | |||
45 | # If we have a manually punched NAT, what is the external IP and port? | ||
46 | # Can use DNS names for DynDNS-based detection of external IP. | ||
47 | # Can use IPv6 addresses ([fefc::]:PORT). | ||
48 | # Use "AUTO" for the hostname to automatically detect external IP. | ||
49 | # Do not set if NAT is not manually punched. | ||
50 | # HOLE_EXTERNAL = AUTO:2086 | ||
51 | |||
42 | TESTING_IGNORE_KEYS = ACCEPT_FROM; | 52 | TESTING_IGNORE_KEYS = ACCEPT_FROM; |
43 | 53 | ||
44 | # Maximum number of open TCP connections allowed | 54 | # Maximum number of open TCP connections allowed |
@@ -72,8 +82,13 @@ BROADCAST_INTERVAL = 30 s | |||
72 | MAX_BPS = 1000000 | 82 | MAX_BPS = 1000000 |
73 | TESTING_IGNORE_KEYS = ACCEPT_FROM; | 83 | TESTING_IGNORE_KEYS = ACCEPT_FROM; |
74 | 84 | ||
75 | # Configuration for manually punched holes in NAT. | 85 | # If we have a manually punched NAT, what is the external IP and port? |
76 | # HOLE_EXTERNAL = auto:2086 | 86 | # Can use DNS names for DynDNS-based detection of external IP. |
87 | # Can use IPv6 addresses ([fefc::]:PORT). | ||
88 | # Use "AUTO" for the hostname to automatically detect external IP. | ||
89 | # Do not set if NAT is not manually punched. | ||
90 | # HOLE_EXTERNAL = AUTO:2086 | ||
91 | |||
77 | 92 | ||
78 | [transport-http_client] | 93 | [transport-http_client] |
79 | MAX_CONNECTIONS = 128 | 94 | MAX_CONNECTIONS = 128 |
@@ -98,7 +113,18 @@ TESTING_IGNORE_KEYS = ACCEPT_FROM; | |||
98 | [transport-http_server] | 113 | [transport-http_server] |
99 | #EXTERNAL_HOSTNAME = <your hostname/path> | 114 | #EXTERNAL_HOSTNAME = <your hostname/path> |
100 | PORT = 1080 | 115 | PORT = 1080 |
116 | |||
117 | # Obsolete option, to be replaced by HOLE_EXTERNAL (soon) | ||
101 | ADVERTISED_PORT = 1080 | 118 | ADVERTISED_PORT = 1080 |
119 | |||
120 | # If we have a manually punched NAT, what is the external IP and port? | ||
121 | # Can use DNS names for DynDNS-based detection of external IP. | ||
122 | # Can use IPv6 addresses ([fefc::]:PORT). | ||
123 | # Use "AUTO" for the hostname to automatically detect external IP. | ||
124 | # Do not set if NAT is not manually punched. | ||
125 | # HOLE_EXTERNAL = AUTO:2086 | ||
126 | |||
127 | |||
102 | MAX_CONNECTIONS = 128 | 128 | MAX_CONNECTIONS = 128 |
103 | TESTING_IGNORE_KEYS = ACCEPT_FROM; | 129 | TESTING_IGNORE_KEYS = ACCEPT_FROM; |
104 | 130 | ||
@@ -139,7 +165,17 @@ TESTING_IGNORE_KEYS = ACCEPT_FROM; | |||
139 | # Does the external hostname use the same port? | 165 | # Does the external hostname use the same port? |
140 | # EXTERNAL_HOSTNAME_USE_PORT = YES | 166 | # EXTERNAL_HOSTNAME_USE_PORT = YES |
141 | PORT = 4433 | 167 | PORT = 4433 |
168 | |||
169 | # Obsolete option, to be replaced by HOLE_EXTERNAL (soon) | ||
142 | ADVERTISED_PORT = 4433 | 170 | ADVERTISED_PORT = 4433 |
171 | |||
172 | # If we have a manually punched NAT, what is the external IP and port? | ||
173 | # Can use DNS names for DynDNS-based detection of external IP. | ||
174 | # Can use IPv6 addresses ([fefc::]:PORT). | ||
175 | # Use "AUTO" for the hostname to automatically detect external IP. | ||
176 | # Do not set if NAT is not manually punched. | ||
177 | # HOLE_EXTERNAL = AUTO:2086 | ||
178 | |||
143 | CRYPTO_INIT = NORMAL | 179 | CRYPTO_INIT = NORMAL |
144 | KEY_FILE = $GNUNET_DATA_HOME/transport/https.key | 180 | KEY_FILE = $GNUNET_DATA_HOME/transport/https.key |
145 | CERT_FILE = $GNUNET_DATA_HOME/transport/https.cert | 181 | CERT_FILE = $GNUNET_DATA_HOME/transport/https.cert |