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 881d0a2bf44ddcd161f5b0cdc2891d1d3d6bf859..845c4d384bd459ed9fddd4c1a24a4dc8b6a728a0 100644 (file)
--- a/src/transport/transport.conf.in
+++ b/src/transport/transport.conf.in
@@ -1,20 +1,19 @@
 [transport]
-AUTOSTART = YES
-@UNIXONLY@ PORT = 2091
+AUTOSTART = @AUTOSTART@
+@JAVAPORT@PORT = 2091
 HOSTNAME = localhost
-HOME = $SERVICEHOME
 BINARY = gnunet-service-transport
-#PREFIX = valgrind
+# PREFIX = valgrind
 NEIGHBOUR_LIMIT = 50
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 PLUGINS = tcp udp
-UNIXPATH = /tmp/gnunet-service-transport.sock
-BLACKLIST_FILE = $SERVICEHOME/blacklist
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport.sock
+BLACKLIST_FILE = $GNUNET_CONFIG_HOME/transport/blacklist
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES
 # DISABLE_SOCKET_FORWARDING = NO
-# USERNAME = 
+# USERNAME =
 # MAXBUF =
 # TIMEOUT =
 # DISABLEV6 =
@@ -27,13 +26,13 @@ UNIX_MATCH_GID = YES
 # Distance
 # MANIPULATE_DISTANCE_IN = 1
 # MANIPULATE_DISTANCE_OUT = 1
-# Delay in ms; WARNING: to large values may lead to peers not connecting!
-# MANIPULATE_DELAY_IN = 1
-# MANIPULATE_DELAY_OUT = 1
-  
+# Delay; WARNING: to large values may lead to peers not connecting!
+# MANIPULATE_DELAY_IN = 1 ms
+# MANIPULATE_DELAY_OUT = 1 ms
+
 
 [transport-unix]
-PORT = 22086
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-transport-plugin-unix.sock
 TESTING_IGNORE_KEYS = ACCEPT_FROM;
 
 [transport-tcp]
@@ -57,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;
@@ -64,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>
@@ -75,20 +91,38 @@ 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>
 # EXTERNAL_HOSTNAME_ONLY = YES
-# If you have a valid SSL certificate for your external hostname tell, 
-# clients to verify it  
+# If you have a valid SSL certificate for your external hostname tell,
+# clients to verify it
 # VERIFY_EXTERNAL_HOSTNAME = YES
 # Does the external hostname use the same port?
 # EXTERNAL_HOSTNAME_USE_PORT = YES
 PORT = 4433
 ADVERTISED_PORT = 4433
 CRYPTO_INIT = NORMAL
-KEY_FILE = $SERVICEHOME/https.key
-CERT_FILE = $SERVICEHOME/https.cert
+KEY_FILE = $GNUNET_DATA_HOME/transport/https.key
+CERT_FILE = $GNUNET_DATA_HOME/transport/https.cert
 MAX_CONNECTIONS = 128
 TESTING_IGNORE_KEYS = ACCEPT_FROM;
 
@@ -98,3 +132,10 @@ INTERFACE = mon0
 # Real hardware, no testing
 TESTMODE = 0
 TESTING_IGNORE_KEYS = ACCEPT_FROM;
+
+[transport-bluetooth]
+# Name of the interface (typically hciX)
+INTERFACE = hci0
+# Real hardware, no testing
+TESTMODE = 0
+TESTING_IGNORE_KEYS = ACCEPT_FROM;