-more uniform naming of statisitcs

diff --git a/bin/rename.sh b/bin/rename.sh
index 7d5790b41986ae43eefcc8d25ceb604f4a448b79..178b44081fd5f5e6c74e83c4e94dae648729c800 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"`
+for n in `find * -name "*.c"` `find * -name "*.h"` `find * -name "*.in"`
 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/src/dht/test_dht_multipeer.c b/src/dht/test_dht_multipeer.c
index 9649405b17633d9182320702c9ae490c5adf3e15..2be938c96558b49aecaab90f2ff892583f1743af 100644 (file)
--- a/src/dht/test_dht_multipeer.c
+++ b/src/dht/test_dht_multipeer.c
@@ -276,7 +276,7 @@ static struct StatValues stats[] = {
   {"core", "# bytes encrypted", 0},
   {"core", "# type maps received", 0},
   {"core", "# session keys confirmed via PONG", 0},
-  {"core", "# entries in session map", 0},
+  {"core", "# peers connected", 0},
   {"core", "# key exchanges initiated", 0},
   {"core", "# send requests dropped (disconnected)", 0},
   {"core", "# transmissions delayed due to corking", 0},

diff --git a/src/integration-tests/connection_watchdog.c b/src/integration-tests/connection_watchdog.c
index 709ca4eebd49751d0a88e48e910cef82d9806262..5929476948eaf144bd302dfc97f07d1a5a082bea 100644 (file)
--- a/src/integration-tests/connection_watchdog.c
+++ b/src/integration-tests/connection_watchdog.c
@@ -499,7 +499,7 @@ stats_check (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   GNUNET_STATISTICS_get (stats, "transport", "# peers connected", GNUNET_TIME_UNIT_MINUTES, NULL, &stats_check_cb, &statistics_transport_connections);
   GNUNET_STATISTICS_get (stats, "core", "# neighbour entries allocated", GNUNET_TIME_UNIT_MINUTES, NULL, &stats_check_cb, &statistics_core_neighbour_entries);
-  GNUNET_STATISTICS_get (stats, "core", "# entries in session map", GNUNET_TIME_UNIT_MINUTES, NULL, &stats_check_cb, &statistics_core_entries_session_map);
+  GNUNET_STATISTICS_get (stats, "core", "# peers connected", GNUNET_TIME_UNIT_MINUTES, NULL, &stats_check_cb, &statistics_core_entries_session_map);
 
   /* TCP plugin specific checks */
   if (GNUNET_YES == have_tcp)

diff --git a/src/integration-tests/test_integration_bootstrap_and_connect.py.in b/src/integration-tests/test_integration_bootstrap_and_connect.py.in
index b1743774ed8778e58a9eacc8ff9bbcf578abac5f..1e71488dc2521fb7b0cc0754d5118f9ad7a5be78 100755 (executable)
--- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in
+++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in
@@ -74,14 +74,14 @@ def check ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (client, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (client, 'core', '# peers connected',1))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
   
 
   check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (server, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (server, 'core', '# peers connected',1))
   check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (server, 'fs', '# peers connected',1))  
   

diff --git a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in
index 0346fd66c9b9c4b55784c5dc1ce0688fdd14fa61..aefb9cd8fb295917aa9f5ad07c0fb899154f87e8 100755 (executable)
--- a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in
+++ b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in
@@ -71,7 +71,7 @@ def success_cont (check):
        check = Check (test)
        check.add (StatisticsCondition (client, 'transport', '# peers connected',0))
        check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',0))  
-       check.add (StatisticsCondition (client, 'core', '# entries in session map',0))
+       check.add (StatisticsCondition (client, 'core', '# peers connected',0))
        check.add (StatisticsCondition (client, 'topology', '# peers connected',0))
        check.add (StatisticsCondition (client, 'fs', '# peers connected',0))
        
@@ -86,14 +86,14 @@ def check ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (client, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (client, 'core', '# peers connected',1))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
   
 
   check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (server, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (server, 'core', '# peers connected',1))
   check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (server, 'fs', '# peers connected',1))  
   

diff --git a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
index 6b720cbb123e9754c43aca15a7204b0f1a007629..88327bfa160d7ef0ce0b3120064c803f948f8906 100755 (executable)
--- a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
+++ b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
@@ -71,7 +71,7 @@ def success_cont (check):
        check = Check (test)
        check.add (StatisticsCondition (client, 'transport', '# peers connected',0))
        check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',0))  
-       check.add (StatisticsCondition (client, 'core', '# entries in session map',0))
+       check.add (StatisticsCondition (client, 'core', '# peers connected',0))
        check.add (StatisticsCondition (client, 'topology', '# peers connected',0))
        check.add (StatisticsCondition (client, 'fs', '# peers connected',0))
        
