From: David Barksdale Date: Sat, 11 Feb 2017 16:58:12 +0000 (-0600) Subject: No need to mention HOLE_EXTERNAL twice X-Git-Tag: taler-0.2.1~186 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=16f20246b1b73d428e4bcea5562a4cc1d3542d6f;p=oweals%2Fgnunet.git No need to mention HOLE_EXTERNAL twice --- diff --git a/src/transport/transport.conf.in b/src/transport/transport.conf.in index 7b5413bbe..37cb4efc7 100644 --- a/src/transport/transport.conf.in +++ b/src/transport/transport.conf.in @@ -65,8 +65,6 @@ MAX_CONNECTIONS = 128 # Enable TCP stealth? TCP_STEALTH = NO -# Configuration for manually punched holes in NAT. -# HOLE_EXTERNAL = auto:2086 [transport-udp] # Use PORT = 0 to autodetect a port available @@ -110,6 +108,7 @@ TESTING_IGNORE_KEYS = ACCEPT_FROM; # Experimental, default: NO # PROXY_HTTP_TUNNELING = NO + [transport-http_server] #EXTERNAL_HOSTNAME = PORT = 1080 @@ -122,8 +121,7 @@ ADVERTISED_PORT = 1080 # 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 - +# HOLE_EXTERNAL = AUTO:1080 MAX_CONNECTIONS = 128 TESTING_IGNORE_KEYS = ACCEPT_FROM; @@ -131,8 +129,6 @@ TESTING_IGNORE_KEYS = ACCEPT_FROM; # Enable TCP stealth? TCP_STEALTH = NO -# Configuration for manually punched holes in NAT. -# HOLE_EXTERNAL = auto:2086 [transport-https_client] MAX_CONNECTIONS = 128 @@ -155,7 +151,6 @@ TESTING_IGNORE_KEYS = ACCEPT_FROM; # PROXY_HTTP_TUNNELING = NO - [transport-https_server] # EXTERNAL_HOSTNAME = # EXTERNAL_HOSTNAME_ONLY = YES @@ -174,7 +169,7 @@ ADVERTISED_PORT = 4433 # 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 +# HOLE_EXTERNAL = AUTO:4433 CRYPTO_INIT = NORMAL KEY_FILE = $GNUNET_DATA_HOME/transport/https.key @@ -185,9 +180,6 @@ TESTING_IGNORE_KEYS = ACCEPT_FROM; # Enable TCP stealth? TCP_STEALTH = NO -# Configuration for manually punched holes in NAT. -# HOLE_EXTERNAL = auto:2086 - [transport-wlan] # Name of the interface in monitor mode (typically monX) @@ -196,6 +188,7 @@ INTERFACE = mon0 TESTMODE = 0 TESTING_IGNORE_KEYS = ACCEPT_FROM; + [transport-bluetooth] # Name of the interface (typically hciX) INTERFACE = hci0