From fe7e93cbcc20631e611c1a5505a03d00e73e0cc2 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 7 Jan 2017 13:05:27 +0100 Subject: fixing uninit sin_addr; now successfully tested external hole punching support in new NAT code; documenting options to be used in the future --- src/transport/transport.conf.in | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) (limited to 'src/transport') 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; [transport-tcp] # Use 0 to ONLY advertise as a peer behind NAT (no port binding) PORT = 2086 + +# Obsolete option, to be replaced by HOLE_EXTERNAL (soon) ADVERTISED_PORT = 2086 + +# If we have a manually punched NAT, what is the external IP and port? +# Can use DNS names for DynDNS-based detection of external IP. +# Can use IPv6 addresses ([fefc::]:PORT). +# Use "AUTO" for the hostname to automatically detect external IP. +# Do not set if NAT is not manually punched. +# HOLE_EXTERNAL = AUTO:2086 + TESTING_IGNORE_KEYS = ACCEPT_FROM; # Maximum number of open TCP connections allowed @@ -72,8 +82,13 @@ BROADCAST_INTERVAL = 30 s MAX_BPS = 1000000 TESTING_IGNORE_KEYS = ACCEPT_FROM; -# Configuration for manually punched holes in NAT. -# HOLE_EXTERNAL = auto:2086 +# If we have a manually punched NAT, what is the external IP and port? +# Can use DNS names for DynDNS-based detection of external IP. +# Can use IPv6 addresses ([fefc::]:PORT). +# Use "AUTO" for the hostname to automatically detect external IP. +# Do not set if NAT is not manually punched. +# HOLE_EXTERNAL = AUTO:2086 + [transport-http_client] MAX_CONNECTIONS = 128 @@ -98,7 +113,18 @@ TESTING_IGNORE_KEYS = ACCEPT_FROM; [transport-http_server] #EXTERNAL_HOSTNAME = PORT = 1080 + +# Obsolete option, to be replaced by HOLE_EXTERNAL (soon) ADVERTISED_PORT = 1080 + +# If we have a manually punched NAT, what is the external IP and port? +# Can use DNS names for DynDNS-based detection of external IP. +# Can use IPv6 addresses ([fefc::]:PORT). +# Use "AUTO" for the hostname to automatically detect external IP. +# Do not set if NAT is not manually punched. +# HOLE_EXTERNAL = AUTO:2086 + + MAX_CONNECTIONS = 128 TESTING_IGNORE_KEYS = ACCEPT_FROM; @@ -139,7 +165,17 @@ TESTING_IGNORE_KEYS = ACCEPT_FROM; # Does the external hostname use the same port? # EXTERNAL_HOSTNAME_USE_PORT = YES PORT = 4433 + +# Obsolete option, to be replaced by HOLE_EXTERNAL (soon) ADVERTISED_PORT = 4433 + +# If we have a manually punched NAT, what is the external IP and port? +# Can use DNS names for DynDNS-based detection of external IP. +# Can use IPv6 addresses ([fefc::]:PORT). +# Use "AUTO" for the hostname to automatically detect external IP. +# Do not set if NAT is not manually punched. +# HOLE_EXTERNAL = AUTO:2086 + CRYPTO_INIT = NORMAL KEY_FILE = $GNUNET_DATA_HOME/transport/https.key CERT_FILE = $GNUNET_DATA_HOME/transport/https.cert -- cgit v1.2.3