@@ -86,14 +86,14 @@ def check ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (client, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (client, 'core', '# peers connected',1))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
   
 
   check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (server, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (server, 'core', '# peers connected',1))
   check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (server, 'fs', '# peers connected',1))  
   

diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in
index 82a406d0b73fa654ff6ab785114d96b0ec72d901..65c93412122c54506da608e2e9024eeedaa8e6d7 100755 (executable)
--- a/src/integration-tests/test_integration_clique.py.in
+++ b/src/integration-tests/test_integration_clique.py.in
@@ -73,7 +73,7 @@ def check_disconnect_client ():
   
   check.add (StatisticsCondition (client2, 'transport', '# peers connected',0))
   check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',0))  
-  check.add (StatisticsCondition (client2, 'core', '# entries in session map',0))
+  check.add (StatisticsCondition (client2, 'core', '# peers connected',0))
   check.add (StatisticsCondition (client2, 'topology', '# peers connected',0))
   check.add (StatisticsCondition (client2, 'fs', '# peers connected',0))
   
@@ -96,13 +96,13 @@ def check_disconnect_server ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (client, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (client, 'core', '# peers connected',1))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
   
   check.add (StatisticsCondition (client2, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (client2, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (client2, 'core', '# peers connected',1))
   check.add (StatisticsCondition (client2, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (client2, 'fs', '# peers connected',1))
   
@@ -123,19 +123,19 @@ def check_connect ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',2))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',2))  
-  check.add (StatisticsCondition (client, 'core', '# entries in session map',2))
+  check.add (StatisticsCondition (client, 'core', '# peers connected',2))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',2))
 
   check.add (StatisticsCondition (client2, 'transport', '# peers connected',2))
   check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',2))  
-  check.add (StatisticsCondition (client2, 'core', '# entries in session map',2))
+  check.add (StatisticsCondition (client2, 'core', '# peers connected',2))
   check.add (StatisticsCondition (client2, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (client2, 'fs', '# peers connected',2))
   
   check.add (StatisticsCondition (server, 'transport', '# peers connected',2))
   check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',2))  
-  check.add (StatisticsCondition (server, 'core', '# entries in session map',2))
+  check.add (StatisticsCondition (server, 'core', '# peers connected',2))
   check.add (StatisticsCondition (server, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (server, 'fs', '# peers connected',2))  
   

diff --git a/src/integration-tests/test_integration_clique_nat.py.in b/src/integration-tests/test_integration_clique_nat.py.in
index 82d85f5309054aeea17a4ac59edf871f8abebfd6..59d117949dc640141c975dd02e6a3552606cba25 100755 (executable)
--- a/src/integration-tests/test_integration_clique_nat.py.in
+++ b/src/integration-tests/test_integration_clique_nat.py.in
@@ -73,7 +73,7 @@ def check_disconnect_client ():
   
   check.add (StatisticsCondition (client2, 'transport', '# peers connected',0))
   check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',0))  
-  check.add (StatisticsCondition (client2, 'core', '# entries in session map',0))
+  check.add (StatisticsCondition (client2, 'core', '# peers connected',0))
   check.add (StatisticsCondition (client2, 'topology', '# peers connected',0))
   check.add (StatisticsCondition (client2, 'fs', '# peers connected',0))
   
@@ -96,13 +96,13 @@ def check_disconnect_server ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (client, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (client, 'core', '# peers connected',1))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
   
   check.add (StatisticsCondition (client2, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (client2, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (client2, 'core', '# peers connected',1))
   check.add (StatisticsCondition (client2, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (client2, 'fs', '# peers connected',1))
   
@@ -123,19 +123,19 @@ def check_connect ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',2))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',2))  
-  check.add (StatisticsCondition (client, 'core', '# entries in session map',2))
+  check.add (StatisticsCondition (client, 'core', '# peers connected',2))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',2))
 
   check.add (StatisticsCondition (client2, 'transport', '# peers connected',2))
   check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',2))  
-  check.add (StatisticsCondition (client2, 'core', '# entries in session map',2))
+  check.add (StatisticsCondition (client2, 'core', '# peers connected',2))
   check.add (StatisticsCondition (client2, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (client2, 'fs', '# peers connected',2))
   
   check.add (StatisticsCondition (server, 'transport', '# peers connected',2))
   check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',2))  
-  check.add (StatisticsCondition (server, 'core', '# entries in session map',2))
+  check.add (StatisticsCondition (server, 'core', '# peers connected',2))
   check.add (StatisticsCondition (server, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (server, 'fs', '# peers connected',2))  
   

diff --git a/src/integration-tests/test_integration_connect_on_restart.py.in b/src/integration-tests/test_integration_connect_on_restart.py.in
index 536ffd8868a8260f4d133d92edc758a16b6e5e16..f77fd1c320ade3f6b8d778e4478290617038b1de 100755 (executable)
--- a/src/integration-tests/test_integration_connect_on_restart.py.in
+++ b/src/integration-tests/test_integration_connect_on_restart.py.in
@@ -82,13 +82,13 @@ def success_connect_cont (check):
        check = Check (test)
        check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
        check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
-       check.add (StatisticsCondition (client, 'core', '# entries in session map',1))
+       check.add (StatisticsCondition (client, 'core', '# peers connected',1))
        check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
        check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
        
        check.add (StatisticsCondition (client2, 'transport', '# peers connected',1))
        check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',1))  
-       check.add (StatisticsCondition (client2, 'core', '# entries in session map',1))
+       check.add (StatisticsCondition (client2, 'core', '# peers connected',1))
        check.add (StatisticsCondition (client2, 'topology', '# peers connected',1))
        check.add (StatisticsCondition (client2, 'fs', '# peers connected',1))  
 
@@ -106,19 +106,19 @@ def check_connect ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',2))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',2))  
-  check.add (StatisticsCondition (client, 'core', '# entries in session map',2))
+  check.add (StatisticsCondition (client, 'core', '# peers connected',2))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',2))
 
   check.add (StatisticsCondition (client2, 'transport', '# peers connected',2))
   check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',2))  
-  check.add (StatisticsCondition (client2, 'core', '# entries in session map',2))
+  check.add (StatisticsCondition (client2, 'core', '# peers connected',2))
   check.add (StatisticsCondition (client2, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (client2, 'fs', '# peers connected',2))
   
   check.add (StatisticsCondition (server, 'transport', '# peers connected',2))
   check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',2))  
-  check.add (StatisticsCondition (server, 'core', '# entries in session map',2))
+  check.add (StatisticsCondition (server, 'core', '# peers connected',2))
   check.add (StatisticsCondition (server, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (server, 'fs', '# peers connected',2))  
   

diff --git a/src/integration-tests/test_integration_connection_values_tcp.py.in b/src/integration-tests/test_integration_connection_values_tcp.py.in
index 7b71abcd1a46b2fd06ce44f5a509b11fe2b28aa8..d8a92bad4a91c20f473abcd72f482ba6bbb04880 100755 (executable)
--- a/src/integration-tests/test_integration_connection_values_tcp.py.in
+++ b/src/integration-tests/test_integration_connection_values_tcp.py.in
@@ -65,10 +65,10 @@ def fail_cont (check):
 def check_connect ():
   check = Check (test)
   check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client,  'core', '# neighbour entries allocated'))
-  check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client,  'core', '# entries in session map'))
-  check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries allocated', client,  'core', '# entries in session map'))
+  check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client,  'core', '# peers connected'))
+  check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries allocated', client,  'core', '# peers connected'))
   check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'topology', '# peers connected'))
