[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r34522 - in gnunet: doc doc/man src/arm src/ats src/cadet s
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r34522 - in gnunet: doc doc/man src/arm src/ats src/cadet src/consensus src/conversation src/core src/datastore src/dht src/dv src/experimentation src/fs src/gns src/hostlist src/identity src/multicast src/namecache src/namestore src/nat src/nse src/peerinfo-tool src/psyc src/psycstore src/pt src/regex src/revocation src/rps src/scalarproduct src/secretsharing src/sensor src/set src/social src/statistics src/testbed src/testing src/topology src/transport |
|
Date: |
Wed, 10 Dec 2014 18:11:06 +0100 |
Author: grothoff
Date: 2014-12-10 18:11:06 +0100 (Wed, 10 Dec 2014)
New Revision: 34522
Modified:
gnunet/doc/gnunet-c-tutorial.tex
gnunet/doc/man/gnunet-auto-share.1
gnunet/doc/man/gnunet-namestore-fcfsd.1
gnunet/doc/man/gnunet.conf.5
gnunet/src/arm/arm.conf.in
gnunet/src/arm/gnunet-service-arm.c
gnunet/src/arm/test_arm_api_data.conf
gnunet/src/arm/test_gnunet_service_arm.c
gnunet/src/ats/test_ats_api.conf
gnunet/src/ats/test_ats_mlp.conf
gnunet/src/ats/test_ats_solver_default.conf
gnunet/src/cadet/cadet.conf.in
gnunet/src/cadet/test_cadet.conf
gnunet/src/consensus/test_consensus.conf
gnunet/src/conversation/test_conversation.conf
gnunet/src/core/test_core_api_data.conf
gnunet/src/core/test_core_api_send_to_self.conf
gnunet/src/core/test_core_defaults.conf
gnunet/src/datastore/test_datastore_api_data_heap.conf
gnunet/src/datastore/test_datastore_api_data_mysql.conf
gnunet/src/datastore/test_datastore_api_data_postgres.conf
gnunet/src/datastore/test_datastore_api_data_sqlite.conf
gnunet/src/datastore/test_defaults.conf
gnunet/src/dht/dht.conf.in
gnunet/src/dht/test_dht_2dtorus.conf
gnunet/src/dht/test_dht_api_data.conf
gnunet/src/dht/test_dht_api_peer1.conf
gnunet/src/dht/test_dht_line.conf
gnunet/src/dht/test_dht_monitor.conf
gnunet/src/dht/test_dht_multipeer.conf
gnunet/src/dv/template_dv.conf
gnunet/src/experimentation/test_experimentation_clique.conf
gnunet/src/fs/fs.conf.in
gnunet/src/fs/test_fs_defaults.conf
gnunet/src/fs/test_fs_uri_data.conf
gnunet/src/gns/gnunet-dns2gns.c
gnunet/src/gns/test_gns_lookup.conf
gnunet/src/gns/test_gns_nick_shorten.conf
gnunet/src/gns/test_gns_proxy.conf
gnunet/src/gns/test_gns_simple_lookup.conf
gnunet/src/hostlist/Makefile.am
gnunet/src/hostlist/hostlist.conf
gnunet/src/hostlist/test_gnunet_daemon_hostlist_data.conf
gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
gnunet/src/hostlist/test_hostlist_defaults.conf
gnunet/src/hostlist/test_learning_adv_peer.conf
gnunet/src/hostlist/test_learning_learn_peer.conf
gnunet/src/hostlist/test_learning_learn_peer2.conf
gnunet/src/identity/test_identity.conf
gnunet/src/multicast/test_multicast.conf
gnunet/src/namecache/test_namecache_api.conf
gnunet/src/namestore/test_namestore_api.conf
gnunet/src/nat/test_nat_data.conf
gnunet/src/nse/nse.conf.in
gnunet/src/nse/nse_infiniband.conf
gnunet/src/nse/nse_profiler_test.conf
gnunet/src/nse/test_nse.conf
gnunet/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
gnunet/src/psyc/test_psyc.conf
gnunet/src/psycstore/test_psycstore.conf
gnunet/src/pt/test_gns_vpn.conf
gnunet/src/pt/test_gnunet_vpn.conf
gnunet/src/regex/test_regex_api_data.conf
gnunet/src/revocation/revocation.conf.in
gnunet/src/revocation/test_revocation.conf
gnunet/src/rps/test_rps.conf
gnunet/src/scalarproduct/test_scalarproduct.conf
gnunet/src/secretsharing/gnunet-service-secretsharing.c
gnunet/src/secretsharing/test_secretsharing.conf
gnunet/src/sensor/gnunet-sensor-profiler.conf
gnunet/src/sensor/test_gnunet-service-sensor_reporting.conf
gnunet/src/sensor/test_pow_sign.conf
gnunet/src/set/test_set.conf
gnunet/src/social/test_social.conf
gnunet/src/statistics/test_statistics_api_data.conf
gnunet/src/testbed/test_testbed_api_template.conf
gnunet/src/testing/test_testing_defaults.conf
gnunet/src/testing/test_testing_sharedservices.conf
gnunet/src/topology/test_gnunet_daemon_topology_data.conf
gnunet/src/topology/topology.conf
gnunet/src/transport/perf_http_peer1.conf
gnunet/src/transport/perf_http_peer2.conf
gnunet/src/transport/perf_https_peer1.conf
gnunet/src/transport/perf_https_peer2.conf
gnunet/src/transport/perf_tcp_peer1.conf
gnunet/src/transport/perf_tcp_peer2.conf
gnunet/src/transport/perf_udp_peer1.conf
gnunet/src/transport/perf_udp_peer2.conf
gnunet/src/transport/perf_unix_peer1.conf
gnunet/src/transport/perf_unix_peer2.conf
gnunet/src/transport/template_cfg_peer1.conf
gnunet/src/transport/template_cfg_peer2.conf
gnunet/src/transport/test_plugin_transport_data.conf
gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
gnunet/src/transport/test_quota_compliance_tcp_peer2.conf
gnunet/src/transport/test_transport_address_switch_http_peer1.conf
gnunet/src/transport/test_transport_address_switch_http_peer2.conf
gnunet/src/transport/test_transport_address_switch_https_peer1.conf
gnunet/src/transport/test_transport_address_switch_https_peer2.conf
gnunet/src/transport/test_transport_address_switch_tcp_peer1.conf
gnunet/src/transport/test_transport_address_switch_tcp_peer2.conf
gnunet/src/transport/test_transport_address_switch_udp_peer1.conf
gnunet/src/transport/test_transport_address_switch_udp_peer2.conf
gnunet/src/transport/test_transport_api_bidirectional_connect_peer1.conf
gnunet/src/transport/test_transport_api_bidirectional_connect_peer2.conf
gnunet/src/transport/test_transport_api_disconnect_tcp_peer1.conf
gnunet/src/transport/test_transport_api_disconnect_tcp_peer2.conf
gnunet/src/transport/test_transport_api_http_peer1.conf
gnunet/src/transport/test_transport_api_http_peer2.conf
gnunet/src/transport/test_transport_api_http_reverse_peer1.conf
gnunet/src/transport/test_transport_api_http_reverse_peer2.conf
gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
gnunet/src/transport/test_transport_api_manipulation_cfg_peer1.conf
gnunet/src/transport/test_transport_api_manipulation_cfg_peer2.conf
gnunet/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf
gnunet/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf
gnunet/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf
gnunet/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf
gnunet/src/transport/test_transport_api_multi_peer1.conf
gnunet/src/transport/test_transport_api_multi_peer2.conf
gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
gnunet/src/transport/test_transport_api_reliability_tcp_peer1.conf
gnunet/src/transport/test_transport_api_reliability_tcp_peer2.conf
gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf
gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf
gnunet/src/transport/test_transport_api_tcp_peer1.conf
gnunet/src/transport/test_transport_api_tcp_peer2.conf
gnunet/src/transport/test_transport_api_timeout_http_peer1.conf
gnunet/src/transport/test_transport_api_timeout_http_peer2.conf
gnunet/src/transport/test_transport_api_timeout_https_peer1.conf
gnunet/src/transport/test_transport_api_timeout_tcp_peer1.conf
gnunet/src/transport/test_transport_api_timeout_tcp_peer2.conf
gnunet/src/transport/test_transport_api_udp_nat_peer1.conf
gnunet/src/transport/test_transport_api_udp_nat_peer2.conf
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
gnunet/src/transport/test_transport_blacklisting_cfg_peer1.conf
gnunet/src/transport/test_transport_blacklisting_cfg_peer2.conf
gnunet/src/transport/test_transport_defaults.conf
gnunet/src/transport/test_transport_startonly.conf
gnunet/src/transport/test_transport_test_transport_address_switch_tcp_peer2.conf
Log:
moving away from DEFAULTSERVICES to per-section FORCESTART, thus addressing
#3565 indirectly
Modified: gnunet/doc/gnunet-c-tutorial.tex
===================================================================
--- gnunet/doc/gnunet-c-tutorial.tex 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/doc/gnunet-c-tutorial.tex 2014-12-10 17:11:06 UTC (rev 34522)
@@ -402,7 +402,7 @@
If you want to use the \texttt{peerinfo} tool to connect your peers, you
should:
\begin{itemize}
\itemsep0em
- \item{Remove {\tt hostlist} from {\tt DEFAULTSERVICES} (to not connect to the
global GNUnet)}
+ \item{Set {\tt FORCESTART = NO} in section {\tt hostlist} (to not connect to
the global GNUnet)}
\item{Start both peers running {\tt gnunet-arm -c peer1.conf -s} and {\tt
gnunet-arm -c peer2.conf -s}}
\item{Get \texttt{HELLO} message of the first peer running {\tt
gnunet-peerinfo -c peer1.conf -g}}
\item{Give the output to the second peer by running {\tt gnunet-peerinfo -c
peer2.conf -p '<output>'}}
@@ -1120,7 +1120,7 @@
\begin{itemize}
\itemsep0em
- \item subsystem: Name of the subsystem responsible for the record.
+ \item subsystem: Name of the subsystem responsible for the record.
\item peerid: Identity of the peer this record is related to.
\item key: a key string identifying the record.
\item value: binary record value.
Modified: gnunet/doc/man/gnunet-auto-share.1
===================================================================
--- gnunet/doc/man/gnunet-auto-share.1 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/doc/man/gnunet-auto-share.1 2014-12-10 17:11:06 UTC (rev 34522)
@@ -69,13 +69,10 @@
Share a directory "$HOME/gnunet\-share/":
- [ARM]
- DEFAULTSERVICES = gnunet-auto-share # other default services here
-
[gnunet-auto-share]
OPTIONS = $HOME/gnunet\-share
+ FORCESTART = YES # start this service when the peer starts
-
.SH FILES
.TP
~/.config/gnunet.conf
Modified: gnunet/doc/man/gnunet-namestore-fcfsd.1
===================================================================
--- gnunet/doc/man/gnunet-namestore-fcfsd.1 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/doc/man/gnunet-namestore-fcfsd.1 2014-12-10 17:11:06 UTC (rev
34522)
@@ -11,7 +11,7 @@
.SH DESCRIPTION
Most users will not want to run an FCFS\-zone and thus will not need this
program.
-\fBgnunet\-gns-fcfsd\fP runs a web server where users can register names to be
mapped to their GNS zone. Names are made available on a First Come First
Served basis (hence fcfs). Registered names do not expire. The HTTP server is
run on the port that is specified in the configuration file in section
"[fcfsd]" under the name "HTTPPORT". The key of the zone in which the names
are registered must be specified under the name "ZONEKEY" in the same section.
It is possible to manage gnunet\-gns\-fcfsd using gnunet\-(service\-arm) by
starting the daemon using "gnunet\-arm \-i fcfsd" or by adding "fcfds" to the
"DEFAULTSERVICES" option.
+\fBgnunet\-gns-fcfsd\fP runs a web server where users can register names to be
mapped to their GNS zone. Names are made available on a First Come First
Served basis (hence fcfs). Registered names do not expire. The HTTP server is
run on the port that is specified in the configuration file in section
"[fcfsd]" under the name "HTTPPORT". The key of the zone in which the names
are registered must be specified under the name "ZONEKEY" in the same section.
It is possible to manage gnunet\-gns\-fcfsd using gnunet\-(service\-arm) by
starting the daemon using "gnunet\-arm \-i fcfsd" or by setting
"FORCESTART=YES" in the "fcfds" section of your configuration.
An FCFS\-zone is run at http://gnunet.org/fcfs/. The respective zone key can
be imported into an individual user's zone using "gnunet-gns-import.sh". GNS
users are encouraged to register their zone with the gnunet.org FCFS authority.
Modified: gnunet/doc/man/gnunet.conf.5
===================================================================
--- gnunet/doc/man/gnunet.conf.5 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/doc/man/gnunet.conf.5 2014-12-10 17:11:06 UTC (rev 34522)
@@ -24,8 +24,10 @@
The hostname specifies the machine on which the service is running. This
is usually "localhost".
.IP BINARY
The filename that implements the service. For example "gnunet-service-ats".
+.IP FORCESTART
+ Start the service always when the peer starts. Set to YES for services
that should always be launched, even if no other service explicitly needs them.
.IP AUTOSTART
- This defines the section it is defined in, which should be a service, will
be started by the ARM service if the value is set to YES.
+ Set to YES to automatically start the service when it is requested by
another service. YES for most GNUnet services.
.IP ACCEPT_FROM
A semi-column separated list of IPv4 addresses that are allowed to use the
service; usually 127.0.0.1.
.IP ACCEPT_FROM6
@@ -41,12 +43,6 @@
-.SH ARM Options
-
-This section is configuration for the automatic restart manager which is
responsible for launching services.
-
-.IP DEFAULTSERVICES
- list of services that ARM should always start by default. AUTOSTART
services are only started when the service is needed by some other service.
The services listed here will always be started, not just on-demand.
"topology" and "hostlist" should virtually always be listed here, and most
users will want to specify high-level applications like "fs", "gns" or "pt"
here as well.
.B
.SH ATS Options
Modified: gnunet/src/arm/arm.conf.in
===================================================================
--- gnunet/src/arm/arm.conf.in 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/arm/arm.conf.in 2014-12-10 17:11:06 UTC (rev 34522)
@@ -1,11 +1,13 @@
-
[arm]
@UNIXONLY@ PORT = 2087
HOSTNAME = localhost
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
+
+
DEFAULTSERVICES = topology hostlist dht nse cadet fs revocation
+
# Special case, uses user runtime dir even for per-system service.
UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-arm.sock
UNIX_MATCH_UID = YES
Modified: gnunet/src/arm/gnunet-service-arm.c
===================================================================
--- gnunet/src/arm/gnunet-service-arm.c 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/arm/gnunet-service-arm.c 2014-12-10 17:11:06 UTC (rev 34522)
@@ -163,7 +163,7 @@
* to start it)? #GNUNET_NO if the service is started only upon 'accept' on
a
* listen socket or possibly explicitly by a client changing the value.
*/
- int is_default;
+ int force_start;
/**
* Should we use pipes to signal this process? (YES for Java binaries and if
we
@@ -669,7 +669,7 @@
#ifdef LINUX
/* Permission settings are not required when abstract sockets are used */
&& ('\0' != ((const struct sockaddr_un *)sa)->sun_path[0])
-#endif
+#endif
)
{
match_uid =
@@ -735,7 +735,8 @@
* #GNUNET_SYSERR to close it (signal serious error)
*/
static void
-handle_start (void *cls, struct GNUNET_SERVER_Client *client,
+handle_start (void *cls,
+ struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
const char *servicename;
@@ -770,7 +771,7 @@
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
- sl->is_default = GNUNET_YES;
+ sl->force_start = GNUNET_YES;
if (NULL != sl->proc)
{
signal_result (client, servicename, request_id,
@@ -790,9 +791,11 @@
* @param tc task context
*/
static void
-trigger_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+trigger_shutdown (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Triggering shutdown\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Triggering shutdown\n");
GNUNET_SCHEDULER_shutdown ();
}
@@ -807,7 +810,8 @@
* #GNUNET_SYSERR to close it (signal serious error)
*/
static void
-handle_stop (void *cls, struct GNUNET_SERVER_Client *client,
+handle_stop (void *cls,
+ struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
struct ServiceList *sl;
@@ -846,7 +850,7 @@
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
- sl->is_default = GNUNET_NO;
+ sl->force_start = GNUNET_NO;
if (GNUNET_YES == in_shutdown)
{
/* shutdown in progress */
@@ -1002,7 +1006,8 @@
* @param tc context
*/
static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct ServiceList *pos;
struct ServiceList *nxt;
@@ -1093,11 +1098,12 @@
if (0 == GNUNET_TIME_absolute_get_remaining (sl->restart_at).rel_value_us)
{
/* restart is now allowed */
- if (sl->is_default)
+ if (sl->force_start)
{
/* process should run by default, start immediately */
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Restarting service `%s'.\n"), sl->name);
+ _("Restarting service `%s'.\n"),
+ sl->name);
start_process (sl, NULL, 0);
}
else
@@ -1377,9 +1383,18 @@
#endif
GNUNET_CONTAINER_DLL_insert (running_head, running_tail, sl);
- if (GNUNET_YES !=
- GNUNET_CONFIGURATION_get_value_yesno (cfg, section, "AUTOSTART"))
+ if (GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_yesno (cfg, section, "FORCESTART"))
+ {
+ sl->force_start = GNUNET_YES;
return;
+ }
+ else
+ {
+ if (GNUNET_YES !=
+ GNUNET_CONFIGURATION_get_value_yesno (cfg, section, "AUTOSTART"))
+ return;
+ }
if (0 >= (ret = GNUNET_SERVICE_get_server_addresses (section, cfg,
&addrs, &addr_lens)))
return;
@@ -1451,8 +1466,6 @@
sizeof (struct GNUNET_ARM_Message)},
{NULL, NULL, 0, 0}
};
- char *defaultservices;
- const char *pos;
struct ServiceList *sl;
cfg = c;
@@ -1490,45 +1503,17 @@
GNUNET_CONFIGURATION_iterate_sections (cfg, &setup_service, NULL);
/* start default services... */
- if (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (cfg,
- "ARM",
- "DEFAULTSERVICES",
- &defaultservices))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Starting default services `%s'\n"),
- defaultservices);
- if (0 < strlen (defaultservices))
- {
- for (pos = strtok (defaultservices, " "); NULL != pos;
- pos = strtok (NULL, " "))
- {
- sl = find_service (pos);
- if (NULL == sl)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Default service `%s' not configured correctly!\n"),
- pos);
- continue;
- }
- sl->is_default = GNUNET_YES;
- start_process (sl, NULL, 0);
- }
- }
- GNUNET_free (defaultservices);
- }
- else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("No default services configured, GNUnet will not really
start right now.\n"));
- }
-
- notifier =
- GNUNET_SERVER_notification_context_create (server, MAX_NOTIFY_QUEUE);
- GNUNET_SERVER_connect_notify (server, handle_client_connecting, NULL);
+ for (sl = running_head; NULL != sl; sl = sl->next)
+ if (GNUNET_YES == sl->force_start)
+ start_process (sl, NULL, 0);
+ notifier
+ = GNUNET_SERVER_notification_context_create (server,
+ MAX_NOTIFY_QUEUE);
+ GNUNET_SERVER_connect_notify (server,
+ &handle_client_connecting, NULL);
/* process client requests */
- GNUNET_SERVER_add_handlers (server, handlers);
+ GNUNET_SERVER_add_handlers (server,
+ handlers);
}
Modified: gnunet/src/arm/test_arm_api_data.conf
===================================================================
--- gnunet/src/arm/test_arm_api_data.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/arm/test_arm_api_data.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -3,7 +3,6 @@
[arm]
PORT = 23354
-DEFAULTSERVICES =
BINARY = gnunet-service-arm
OPTIONS = -L ERROR
#PREFIX = valgrind --tool=memcheck --leak-check=yes
@@ -22,6 +21,7 @@
[fs]
AUTOSTART = NO
+FORCESTART = NO
[datastore]
AUTOSTART = NO
@@ -46,5 +46,20 @@
[nse]
AUTOSTART = NO
+FORCESTART = NO
+[hostlist]
+AUTOSTART = NO
+FORCESTART = NO
+[dht]
+AUTOSTART = NO
+FORCESTART = NO
+
+[cadet]
+AUTOSTART = NO
+FORCESTART = NO
+
+[revocation]
+AUTOSTART = NO
+FORCESTART = NO
Modified: gnunet/src/arm/test_gnunet_service_arm.c
===================================================================
--- gnunet/src/arm/test_gnunet_service_arm.c 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/arm/test_gnunet_service_arm.c 2014-12-10 17:11:06 UTC (rev
34522)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+ (C) 2009, 2014 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -40,14 +40,16 @@
static int ret = 1;
-static int resolved_ok = 0;
+static int resolved_ok;
-static int asked_for_a_list = 0;
+static int asked_for_a_list;
static struct GNUNET_ARM_Handle *arm;
+
static void
-trigger_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+trigger_disconnect (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
GNUNET_ARM_disconnect_and_free (arm);
arm = NULL;
@@ -71,40 +73,52 @@
static void
service_list (void *cls,
enum GNUNET_ARM_RequestStatus rs,
- unsigned int count, const char *const*list)
+ unsigned int count,
+ const char *const*list)
{
+ unsigned int i;
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%u services are are currently running\n",
count);
if (GNUNET_ARM_REQUEST_SENT_OK != rs)
goto stop_arm;
- if (1 == count)
+ for (i=0;i<count;i++)
{
- GNUNET_break (0 == strcasecmp (list[0], "resolver
(gnunet-service-resolver)"));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got service list, now stopping
arm\n");
- ret = 0;
+ if (0 == strcasecmp (list[i],
+ "resolver (gnunet-service-resolver)"));
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Got service list, now stopping arm\n");
+ ret = 0;
+ }
}
stop_arm:
- GNUNET_ARM_request_service_stop (arm, "arm", TIMEOUT, arm_stop_cb, NULL);
+ GNUNET_ARM_request_service_stop (arm, "arm", TIMEOUT,
+ &arm_stop_cb, NULL);
}
static void
-hostNameResolveCB (void *cls, const struct sockaddr *addr, socklen_t addrlen)
+hostNameResolveCB (void *cls,
+ const struct sockaddr *addr,
+ socklen_t addrlen)
{
if ((ret == 0) || (ret == 4) || (resolved_ok == 1))
return;
if (NULL == addr)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Name not resolved!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Name not resolved!\n");
ret = 3;
- GNUNET_ARM_request_service_stop (arm, "arm", TIMEOUT, arm_stop_cb, NULL);
+ GNUNET_ARM_request_service_stop (arm, "arm", TIMEOUT,
+ &arm_stop_cb, NULL);
}
else if (asked_for_a_list == 0)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Resolved hostname, now checking the service list\n");
+ "Resolved hostname, now checking the service list\n");
GNUNET_ARM_request_service_list (arm, TIMEOUT, service_list, NULL);
asked_for_a_list = 1;
resolved_ok = 1;
@@ -121,21 +135,26 @@
GNUNET_break (status == GNUNET_ARM_REQUEST_SENT_OK);
GNUNET_break (result == GNUNET_ARM_RESULT_STARTING);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Trying to resolve our own hostname!\n");
+ "Trying to resolve our own hostname!\n");
/* connect to the resolver service */
- if (NULL == GNUNET_RESOLVER_hostname_resolve (
- AF_UNSPEC, TIMEOUT, &hostNameResolveCB, NULL))
+ if (NULL ==
+ GNUNET_RESOLVER_hostname_resolve (AF_UNSPEC, TIMEOUT,
+ &hostNameResolveCB, NULL))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Unable initiate connection to resolver service\n");
ret = 2;
- GNUNET_ARM_request_service_stop (arm, "arm", TIMEOUT, arm_stop_cb, NULL);
+ GNUNET_ARM_request_service_stop (arm,
+ "arm", TIMEOUT,
+ &arm_stop_cb, NULL);
}
}
static void
-run (void *cls, char *const *args, const char *cfgfile,
+run (void *cls,
+ char *const *args,
+ const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *c)
{
char *armconfig;
@@ -144,10 +163,10 @@
{
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (c, "arm", "CONFIG",
- &armconfig))
+ &armconfig))
{
- GNUNET_CONFIGURATION_set_value_string ((struct
GNUNET_CONFIGURATION_Handle
- *) c, "arm", "CONFIG",
+ GNUNET_CONFIGURATION_set_value_string ((struct
GNUNET_CONFIGURATION_Handle *) c,
+ "arm", "CONFIG",
cfgfile);
}
else
@@ -155,7 +174,9 @@
}
arm = GNUNET_ARM_connect (c, NULL, NULL);
GNUNET_ARM_request_service_start (arm, "arm",
- GNUNET_OS_INHERIT_STD_OUT_AND_ERR, START_TIMEOUT, arm_start_cb, NULL);
+ GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+ START_TIMEOUT,
+ &arm_start_cb, NULL);
}
@@ -173,27 +194,29 @@
char hostname[GNUNET_OS_get_hostname_max_length () + 1];
if (0 != gethostname (hostname, sizeof (hostname) - 1))
- {
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "gethostname");
- FPRINTF (stderr,
- "%s", "Failed to determine my own hostname, testcase not
run.\n");
- return 0;
- }
+ {
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "gethostname");
+ FPRINTF (stderr,
+ "%s",
+ "Failed to determine my own hostname, testcase not run.\n");
+ return 0;
+ }
if (NULL == gethostbyname (hostname))
- {
- FPRINTF (stderr,
- "Failed to resolve my hostname `%s', testcase not run.\n",
- hostname);
- return 0;
- }
+ {
+ FPRINTF (stderr,
+ "Failed to resolve my hostname `%s', testcase not run.\n",
+ hostname);
+ return 0;
+ }
GNUNET_log_setup ("test-gnunet-service-arm",
"WARNING",
NULL);
GNUNET_break (GNUNET_OK ==
GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
argv, "test-gnunet-service-arm",
- "nohelp", options, &run, NULL));
+ "nohelp", options,
+ &run, NULL));
return ret;
}
Modified: gnunet/src/ats/test_ats_api.conf
===================================================================
--- gnunet/src/ats/test_ats_api.conf 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/ats/test_ats_api.conf 2014-12-10 17:11:06 UTC (rev 34522)
@@ -3,7 +3,6 @@
[arm]
PORT = 12001
-DEFAULTSERVICES =
UNIXPATH = $GNUNET_RUNTIME_DIR/test-ats-scheduling-arm.sock
[ats]
@@ -41,7 +40,7 @@
# ATS extended options
DUMP_MLP = NO
DUMP_SOLUTION = NO
-DUMP_OVERWRITE = NO
+DUMP_OVERWRITE = NO
DUMP_MIN_PEERS = 0
DUMP_MIN_ADDRS = 0
DUMP_OVERWRITE = NO
Modified: gnunet/src/ats/test_ats_mlp.conf
===================================================================
--- gnunet/src/ats/test_ats_mlp.conf 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/ats/test_ats_mlp.conf 2014-12-10 17:11:06 UTC (rev 34522)
@@ -3,7 +3,6 @@
[arm]
PORT = 12001
-DEFAULTSERVICES = ats
UNIXPATH = $GNUNET_RUNTIME_DIR/test-ats-scheduling-arm.sock
[ats]
@@ -43,7 +42,7 @@
# MLP defaults
# MLP_MAX_DURATION = 3 s
-# MLP_MAX_ITERATIONS = 1024
+# MLP_MAX_ITERATIONS = 1024
# MLP_COEFFICIENT_D = 1.0
# MLP_COEFFICIENT_U = 1.0
# MLP_COEFFICIENT_R = 1.0
@@ -53,7 +52,7 @@
# MLP Debugging settings
DUMP_MLP = NO
DUMP_SOLUTION = NO
-DUMP_OVERWRITE = NO
+DUMP_OVERWRITE = NO
DUMP_MIN_PEERS = 0
DUMP_MIN_ADDRS = 0
DUMP_OVERWRITE = NO
Modified: gnunet/src/ats/test_ats_solver_default.conf
===================================================================
--- gnunet/src/ats/test_ats_solver_default.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/ats/test_ats_solver_default.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -1,6 +1,5 @@
[arm]
PORT = 12001
-DEFAULTSERVICES = ats
UNIXPATH = $GNUNET_RUNTIME_DIR/test-ats-scheduling-arm.sock
[transport]
Modified: gnunet/src/cadet/cadet.conf.in
===================================================================
--- gnunet/src/cadet/cadet.conf.in 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/cadet/cadet.conf.in 2014-12-10 17:11:06 UTC (rev 34522)
@@ -1,4 +1,5 @@
[cadet]
+FORCESTART = YES
AUTOSTART = @AUTOSTART@
@address@hidden = 2096
HOSTNAME = localhost
@@ -17,4 +18,4 @@
MAX_CONNECTIONS = 1000
MAX_MSGS_QUEUE = 10000
MAX_PEERS = 1000
-REKEY_PERIOD = 12 h
\ No newline at end of file
+REKEY_PERIOD = 12 h
Modified: gnunet/src/cadet/test_cadet.conf
===================================================================
--- gnunet/src/cadet/test_cadet.conf 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/cadet/test_cadet.conf 2014-12-10 17:11:06 UTC (rev 34522)
@@ -58,7 +58,6 @@
USE_EPHEMERAL_KEYS = NO
[arm]
-DEFAULTSERVICES = core transport dht cadet statistics
PORT = 12366
[transport-udp]
Modified: gnunet/src/consensus/test_consensus.conf
===================================================================
--- gnunet/src/consensus/test_consensus.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/consensus/test_consensus.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -1,38 +1,22 @@
[consensus]
-AUTOSTART = YES
-PORT = 2110
-HOSTNAME = localhost
-BINARY = gnunet-service-consensus
#PREFIX = gdbserver :12345
#PREFIX = valgrind
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-consensus.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
OPTIONS = -L INFO
-
[transport]
OPTIONS = -LERROR
-
-[arm]
-DEFAULTSERVICES = core consensus set
-
[set]
OPTIONS = -L INFO
#PREFIX = valgrind --leak-check=full
#PREFIX = valgrind
-
[testbed]
OVERLAY_TOPOLOGY = CLIQUE
[hostlist]
-SERVERS =
+SERVERS =
-
[nat]
# Use addresses from the local network interfaces (inluding loopback, but also
others)
USE_LOCALADDR = YES
@@ -43,6 +27,3 @@
# Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8)
RETURN_LOCAL_ADDRESSES = YES
-[nse]
-AUTOSTART = NO
-
Modified: gnunet/src/conversation/test_conversation.conf
===================================================================
--- gnunet/src/conversation/test_conversation.conf 2014-12-10 17:06:39 UTC
(rev 34521)
+++ gnunet/src/conversation/test_conversation.conf 2014-12-10 17:11:06 UTC
(rev 34522)
@@ -1,5 +1,3 @@
[conversation]
LINE=1
-[arm]
-DEFAULTSERVICES = topology
Modified: gnunet/src/core/test_core_api_data.conf
===================================================================
--- gnunet/src/core/test_core_api_data.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/core/test_core_api_data.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -1,9 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
-[arm]
-DEFAULTSERVICES = topology hostlist
-
[ats]
WAN_QUOTA_IN = 64 kiB
WAN_QUOTA_OUT = 64 kiB
Modified: gnunet/src/core/test_core_api_send_to_self.conf
===================================================================
--- gnunet/src/core/test_core_api_send_to_self.conf 2014-12-10 17:06:39 UTC
(rev 34521)
+++ gnunet/src/core/test_core_api_send_to_self.conf 2014-12-10 17:11:06 UTC
(rev 34522)
@@ -2,23 +2,13 @@
[PATHS]
GNUNET_TEST_HOME = ~/.gnunet/
-[arm]
-PORT = 2425
-DEFAULTSERVICES = core test-sts
-
-[core]
-PORT = 24512
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-core.sock
-
[ats]
WAN_QUOTA_IN = 104857600
WAN_QUOTA_OUT = 104757600
-PORT = 24571
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock
[test-sts]
-AUTOSTART = YES
-PORT = 9252
+FORCESTART = YES
+PORT = 9252
HOSTNAME = localhost
BINARY = test_core_api_send_to_self
ACCEPT_FROM = 127.0.0.1;
Modified: gnunet/src/core/test_core_defaults.conf
===================================================================
--- gnunet/src/core/test_core_defaults.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/core/test_core_defaults.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -1,9 +1,6 @@
[PATHS]
GNUNET_TEST_HOME = /tmp/test-gnunet-core/
-[arm]
-DEFAULTSERVICES =
-
[nat]
DISABLEV6 = YES
ENABLE_UPNP = NO
@@ -17,81 +14,12 @@
WAN_QUOTA_IN = 1 GB
WAN_QUOTA_OUT = 1 GB
-[core]
-PORT = 12470
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-core.sock
-
[transport-tcp]
BINDTO = 127.0.0.1
[transport-udp]
BROADCAST = NO
-[testing]
-WEAKRANDOM = YES
-
[peerinfo]
NO_IO = YES
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[cadet]
-AUTOSTART = NO
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[chat]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[lockmanager]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
-[regex]
-AUTOSTART = NO
-
-[identity]
-AUTOSTART = NO
-
-[psycstore]
-AUTOSTART = NO
-
-[multicast]
-AUTOSTART = NO
-
-[revocation]
-AUTOSTART = NO
-
-[conversation]
-AUTOSTART = NO
-
-[namecache]
-AUTOSTART = NO
-
-[set]
-AUTOSTART = NO
Modified: gnunet/src/datastore/test_datastore_api_data_heap.conf
===================================================================
--- gnunet/src/datastore/test_datastore_api_data_heap.conf 2014-12-10
17:06:39 UTC (rev 34521)
+++ gnunet/src/datastore/test_datastore_api_data_heap.conf 2014-12-10
17:11:06 UTC (rev 34522)
@@ -7,7 +7,6 @@
[arm]
PORT = 42466
-DEFAULTSERVICES =
[statistics]
PORT = 22667
Modified: gnunet/src/datastore/test_datastore_api_data_mysql.conf
===================================================================
--- gnunet/src/datastore/test_datastore_api_data_mysql.conf 2014-12-10
17:06:39 UTC (rev 34521)
+++ gnunet/src/datastore/test_datastore_api_data_mysql.conf 2014-12-10
17:11:06 UTC (rev 34522)
@@ -2,12 +2,8 @@
[PATHS]
GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-mysql/
-[TESTING]
-WEAKRANDOM = YES
-
[arm]
PORT = 42466
-DEFAULTSERVICES =
[statistics]
PORT = 22667
@@ -22,6 +18,3 @@
[datastore-mysql]
DATABASE = gnunetcheck
-[fs]
-AUTOSTART = NO
-
Modified: gnunet/src/datastore/test_datastore_api_data_postgres.conf
===================================================================
--- gnunet/src/datastore/test_datastore_api_data_postgres.conf 2014-12-10
17:06:39 UTC (rev 34521)
+++ gnunet/src/datastore/test_datastore_api_data_postgres.conf 2014-12-10
17:11:06 UTC (rev 34522)
@@ -2,12 +2,8 @@
[PATHS]
GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-postgres/
-[TESTING]
-WEAKRANDOM = YES
-
[arm]
PORT = 42466
-DEFAULTSERVICES =
[statistics]
PORT = 22667
@@ -22,6 +18,4 @@
[datastore-postgres]
CONFIG = dbname=gnunetcheck
-[fs]
-AUTOSTART = NO
Modified: gnunet/src/datastore/test_datastore_api_data_sqlite.conf
===================================================================
--- gnunet/src/datastore/test_datastore_api_data_sqlite.conf 2014-12-10
17:06:39 UTC (rev 34521)
+++ gnunet/src/datastore/test_datastore_api_data_sqlite.conf 2014-12-10
17:11:06 UTC (rev 34522)
@@ -2,12 +2,8 @@
[PATHS]
GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-sqlite/
-[TESTING]
-WEAKRANDOM = YES
-
[arm]
PORT = 42466
-DEFAULTSERVICES =
[statistics]
PORT = 22667
Modified: gnunet/src/datastore/test_defaults.conf
===================================================================
--- gnunet/src/datastore/test_defaults.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/datastore/test_defaults.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -2,38 +2,3 @@
PORT = 22654
QUOTA = 1 MB
-[dht]
-AUTOSTART = NO
-
-[dns]
-AUTOSTART = NO
-
-[cadet]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[chat]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[fs]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
Modified: gnunet/src/dht/dht.conf.in
===================================================================
--- gnunet/src/dht/dht.conf.in 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/dht/dht.conf.in 2014-12-10 17:11:06 UTC (rev 34522)
@@ -1,4 +1,5 @@
[dht]
+FORCESTART = YES
AUTOSTART = @AUTOSTART@
@address@hidden = 2095
HOSTNAME = localhost
Modified: gnunet/src/dht/test_dht_2dtorus.conf
===================================================================
--- gnunet/src/dht/test_dht_2dtorus.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/dht/test_dht_2dtorus.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -1,16 +1,10 @@
[PATHS]
GNUNET_TEST_HOME = /tmp/test_dht_2dtorus/
-[arm]
-DEFAULTSERVICES = core dht
-
[dhtcache]
QUOTA = 1 MB
DATABASE = heap
-[dns]
-AUTOSTART = NO
-
[nat]
DISABLEV6 = YES
RETURN_LOCAL_ADDRESSES = YES
@@ -32,8 +26,3 @@
INTERVAL = 60 s
WORKBITS = 0
-[vpn]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
Modified: gnunet/src/dht/test_dht_api_data.conf
===================================================================
--- gnunet/src/dht/test_dht_api_data.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/dht/test_dht_api_data.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -1,15 +1,6 @@
[PATHS]
GNUNET_TEST_HOME = /tmp/test-dht-api/
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
[dhtcache]
QUOTA = 1 MB
DATABASE = heap
@@ -24,33 +15,13 @@
WAN_QUOTA_IN = 1 GB
WAN_QUOTA_OUT = 1 GB
-[core]
-PORT = 2092
-
-[dht]
-PORT = 12370
-
[transport]
plugins = tcp
NEIGHBOUR_LIMIT = 50
PORT = 2091
-[peerinfo]
-PORT = 2090
-
-[resolver]
-PORT = 2089
-
-[statistics]
-PORT = 2088
-
-[arm]
-DEFAULTSERVICES =
-PORT = 2087
-
[transport-tcp]
TIMEOUT = 300 s
-PORT = 2094
[nat]
DISABLEV6 = YES
@@ -61,14 +32,3 @@
INTERNAL_ADDRESS = 127.0.0.1
EXTERNAL_ADDRESS = 127.0.0.1
-[dns]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART=NO
Modified: gnunet/src/dht/test_dht_api_peer1.conf
===================================================================
--- gnunet/src/dht/test_dht_api_peer1.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/dht/test_dht_api_peer1.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -1,17 +1,3 @@
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-PORT = 12100
-BINARY = gnunet-service-dht
-
[dhtcache]
QUOTA = 1 MB
DATABASE = heap
@@ -27,16 +13,8 @@
WAN_QUOTA_IN = 1 GB
WAN_QUOTA_OUT = 1 GB
-[core]
-PORT = 12092
-
-[arm]
-DEFAULTSERVICES = core
-PORT = 12366
-
[transport-tcp]
TIMEOUT = 300 s
-PORT = 12368
BINDTO = 127.0.0.1
[PATHS]
@@ -51,14 +29,3 @@
EXTERNAL_ADDRESS = 127.0.0.1
USE_LOCALADDR = NO
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART=NO
-
-[namestore]
-AUTOSTART = NO
Modified: gnunet/src/dht/test_dht_line.conf
===================================================================
--- gnunet/src/dht/test_dht_line.conf 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/dht/test_dht_line.conf 2014-12-10 17:11:06 UTC (rev 34522)
@@ -4,14 +4,8 @@
QUOTA = 1 MB
DATABASE = heap
-[arm]
-DEFAULTSERVICES = core dht
-
-[dns]
-AUTOSTART = NO
-
[nat]
-DISABLEV6 = YES
+DISABLEV6 = YES
RETURN_LOCAL_ADDRESSES = YES
USE_LOCALADDR = YES
ENABLE_UPNP = NO
@@ -24,15 +18,9 @@
WAN_QUOTA_IN = 1 GB
WAN_QUOTA_OUT = 1 GB
-[testing]
-WEAKRANDOM = YES
-
[testbed]
OVERLAY_TOPOLOGY = LINE
-[namestore]
-AUTOSTART = NO
-
[transport]
plugins = tcp
@@ -41,7 +29,3 @@
INTERVAL = 60 s
WORKBITS = 0
-[vpn]
-AUTOSTART = NO
-
-
Modified: gnunet/src/dht/test_dht_monitor.conf
===================================================================
--- gnunet/src/dht/test_dht_monitor.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/dht/test_dht_monitor.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -1,9 +1,3 @@
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
[dhtcache]
QUOTA = 1 MB
DATABASE = heap
@@ -15,9 +9,6 @@
WAN_QUOTA_IN = 1 GB
WAN_QUOTA_OUT = 1 GB
-[arm]
-DEFAULTSERVICES = dht core
-
[testbed]
OVERLAY_TOPOLOGY = LINE
@@ -34,15 +25,3 @@
USE_LOCALADDR = YES
RETURN_LOCAL_ADDRESSES = YES
-[dns]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART=NO
-
Modified: gnunet/src/dht/test_dht_multipeer.conf
===================================================================
--- gnunet/src/dht/test_dht_multipeer.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/dht/test_dht_multipeer.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -1,9 +1,3 @@
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
[dhtcache]
QUOTA = 1 MB
DATABASE = heap
@@ -15,19 +9,10 @@
WAN_QUOTA_IN = 1 GB
WAN_QUOTA_OUT = 1 GB
-[arm]
-DEFAULTSERVICES = dht core
-
-[TESTING]
-WEAKRANDOM = YES
-
[testbed]
OVERLAY_TOPOLOGY = FROM_FILE
OVERLAY_TOPOLOGY_FILE = test_dht_multipeer_topology.dat
-[gnunetd]
-HOSTKEY = $GNUNET_TEST_HOME/.hostkey
-
[PATHS]
GNUNET_TEST_HOME = /tmp/test-dht-multipeer/
@@ -41,16 +26,3 @@
EXTERNAL_ADDRESS = 127.0.0.1
USE_LOCALADDR = YES
-[dns]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART=NO
-
-
Modified: gnunet/src/dv/template_dv.conf
===================================================================
--- gnunet/src/dv/template_dv.conf 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/dv/template_dv.conf 2014-12-10 17:11:06 UTC (rev 34522)
@@ -28,38 +28,6 @@
[peerinfo]
USE_INCLUDED_HELLOS = NO
-[arm]
-DEFAULTSERVICES = core
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[chat]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[lockmanager]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
[nat]
RETURN_LOCAL_ADDRESSES = YES
+
Modified: gnunet/src/experimentation/test_experimentation_clique.conf
===================================================================
--- gnunet/src/experimentation/test_experimentation_clique.conf 2014-12-10
17:06:39 UTC (rev 34521)
+++ gnunet/src/experimentation/test_experimentation_clique.conf 2014-12-10
17:11:06 UTC (rev 34522)
@@ -7,19 +7,6 @@
TOPOLOGY = RANDOM
#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[cadet]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = YES
-DISABLE_TRY_CONNECT = NO
-
[dhtcache]
QUOTA = 1 MB
DATABASE = heap
@@ -41,44 +28,16 @@
WAN_QUOTA_IN = 3932160
[core]
-PORT = 12092
-AUTOSTART = YES
USE_EPHEMERAL_KEYS = NO
-[arm]
-DEFAULTSERVICES = core transport experimentation dht
-PORT = 12366
-
[transport-udp]
TIMEOUT = 300 s
-PORT = 12368
[PATHS]
GNUNET_TEST_HOME = /tmp/test-experimentation/
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
[nat]
RETURN_LOCAL_ADDRESSES = YES
-[gns-helper-service-w32]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[statistics]
-AUTOSTART = YES
-
[peerinfo]
NO_IO = YES
Modified: gnunet/src/fs/fs.conf.in
===================================================================
--- gnunet/src/fs/fs.conf.in 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/fs/fs.conf.in 2014-12-10 17:11:06 UTC (rev 34522)
@@ -1,5 +1,6 @@
[fs]
AUTOSTART = @AUTOSTART@
+FORCESTART = YES
INDEXDB = $GNUNET_DATA_HOME/fs/idxinfo.lst
RESPECT = $GNUNET_DATA_HOME/fs/credit/
STATE_DIR = $GNUNET_DATA_HOME/fs/persistence/
@@ -60,6 +61,7 @@
[gnunet-auto-share]
BINARY = gnunet-auto-share
+FORCESTART = NO
# Note: MUST specify path to auto-share directory and CAN specify other options
# to gnunet-auto-share here!
Modified: gnunet/src/fs/test_fs_defaults.conf
===================================================================
--- gnunet/src/fs/test_fs_defaults.conf 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/fs/test_fs_defaults.conf 2014-12-10 17:11:06 UTC (rev 34522)
@@ -22,7 +22,6 @@
[arm]
PORT = 4366
HOSTNAME = localhost
-DEFAULTSERVICES = fs
[datastore]
QUOTA = 100 MB
Modified: gnunet/src/fs/test_fs_uri_data.conf
===================================================================
--- gnunet/src/fs/test_fs_uri_data.conf 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/fs/test_fs_uri_data.conf 2014-12-10 17:11:06 UTC (rev 34522)
@@ -2,6 +2,4 @@
[PATHS]
GNUNET_TEST_HOME = /tmp/gnunet-test-fs-uri/
-[arm]
-DEFAULTSERVICES = topology hostlist
Modified: gnunet/src/gns/gnunet-dns2gns.c
===================================================================
--- gnunet/src/gns/gnunet-dns2gns.c 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/gns/gnunet-dns2gns.c 2014-12-10 17:11:06 UTC (rev 34522)
@@ -200,10 +200,16 @@
GNUNET_IDENTITY_disconnect (identity);
identity = NULL;
}
- GNUNET_GNS_disconnect (gns);
- gns = NULL;
- GNUNET_DNSSTUB_stop (dns_stub);
- dns_stub = NULL;
+ if (NULL != gns)
+ {
+ GNUNET_GNS_disconnect (gns);
+ gns = NULL;
+ }
+ if (NULL != dns_stub)
+ {
+ GNUNET_DNSSTUB_stop (dns_stub);
+ dns_stub = NULL;
+ }
}
@@ -448,9 +454,10 @@
strcpy (&name[name_len - strlen (fcfs_suffix)],
".gnu");
use_gns = GNUNET_YES;
- } else if ( (name_len > strlen (dns_suffix)) &&
- (0 == strcasecmp (dns_suffix,
- &name[name_len - strlen (dns_suffix)])) )
+ }
+ else if ( (name_len > strlen (dns_suffix)) &&
+ (0 == strcasecmp (dns_suffix,
+ &name[name_len - strlen (dns_suffix)])) )
{
/* replace ".zkey.eu" with ".zkey" */
strcpy (&name[name_len - strlen (dns_suffix)],
Modified: gnunet/src/gns/test_gns_lookup.conf
===================================================================
--- gnunet/src/gns/test_gns_lookup.conf 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/gns/test_gns_lookup.conf 2014-12-10 17:11:06 UTC (rev 34522)
@@ -9,9 +9,6 @@
[transport]
PLUGINS =
-[arm]
-DEFAULTSERVICES =
-
[gns]
#PREFIX = valgrind --leak-check=full --track-origins=yes
AUTOSTART = YES
Modified: gnunet/src/gns/test_gns_nick_shorten.conf
===================================================================
--- gnunet/src/gns/test_gns_nick_shorten.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/gns/test_gns_nick_shorten.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -9,9 +9,6 @@
[transport]
PLUGINS =
-[arm]
-DEFAULTSERVICES =
-
[gns]
#PREFIX = valgrind --leak-check=full --track-origins=yes
AUTOSTART = YES
Modified: gnunet/src/gns/test_gns_proxy.conf
===================================================================
--- gnunet/src/gns/test_gns_proxy.conf 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/gns/test_gns_proxy.conf 2014-12-10 17:11:06 UTC (rev 34522)
@@ -5,7 +5,6 @@
PLUGINS = tcp
[arm]
-DEFAULTSERVICES = statistics dns namestore gns
PORT = 0
ALLOW_SHUTDOWN = YES
Modified: gnunet/src/gns/test_gns_simple_lookup.conf
===================================================================
--- gnunet/src/gns/test_gns_simple_lookup.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/gns/test_gns_simple_lookup.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -33,7 +33,6 @@
PORT = 12092
[arm]
-DEFAULTSERVICES = core dht namestore gns
PORT = 12366
[transport-tcp]
@@ -59,7 +58,7 @@
DNS_EXIT = 8.8.8.8
[gns]
-#PREFIX = valgrind --leak-check=full --track-origins=yes
+#PREFIX = valgrind --leak-check=full --track-origins=yes
AUTOSTART = YES
BINARY = gnunet-service-gns
ZONEKEY = zonefiles/test_zonekey
Modified: gnunet/src/hostlist/Makefile.am
===================================================================
--- gnunet/src/hostlist/Makefile.am 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/hostlist/Makefile.am 2014-12-10 17:11:06 UTC (rev 34522)
@@ -4,8 +4,6 @@
libexecdir= $(pkglibdir)/libexec/
-dist_pkgcfg_DATA = \
- hostlist.conf
if USE_COVERAGE
AM_CFLAGS = --coverage -O0
@@ -22,12 +20,16 @@
gnunet-daemon-hostlist
address@hidden@
address@hidden@
+dist_pkgcfg_DATA = \
+ hostlist.conf
else
if HAVE_LIBCURL
libexec_PROGRAMS = \
gnunet-daemon-hostlist
address@hidden@
address@hidden@
+dist_pkgcfg_DATA = \
+ hostlist.conf
endif
endif
Modified: gnunet/src/hostlist/hostlist.conf
===================================================================
--- gnunet/src/hostlist/hostlist.conf 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/hostlist/hostlist.conf 2014-12-10 17:11:06 UTC (rev 34522)
@@ -1,4 +1,5 @@
[hostlist]
+FORCESTART = YES
BINARY = gnunet-daemon-hostlist
# port for hostlist http server
Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_data.conf
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_data.conf 2014-12-10
17:06:39 UTC (rev 34521)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_data.conf 2014-12-10
17:11:06 UTC (rev 34522)
@@ -4,7 +4,6 @@
[arm]
PORT = 12966
-DEFAULTSERVICES = hostlist topology
[statistics]
PORT = 12967
Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf 2014-12-10
17:06:39 UTC (rev 34521)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf 2014-12-10
17:11:06 UTC (rev 34522)
@@ -7,7 +7,6 @@
[arm]
PORT = 12966
-DEFAULTSERVICES = hostlist topology
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf 2014-12-10
17:06:39 UTC (rev 34521)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf 2014-12-10
17:11:06 UTC (rev 34522)
@@ -7,7 +7,6 @@
[arm]
PORT = 22966
-DEFAULTSERVICES = hostlist topology
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified: gnunet/src/hostlist/test_hostlist_defaults.conf
===================================================================
--- gnunet/src/hostlist/test_hostlist_defaults.conf 2014-12-10 17:06:39 UTC
(rev 34521)
+++ gnunet/src/hostlist/test_hostlist_defaults.conf 2014-12-10 17:11:06 UTC
(rev 34522)
@@ -1,89 +1,15 @@
[PATHS]
GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist/
-[resolver]
-PORT = 12464
-
[transport]
-PORT = 12465
PLUGINS = tcp
-[arm]
-PORT = 12466
-DEFAULTSERVICES = hostlist
-
-[statistics]
-PORT = 12467
-
-[tcp]
-PORT = 12468
-
[peerinfo]
-PORT = 12469
NO_IO = YES
[core]
PORT = 12470
-[testing]
-WEAKRANDOM = YES
-
-[hostlist]
-HTTP-PROXY =
-
-[cadet]
-AUTOSTART = NO
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[fs]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[revocation]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[namecache]
-AUTOSTART = NO
-
[nat]
RETURN_LOCAL_ADDRESSES = YES
-[consensus]
-AUTOSTART = NO
-
-[regex]
-AUTOSTART = NO
-
-[identity]
-AUTOSTART = NO
-
-[conversation]
-AUTOSTART = NO
-
-[psycstore]
-AUTOSTART = NO
-
-[set]
-AUTOSTART = NO
Modified: gnunet/src/hostlist/test_learning_adv_peer.conf
===================================================================
--- gnunet/src/hostlist/test_learning_adv_peer.conf 2014-12-10 17:06:39 UTC
(rev 34521)
+++ gnunet/src/hostlist/test_learning_adv_peer.conf 2014-12-10 17:11:06 UTC
(rev 34522)
@@ -7,7 +7,6 @@
[arm]
PORT = 22966
-DEFAULTSERVICES = topology hostlist
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p2-service-arm.sock
[statistics]
Modified: gnunet/src/hostlist/test_learning_learn_peer.conf
===================================================================
--- gnunet/src/hostlist/test_learning_learn_peer.conf 2014-12-10 17:06:39 UTC
(rev 34521)
+++ gnunet/src/hostlist/test_learning_learn_peer.conf 2014-12-10 17:11:06 UTC
(rev 34522)
@@ -7,7 +7,6 @@
[arm]
PORT = 12966
-DEFAULTSERVICES = topology hostlist
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p1-service-arm.sock
[statistics]
Modified: gnunet/src/hostlist/test_learning_learn_peer2.conf
===================================================================
--- gnunet/src/hostlist/test_learning_learn_peer2.conf 2014-12-10 17:06:39 UTC
(rev 34521)
+++ gnunet/src/hostlist/test_learning_learn_peer2.conf 2014-12-10 17:11:06 UTC
(rev 34522)
@@ -7,7 +7,6 @@
[arm]
PORT = 32966
-DEFAULTSERVICES = topology hostlist
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p3-service-arm.sock
[statistics]
Modified: gnunet/src/identity/test_identity.conf
===================================================================
--- gnunet/src/identity/test_identity.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/identity/test_identity.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -1,6 +1,5 @@
[arm]
PORT = 12000
-DEFAULTSERVICES = identity
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[identity]
Modified: gnunet/src/multicast/test_multicast.conf
===================================================================
--- gnunet/src/multicast/test_multicast.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/multicast/test_multicast.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -1,2 +0,0 @@
-[arm]
-DEFAULTSERVICES = statistics core transport dht cadet multicast
Modified: gnunet/src/namecache/test_namecache_api.conf
===================================================================
--- gnunet/src/namecache/test_namecache_api.conf 2014-12-10 17:06:39 UTC
(rev 34521)
+++ gnunet/src/namecache/test_namecache_api.conf 2014-12-10 17:11:06 UTC
(rev 34522)
@@ -1,13 +1,7 @@
[PATHS]
GNUNET_TEST_HOME = /tmp/test-gnunet-namecache/
-[arm]
-PORT = 12000
-DEFAULTSERVICES = namecache
-
[namecache]
-#PREFIX = valgrind
-AUTOSTART = YES
DATABASE = sqlite
[namecache-sqlite]
Modified: gnunet/src/namestore/test_namestore_api.conf
===================================================================
--- gnunet/src/namestore/test_namestore_api.conf 2014-12-10 17:06:39 UTC
(rev 34521)
+++ gnunet/src/namestore/test_namestore_api.conf 2014-12-10 17:11:06 UTC
(rev 34522)
@@ -1,13 +1,7 @@
[PATHS]
GNUNET_TEST_HOME = /tmp/test-gnunet-namestore/
-[arm]
-PORT = 12000
-DEFAULTSERVICES = namecache namestore
-
[namestore]
-#PREFIX = valgrind
-AUTOSTART = YES
DATABASE = sqlite
[namestore-sqlite]
Modified: gnunet/src/nat/test_nat_data.conf
===================================================================
--- gnunet/src/nat/test_nat_data.conf 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/nat/test_nat_data.conf 2014-12-10 17:11:06 UTC (rev 34522)
@@ -4,15 +4,6 @@
# configuration file is assumed to be the default,
# which is what we want by default...
-[gnunetd]
-HOSTKEY = $GNUNET_TEST_HOME/.hostkey
-
-[TESTING]
-WEAKRANDOM = NO
-
-[client]
-
-
[nat]
# Are we behind NAT?
BEHIND_NAT = YES
@@ -27,9 +18,9 @@
USE_LOCALADDR = YES
# External IP address of the NAT box (if known); IPv4 dotted-decimal ONLY at
this time (should allow DynDNS!)
-# normal interface IP address for non-NATed peers;
+# normal interface IP address for non-NATed peers;
# possibly auto-detected (using UPnP) if possible if not specified
-# EXTERNAL_ADDRESS =
+# EXTERNAL_ADDRESS =
# Should we use ICMP-based NAT traversal to try connect to NATed peers
# or, if we are behind NAT, to allow connections to us?
@@ -37,98 +28,10 @@
ENABLE_ICMP_SERVER = NO
# IP address of the interface connected to the NAT box; IPv4 dotted-decimal
ONLY;
-# normal interface IP address for non-NATed peers;
+# normal interface IP address for non-NATed peers;
# likely auto-detected (via interface list) if not specified (!)
-# INTERNAL_ADDRESS =
+# INTERNAL_ADDRESS =
# Disable IPv6 support
DISABLEV6 = NO
-[arm]
-PORT = 2087
-HOSTNAME = localhost
-BINARY = gnunet-service-arm
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DEFAULTSERVICES = topology hostlist
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-arm.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-# GLOBAL_POSTFIX = -l $GNUNET_TEST_HOME/{}-logs
-# GLOBAL_PREFIX =
-# USERNAME =
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-
-[statistics]
-AUTOSTART = YES
-PORT = 2088
-HOSTNAME = localhost
-BINARY = gnunet-service-statistics
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-# DISABLE_SOCKET_FORWARDING = NO
-# USERNAME =
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-
-[resolver]
-AUTOSTART = YES
-PORT = 2089
-HOSTNAME = localhost
-BINARY = gnunet-service-resolver
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = NO
-# DISABLE_SOCKET_FORWARDING = NO
-# USERNAME =
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-
-[peerinfo]
-AUTOSTART = NO
-
-[transport]
-AUTOSTART = NO
-
-[core]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[fs]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[cadet]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-
-[consensus]
-AUTOSTART = NO
Modified: gnunet/src/nse/nse.conf.in
===================================================================
--- gnunet/src/nse/nse.conf.in 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/nse/nse.conf.in 2014-12-10 17:11:06 UTC (rev 34522)
@@ -1,5 +1,6 @@
[nse]
AUTOSTART = @AUTOSTART@
+FORCESTART = YES
@address@hidden = 2097
HOSTNAME = localhost
BINARY = gnunet-service-nse
Modified: gnunet/src/nse/nse_infiniband.conf
===================================================================
--- gnunet/src/nse/nse_infiniband.conf 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/nse/nse_infiniband.conf 2014-12-10 17:11:06 UTC (rev 34522)
@@ -3,7 +3,7 @@
[testbed]
AUTOSTART = NO
-PORT = 12113
+ORT = 12113
ACCEPT_FROM = 127.0.0.1; 10.6.0.0/16; 192.168.0.0/16;
HOSTNAME = localhost
MAX_PARALLEL_OPERATIONS = 400
@@ -14,12 +14,7 @@
STATS_DIR= /home/totakura/nse/test/load
[nse]
-PORT = 12114
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-nse.unix
-BINARY = gnunet-service-nse
-#BINARY =
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse
-#PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
-AUTOSTART = NO
+FORCESTART = YES
# Overriding network settings for faster testing (do NOT use
# these values in production just because they are here)
WORKDELAY = 60 s
@@ -28,23 +23,6 @@
PROOFFILE = $GNUNET_TEST_HOME/nse.proof
HISTOGRAM_DIR = /home/totakura/nse/test/histograms
-[arm]
-DEFAULTSERVICES = core nse
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-arm.unix
-
-[statistics]
-AUTOSTART = YES
-PORT = 12115
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
[nat]
DISABLEV6 = YES
BINDTO = 127.0.0.1
@@ -60,36 +38,6 @@
[transport-udp]
PORT = 12116
-[core]
-AUTOSTART = YES
-
-[peerinfo]
-AUTOSTART = YES
-
-[dns]
-AUTOSTART = NO
-
-[topology]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = YES
-
-[cadet]
-AUTOSTART = NO
-
-[chat]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
[nse-profiler]
OUTPUT_FILE = nse_output_2000_peers.dat
TOPOLOGY_OUTPUT_FILE = nse_topo_2000_peers
Modified: gnunet/src/nse/nse_profiler_test.conf
===================================================================
--- gnunet/src/nse/nse_profiler_test.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/nse/nse_profiler_test.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -12,11 +12,7 @@
OPERATION_TIMEOUT = 45 s
[nse]
-PORT = 12114
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-nse.unix
-BINARY = gnunet-service-nse
-#BINARY =
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse
-#PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
+FORCESTART = YES
AUTOSTART = NO
# Overriding network settings for faster testing (do NOT use
# these values in production just because they are here)
@@ -25,23 +21,6 @@
WORKBITS = 0
PROOFFILE = $GNUNET_TEST_HOME/nse.proof
-[arm]
-DEFAULTSERVICES = core nse
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-arm.unix
-
-[statistics]
-AUTOSTART = YES
-PORT = 12115
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
[nat]
DISABLEV6 = YES
BINDTO = 127.0.0.1
@@ -54,39 +33,6 @@
[transport]
plugins = udp
-[transport-udp]
-PORT = 12116
-
-[core]
-AUTOSTART = YES
-
-[peerinfo]
-AUTOSTART = YES
-
-[dns]
-AUTOSTART = NO
-
-[topology]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = YES
-
-[cadet]
-AUTOSTART = NO
-
-[chat]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
[nse-profiler]
OUTPUT_FILE = nse_output_2000_peers.dat
TOPOLOGY_OUTPUT_FILE = nse_topo_2000_peers
Modified: gnunet/src/nse/test_nse.conf
===================================================================
--- gnunet/src/nse/test_nse.conf 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/nse/test_nse.conf 2014-12-10 17:11:06 UTC (rev 34522)
@@ -2,45 +2,16 @@
GNUNET_TEST_HOME = /tmp/test-nse-multipeer/
[nse]
-PORT = 22353
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-nse.unix
-BINARY = gnunet-service-nse
-#BINARY =
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse
#PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
-AUTOSTART = YES
+FORCESTART = YES
PROOFFILE = $GNUNET_TEST_HOME/proof.nse
# Overriding network settings for faster testing (do NOT use
# these values in production just because they are here)
WORKDELAY = 1 ms
INTERVAL = 60 s
WORKBITS = 1
-
HISTOGRAM = $GNUNET_TEST_HOME/nse-histogram
-
-[arm]
-PORT = 22354
-DEFAULTSERVICES = nse core
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-arm.unix
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[transport]
-AUTOSTART = YES
-
-[core]
-AUTOSTART = YES
-
-[peerinfo]
-AUTOSTART = YES
-
[nat]
DISABLEV6 = YES
BINDTO = 127.0.0.1
@@ -50,27 +21,3 @@
INTERNAL_ADDRESS = 127.0.0.1
EXTERNAL_ADDRESS = 127.0.0.1
-[dns]
-AUTOSTART = NO
-
-[testing]
-WEAKRANDOM = YES
-
-[testing_old]
-NUM_PEERS = 10
-TOPOLOGY = NONE
-CONNECT_TOPOLOGY = SMALL_WORLD_RING
-PERCENTAGE = 3
-F2F = NO
-CONNECT_TIMEOUT = 60 s
-CONNECT_ATTEMPTS = 3
-HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 20
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 1000 s
-
-DELETE_FILES = NO
-
-
-[consensus]
-AUTOSTART = NO
Modified: gnunet/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
===================================================================
--- gnunet/src/peerinfo-tool/test_gnunet_peerinfo_data.conf 2014-12-10
17:06:39 UTC (rev 34521)
+++ gnunet/src/peerinfo-tool/test_gnunet_peerinfo_data.conf 2014-12-10
17:11:06 UTC (rev 34522)
@@ -1,37 +1,10 @@
[PATHS]
GNUNET_TEST_HOME = /tmp/gnunet-test-peerinfo/
-[gnunetd]
-#HOSTKEY = test_gnunet_peerinfo.hostkey
-
-[peerinfo]
-PORT = 24354
-
-[resolver]
-PORT = 24355
-
-[arm]
-DEFAULTSERVICES =
-
-[testing]
-WEAKRANDOM = YES
-
[transport]
plugins = tcp
PORT = 24356
-[transport-tcp]
-PORT = 24357
-
-[dns]
-AUTOSTART = NO
-
-[cadet]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
[nat]
RETURN_LOCAL_ADDRESSES = YES
Modified: gnunet/src/psyc/test_psyc.conf
===================================================================
--- gnunet/src/psyc/test_psyc.conf 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/psyc/test_psyc.conf 2014-12-10 17:11:06 UTC (rev 34522)
@@ -1,2 +0,0 @@
-[arm]
-DEFAULTSERVICES = statistics core transport dht cadet multicast psycstore psyc
Modified: gnunet/src/psycstore/test_psycstore.conf
===================================================================
--- gnunet/src/psycstore/test_psycstore.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/psycstore/test_psycstore.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -1,16 +1,7 @@
[PATHS]
GNUNET_TEST_HOME = /tmp/test-gnunet-psycstore/
-[arm]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-gnunet-service-arm.sock
-DEFAULTSERVICES = psycstore
-
[psycstore]
-AUTOSTART = YES
-BINARY = gnunet-service-psycstore
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-gnunet-service-psycstore.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
DATABASE = sqlite
[psycstore-sqlite]
Modified: gnunet/src/pt/test_gns_vpn.conf
===================================================================
--- gnunet/src/pt/test_gns_vpn.conf 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/pt/test_gns_vpn.conf 2014-12-10 17:11:06 UTC (rev 34522)
@@ -5,7 +5,6 @@
PLUGINS = tcp
[arm]
-DEFAULTSERVICES = statistics exit cadet vpn namestore gns
PORT = 0
ALLOW_SHUTDOWN = YES
Modified: gnunet/src/pt/test_gnunet_vpn.conf
===================================================================
--- gnunet/src/pt/test_gnunet_vpn.conf 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/pt/test_gnunet_vpn.conf 2014-12-10 17:11:06 UTC (rev 34522)
@@ -5,7 +5,6 @@
PLUGINS = tcp
[arm]
-DEFAULTSERVICES = statistics exit vpn
PORT = 0
ALLOW_SHUTDOWN = YES
Modified: gnunet/src/regex/test_regex_api_data.conf
===================================================================
--- gnunet/src/regex/test_regex_api_data.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/regex/test_regex_api_data.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -45,7 +45,6 @@
PORT = 2088
[arm]
-DEFAULTSERVICES =
PORT = 2087
[transport-tcp]
Modified: gnunet/src/revocation/revocation.conf.in
===================================================================
--- gnunet/src/revocation/revocation.conf.in 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/revocation/revocation.conf.in 2014-12-10 17:11:06 UTC (rev
34522)
@@ -1,5 +1,6 @@
[revocation]
AUTOSTART = @AUTOSTART@
+FORCESTART = YES
@address@hidden = 2112
HOSTNAME = localhost
BINARY = gnunet-service-revocation
Modified: gnunet/src/revocation/test_revocation.conf
===================================================================
--- gnunet/src/revocation/test_revocation.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/revocation/test_revocation.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -4,10 +4,8 @@
[revocation]
WORKBITS = 3
+FORCESTART = YES
-[arm]
-DEFAULTSERVICES = core identity revocation
-
[identity]
# Directory where we store information about our egos
EGODIR = $GNUNET_HOME/identity/egos/
@@ -17,9 +15,6 @@
AUTOSTART = NO
SERVERS = dummy
-[transport-udp]
-BROADCAST = NO
-
[nat]
RETURN_LOCAL_ADDRESSES = YES
Modified: gnunet/src/rps/test_rps.conf
===================================================================
--- gnunet/src/rps/test_rps.conf 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/rps/test_rps.conf 2014-12-10 17:11:06 UTC (rev 34522)
@@ -19,16 +19,12 @@
ALPHA = 0.45
-
-[arm]
-DEFAULTSERVICES = core ats transport cadet nse rps
-
[testbed]
OPERATION_TIMEOUT = 60 s
MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 1
OVERLAY_TOPOLOGY = CLIQUE
-#SCALE_FREE_TOPOLOGY_CAP =
+#SCALE_FREE_TOPOLOGY_CAP =
OVERLAY_RANDOM_LINKS = 5
Modified: gnunet/src/scalarproduct/test_scalarproduct.conf
===================================================================
--- gnunet/src/scalarproduct/test_scalarproduct.conf 2014-12-10 17:06:39 UTC
(rev 34521)
+++ gnunet/src/scalarproduct/test_scalarproduct.conf 2014-12-10 17:11:06 UTC
(rev 34522)
@@ -1,7 +1,3 @@
-[arm]
-DEFAULTSERVICES = core cadet statistics set
-PORT = 12366
-
[PATHS]
GNUNET_TEST_HOME = /tmp/test-scalarproduct/
Modified: gnunet/src/secretsharing/gnunet-service-secretsharing.c
===================================================================
--- gnunet/src/secretsharing/gnunet-service-secretsharing.c 2014-12-10
17:06:39 UTC (rev 34521)
+++ gnunet/src/secretsharing/gnunet-service-secretsharing.c 2014-12-10
17:11:06 UTC (rev 34522)
@@ -409,7 +409,9 @@
static int
peer_id_cmp (const void *p1, const void *p2)
{
- return memcmp (p1, p2, sizeof (struct GNUNET_PeerIdentity));
+ return memcmp (p1,
+ p2,
+ sizeof (struct GNUNET_PeerIdentity));
}
@@ -427,8 +429,11 @@
const struct GNUNET_PeerIdentity *needle)
{
unsigned int i;
+
for (i = 0; i < n; i++)
- if (0 == memcmp (&haystack[i], needle, sizeof (struct
GNUNET_PeerIdentity)))
+ if (0 == memcmp (&haystack[i],
+ needle,
+ sizeof (struct GNUNET_PeerIdentity)))
return i;
return -1;
}
@@ -468,8 +473,13 @@
if (GNUNET_NO == local_peer_in_list)
normalized[n - 1] = my_peer;
- memcpy (normalized, listed, num_listed * sizeof (struct
GNUNET_PeerIdentity));
- qsort (normalized, n, sizeof (struct GNUNET_PeerIdentity), &peer_id_cmp);
+ memcpy (normalized,
+ listed,
+ num_listed * sizeof (struct GNUNET_PeerIdentity));
+ qsort (normalized,
+ n,
+ sizeof (struct GNUNET_PeerIdentity),
+ &peer_id_cmp);
if (NULL != my_peer_idx)
*my_peer_idx = peer_find (normalized, n, &my_peer);
Modified: gnunet/src/secretsharing/test_secretsharing.conf
===================================================================
--- gnunet/src/secretsharing/test_secretsharing.conf 2014-12-10 17:06:39 UTC
(rev 34521)
+++ gnunet/src/secretsharing/test_secretsharing.conf 2014-12-10 17:11:06 UTC
(rev 34522)
@@ -10,10 +10,6 @@
OPTIONS = -LERROR
PLUGINS = unix
-
-[arm]
-DEFAULTSERVICES = core consensus set secretsharing
-
[set]
OPTIONS = -L INFO
AUTOSTART = YES
@@ -23,7 +19,7 @@
OVERLAY_TOPOLOGY = CLIQUE
[hostlist]
-SERVERS =
+SERVERS =
[nat]
# Use addresses from the local network interfaces (inluding loopback, but also
others)
Modified: gnunet/src/sensor/gnunet-sensor-profiler.conf
===================================================================
--- gnunet/src/sensor/gnunet-sensor-profiler.conf 2014-12-10 17:06:39 UTC
(rev 34521)
+++ gnunet/src/sensor/gnunet-sensor-profiler.conf 2014-12-10 17:11:06 UTC
(rev 34522)
@@ -1,9 +1,6 @@
[testbed]
OVERLAY_TOPOLOGY = FROM_FILE
-[arm]
-DEFAULTSERVICES = topology dht cadet
-
[sensor]
SENSOR_DIR = /tmp/gnunet-sensor-profiler/
Modified: gnunet/src/sensor/test_gnunet-service-sensor_reporting.conf
===================================================================
--- gnunet/src/sensor/test_gnunet-service-sensor_reporting.conf 2014-12-10
17:06:39 UTC (rev 34521)
+++ gnunet/src/sensor/test_gnunet-service-sensor_reporting.conf 2014-12-10
17:11:06 UTC (rev 34522)
@@ -1,9 +1,6 @@
[testbed]
OVERLAY_TOPOLOGY = CLIQUE
-[arm]
-DEFAULTSERVICES = topology dht cadet
-
[sensor]
#PREFIX = valgrind --leak-check=full
SENSOR_DIR = /tmp/test-gnunet-service-sensor-reporting/
Modified: gnunet/src/sensor/test_pow_sign.conf
===================================================================
--- gnunet/src/sensor/test_pow_sign.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/sensor/test_pow_sign.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -1,2 +0,0 @@
-[arm]
-DEFAULTSERVICES = core
\ No newline at end of file
Modified: gnunet/src/set/test_set.conf
===================================================================
--- gnunet/src/set/test_set.conf 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/set/test_set.conf 2014-12-10 17:11:06 UTC (rev 34522)
@@ -2,9 +2,6 @@
[PATHS]
GNUNET_TEST_HOME = /tmp/test-gnunet-set/
-[arm]
-DEFAULTSERVICES = topology dht nse cadet
-
[set]
AUTOSTART = YES
@UNIXONLY@ PORT = 2106
Modified: gnunet/src/social/test_social.conf
===================================================================
--- gnunet/src/social/test_social.conf 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/social/test_social.conf 2014-12-10 17:11:06 UTC (rev 34522)
@@ -1,2 +0,0 @@
-[arm]
-DEFAULTSERVICES = statistics core transport dht cadet multicast psycstore psyc
social
Modified: gnunet/src/statistics/test_statistics_api_data.conf
===================================================================
--- gnunet/src/statistics/test_statistics_api_data.conf 2014-12-10 17:06:39 UTC
(rev 34521)
+++ gnunet/src/statistics/test_statistics_api_data.conf 2014-12-10 17:11:06 UTC
(rev 34522)
@@ -8,47 +8,28 @@
[arm]
PORT = 22354
-DEFAULTSERVICES =
UNIXPATH = $GNUNET_RUNTIME_DIR/test-statistics-service-arm.unix
-[fs]
-AUTOSTART = NO
+[hostlist]
+FORCESTART = NO
[datastore]
-AUTOSTART = NO
+FORCESTART = NO
[dht]
-AUTOSTART = NO
+FORCESTART = NO
-[transport]
-AUTOSTART = NO
-
-[core]
-AUTOSTART = NO
-
-[peerinfo]
-AUTOSTART = NO
-
-[dns]
-AUTOSTART = NO
-
[nse]
-AUTOSTART = NO
+FORCESTART = NO
-[lockmanager]
-AUTOSTART = NO
+[cadet]
+FORCESTART = NO
-[ats]
-AUTOSTART = NO
+[revocation]
+FORCESTART = NO
-[namestore]
-AUTOSTART = NO
+[topology]
+FORCESTART = NO
-[gns]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
+[fs]
+FORCESTART = NO
\ No newline at end of file
Modified: gnunet/src/testbed/test_testbed_api_template.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_template.conf 2014-12-10 17:06:39 UTC
(rev 34521)
+++ gnunet/src/testbed/test_testbed_api_template.conf 2014-12-10 17:11:06 UTC
(rev 34522)
@@ -6,18 +6,6 @@
OVERLAY_TOPOLOGY = NONE
#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[cadet]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
[dhtcache]
QUOTA = 1 MB
DATABASE = heap
@@ -27,54 +15,22 @@
ACCEPT_FROM6 = ::1;
ACCEPT_FROM = 127.0.0.1;
NEIGHBOUR_LIMIT = 50
-PORT = 12365
[ats]
WAN_QUOTA_OUT = 3932160
WAN_QUOTA_IN = 3932160
[core]
-PORT = 12092
-AUTOSTART = YES
USE_EPHEMERAL_KEYS = NO
-[arm]
-DEFAULTSERVICES = core transport
-PORT = 12366
-
[transport-udp]
TIMEOUT = 300 s
-PORT = 12368
-[gnunetd]
-HOSTKEY = $GNUNET_TEST_HOME/.hostkey
-
[PATHS]
GNUNET_TEST_HOME = /tmp/test-testbed/
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
[nat]
RETURN_LOCAL_ADDRESSES = YES
-[gns-helper-service-w32]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[statistics]
-AUTOSTART = NO
-
[peerinfo]
NO_IO = YES
Modified: gnunet/src/testing/test_testing_defaults.conf
===================================================================
--- gnunet/src/testing/test_testing_defaults.conf 2014-12-10 17:06:39 UTC
(rev 34521)
+++ gnunet/src/testing/test_testing_defaults.conf 2014-12-10 17:11:06 UTC
(rev 34522)
@@ -1,36 +1,15 @@
[PATHS]
GNUNET_TEST_HOME = /tmp/test-gnunet-testing/
-[resolver]
-PORT = 2564
-
[transport]
-PORT = 2565
PLUGINS = tcp
[transport-tcp]
TESTING_IGNORE_KEYS = SOMETHING;KEY1;ACCEPT_FROM;
-[arm]
-PORT = 2566
-DEFAULTSERVICES =
-
-[statistics]
-PORT = 2567
-
[transport-tcp]
-PORT = 2568
BINDTO = 127.0.0.1
-[peerinfo]
-PORT = 2569
-
-[core]
-PORT = 2570
-
-[dht]
-AUTOSTART = NO
-
[nat]
DISABLEV6 = YES
ENABLE_UPNP = NO
@@ -40,39 +19,3 @@
EXTERNAL_ADDRESS = 127.0.0.1
USE_LOCALADDR = NO
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[cadet]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[fs]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[chat]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[lockmanager]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
Modified: gnunet/src/testing/test_testing_sharedservices.conf
===================================================================
--- gnunet/src/testing/test_testing_sharedservices.conf 2014-12-10 17:06:39 UTC
(rev 34521)
+++ gnunet/src/testing/test_testing_sharedservices.conf 2014-12-10 17:11:06 UTC
(rev 34522)
@@ -6,37 +6,15 @@
UNIXPATH = $GNUNET_RUNTIME_DIR/testbed-logger.sock
DIR = /tmp/testbed-logger
-[resolver]
-PORT = 2564
-
[transport]
-PORT = 2565
PLUGINS = tcp
[transport-tcp]
TESTING_IGNORE_KEYS = SOMETHING;KEY1;ACCEPT_FROM;
-[arm]
-PORT = 2566
-DEFAULTSERVICES =
-
-[statistics]
-PORT = 2567
-
[transport-tcp]
-PORT = 2568
BINDTO = 127.0.0.1
-[peerinfo]
-PORT = 2569
-AUTOSTART = NO
-
-[core]
-PORT = 2570
-
-[dht]
-AUTOSTART = NO
-
[nat]
DISABLEV6 = YES
ENABLE_UPNP = NO
@@ -46,39 +24,3 @@
EXTERNAL_ADDRESS = 127.0.0.1
USE_LOCALADDR = NO
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[cadet]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[fs]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[chat]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[lockmanager]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
Modified: gnunet/src/topology/test_gnunet_daemon_topology_data.conf
===================================================================
--- gnunet/src/topology/test_gnunet_daemon_topology_data.conf 2014-12-10
17:06:39 UTC (rev 34521)
+++ gnunet/src/topology/test_gnunet_daemon_topology_data.conf 2014-12-10
17:11:06 UTC (rev 34522)
@@ -1,27 +1,15 @@
[PATHS]
GNUNET_TEST_HOME = /tmp/test-gnunet-topology/
-[resolver]
-PORT = 2664
-
[transport]
-PORT = 2665
PLUGINS = tcp
#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-[arm]
-PORT = 2666
-DEFAULTSERVICES = topology
-
[testbed]
OVERLAY_TOPOLOGY=LINE
-[statistics]
-PORT = 2667
-
[transport-tcp]
-PORT = 2668
BINDTO = 127.0.0.1
[nat]
@@ -34,36 +22,3 @@
USE_LOCALADDR = NO
USE_HOSTNAME = NO
-[peerinfo]
-PORT = 2669
-
-[core]
-PORT = 2670
-
-[topology]
-#PREFIX = valgrind --tool=memcheck
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[testing]
-WEAKRANDOM = YES
-
-[testing_old]
-HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
-
-[dns]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
Modified: gnunet/src/topology/topology.conf
===================================================================
--- gnunet/src/topology/topology.conf 2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/topology/topology.conf 2014-12-10 17:11:06 UTC (rev 34522)
@@ -1,4 +1,5 @@
[topology]
+FORCESTART = YES
MINIMUM-FRIENDS = 0
FRIENDS-ONLY = NO
TARGET-CONNECTION-COUNT = 16
Modified: gnunet/src/transport/perf_http_peer1.conf
===================================================================
--- gnunet/src/transport/perf_http_peer1.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/transport/perf_http_peer1.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -7,8 +7,6 @@
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
PLUGINS = http_client
-[transport-http_client]
-
[nat]
# Disable IPv6 support
DISABLEV6 = YES
@@ -18,7 +16,6 @@
[arm]
PORT = 12005
-DEFAULTSERVICES = transport hostlist
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified: gnunet/src/transport/perf_http_peer2.conf
===================================================================
--- gnunet/src/transport/perf_http_peer2.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/transport/perf_http_peer2.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -19,7 +19,6 @@
[arm]
PORT = 12014
-DEFAULTSERVICES = transport hostlist
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified: gnunet/src/transport/perf_https_peer1.conf
===================================================================
--- gnunet/src/transport/perf_https_peer1.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/transport/perf_https_peer1.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -18,7 +18,6 @@
[arm]
PORT = 12005
-DEFAULTSERVICES = transport hostlist
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified: gnunet/src/transport/perf_https_peer2.conf
===================================================================
--- gnunet/src/transport/perf_https_peer2.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/transport/perf_https_peer2.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -19,7 +19,6 @@
[arm]
PORT = 12014
-DEFAULTSERVICES = transport hostlist
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified: gnunet/src/transport/perf_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/perf_tcp_peer1.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/transport/perf_tcp_peer1.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12005
-DEFAULTSERVICES = transport hostlist
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified: gnunet/src/transport/perf_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/perf_tcp_peer2.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/transport/perf_tcp_peer2.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12014
-DEFAULTSERVICES = transport hostlist
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified: gnunet/src/transport/perf_udp_peer1.conf
===================================================================
--- gnunet/src/transport/perf_udp_peer1.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/transport/perf_udp_peer1.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -24,7 +24,6 @@
[arm]
PORT = 12005
-DEFAULTSERVICES = transport hostlist
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified: gnunet/src/transport/perf_udp_peer2.conf
===================================================================
--- gnunet/src/transport/perf_udp_peer2.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/transport/perf_udp_peer2.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -24,7 +24,6 @@
[arm]
PORT = 12014
-DEFAULTSERVICES = transport hostlist
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified: gnunet/src/transport/perf_unix_peer1.conf
===================================================================
--- gnunet/src/transport/perf_unix_peer1.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/transport/perf_unix_peer1.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -12,7 +12,6 @@
[arm]
PORT = 12005
-DEFAULTSERVICES = transport hostlist
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified: gnunet/src/transport/perf_unix_peer2.conf
===================================================================
--- gnunet/src/transport/perf_unix_peer2.conf 2014-12-10 17:06:39 UTC (rev
34521)
+++ gnunet/src/transport/perf_unix_peer2.conf 2014-12-10 17:11:06 UTC (rev
34522)
@@ -13,7 +13,6 @@
[arm]
PORT = 12014
-DEFAULTSERVICES = transport hostlist
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified: gnunet/src/transport/template_cfg_peer1.conf
===================================================================
--- gnunet/src/transport/template_cfg_peer1.conf 2014-12-10 17:06:39 UTC
(rev 34521)
+++ gnunet/src/transport/template_cfg_peer1.conf 2014-12-10 17:11:06 UTC
(rev 34522)
@@ -18,7 +18,6 @@
[arm]
PORT = 12005
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
@@ -46,4 +45,4 @@
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock
[hostlist]
-SERVERS = dummy
\ No newline at end of file
+SERVERS = dummy
Modified: gnunet/src/transport/template_cfg_peer2.conf
===================================================================
--- gnunet/src/transport/template_cfg_peer2.conf 2014-12-10 17:06:39 UTC
(rev 34521)
+++ gnunet/src/transport/template_cfg_peer2.conf 2014-12-10 17:11:06 UTC
(rev 34522)
@@ -14,7 +14,6 @@
[arm]
PORT = 12014
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
@@ -40,4 +39,4 @@
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-ats.sock
[hostlist]
-SERVERS = dummy
\ No newline at end of file
+SERVERS = dummy
Modified: gnunet/src/transport/test_plugin_transport_data.conf
===================================================================
--- gnunet/src/transport/test_plugin_transport_data.conf 2014-12-10
17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_plugin_transport_data.conf 2014-12-10
17:11:06 UTC (rev 34522)
@@ -8,8 +8,6 @@
[transport-udp]
PORT = 2401
-[transport-unix]
-
[transport-wlan]
INTERFACE = mon0
TESTMODE = 1
@@ -18,13 +16,9 @@
INTERFACE = hci0
TESTMODE = 1
-[transport-http_client]
-
[transport-http_server]
PORT = 2402
-[transport-https_client]
-
[transport-https_server]
PORT = 2403
Modified: gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12014
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_quota_compliance_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_tcp_peer2.conf 2014-12-10
17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_quota_compliance_tcp_peer2.conf 2014-12-10
17:11:06 UTC (rev 34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12014
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_address_switch_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_address_switch_http_peer1.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_address_switch_http_peer1.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -27,7 +27,6 @@
[arm]
PORT = 12005
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_address_switch_http_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_address_switch_http_peer2.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_address_switch_http_peer2.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -27,7 +27,6 @@
[arm]
PORT = 12014
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_address_switch_https_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_address_switch_https_peer1.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_address_switch_https_peer1.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -27,7 +27,6 @@
[arm]
PORT = 12005
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_address_switch_https_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_address_switch_https_peer2.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_address_switch_https_peer2.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -27,7 +27,6 @@
[arm]
PORT = 12014
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_address_switch_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_address_switch_tcp_peer1.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_address_switch_tcp_peer1.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -27,7 +27,6 @@
[arm]
PORT = 12005
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_address_switch_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_address_switch_tcp_peer2.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_address_switch_tcp_peer2.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -27,7 +27,6 @@
[arm]
PORT = 12014
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_address_switch_udp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_address_switch_udp_peer1.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_address_switch_udp_peer1.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -27,7 +27,6 @@
[arm]
PORT = 12005
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_address_switch_udp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_address_switch_udp_peer2.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_address_switch_udp_peer2.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -27,7 +27,6 @@
[arm]
PORT = 12014
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified:
gnunet/src/transport/test_transport_api_bidirectional_connect_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_bidirectional_connect_peer1.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_bidirectional_connect_peer1.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -4,7 +4,6 @@
[arm]
PORT = 12000
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified:
gnunet/src/transport/test_transport_api_bidirectional_connect_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_bidirectional_connect_peer2.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_bidirectional_connect_peer2.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -4,7 +4,6 @@
[arm]
PORT = 12010
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_api_disconnect_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_disconnect_tcp_peer1.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_disconnect_tcp_peer1.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12005
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_api_disconnect_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_disconnect_tcp_peer2.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_disconnect_tcp_peer2.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12014
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_api_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_peer1.conf 2014-12-10
17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_http_peer1.conf 2014-12-10
17:11:06 UTC (rev 34522)
@@ -6,7 +6,6 @@
[arm]
PORT = 12085
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_api_http_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_peer2.conf 2014-12-10
17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_http_peer2.conf 2014-12-10
17:11:06 UTC (rev 34522)
@@ -9,7 +9,6 @@
[arm]
PORT = 12095
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_api_http_reverse_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_reverse_peer1.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_http_reverse_peer1.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -7,7 +7,6 @@
[arm]
PORT = 12095
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_api_http_reverse_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_reverse_peer2.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_http_reverse_peer2.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -16,7 +16,6 @@
[arm]
PORT = 12085
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12005
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12014
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_api_manipulation_cfg_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_manipulation_cfg_peer1.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_manipulation_cfg_peer1.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12005
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
@@ -28,4 +27,4 @@
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
PLUGINS = tcp
MANIPULATE_DELAY_IN = 100 ms
-MANIPULATE_DELAY_OUT = 100 ms
\ No newline at end of file
+MANIPULATE_DELAY_OUT = 100 ms
Modified: gnunet/src/transport/test_transport_api_manipulation_cfg_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_manipulation_cfg_peer2.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_manipulation_cfg_peer2.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12014
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified:
gnunet/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12005
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified:
gnunet/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12014
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified:
gnunet/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12005
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified:
gnunet/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12014
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_api_multi_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_multi_peer1.conf 2014-12-10
17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_multi_peer1.conf 2014-12-10
17:11:06 UTC (rev 34522)
@@ -17,7 +17,6 @@
[arm]
PORT = 12149
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_api_multi_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_multi_peer2.conf 2014-12-10
17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_multi_peer2.conf 2014-12-10
17:11:06 UTC (rev 34522)
@@ -20,7 +20,6 @@
[arm]
PORT = 12159
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -13,7 +13,6 @@
[arm]
PORT = 1204
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -12,7 +12,6 @@
[arm]
PORT = 12034
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_api_reliability_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_tcp_peer1.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_reliability_tcp_peer1.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12005
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_api_reliability_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_tcp_peer2.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_reliability_tcp_peer2.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12014
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf 2014-12-10
17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf 2014-12-10
17:11:06 UTC (rev 34522)
@@ -13,7 +13,6 @@
[arm]
PORT = 1204
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf 2014-12-10
17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf 2014-12-10
17:11:06 UTC (rev 34522)
@@ -12,7 +12,6 @@
[arm]
PORT = 12034
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_api_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_peer1.conf 2014-12-10
17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_tcp_peer1.conf 2014-12-10
17:11:06 UTC (rev 34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12005
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_api_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_peer2.conf 2014-12-10
17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_tcp_peer2.conf 2014-12-10
17:11:06 UTC (rev 34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12014
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_api_timeout_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_http_peer1.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_timeout_http_peer1.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -2,13 +2,8 @@
[PATHS]
GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/
-[nat]
-
-[transport-http_client]
-
[arm]
PORT = 12085
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_api_timeout_http_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_http_peer2.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_timeout_http_peer2.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -2,8 +2,6 @@
[PATHS]
GNUNET_TEST_HOME = /tmp/test-transport/api-http-p2/
-[nat]
-
[transport-http_server]
PORT = 12090
USE_IPv6 = NO
@@ -12,7 +10,6 @@
[arm]
PORT = 12095
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_api_timeout_https_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_https_peer1.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_timeout_https_peer1.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -2,8 +2,6 @@
[PATHS]
GNUNET_TEST_HOME = /tmp/test-transport/api-https-p1/
-[transport-https_client]
-
[arm]
PORT = 12105
Modified: gnunet/src/transport/test_transport_api_timeout_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_tcp_peer1.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_timeout_tcp_peer1.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12005
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_api_timeout_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_tcp_peer2.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_timeout_tcp_peer2.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -10,7 +10,6 @@
[arm]
PORT = 12014
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_api_udp_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_udp_nat_peer1.conf 2014-12-10
17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_udp_nat_peer1.conf 2014-12-10
17:11:06 UTC (rev 34522)
@@ -12,7 +12,6 @@
[arm]
PORT = 12065
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_api_udp_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_udp_nat_peer2.conf 2014-12-10
17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_api_udp_nat_peer2.conf 2014-12-10
17:11:06 UTC (rev 34522)
@@ -10,7 +10,6 @@
[arm]
PORT = 12075
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified:
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
===================================================================
--- gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12005
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
@@ -33,4 +32,4 @@
#Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50
[transport-blacklist-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG]
-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 =
\ No newline at end of file
+DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 =
Modified:
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
===================================================================
---
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12005
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
@@ -34,4 +33,4 @@
[transport-blacklist-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG]
DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 = tcp
-
\ No newline at end of file
+
Modified:
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
===================================================================
--- gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12005
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
@@ -34,4 +33,4 @@
[transport-blacklist-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG]
DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 = tcp
-
\ No newline at end of file
+
Modified:
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf
===================================================================
--- gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12014
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
@@ -34,4 +33,4 @@
[transport-blacklist-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50]
6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG =
-
\ No newline at end of file
+
Modified:
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
===================================================================
---
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12014
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
@@ -33,4 +32,4 @@
#Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50
[transport-blacklist-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50]
-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = tcp
\ No newline at end of file
+6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = tcp
Modified:
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
===================================================================
--- gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12014
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
@@ -33,4 +32,4 @@
#Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50
[transport-blacklist-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50]
-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = tcp
\ No newline at end of file
+6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = tcp
Modified: gnunet/src/transport/test_transport_blacklisting_cfg_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_blacklisting_cfg_peer1.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_blacklisting_cfg_peer1.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12005
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_blacklisting_cfg_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_blacklisting_cfg_peer2.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++ gnunet/src/transport/test_transport_blacklisting_cfg_peer2.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -8,7 +8,6 @@
[arm]
PORT = 12014
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
Modified: gnunet/src/transport/test_transport_defaults.conf
===================================================================
--- gnunet/src/transport/test_transport_defaults.conf 2014-12-10 17:06:39 UTC
(rev 34521)
+++ gnunet/src/transport/test_transport_defaults.conf 2014-12-10 17:11:06 UTC
(rev 34522)
@@ -4,29 +4,31 @@
[transport-tcp]
TIMEOUT = 300 s
-[arm]
-DEFAULTSERVICES =
-
[transport]
#PREFIX = valgrind -v --gen-suppressions=yes
[core]
AUTOSTART = NO
+FORCESTART = NO
[datastore]
AUTOSTART = NO
[fs]
AUTOSTART = NO
+FORCESTART = NO
[dht]
AUTOSTART = NO
+FORCESTART = NO
[cadet]
AUTOSTART = NO
+FORCESTART = NO
[nse]
AUTOSTART = NO
+FORCESTART = NO
[dns]
AUTOSTART = NO
@@ -58,9 +60,6 @@
[sensor]
AUTOSTART = NO
-[mesh]
-AUTOSTART = NO
-
[set]
AUTOSTART = NO
@@ -75,6 +74,7 @@
[revocation]
AUTOSTART = NO
+FORCESTART = NO
[nat]
DISABLEV6 = NO
@@ -83,8 +83,5 @@
INTERNAL_ADDRESS = 127.0.0.1
EXTERNAL_ADDRESS = 127.0.0.1
-[TESTING]
-WEAKRANDOM = YES
-
[transport-udp]
BROADCAST_RECEIVE = no
Modified: gnunet/src/transport/test_transport_startonly.conf
===================================================================
--- gnunet/src/transport/test_transport_startonly.conf 2014-12-10 17:06:39 UTC
(rev 34521)
+++ gnunet/src/transport/test_transport_startonly.conf 2014-12-10 17:11:06 UTC
(rev 34522)
@@ -1,9 +1,6 @@
@INLINE@ test_transport_defaults.conf
[PATHS]
-[arm]
-DEFAULTSERVICES = transport
-
[transport-tcp]
PORT = 2094
Modified:
gnunet/src/transport/test_transport_test_transport_address_switch_tcp_peer2.conf
===================================================================
---
gnunet/src/transport/test_transport_test_transport_address_switch_tcp_peer2.conf
2014-12-10 17:06:39 UTC (rev 34521)
+++
gnunet/src/transport/test_transport_test_transport_address_switch_tcp_peer2.conf
2014-12-10 17:11:06 UTC (rev 34522)
@@ -29,7 +29,6 @@
[arm]
PORT = 12014
-DEFAULTSERVICES = transport
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
[statistics]
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r34522 - in gnunet: doc doc/man src/arm src/ats src/cadet src/consensus src/conversation src/core src/datastore src/dht src/dv src/experimentation src/fs src/gns src/hostlist src/identity src/multicast src/namecache src/namestore src/nat src/nse src/peerinfo-tool src/psyc src/psycstore src/pt src/regex src/revocation src/rps src/scalarproduct src/secretsharing src/sensor src/set src/social src/statistics src/testbed src/testing src/topology src/transport,
gnunet <=