2 files changed, 26 insertions, 34 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index fbf4a151b..2ca4f3684 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,6 @@ src/arm/do_start_process.c
 src/arm/gnunet-arm.c
 src/arm/gnunet-service-arm.c
 src/arm/mockup-service.c
-src/ats/ats_api.c
 src/ats/ats_api_peer_change_preference.c
 src/ats/ats_api_performance.c
 src/ats/ats_api_scheduling.c
@@ -20,6 +19,7 @@ src/chat/chat.c
 src/chat/gnunet-chat.c
 src/chat/gnunet-service-chat.c
 src/core/core_api.c
+src/core/core_api_is_connected.c
 src/core/core_api_iterate_peers.c
 src/core/gnunet-core.c
 src/core/gnunet-service-core.c
@@ -41,6 +41,7 @@ src/datastore/plugin_datastore_sqlite.c
 src/datastore/plugin_datastore_template.c
 src/dht/dht_api.c
 src/dht/gnunet-dht-get.c
+src/dht/gnunet-dht-monitor.c
 src/dht/gnunet-dht-put.c
 src/dht/gnunet-service-dht.c
 src/dht/gnunet-service-dht_clients.c
@@ -106,6 +107,9 @@ src/gns/gnunet-gns-lookup.c
 src/gns/gnunet-service-gns.c
 src/gns/gnunet-service-gns_interceptor.c
 src/gns/gnunet-service-gns_resolver.c
+src/gns/nss/nss_gns.c
+src/gns/nss/query.c
+src/gns/nss/util.c
 src/gns/plugin_block_gns.c
 src/hello/address.c
 src/hello/gnunet-hello.c
@@ -113,6 +117,9 @@ src/hello/hello.c
 src/hostlist/gnunet-daemon-hostlist.c
 src/hostlist/hostlist-client.c
 src/hostlist/hostlist-server.c
+src/integration-tests/connection_watchdog.c
+src/lockmanager/gnunet-service-lockmanager.c
+src/lockmanager/lockmanager_api.c
 src/mesh/gnunet-service-mesh.c
 src/mesh/mesh_api.c
 src/mesh/mesh_tunnel_tree.c
@@ -140,16 +147,26 @@ src/peerinfo-tool/gnunet-peerinfo.c
 src/peerinfo-tool/gnunet-peerinfo_plugins.c
 src/postgres/postgres.c
 src/pt/gnunet-daemon-pt.c
+src/regex/regex.c
 src/statistics/gnunet-service-statistics.c
 src/statistics/gnunet-statistics.c
 src/statistics/statistics_api.c
 src/stream/stream_api.c
 src/template/gnunet-service-template.c
 src/template/gnunet-template.c
+src/testbed/testbed_api.c
+src/testbed/testbed_api_hosts.c
+src/testbed/testbed_api_operations.c
+src/testbed/testbed_api_peers.c
+src/testbed/testbed_api_services.c
+src/testbed/testbed_api_testbed.c
+src/testbed/testbed_api_test.c
+src/testbed/testbed_api_topology.c
 src/testing/gnunet-testing.c
 src/testing/helper.c
 src/testing/testing.c
 src/testing/testing_group.c
+src/testing/testing_new.c
 src/testing/testing_peergroup.c
 src/topology/gnunet-daemon-topology.c
 src/transport/gnunet-helper-transport-wlan.c
@@ -234,5 +251,6 @@ src/vpn/gnunet-helper-vpn.c
 src/vpn/gnunet-service-vpn.c
 src/vpn/gnunet-vpn.c
 src/vpn/vpn_api.c
+src/dht/dht.h
 src/include/gnunet_common.h
 src/include/gnunet_postgres_lib.h
diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf
index 0185ed217..2d7be1178 100644
--- a/src/nse/nse_profiler_test.conf
+++ b/src/nse/nse_profiler_test.conf
@@ -52,6 +52,7 @@ EXTERNAL_ADDRESS = 127.0.0.1
 [transport]
 PORT = 0
 plugins = unix
+PREFIX = valgrind
 
 [transport-unix]
 PORT = 1
@@ -104,7 +105,7 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 [testing]
-NUM_PEERS = 4000
+NUM_PEERS = 20
 WEAKRANDOM = YES
 TOPOLOGY = NONE
 #CONNECT_TOPOLOGY = SMALL_WORLD_RING
@@ -135,36 +136,9 @@ DELETE_FILES = NO
 OUTPUT_FILE = nse_output_4000_peers.dat
 TOPOLOGY_OUTPUT_FILE = nse_topo_4000_peers
 DATA_OUTPUT_FILE = nse_stats_4000_peers
-ROUND0 = 1000
-#ROUND1 = 4000
-ROUND2 = 4000
-ROUND3 = 4000
-ROUND4 = 4000
-ROUND5 = 4000
-ROUND6 = 4000
-ROUND7 = 4000
-ROUND8 = 4000
-ROUND9 = 4000
-ROUND10 = 4000
-ROUND11 = 1000
-ROUND12 = 1000
-ROUND13 = 1000
-ROUND14 = 1000
-ROUND15 = 1000
-ROUND16 = 1000
-ROUND17 = 1000
-ROUND18 = 1000
-ROUND19 = 1000
-ROUND20 = 1000
-ROUND21 = 2000
-ROUND22 = 2000
-ROUND23 = 2000
-ROUND24 = 2000
-ROUND25 = 2000
-ROUND26 = 2000
-ROUND27 = 2000
-ROUND28 = 2000
-ROUND29 = 2000
-ROUND30 = 2000
-WAIT_TIME = 1920 s
+ROUND0 = 20
+ROUND1 = 20
+ROUND2 = 20
+ROUND3 = 20
+WAIT_TIME = 60 s
 CONNECTION_LIMIT = 10