[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21599 - in gnunet: bin src/dht src/integration-tests src/v
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r21599 - in gnunet: bin src/dht src/integration-tests src/vpn |
|
Date: |
Sun, 27 May 2012 21:50:28 +0200 |
Author: grothoff
Date: 2012-05-27 21:50:28 +0200 (Sun, 27 May 2012)
New Revision: 21599
Modified:
gnunet/bin/rename.sh
gnunet/src/dht/test_dht_multipeer.c
gnunet/src/integration-tests/connection_watchdog.c
gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
gnunet/src/integration-tests/test_integration_clique.py.in
gnunet/src/integration-tests/test_integration_clique_nat.py.in
gnunet/src/integration-tests/test_integration_connect_on_restart.py.in
gnunet/src/integration-tests/test_integration_connection_values_tcp.py.in
gnunet/src/integration-tests/test_integration_connection_values_tcp_udp.py.in
gnunet/src/integration-tests/test_integration_connection_values_tcp_udp_http.py.in
gnunet/src/integration-tests/test_integration_disconnect.py.in
gnunet/src/integration-tests/test_integration_restart.py.in
gnunet/src/vpn/gnunet-service-vpn.c
Log:
-more uniform naming of statisitcs
Modified: gnunet/bin/rename.sh
===================================================================
--- gnunet/bin/rename.sh 2012-05-27 19:48:17 UTC (rev 21598)
+++ gnunet/bin/rename.sh 2012-05-27 19:50:28 UTC (rev 21599)
@@ -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"
Modified: gnunet/src/dht/test_dht_multipeer.c
===================================================================
--- gnunet/src/dht/test_dht_multipeer.c 2012-05-27 19:48:17 UTC (rev 21598)
+++ gnunet/src/dht/test_dht_multipeer.c 2012-05-27 19:50:28 UTC (rev 21599)
@@ -276,7 +276,7 @@
{"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},
Modified: gnunet/src/integration-tests/connection_watchdog.c
===================================================================
--- gnunet/src/integration-tests/connection_watchdog.c 2012-05-27 19:48:17 UTC
(rev 21598)
+++ gnunet/src/integration-tests/connection_watchdog.c 2012-05-27 19:50:28 UTC
(rev 21599)
@@ -499,7 +499,7 @@
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)
Modified:
gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
2012-05-27 19:48:17 UTC (rev 21598)
+++ gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
2012-05-27 19:50:28 UTC (rev 21599)
@@ -74,14 +74,14 @@
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))
Modified:
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in
===================================================================
---
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in
2012-05-27 19:48:17 UTC (rev 21598)
+++
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in
2012-05-27 19:50:28 UTC (rev 21599)
@@ -71,7 +71,7 @@
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 @@
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))
Modified:
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
===================================================================
---
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
2012-05-27 19:48:17 UTC (rev 21598)
+++
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
2012-05-27 19:50:28 UTC (rev 21599)
@@ -71,7 +71,7 @@
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 @@
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))
Modified: gnunet/src/integration-tests/test_integration_clique.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_clique.py.in 2012-05-27
19:48:17 UTC (rev 21598)
+++ gnunet/src/integration-tests/test_integration_clique.py.in 2012-05-27
19:50:28 UTC (rev 21599)
@@ -73,7 +73,7 @@
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 @@
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 @@
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))
Modified: gnunet/src/integration-tests/test_integration_clique_nat.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_clique_nat.py.in
2012-05-27 19:48:17 UTC (rev 21598)
+++ gnunet/src/integration-tests/test_integration_clique_nat.py.in
2012-05-27 19:50:28 UTC (rev 21599)
@@ -73,7 +73,7 @@
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 @@
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 @@
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))
Modified: gnunet/src/integration-tests/test_integration_connect_on_restart.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_connect_on_restart.py.in
2012-05-27 19:48:17 UTC (rev 21598)
+++ gnunet/src/integration-tests/test_integration_connect_on_restart.py.in
2012-05-27 19:50:28 UTC (rev 21599)
@@ -82,13 +82,13 @@
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 @@
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))
Modified:
gnunet/src/integration-tests/test_integration_connection_values_tcp.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_connection_values_tcp.py.in
2012-05-27 19:48:17 UTC (rev 21598)
+++ gnunet/src/integration-tests/test_integration_connection_values_tcp.py.in
2012-05-27 19:50:28 UTC (rev 21599)
@@ -65,10 +65,10 @@
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()
Modified:
gnunet/src/integration-tests/test_integration_connection_values_tcp_udp.py.in
===================================================================
---
gnunet/src/integration-tests/test_integration_connection_values_tcp_udp.py.in
2012-05-27 19:48:17 UTC (rev 21598)
+++
gnunet/src/integration-tests/test_integration_connection_values_tcp_udp.py.in
2012-05-27 19:50:28 UTC (rev 21599)
@@ -65,10 +65,10 @@
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()
Modified:
gnunet/src/integration-tests/test_integration_connection_values_tcp_udp_http.py.in
===================================================================
---
gnunet/src/integration-tests/test_integration_connection_values_tcp_udp_http.py.in
2012-05-27 19:48:17 UTC (rev 21598)
+++
gnunet/src/integration-tests/test_integration_connection_values_tcp_udp_http.py.in
2012-05-27 19:50:28 UTC (rev 21599)
@@ -65,10 +65,10 @@
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()
Modified: gnunet/src/integration-tests/test_integration_disconnect.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_disconnect.py.in
2012-05-27 19:48:17 UTC (rev 21598)
+++ gnunet/src/integration-tests/test_integration_disconnect.py.in
2012-05-27 19:50:28 UTC (rev 21599)
@@ -73,7 +73,7 @@
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 @@
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))
Modified: gnunet/src/integration-tests/test_integration_restart.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_restart.py.in 2012-05-27
19:48:17 UTC (rev 21598)
+++ gnunet/src/integration-tests/test_integration_restart.py.in 2012-05-27
19:50:28 UTC (rev 21599)
@@ -85,13 +85,13 @@
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 @@
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))
Modified: gnunet/src/vpn/gnunet-service-vpn.c
===================================================================
--- gnunet/src/vpn/gnunet-service-vpn.c 2012-05-27 19:48:17 UTC (rev 21598)
+++ gnunet/src/vpn/gnunet-service-vpn.c 2012-05-27 19:50:28 UTC (rev 21599)
@@ -605,7 +605,7 @@
"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 @@
"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 */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21599 - in gnunet: bin src/dht src/integration-tests src/vpn,
gnunet <=