diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-05-31 21:25:46 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-05-31 21:25:46 +0000 |
commit | 1efc19b93376335334628ca6d25a78e01e360370 (patch) | |
tree | e85542c72df668600c241fb8eb60bd1f4a26f72c /src/transport/test_transport_api_restart_2peers.c | |
parent | 521b89ad0aab592c9a0a7af05a34a19056958e37 (diff) | |
download | gnunet-1efc19b93376335334628ca6d25a78e01e360370.tar.gz gnunet-1efc19b93376335334628ca6d25a78e01e360370.zip |
-code cleanup, more precise error messages
Diffstat (limited to 'src/transport/test_transport_api_restart_2peers.c')
-rw-r--r-- | src/transport/test_transport_api_restart_2peers.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/transport/test_transport_api_restart_2peers.c b/src/transport/test_transport_api_restart_2peers.c index 22b602c17..1d7790c9f 100644 --- a/src/transport/test_transport_api_restart_2peers.c +++ b/src/transport/test_transport_api_restart_2peers.c | |||
@@ -81,7 +81,6 @@ static void | |||
81 | end () | 81 | end () |
82 | { | 82 | { |
83 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n"); | 83 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n"); |
84 | |||
85 | if (send_task != GNUNET_SCHEDULER_NO_TASK) | 84 | if (send_task != GNUNET_SCHEDULER_NO_TASK) |
86 | GNUNET_SCHEDULER_cancel (send_task); | 85 | GNUNET_SCHEDULER_cancel (send_task); |
87 | send_task = GNUNET_SCHEDULER_NO_TASK; | 86 | send_task = GNUNET_SCHEDULER_NO_TASK; |
@@ -108,13 +107,11 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
108 | { | 107 | { |
109 | die_task = GNUNET_SCHEDULER_NO_TASK; | 108 | die_task = GNUNET_SCHEDULER_NO_TASK; |
110 | 109 | ||
111 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n"); | ||
112 | |||
113 | if (restarted == GNUNET_YES) | 110 | if (restarted == GNUNET_YES) |
114 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peer was restarted\n"); | 111 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peer was restarted, but communication did not resume\n"); |
115 | 112 | ||
116 | if (restarted == GNUNET_NO) | 113 | if (restarted == GNUNET_NO) |
117 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peer was NOT restarted\n"); | 114 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peer was NOT (even) restarted\n"); |
118 | 115 | ||
119 | if (reconnect_task != GNUNET_SCHEDULER_NO_TASK) | 116 | if (reconnect_task != GNUNET_SCHEDULER_NO_TASK) |
120 | GNUNET_SCHEDULER_cancel (reconnect_task); | 117 | GNUNET_SCHEDULER_cancel (reconnect_task); |
@@ -150,7 +147,6 @@ reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
150 | struct PeerContext *p = cls; | 147 | struct PeerContext *p = cls; |
151 | 148 | ||
152 | reconnect_task = GNUNET_SCHEDULER_NO_TASK; | 149 | reconnect_task = GNUNET_SCHEDULER_NO_TASK; |
153 | |||
154 | GNUNET_TRANSPORT_try_connect (p1->th, &p2->id); | 150 | GNUNET_TRANSPORT_try_connect (p1->th, &p2->id); |
155 | reconnect_task = | 151 | reconnect_task = |
156 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &reconnect, p); | 152 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &reconnect, p); |
@@ -163,14 +159,11 @@ restart_cb (struct PeerContext *p, void *cls) | |||
163 | static int c; | 159 | static int c; |
164 | 160 | ||
165 | c++; | 161 | c++; |
166 | |||
167 | if (c != 2) | 162 | if (c != 2) |
168 | return; | 163 | return; |
169 | |||
170 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 164 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
171 | "Restarted peer %u (`%4s'), issuing reconnect\n", p->no, | 165 | "Restarted peer %u (`%4s'), issuing reconnect\n", p->no, |
172 | GNUNET_i2s (&p->id)); | 166 | GNUNET_i2s (&p->id)); |
173 | |||
174 | reconnect_task = GNUNET_SCHEDULER_add_now (&reconnect, p); | 167 | reconnect_task = GNUNET_SCHEDULER_add_now (&reconnect, p); |
175 | } | 168 | } |
176 | 169 | ||
@@ -182,7 +175,6 @@ restart (struct PeerContext *p, char *cfg_file) | |||
182 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Restarting peer %u (`%4s')\n", p->no, | 175 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Restarting peer %u (`%4s')\n", p->no, |
183 | GNUNET_i2s (&p->id)); | 176 | GNUNET_i2s (&p->id)); |
184 | GNUNET_TRANSPORT_TESTING_restart_peer (tth, p, cfg_file, &restart_cb, p); | 177 | GNUNET_TRANSPORT_TESTING_restart_peer (tth, p, cfg_file, &restart_cb, p); |
185 | return; | ||
186 | } | 178 | } |
187 | 179 | ||
188 | 180 | ||
@@ -244,7 +236,6 @@ notify_ready (void *cls, size_t size, void *buf) | |||
244 | struct GNUNET_MessageHeader *hdr; | 236 | struct GNUNET_MessageHeader *hdr; |
245 | 237 | ||
246 | th = NULL; | 238 | th = NULL; |
247 | |||
248 | if (buf == NULL) | 239 | if (buf == NULL) |
249 | { | 240 | { |
250 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 241 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
@@ -433,7 +424,7 @@ check () | |||
433 | 424 | ||
434 | ok = 1; | 425 | ok = 1; |
435 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name, | 426 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name, |
436 | "nohelp", options, &run, &ok); | 427 | "nohelp", options, &run, NULL); |
437 | 428 | ||
438 | return ok; | 429 | return ok; |
439 | } | 430 | } |