-  check.add (EqualStatisticsCondition (client, 'topology', '# peers connected', client, 'core', '# entries in session map'))
+  check.add (EqualStatisticsCondition (client, 'topology', '# peers connected', client, 'core', '# peers connected'))
   
   while True:
        check.reset()

diff --git a/src/integration-tests/test_integration_connection_values_tcp_udp.py.in b/src/integration-tests/test_integration_connection_values_tcp_udp.py.in
index 70877cca1a3aae364facdcea3ad21d3468c73147..11b8266d1e69f5bc943c9d57931bd8959ccc59c6 100755 (executable)
--- a/src/integration-tests/test_integration_connection_values_tcp_udp.py.in
+++ b/src/integration-tests/test_integration_connection_values_tcp_udp.py.in
@@ -65,10 +65,10 @@ def fail_cont (check):
 def check_connect ():
   check = Check (test)
   check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client,  'core', '# neighbour entries allocated'))
-  check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client,  'core', '# entries in session map'))
-  check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries allocated', client,  'core', '# entries in session map'))
+  check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client,  'core', '# peers connected'))
+  check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries allocated', client,  'core', '# peers connected'))
   check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'topology', '# peers connected'))
-  check.add (EqualStatisticsCondition (client, 'topology', '# peers connected', client, 'core', '# entries in session map'))
+  check.add (EqualStatisticsCondition (client, 'topology', '# peers connected', client, 'core', '# peers connected'))
   
   while True:
        check.reset()

