aboutsummaryrefslogtreecommitdiff
path: root/src/transport/test_transport_api_restart_2peers.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/transport/test_transport_api_restart_2peers.c')
-rw-r--r--src/transport/test_transport_api_restart_2peers.c30
1 files changed, 17 insertions, 13 deletions
diff --git a/src/transport/test_transport_api_restart_2peers.c b/src/transport/test_transport_api_restart_2peers.c
index 44a41614f..67cc90f0e 100644
--- a/src/transport/test_transport_api_restart_2peers.c
+++ b/src/transport/test_transport_api_restart_2peers.c
@@ -155,36 +155,36 @@ static void
155reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 155reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
156{ 156{
157 struct PeerContext *p = cls; 157 struct PeerContext *p = cls;
158
158 reconnect_task = GNUNET_SCHEDULER_NO_TASK; 159 reconnect_task = GNUNET_SCHEDULER_NO_TASK;
159 160
160 GNUNET_TRANSPORT_try_connect (p1->th, &p2->id); 161 GNUNET_TRANSPORT_try_connect (p1->th, &p2->id);
161 reconnect_task = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_SECONDS, &reconnect, p); 162 reconnect_task =
163 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &reconnect, p);
162} 164}
163 165
164static void 166static void
165restart_cb (struct PeerContext *p, void *cls) 167restart_cb (struct PeerContext *p, void *cls)
166{ 168{
167 static int c; 169 static int c;
170
168 c++; 171 c++;
169 172
170 if (c != 2) 173 if (c != 2)
171 return; 174 return;
172 175
173 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 176 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
174 "Restarted peer %u (`%4s'), issuing reconnect\n", 177 "Restarted peer %u (`%4s'), issuing reconnect\n", p->no,
175 p->no,
176 GNUNET_i2s (&p->id)); 178 GNUNET_i2s (&p->id));
177 179
178 reconnect_task = GNUNET_SCHEDULER_add_now(&reconnect, p); 180 reconnect_task = GNUNET_SCHEDULER_add_now (&reconnect, p);
179} 181}
180 182
181static 183static void
182void restart (struct PeerContext *p , char * cfg_file) 184restart (struct PeerContext *p, char *cfg_file)
183{ 185{
184 GNUNET_assert (p != NULL); 186 GNUNET_assert (p != NULL);
185 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 187 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Restarting peer %u (`%4s')\n", p->no,
186 "Restarting peer %u (`%4s')\n",
187 p->no,
188 GNUNET_i2s (&p->id)); 188 GNUNET_i2s (&p->id));
189 GNUNET_TRANSPORT_TESTING_restart_peer (tth, p, cfg_file, &restart_cb, p); 189 GNUNET_TRANSPORT_TESTING_restart_peer (tth, p, cfg_file, &restart_cb, p);
190 return; 190 return;
@@ -205,6 +205,7 @@ notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
205 GNUNET_assert (t != NULL); 205 GNUNET_assert (t != NULL);
206 206
207 char *ps = GNUNET_strdup (GNUNET_i2s (&p->id)); 207 char *ps = GNUNET_strdup (GNUNET_i2s (&p->id));
208
208 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 209 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
209 "Peer %u (`%4s') received message of type %d and size %u size from peer %u (`%4s')!\n", 210 "Peer %u (`%4s') received message of type %d and size %u size from peer %u (`%4s')!\n",
210 p->no, ps, ntohs (message->type), ntohs (message->size), t->no, 211 p->no, ps, ntohs (message->type), ntohs (message->size), t->no,
@@ -223,8 +224,8 @@ notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
223 } 224 }
224 else 225 else
225 { 226 {
226 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 227 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
227 "Restarted peers connected, stopping test...\n"); 228 "Restarted peers connected, stopping test...\n");
228 ok = 0; 229 ok = 0;
229 end (); 230 end ();
230 } 231 }
@@ -335,6 +336,7 @@ notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
335 336
336 337
337 char *ps = GNUNET_strdup (GNUNET_i2s (&p->id)); 338 char *ps = GNUNET_strdup (GNUNET_i2s (&p->id));
339
338 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 340 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
339 "Peer %u (`%4s'): peer (`%s') disconnected from me!\n", p->no, ps, 341 "Peer %u (`%4s'): peer (`%s') disconnected from me!\n", p->no, ps,
340 GNUNET_i2s (peer)); 342 GNUNET_i2s (peer));
@@ -374,6 +376,7 @@ start_cb (struct PeerContext *p, void *cls)
374 return; 376 return;
375 377
376 char *sender_c = GNUNET_strdup (GNUNET_i2s (&p1->id)); 378 char *sender_c = GNUNET_strdup (GNUNET_i2s (&p1->id));
379
377 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 380 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
378 "Test tries to connect peer %u (`%s') -> peer %u (`%s')\n", 381 "Test tries to connect peer %u (`%s') -> peer %u (`%s')\n",
379 p1->no, sender_c, p2->no, GNUNET_i2s (&p2->id)); 382 p1->no, sender_c, p2->no, GNUNET_i2s (&p2->id));
@@ -457,8 +460,8 @@ main (int argc, char *argv[])
457 tth = GNUNET_TRANSPORT_TESTING_init (); 460 tth = GNUNET_TRANSPORT_TESTING_init ();
458 461
459 462
460 GNUNET_asprintf(&cfg_file_p1,"test_transport_api_tcp_peer1.conf"); 463 GNUNET_asprintf (&cfg_file_p1, "test_transport_api_tcp_peer1.conf");
461 GNUNET_asprintf(&cfg_file_p2,"test_transport_api_tcp_peer2.conf"); 464 GNUNET_asprintf (&cfg_file_p2, "test_transport_api_tcp_peer2.conf");
462 465
463 466
464 ret = check (); 467 ret = check ();
@@ -472,4 +475,5 @@ main (int argc, char *argv[])
472 475
473 return ret; 476 return ret;
474} 477}
478
475/* end of test_transport_api_restart_2peers.c */ 479/* end of test_transport_api_restart_2peers.c */