diff options
author | Bart Polot <bart@net.in.tum.de> | 2014-04-09 17:18:46 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2014-04-09 17:18:46 +0000 |
commit | 2dae6d8d5b7eff1ee73f47ee6b3b57d40ae4f602 (patch) | |
tree | 5aa852960afa3cecdbb1d676018b2909d951636d /src | |
parent | cfe9796d91dc55f1bbf97764cddb2105b8cfce8a (diff) | |
download | gnunet-2dae6d8d5b7eff1ee73f47ee6b3b57d40ae4f602.tar.gz gnunet-2dae6d8d5b7eff1ee73f47ee6b3b57d40ae4f602.zip |
- fix names
Diffstat (limited to 'src')
-rw-r--r-- | src/mesh/test_mesh.c | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/src/mesh/test_mesh.c b/src/mesh/test_mesh.c index aec95aacb..f63e63aa4 100644 --- a/src/mesh/test_mesh.c +++ b/src/mesh/test_mesh.c | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | /** | 20 | /** |
21 | * @file mesh/test_mesh_small.c | 21 | * @file mesh/test_mesh.c |
22 | * | 22 | * |
23 | * @brief Test for the mesh service: retransmission of traffic. | 23 | * @brief Test for the mesh service: retransmission of traffic. |
24 | */ | 24 | */ |
@@ -33,7 +33,7 @@ | |||
33 | /** | 33 | /** |
34 | * How namy messages to send | 34 | * How namy messages to send |
35 | */ | 35 | */ |
36 | #define TOTAL_PACKETS 1000 | 36 | #define TOTAL_PACKETS 100 |
37 | 37 | ||
38 | /** | 38 | /** |
39 | * How long until we give up on connecting the peers? | 39 | * How long until we give up on connecting the peers? |
@@ -172,9 +172,24 @@ static struct GNUNET_MESH_Channel *incoming_ch; | |||
172 | */ | 172 | */ |
173 | static struct GNUNET_TIME_Absolute start_time; | 173 | static struct GNUNET_TIME_Absolute start_time; |
174 | 174 | ||
175 | /** | ||
176 | * Peers handle. | ||
177 | */ | ||
175 | static struct GNUNET_TESTBED_Peer **testbed_peers; | 178 | static struct GNUNET_TESTBED_Peer **testbed_peers; |
179 | |||
180 | /** | ||
181 | * Statistics operation handle. | ||
182 | */ | ||
176 | static struct GNUNET_TESTBED_Operation *stats_op; | 183 | static struct GNUNET_TESTBED_Operation *stats_op; |
184 | |||
185 | /** | ||
186 | * Keepalives sent. | ||
187 | */ | ||
177 | static unsigned int ka_sent; | 188 | static unsigned int ka_sent; |
189 | |||
190 | /** | ||
191 | * Keepalives received. | ||
192 | */ | ||
178 | static unsigned int ka_received; | 193 | static unsigned int ka_received; |
179 | 194 | ||
180 | 195 | ||
@@ -837,21 +852,21 @@ main (int argc, char *argv[]) | |||
837 | config_file = "test_mesh.conf"; | 852 | config_file = "test_mesh.conf"; |
838 | 853 | ||
839 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Start\n"); | 854 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Start\n"); |
840 | if (strstr (argv[0], "_small_forward") != NULL) | 855 | if (strstr (argv[0], "_mesh_forward") != NULL) |
841 | { | 856 | { |
842 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "FORWARD\n"); | 857 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "FORWARD\n"); |
843 | test = FORWARD; | 858 | test = FORWARD; |
844 | test_name = "unicast"; | 859 | test_name = "unicast"; |
845 | ok_goal = 4; | 860 | ok_goal = 4; |
846 | } | 861 | } |
847 | else if (strstr (argv[0], "_small_signal") != NULL) | 862 | else if (strstr (argv[0], "_mesh_signal") != NULL) |
848 | { | 863 | { |
849 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "SIGNAL\n"); | 864 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "SIGNAL\n"); |
850 | test = P2P_SIGNAL; | 865 | test = P2P_SIGNAL; |
851 | test_name = "signal"; | 866 | test_name = "signal"; |
852 | ok_goal = 4; | 867 | ok_goal = 4; |
853 | } | 868 | } |
854 | else if (strstr (argv[0], "_small_speed_ack") != NULL) | 869 | else if (strstr (argv[0], "_mesh_speed_ack") != NULL) |
855 | { | 870 | { |
856 | /* Test is supposed to generate the following callbacks: | 871 | /* Test is supposed to generate the following callbacks: |
857 | * 1 incoming channel (@dest) | 872 | * 1 incoming channel (@dest) |
@@ -864,7 +879,7 @@ main (int argc, char *argv[]) | |||
864 | test = SPEED_ACK; | 879 | test = SPEED_ACK; |
865 | test_name = "speed ack"; | 880 | test_name = "speed ack"; |
866 | } | 881 | } |
867 | else if (strstr (argv[0], "_small_speed") != NULL) | 882 | else if (strstr (argv[0], "_mesh_speed") != NULL) |
868 | { | 883 | { |
869 | /* Test is supposed to generate the following callbacks: | 884 | /* Test is supposed to generate the following callbacks: |
870 | * 1 incoming channel (@dest) | 885 | * 1 incoming channel (@dest) |
@@ -934,5 +949,5 @@ main (int argc, char *argv[]) | |||
934 | return 0; | 949 | return 0; |
935 | } | 950 | } |
936 | 951 | ||
937 | /* end of test_mesh_small.c */ | 952 | /* end of test_mesh.c */ |
938 | 953 | ||