- rename also contents of config files, update config files

diff --git a/bin/rename.sh b/bin/rename.sh
index 8b6e6c899258892f7aacd5c858db85e5d9bcade0..4234b8316479d93f28677d41132cc7d617783d24 100755 (executable)
--- 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 bb3ebd3574bd2e62a30249217843276e8662396a..1720e0131216f71dc5b281c29cd125d3a4946305 100644 (file)
--- 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 dac0a8c230789e3b78a9ca3abf967167d6a70624..e4d6138cac052de007909fa0f2b128e0d6a33fcb 100644 (file)
--- 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 3fe3fc56c63c391b90c7ee5040e5f82c3f3a381d..d55761f1080ec7a5bd0231f330ad3f0b1b32256c 100644 (file)
--- 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 604aae8fbaa2946636d1cf6b357d4a70e8572ff6..aea11a18eaf1ab483163e7b64e7cd062a5784d71 100644 (file)
--- 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 38ad1a851ccfcd6bea51dde08e65800ab9560276..02d64d62f06c0685078841c37379f239f2d92db1 100644 (file)
--- 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 8817802d178b958a758d6b908a1c3c3a64081609..0779c11ca91ad0edb1bb7f5d1c73cb240e5b8254 100644 (file)
--- 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 5a2f03dd0ad2ba4f71499658a1a53f449eb2cdcf..880a22ecd517c4938149ef72ec7b9e67ab4b3f32 100644 (file)
--- 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 4df0e3f34ca1d04042ae4730fb5f39ea224ad52d..c9bcf603b903f141f08f3d08be3761b802268cf1 100644 (file)
--- 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 587c47f1dd24ece1da1c240781b236f4e56ea6e1..b0acb839574a3190c1fff72f0d93873efd5706de 100644 (file)
--- 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 53bd66c793e23aced0b268afc5317344d7110925..f7c965e6dab4ba4b1de2a8ba67420ae23e4a5d17 100644 (file)
--- 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 46851420d4fb1c6ca10e384bc95f21293f4fa81d..177834c38f6afbd6c04aad184aceacc83b6e933c 100644 (file)
--- 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 646753ef67ca44b4c12f8bd3e4fcb610a7b0a094..e7a0cd1a047cbebe7142821693e1b461f4c2fa73 100644 (file)
--- 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 2e980daab53b69712f9e8fa84a3d9fae1d24e3a8..b57e51ed02f75e145b8a8afcc1ad32860deb12ad 100644 (file)
--- 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 328bc986c971346d8be28875ee07617fcfaae073..12e10696831cf3048f836402025db566a03e01ad 100644 (file)
--- 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 60efa2693e49679a04f91abc1f3659e5dfb8d06b..e02c803b93f1d5a88bc53db700236c5bcf33e545 100644 (file)
--- 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 e71470626cae7e2ac5e911cfe267161fa86ec207..b3eb87a2d919e026d86bcfa870166dd5f89a7b1a 100644 (file)
--- 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 b6653ccd57ef87942b85a188914b5a3d0f0f6c3d..acd29493b8b79f2bbd8f822d8285b8770a298be4 100644 (file)
--- 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 25f2377bb9bfd3004c709b7d165d5918ac746b99..89c0b771d8d18db09102fd5c52f71778656f995d 100644 (file)
--- 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 9da32fe14660bae2f9185bb62308b665acdc540e..0b78d6e877846b611bbdad6143471297f246d9f1 100644 (file)
--- 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 7a2cd778e4ddb2eaff57365794f0434065d25c7f..3bd06017c450b8838354890f062a97cad20a4ca0 100644 (file)
--- 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 e9a1b77bfdc41af823180175fb8954a282e105e3..42c1399cf43ef9d5a9d1d8ec54940b6c5b12bb80 100644 (file)
--- 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 7600ce7b6eb873b97f9ee88791fe6753a562cc36..fc2e4f8b7e36cd899ba16c4f3756f492bf3ddce2 100644 (file)
--- 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 2a06d3bc0de8f4fd38a76c699af5ce5c25e30902..26bcda5204bae0b06cc8ed4d7750ef747e6a6b4f 100644 (file)
--- 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 eef1517632c0a6199169a072c751fe9e0bb035a9..31c31023247cbc01ba8e7655b95cbfe61c97a03e 100644 (file)
--- 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 60584948ec93218b9cd59c02bff314921526c3db..96391dd2e5d8fcf130aebb0beff9a9ea5734bab1 100644 (file)
--- 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 1d28982c8d9a8244a5ff45dae92b3513cafcd535..e80b9dc0ea6e68ae4d0900632661c4f4317d2d09 100644 (file)
--- 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 c72377346c63c5c9c0970d1ae5a7dd3f4998b2b1..f08cb5b9acf83c6dbc047a5fb5ec5fcd0bf40ff8 100644 (file)
--- 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 b6e4ccdabc2b02cd95d9cdefe15437b9a87c7891..7a174b9dd723eae98268c8f5d06ae714d965dcb8 100644 (file)
--- 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 ad8a346c0f0b9f847afb253f8227da9948d09212..b8408774f12868b0f24014f894ff35c83ee2f767 100644 (file)
--- 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 314613226ce57889dfa2e4abfc5cbb3e30dfc24d..46afbe18f82fe42a7af5b67884f11e654d2dbdf1 100644 (file)
--- 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]