diff --git a/src/integration-tests/test_integration_connection_values_tcp_udp_http.py.in b/src/integration-tests/test_integration_connection_values_tcp_udp_http.py.in
index cd4cc9d2e24de5acfa89af901a465377fcb1085c..69184a2e9a8de80173fe63151e8e8f37bf79c6e1 100755 (executable)
--- a/src/integration-tests/test_integration_connection_values_tcp_udp_http.py.in
+++ b/src/integration-tests/test_integration_connection_values_tcp_udp_http.py.in
@@ -65,10 +65,10 @@ def fail_cont (check):
 def check_connect ():
   check = Check (test)
   check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client,  'core', '# neighbour entries allocated'))
-  check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client,  'core', '# entries in session map'))
-  check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries allocated', client,  'core', '# entries in session map'))
+  check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client,  'core', '# peers connected'))
+  check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries allocated', client,  'core', '# peers connected'))
   check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'topology', '# peers connected'))
-  check.add (EqualStatisticsCondition (client, 'topology', '# peers connected', client, 'core', '# entries in session map'))
+  check.add (EqualStatisticsCondition (client, 'topology', '# peers connected', client, 'core', '# peers connected'))
   
   while True:
        check.reset()

diff --git a/src/integration-tests/test_integration_disconnect.py.in b/src/integration-tests/test_integration_disconnect.py.in
index bd6bc121f785d09048d8f75c1003ee94edc2ad10..6f84f37e00b57c7dbe39447ea23b161cfb9059a8 100755 (executable)
--- a/src/integration-tests/test_integration_disconnect.py.in
+++ b/src/integration-tests/test_integration_disconnect.py.in
@@ -73,7 +73,7 @@ def check_disconnect ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',0))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',0))  
-  check.add (StatisticsCondition (client, 'core', '# entries in session map',0))
+  check.add (StatisticsCondition (client, 'core', '# peers connected',0))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',0))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',0))
   check.run_blocking (check_timeout, success_disconnect_cont, fail_disconnect_cont)
@@ -93,13 +93,13 @@ def check_connect ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (client, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (client, 'core', '# peers connected',1))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
   
   check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (server, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (server, 'core', '# peers connected',1))
   check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (server, 'fs', '# peers connected',1))  
   

diff --git a/src/integration-tests/test_integration_restart.py.in b/src/integration-tests/test_integration_restart.py.in
index aadfec5b97ea8aca164def602e757a18a4299aa1..26917d0a099a16fdf59e94dc2f8bb19ea7818301 100755 (executable)
--- a/src/integration-tests/test_integration_restart.py.in
+++ b/src/integration-tests/test_integration_restart.py.in
@@ -85,13 +85,13 @@ def success_connect_cont (check):
        check = Check (test)
        check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
        check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
-       check.add (StatisticsCondition (client, 'core', '# entries in session map',1))
+       check.add (StatisticsCondition (client, 'core', '# peers connected',1))
        check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
        check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
        
        check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
        check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))  
-       check.add (StatisticsCondition (server, 'core', '# entries in session map',1))
+       check.add (StatisticsCondition (server, 'core', '# peers connected',1))
        check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
        check.add (StatisticsCondition (server, 'fs', '# peers connected',1))  
        
@@ -108,13 +108,13 @@ def check_connect ():
        check = Check (test)
        check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
        check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
-       check.add (StatisticsCondition (client, 'core', '# entries in session map',1))
+       check.add (StatisticsCondition (client, 'core', '# peers connected',1))
        check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
        check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
        
        check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
        check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))  
-       check.add (StatisticsCondition (server, 'core', '# entries in session map',1))
+       check.add (StatisticsCondition (server, 'core', '# peers connected',1))
        check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
        check.add (StatisticsCondition (server, 'fs', '# peers connected',1))  
        

diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c
index 324671b0c1d08507afb8a305c7f449589f95d150..b7756a35a7bc88ce02ffbc356ba8f4aff233f66b 100644 (file)
--- a/src/vpn/gnunet-service-vpn.c
+++ b/src/vpn/gnunet-service-vpn.c
@@ -605,7 +605,7 @@ tunnel_peer_disconnect_handler (void *cls,
              "Peer %s disconnected from tunnel.\n",
              GNUNET_i2s (peer));
   GNUNET_STATISTICS_update (stats,
-                           gettext_noop ("# Peers connected to mesh tunnels"),
+                           gettext_noop ("# peers connected to mesh tunnels"),
                            -1, GNUNET_NO);
   if (NULL != ts->th)
   {
@@ -642,7 +642,7 @@ tunnel_peer_connect_handler (void *cls,
              "Peer %s connected to tunnel.\n",
              GNUNET_i2s (peer));
   GNUNET_STATISTICS_update (stats,
-                           gettext_noop ("# Peers connected to mesh tunnels"),
+                           gettext_noop ("# peers connected to mesh tunnels"),
                            1, GNUNET_NO);
   if (NULL == ts->client)
     return; /* nothing to do */