[gnunet] branch master updated (1b84baca9 -> 29e2e5150)

[gnunet]

This is an automated email from the git hooks/post-receive script.

t3sserakt pushed a change to branch master
in repository gnunet.

    from 1b84baca9 Merge branch 'master' of ssh://git.gnunet.org/gnunet
     new fe6399f44 TNG: Removed old config options.
     new 3774f6b3b Topology: Removed F2F options from config.
     new 29e2e5150 Peerstore: Make peerstore start immediately. Added option to 
use included hello.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/service/peerstore/peerstore.conf.in |   3 +-
 src/service/topology/topology.conf      |   3 -
 src/service/transport/transport.conf.in | 230 +-------------------------------
 3 files changed, 9 insertions(+), 227 deletions(-)

diff --git a/src/service/peerstore/peerstore.conf.in 
b/src/service/peerstore/peerstore.conf.in
index a3a7c672b..c7f387ad0 100644
--- a/src/service/peerstore/peerstore.conf.in
+++ b/src/service/peerstore/peerstore.conf.in
@@ -1,5 +1,6 @@
 [peerstore]
-START_ON_DEMAND = @START_ON_DEMAND@
+IMMEDIATE_START = YES
+USE_INCLUDED_HELLOS = YES
 @JAVAPORT@PORT = 2110
 HOSTNAME = localhost
 BINARY = gnunet-service-peerstore
diff --git a/src/service/topology/topology.conf 
b/src/service/topology/topology.conf
index 45d8dd0c7..9bcfb479c 100644
--- a/src/service/topology/topology.conf
+++ b/src/service/topology/topology.conf
@@ -1,8 +1,5 @@
 [topology]
 IMMEDIATE_START = YES
 NOARMBIND = YES
-MINIMUM-FRIENDS = 0
-FRIENDS-ONLY = NO
 TARGET-CONNECTION-COUNT = 16
-FRIENDS = $GNUNET_CONFIG_HOME/topology/friends.txt
 BINARY = gnunet-daemon-topology
diff --git a/src/service/transport/transport.conf.in 
b/src/service/transport/transport.conf.in
index de4855c6a..6fb8e9ad7 100644
--- a/src/service/transport/transport.conf.in
+++ b/src/service/transport/transport.conf.in
@@ -5,244 +5,28 @@ HOSTNAME = localhost
 BINARY = gnunet-service-transport
 # PREFIX = valgrind
 
-# Maximum number of neighbours PER PLUGIN (not in total).
-NEIGHBOUR_LIMIT = 50
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-# TCP is the only transport plugin known to work "reliably"
-PLUGINS = tcp
 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 =
-# MAXBUF =
-# TIMEOUT =
 # DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX = valgrind --leak-check=full
-
-# Configuration settings related to traffic manipulation for testing purposes
-# Distance
-# MANIPULATE_DISTANCE_IN = 1
-# MANIPULATE_DISTANCE_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]
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-transport-plugin-unix.sock
-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
-MAX_CONNECTIONS = 128
-
-TIMEOUT = 5 s
-# ACCEPT_FROM =
-# ACCEPT_FROM6 =
 # REJECT_FROM =
 # REJECT_FROM6 =
 # BINDTO =
-MAX_CONNECTIONS = 128
-
-# Enable TCP stealth?
-TCP_STEALTH = NO
-
-
-
-[transport-xt]
-# Use 0 to ONLY advertise as a peer behind NAT (no port binding)
-PORT = 2087
-
-# Obsolete option, to be replaced by HOLE_EXTERNAL (soon)
-ADVERTISED_PORT = 2087
-
-# 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:2087
-
-TESTING_IGNORE_KEYS = ACCEPT_FROM;
-
-# Maximum number of open TCP connections allowed
-MAX_CONNECTIONS = 128
-
-TIMEOUT = 5 s
-# ACCEPT_FROM =
-# ACCEPT_FROM6 =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# BINDTO =
-MAX_CONNECTIONS = 128
-
-# Enable TCP stealth?
-TCP_STEALTH = NO
-
-
-[transport-udp]
-# Use PORT = 0 to autodetect a port available
-PORT = 2086
-BROADCAST = YES
-BROADCAST_RECEIVE = YES
-BROADCAST_INTERVAL = 30 s
-
-# This limits UDP to 1MB/s for SENDING. Higher values are advised
-# for benchmarking or well-connected systems.  Note that this quota
-# applies IN ADDITION to the system-wide transport-wide WAN/LAN
-# quotas.
-MAX_BPS = 1000000
-TESTING_IGNORE_KEYS = ACCEPT_FROM;
-
-# 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-xu]
-# Use PORT = 0 to autodetect a port available
-PORT = 2087
-
-
-[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>
-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:1080
-
-MAX_CONNECTIONS = 128
-TESTING_IGNORE_KEYS = ACCEPT_FROM;
-
-# Enable TCP stealth?
-TCP_STEALTH = NO
-
-
-[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
-# VERIFY_EXTERNAL_HOSTNAME = YES
-# 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:4433
-
-CRYPTO_INIT = NORMAL
-KEY_FILE = $GNUNET_DATA_HOME/transport/https.key
-CERT_FILE = $GNUNET_DATA_HOME/transport/https.cert
-MAX_CONNECTIONS = 128
-TESTING_IGNORE_KEYS = ACCEPT_FROM;
-
-# Enable TCP stealth?
-TCP_STEALTH = NO
-
-
-[transport-wlan]
-# Name of the interface in monitor mode (typically monX)
-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;
 
 [communicator-tcp]
-#PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
 #PREFIX = valgrind --leak-check=full --track-origins=yes
 BINDTO = 2086
 DISABLE_V6 = NO
 BINARY = gnunet-communicator-tcp
 IMMEDIATE_START = YES
 
+[communicator-udp]
+#PREFIX = valgrind --leak-check=full --track-origins=yes --trace-children=yes 
--log-file=$GNUNET_TEST_HOME/vg_cupeer1-%p
+BINARY = gnunet-communicator-udp
+BINDTO = 2086
+DISABLE_V6 = NO
+IMMEDIATE_START = YES
+
 [communicator-quic]
 BINDTO = 127.0.0.1

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.