Check that you are not present in trail twice

[oweals/gnunet.git] / src / transport / transport.conf.in

diff --git a/src/transport/transport.conf.in b/src/transport/transport.conf.in
index 945d7b4cbd68a3bc411ce11ba0ba2e50545df07a..845c4d384bd459ed9fddd4c1a24a4dc8b6a728a0 100644 (file)
--- a/src/transport/transport.conf.in
+++ b/src/transport/transport.conf.in
@@ -1,9 +1,9 @@
 [transport]
-AUTOSTART = YES
-@UNIXONLY@ PORT = 2091
+AUTOSTART = @AUTOSTART@
+@JAVAPORT@PORT = 2091
 HOSTNAME = localhost
 BINARY = gnunet-service-transport
-#PREFIX = valgrind
+# PREFIX = valgrind
 NEIGHBOUR_LIMIT = 50
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -32,7 +32,7 @@ UNIX_MATCH_GID = YES
 
 
 [transport-unix]
-PORT = 22086
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-transport-plugin-unix.sock
 TESTING_IGNORE_KEYS = ACCEPT_FROM;
 
 [transport-tcp]
@@ -56,6 +56,7 @@ MAX_CONNECTIONS = 128
 # Use PORT = 0 to autodetect a port available
 PORT = 2086
 BROADCAST = YES
+BROADCAST_RECEIVE = YES
 BROADCAST_INTERVAL = 30 s
 MAX_BPS = 1000000
 TESTING_IGNORE_KEYS = ACCEPT_FROM;
@@ -63,6 +64,22 @@ TESTING_IGNORE_KEYS = ACCEPT_FROM;
 [transport-http_client]
 MAX_CONNECTIONS = 128
 TESTING_IGNORE_KEYS = ACCEPT_FROM;
+# Hostname or IP of proxy server
+# PROXY =
+
+# User name for proxy server
+# PROXY_USERNAME =
+# User password for proxy server
+# PROXY_PASSWORD =
+
+# Type of proxy server,
+# Valid values: HTTP, SOCKS4, SOCKS5, SOCKS4A, SOCKS5_HOSTNAME
+# Default: HTTP
+# PROXY_TYPE = HTTP
+
+# Enable tunneling proxy request instead of having proxy server evaluate it
+# Experimental, default: NO
+# PROXY_HTTP_TUNNELING = NO
 
 [transport-http_server]
 #EXTERNAL_HOSTNAME = <your hostname/path>
@@ -74,6 +91,24 @@ TESTING_IGNORE_KEYS = ACCEPT_FROM;
 [transport-https_client]
 MAX_CONNECTIONS = 128
 TESTING_IGNORE_KEYS = ACCEPT_FROM;
+# Hostname or IP of proxy server
+# PROXY =
+
+# User name for proxy server
+# PROXY_USERNAME =
+# User password for proxy server
+# PROXY_PASSWORD =
+
+# Type of proxy server,
+# Valid values: HTTP, SOCKS4, SOCKS5, SOCKS4A, SOCKS5_HOSTNAME
+# Default: HTTP
+# PROXY_TYPE = HTTP
+
+# Enable tunneling proxy request instead of having proxy server evaluate it
+# Experimental, default: NO
+# PROXY_HTTP_TUNNELING = NO
+
+
 
 [transport-https_server]
 # EXTERNAL_HOSTNAME = <your hostname/path>