diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-02-27 10:54:36 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-02-27 10:54:36 +0000 |
commit | dc3ae8f36ec69ca2a96a93feda501682ff168320 (patch) | |
tree | a7b1af54f1bdd34ce59d442f87c91f7979b6e547 /src/transport/test_transport_api.c | |
parent | f632382b95605adb705bc7df830e016ed1f7735a (diff) | |
download | gnunet-dc3ae8f36ec69ca2a96a93feda501682ff168320.tar.gz gnunet-dc3ae8f36ec69ca2a96a93feda501682ff168320.zip |
adding error messages
Diffstat (limited to 'src/transport/test_transport_api.c')
-rw-r--r-- | src/transport/test_transport_api.c | 36 |
1 files changed, 34 insertions, 2 deletions
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c index 7596c30b1..021dec87a 100644 --- a/src/transport/test_transport_api.c +++ b/src/transport/test_transport_api.c | |||
@@ -64,6 +64,10 @@ static char *test_name; | |||
64 | 64 | ||
65 | static int ok; | 65 | static int ok; |
66 | 66 | ||
67 | static int s_started; | ||
68 | static int s_connected; | ||
69 | static int s_sending; | ||
70 | |||
67 | static GNUNET_SCHEDULER_TaskIdentifier die_task; | 71 | static GNUNET_SCHEDULER_TaskIdentifier die_task; |
68 | 72 | ||
69 | static GNUNET_SCHEDULER_TaskIdentifier send_task; | 73 | static GNUNET_SCHEDULER_TaskIdentifier send_task; |
@@ -127,12 +131,34 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
127 | 131 | ||
128 | if (th != NULL) | 132 | if (th != NULL) |
129 | GNUNET_TRANSPORT_notify_transmit_ready_cancel (th); | 133 | GNUNET_TRANSPORT_notify_transmit_ready_cancel (th); |
134 | else | ||
135 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer were not ready to send data\n")); | ||
136 | |||
137 | if (s_started == GNUNET_NO) | ||
138 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peers were not started n")); | ||
139 | else | ||
140 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peers were started n")); | ||
141 | |||
142 | if (s_connected == GNUNET_NO) | ||
143 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer were not connected\n")); | ||
144 | else | ||
145 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer were connected\n")); | ||
146 | |||
147 | if (s_sending == GNUNET_NO) | ||
148 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer were not ready to send data\n")); | ||
149 | else | ||
150 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer were ready to send data\n")); | ||
151 | |||
130 | th = NULL; | 152 | th = NULL; |
131 | 153 | ||
132 | if (p1 != NULL) | 154 | if (p1 != NULL) |
133 | GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1); | 155 | GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1); |
156 | else | ||
157 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer 1 was not started\n")); | ||
134 | if (p2 != NULL) | 158 | if (p2 != NULL) |
135 | GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2); | 159 | GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2); |
160 | else | ||
161 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer 2 was not started\n")); | ||
136 | 162 | ||
137 | ok = GNUNET_SYSERR; | 163 | ok = GNUNET_SYSERR; |
138 | } | 164 | } |
@@ -227,7 +253,7 @@ sendtask (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
227 | "Sending message from peer %u (`%4s') -> peer %u (`%s') !\n", | 253 | "Sending message from peer %u (`%4s') -> peer %u (`%s') !\n", |
228 | p2->no, GNUNET_i2s (&p2->id), p1->no, receiver_s); | 254 | p2->no, GNUNET_i2s (&p2->id), p1->no, receiver_s); |
229 | GNUNET_free (receiver_s); | 255 | GNUNET_free (receiver_s); |
230 | 256 | s_sending = GNUNET_YES; | |
231 | th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, MSIZE, 0, | 257 | th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, MSIZE, 0, |
232 | TIMEOUT_TRANSMIT, ¬ify_ready, | 258 | TIMEOUT_TRANSMIT, ¬ify_ready, |
233 | p1); | 259 | p1); |
@@ -286,6 +312,7 @@ testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls) | |||
286 | p1->no, p1_c, p2->no, GNUNET_i2s (&p2->id)); | 312 | p1->no, p1_c, p2->no, GNUNET_i2s (&p2->id)); |
287 | GNUNET_free (p1_c); | 313 | GNUNET_free (p1_c); |
288 | 314 | ||
315 | s_connected = GNUNET_YES; | ||
289 | send_task = GNUNET_SCHEDULER_add_now (&sendtask, NULL); | 316 | send_task = GNUNET_SCHEDULER_add_now (&sendtask, NULL); |
290 | } | 317 | } |
291 | 318 | ||
@@ -303,7 +330,8 @@ start_cb (struct PeerContext *p, void *cls) | |||
303 | 330 | ||
304 | if (started != 2) | 331 | if (started != 2) |
305 | return; | 332 | return; |
306 | 333 | else | |
334 | s_started = GNUNET_YES; | ||
307 | char *sender_c = GNUNET_strdup (GNUNET_i2s (&p1->id)); | 335 | char *sender_c = GNUNET_strdup (GNUNET_i2s (&p1->id)); |
308 | 336 | ||
309 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 337 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -322,6 +350,10 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
322 | { | 350 | { |
323 | die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); | 351 | die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); |
324 | 352 | ||
353 | s_started = GNUNET_NO; | ||
354 | s_connected = GNUNET_NO; | ||
355 | s_sending = GNUNET_NO; | ||
356 | |||
325 | p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p1, 1, | 357 | p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p1, 1, |
326 | ¬ify_receive, ¬ify_connect, | 358 | ¬ify_receive, ¬ify_connect, |
327 | ¬ify_disconnect, &start_cb, | 359 | ¬ify_disconnect, &start_cb, |