From b3c9c0eae35e6419088b647791b85d0da93b1f4d Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Wed, 7 May 2014 12:07:47 +0000 Subject: - rename also contents of config files, update config files --- bin/rename.sh | 2 +- contrib/experiments/nse/infiniband.conf | 2 +- contrib/regex_profiler_infiniband.conf | 6 +++--- contrib/testbed_cluster.conf | 2 +- contrib/testbed_infiniband.conf | 2 +- contrib/testbed_supermuc.conf | 2 +- src/cadet/profiler.conf | 4 ++-- src/cadet/test_cadet.conf | 8 ++++---- src/cadet/test_cadet_drop.conf | 4 ++-- src/core/test_core_defaults.conf | 2 +- src/datastore/test_defaults.conf | 2 +- src/exit/exit.conf | 2 +- src/experimentation/test_experimentation_clique.conf | 2 +- src/fs/test_fs_defaults.conf | 2 +- src/fs/test_gnunet_service_fs_p2p_mesh.conf | 2 +- src/gns/test_gns_defaults.conf | 2 +- src/hostlist/test_hostlist_defaults.conf | 2 +- src/integration-tests/confs/c_bootstrap_server.conf | 4 ++-- src/integration-tests/confs/c_no_nat_client.conf | 4 ++-- src/integration-tests/confs/c_no_nat_client_2.conf | 4 ++-- src/integration-tests/confs/test_defaults.conf | 2 +- src/nat/test_nat_data.conf | 2 +- src/nse/nse_infiniband.conf | 2 +- src/nse/nse_profiler_test.conf | 2 +- src/peerinfo-tool/test_gnunet_peerinfo_data.conf | 2 +- src/pt/test_gns_vpn.conf | 2 +- src/scalarproduct/test_scalarproduct.conf | 4 ++-- src/testbed/test_testbed_api_template.conf | 2 +- src/testing/test_testing_defaults.conf | 2 +- src/testing/test_testing_sharedservices.conf | 2 +- src/transport/test_transport_defaults.conf | 2 +- 31 files changed, 42 insertions(+), 42 deletions(-) diff --git a/bin/rename.sh b/bin/rename.sh index 8b6e6c899..4234b8316 100755 --- a/bin/rename.sh +++ b/bin/rename.sh @@ -1,5 +1,5 @@ #!/bin/sh -for n in `find * -name "*.c"` `find * -name "*.h"` `find * -name "*.am"` +for n in `find * -name "*.c"` `find * -name "*.h"` `find * -name "*.am"` `find * -name "*.conf"` do cat $n | sed -e "s/$1/$2/g" > $n.new mv $n.new $n || echo "Move failed: $n.new to $n" diff --git a/contrib/experiments/nse/infiniband.conf b/contrib/experiments/nse/infiniband.conf index bb3ebd357..1720e0131 100644 --- a/contrib/experiments/nse/infiniband.conf +++ b/contrib/experiments/nse/infiniband.conf @@ -75,7 +75,7 @@ AUTOSTART = NO [resolver] AUTOSTART = YES -[mesh] +[cadet] AUTOSTART = NO [chat] diff --git a/contrib/regex_profiler_infiniband.conf b/contrib/regex_profiler_infiniband.conf index dac0a8c23..e4d6138ca 100644 --- a/contrib/regex_profiler_infiniband.conf +++ b/contrib/regex_profiler_infiniband.conf @@ -9,10 +9,10 @@ MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5 #MAX_PARALLEL_SERVICE_CONNECTIONS = 1000 [regexprofiler] -BINARY = /home/szengel/gnunet/src/mesh/.libs/gnunet-daemon-regexprofiler +BINARY = /home/szengel/gnunet/src/cadet/.libs/gnunet-daemon-regexprofiler REGEX_PREFIX = "GNVPN-0001-PAD" -[mesh] +[cadet] AUTOSTART = YES ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; APP_ANNOUNCE_TIME = 240 s @@ -41,7 +41,7 @@ DISABLE_BF = YES IN_MEMORY = YES [arm] -DEFAULTSERVICES = core mesh dht statistics regexprofiler +DEFAULTSERVICES = core cadet dht statistics regexprofiler [fs] AUTOSTART = NO diff --git a/contrib/testbed_cluster.conf b/contrib/testbed_cluster.conf index 3fe3fc56c..d55761f10 100644 --- a/contrib/testbed_cluster.conf +++ b/contrib/testbed_cluster.conf @@ -16,7 +16,7 @@ AUTOSTART = NO [resolver] AUTOSTART = NO -[mesh] +[cadet] AUTOSTART = NO PORT = 71 diff --git a/contrib/testbed_infiniband.conf b/contrib/testbed_infiniband.conf index 604aae8fb..aea11a18e 100644 --- a/contrib/testbed_infiniband.conf +++ b/contrib/testbed_infiniband.conf @@ -16,7 +16,7 @@ AUTOSTART = NO [resolver] AUTOSTART = NO -[mesh] +[cadet] AUTOSTART = NO PORT = 71 diff --git a/contrib/testbed_supermuc.conf b/contrib/testbed_supermuc.conf index 38ad1a851..02d64d62f 100644 --- a/contrib/testbed_supermuc.conf +++ b/contrib/testbed_supermuc.conf @@ -19,7 +19,7 @@ AUTOSTART = NO [resolver] AUTOSTART = NO -[mesh] +[cadet] AUTOSTART = NO PORT = 71 diff --git a/src/cadet/profiler.conf b/src/cadet/profiler.conf index 8817802d1..0779c11ca 100644 --- a/src/cadet/profiler.conf +++ b/src/cadet/profiler.conf @@ -1,4 +1,4 @@ -@INLINE@ test_mesh.conf +@INLINE@ test_cadet.conf [testbed] OVERLAY_TOPOLOGY = RANDOM @@ -10,7 +10,7 @@ SETUP_TIMEOUT = 60 m #MANIPULATE_DELAY_IN = 50 ms MANIPULATE_DELAY_OUT = 10 ms -[mesh] +[cadet] REFRESH_CONNECTION_TIME = 1 h DISABLE_TRY_CONNECT = YES ID_ANNOUNCE_TIME = 240 s diff --git a/src/cadet/test_cadet.conf b/src/cadet/test_cadet.conf index 5a2f03dd0..880a22ecd 100644 --- a/src/cadet/test_cadet.conf +++ b/src/cadet/test_cadet.conf @@ -12,8 +12,8 @@ AUTOSTART = NO [resolver] AUTOSTART = NO -[mesh] -#BINARY = gnunet-service-mesh-enc +[cadet] +#BINARY = gnunet-service-cadet-enc #PREFIX = valgrind --leak-check=full #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args AUTOSTART = NO @@ -57,7 +57,7 @@ AUTOSTART = YES USE_EPHEMERAL_KEYS = NO [arm] -DEFAULTSERVICES = core transport dht mesh statistics +DEFAULTSERVICES = core transport dht cadet statistics PORT = 12366 [transport-udp] @@ -68,7 +68,7 @@ PORT = 12368 HOSTKEY = $GNUNET_TEST_HOME/.hostkey [PATHS] -GNUNET_TEST_HOME = /tmp/test-mesh/ +GNUNET_TEST_HOME = /tmp/test-cadet/ [dns] AUTOSTART = NO diff --git a/src/cadet/test_cadet_drop.conf b/src/cadet/test_cadet_drop.conf index 4df0e3f34..c9bcf603b 100644 --- a/src/cadet/test_cadet_drop.conf +++ b/src/cadet/test_cadet_drop.conf @@ -1,4 +1,4 @@ -@INLINE@ test_mesh.conf +@INLINE@ test_cadet.conf -[mesh] +[cadet] DROP_PERCENT = 1 diff --git a/src/core/test_core_defaults.conf b/src/core/test_core_defaults.conf index 587c47f1d..b0acb8395 100644 --- a/src/core/test_core_defaults.conf +++ b/src/core/test_core_defaults.conf @@ -42,7 +42,7 @@ AUTOSTART = NO [dht] AUTOSTART = NO -[mesh] +[cadet] AUTOSTART = NO [dns] diff --git a/src/datastore/test_defaults.conf b/src/datastore/test_defaults.conf index 53bd66c79..f7c965e6d 100644 --- a/src/datastore/test_defaults.conf +++ b/src/datastore/test_defaults.conf @@ -8,7 +8,7 @@ AUTOSTART = NO [dns] AUTOSTART = NO -[mesh] +[cadet] AUTOSTART = NO [nse] diff --git a/src/exit/exit.conf b/src/exit/exit.conf index 46851420d..177834c38 100644 --- a/src/exit/exit.conf +++ b/src/exit/exit.conf @@ -48,7 +48,7 @@ EXIT_IPV6 = NO # (set to "NO" if no normal ISP is locally available and thus # requests for normal ".com"/".org"/etc. must be routed via # the GNUnet VPN (the GNUNET PT daemon then needs to be configured -# to intercept and route DNS queries via mesh). +# to intercept and route DNS queries via cadet). # Set this to YES to allow using this system for DNS queries. EXIT_DNS = NO diff --git a/src/experimentation/test_experimentation_clique.conf b/src/experimentation/test_experimentation_clique.conf index 646753ef6..e7a0cd1a0 100644 --- a/src/experimentation/test_experimentation_clique.conf +++ b/src/experimentation/test_experimentation_clique.conf @@ -13,7 +13,7 @@ AUTOSTART = NO [resolver] AUTOSTART = NO -[mesh] +[cadet] AUTOSTART = NO [dht] diff --git a/src/fs/test_fs_defaults.conf b/src/fs/test_fs_defaults.conf index 2e980daab..b57e51ed0 100644 --- a/src/fs/test_fs_defaults.conf +++ b/src/fs/test_fs_defaults.conf @@ -87,6 +87,6 @@ AUTOSTART = NO [consensus] AUTOSTART = NO -[mesh] +[cadet] REFRESH_PATH_TIME = 30 min diff --git a/src/fs/test_gnunet_service_fs_p2p_mesh.conf b/src/fs/test_gnunet_service_fs_p2p_mesh.conf index 328bc986c..12e106968 100644 --- a/src/fs/test_gnunet_service_fs_p2p_mesh.conf +++ b/src/fs/test_gnunet_service_fs_p2p_mesh.conf @@ -16,5 +16,5 @@ CONTENT_PUSHING = NO #PREFIX = valgrind -[mesh] +[cadet] #PREFIX = valgrind diff --git a/src/gns/test_gns_defaults.conf b/src/gns/test_gns_defaults.conf index 60efa2693..e02c803b9 100644 --- a/src/gns/test_gns_defaults.conf +++ b/src/gns/test_gns_defaults.conf @@ -26,7 +26,7 @@ AUTOSTART = NO [nse] AUTOSTART = NO -[mesh] +[cadet] AUTOSTART = NO [datastore] diff --git a/src/hostlist/test_hostlist_defaults.conf b/src/hostlist/test_hostlist_defaults.conf index e71470626..b3eb87a2d 100644 --- a/src/hostlist/test_hostlist_defaults.conf +++ b/src/hostlist/test_hostlist_defaults.conf @@ -31,7 +31,7 @@ WEAKRANDOM = YES [hostlist] HTTP-PROXY = -[mesh] +[cadet] AUTOSTART = NO [dns] diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf index b6653ccd5..acd29493b 100644 --- a/src/integration-tests/confs/c_bootstrap_server.conf +++ b/src/integration-tests/confs/c_bootstrap_server.conf @@ -49,8 +49,8 @@ PORT = 20003 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-9 PORT = 20012 -[mesh] -UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-13 +[cadet] +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-cadet-13 PORT = 20016 [datastore] diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf index 25f2377bb..89c0b771d 100644 --- a/src/integration-tests/confs/c_no_nat_client.conf +++ b/src/integration-tests/confs/c_no_nat_client.conf @@ -54,8 +54,8 @@ WAN_QUOTA_IN = 64 KiB WAN_QUOTA_OUT = 64 KiB PORT = 20030 -[mesh] -UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-27 +[cadet] +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-cadet-27 PORT = 20034 [datastore] diff --git a/src/integration-tests/confs/c_no_nat_client_2.conf b/src/integration-tests/confs/c_no_nat_client_2.conf index 9da32fe14..0b78d6e87 100644 --- a/src/integration-tests/confs/c_no_nat_client_2.conf +++ b/src/integration-tests/confs/c_no_nat_client_2.conf @@ -54,8 +54,8 @@ WAN_QUOTA_IN = 64 KiB WAN_QUOTA_OUT = 64 KiB PORT = 20030 -[mesh] -UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-27 +[cadet] +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-cadet-27 PORT = 20034 [datastore] diff --git a/src/integration-tests/confs/test_defaults.conf b/src/integration-tests/confs/test_defaults.conf index 7a2cd778e..3bd06017c 100644 --- a/src/integration-tests/confs/test_defaults.conf +++ b/src/integration-tests/confs/test_defaults.conf @@ -54,7 +54,7 @@ STATE_DIR = $GNUNET_TEST_HOME/persistence/ UPDATE_DIR = $GNUNET_TEST_HOME/updates/ TRUST = $GNUNET_TEST_HOME/data/credit/ -[mesh] +[cadet] AUTOSTART = NO [consensus] diff --git a/src/nat/test_nat_data.conf b/src/nat/test_nat_data.conf index e9a1b77bf..42c1399cf 100644 --- a/src/nat/test_nat_data.conf +++ b/src/nat/test_nat_data.conf @@ -123,7 +123,7 @@ AUTOSTART = NO [dht] AUTOSTART = NO -[mesh] +[cadet] AUTOSTART = NO [nse] diff --git a/src/nse/nse_infiniband.conf b/src/nse/nse_infiniband.conf index 7600ce7b6..fc2e4f8b7 100644 --- a/src/nse/nse_infiniband.conf +++ b/src/nse/nse_infiniband.conf @@ -78,7 +78,7 @@ AUTOSTART = NO [resolver] AUTOSTART = YES -[mesh] +[cadet] AUTOSTART = NO [chat] diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf index 2a06d3bc0..26bcda520 100644 --- a/src/nse/nse_profiler_test.conf +++ b/src/nse/nse_profiler_test.conf @@ -75,7 +75,7 @@ AUTOSTART = NO [resolver] AUTOSTART = YES -[mesh] +[cadet] AUTOSTART = NO [chat] diff --git a/src/peerinfo-tool/test_gnunet_peerinfo_data.conf b/src/peerinfo-tool/test_gnunet_peerinfo_data.conf index eef151763..31c310232 100644 --- a/src/peerinfo-tool/test_gnunet_peerinfo_data.conf +++ b/src/peerinfo-tool/test_gnunet_peerinfo_data.conf @@ -26,7 +26,7 @@ PORT = 24357 [dns] AUTOSTART = NO -[mesh] +[cadet] AUTOSTART = NO [nse] diff --git a/src/pt/test_gns_vpn.conf b/src/pt/test_gns_vpn.conf index 60584948e..96391dd2e 100644 --- a/src/pt/test_gns_vpn.conf +++ b/src/pt/test_gns_vpn.conf @@ -5,7 +5,7 @@ GNUNET_TEST_HOME = /tmp/gnunet-test-gns-vpn/ PLUGINS = tcp [arm] -DEFAULTSERVICES = statistics exit mesh vpn namestore gns +DEFAULTSERVICES = statistics exit cadet vpn namestore gns PORT = 0 ALLOW_SHUTDOWN = YES diff --git a/src/scalarproduct/test_scalarproduct.conf b/src/scalarproduct/test_scalarproduct.conf index 1d28982c8..e80b9dc0e 100644 --- a/src/scalarproduct/test_scalarproduct.conf +++ b/src/scalarproduct/test_scalarproduct.conf @@ -1,5 +1,5 @@ [arm] -DEFAULTSERVICES = core mesh statistics scalarproduct +DEFAULTSERVICES = core cadet statistics scalarproduct PORT = 12366 [ats] @@ -33,7 +33,7 @@ AUTOSTART = NO [gnunetd] HOSTKEY = $SERVICEHOME/.hostkey -[mesh] +[cadet] #AUTOSTART = YES ACCEPT_FROM = 127.0.0.1; PORT = 10700 diff --git a/src/testbed/test_testbed_api_template.conf b/src/testbed/test_testbed_api_template.conf index c72377346..f08cb5b9a 100644 --- a/src/testbed/test_testbed_api_template.conf +++ b/src/testbed/test_testbed_api_template.conf @@ -12,7 +12,7 @@ AUTOSTART = NO [resolver] AUTOSTART = NO -[mesh] +[cadet] AUTOSTART = NO [dht] diff --git a/src/testing/test_testing_defaults.conf b/src/testing/test_testing_defaults.conf index b6e4ccdab..7a174b9dd 100644 --- a/src/testing/test_testing_defaults.conf +++ b/src/testing/test_testing_defaults.conf @@ -46,7 +46,7 @@ AUTOSTART = NO [nse] AUTOSTART = NO -[mesh] +[cadet] AUTOSTART = NO [datastore] diff --git a/src/testing/test_testing_sharedservices.conf b/src/testing/test_testing_sharedservices.conf index ad8a346c0..b8408774f 100644 --- a/src/testing/test_testing_sharedservices.conf +++ b/src/testing/test_testing_sharedservices.conf @@ -52,7 +52,7 @@ AUTOSTART = NO [nse] AUTOSTART = NO -[mesh] +[cadet] AUTOSTART = NO [datastore] diff --git a/src/transport/test_transport_defaults.conf b/src/transport/test_transport_defaults.conf index 314613226..46afbe18f 100644 --- a/src/transport/test_transport_defaults.conf +++ b/src/transport/test_transport_defaults.conf @@ -22,7 +22,7 @@ AUTOSTART = NO [dht] AUTOSTART = NO -[mesh] +[cadet] AUTOSTART = NO [nse] -- cgit v1.2.3