diff options
-rw-r--r-- | src/transport/test_transport_api_restart_2peers.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/transport/test_transport_api_restart_2peers.c b/src/transport/test_transport_api_restart_2peers.c index 9fd9c0da6..22b602c17 100644 --- a/src/transport/test_transport_api_restart_2peers.c +++ b/src/transport/test_transport_api_restart_2peers.c | |||
@@ -41,12 +41,12 @@ | |||
41 | /** | 41 | /** |
42 | * How long until we give up on transmitting the message? | 42 | * How long until we give up on transmitting the message? |
43 | */ | 43 | */ |
44 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) | 44 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 90) |
45 | 45 | ||
46 | /** | 46 | /** |
47 | * How long until we give up on transmitting the message? | 47 | * How long until we give up on transmitting the message? |
48 | */ | 48 | */ |
49 | #define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60) | 49 | #define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120) |
50 | 50 | ||
51 | #define MTYPE 12345 | 51 | #define MTYPE 12345 |
52 | 52 | ||
@@ -102,6 +102,7 @@ end () | |||
102 | GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2); | 102 | GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2); |
103 | } | 103 | } |
104 | 104 | ||
105 | |||
105 | static void | 106 | static void |
106 | end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 107 | end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
107 | { | 108 | { |
@@ -142,6 +143,7 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
142 | ok = GNUNET_SYSERR; | 143 | ok = GNUNET_SYSERR; |
143 | } | 144 | } |
144 | 145 | ||
146 | |||
145 | static void | 147 | static void |
146 | reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 148 | reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
147 | { | 149 | { |
@@ -154,6 +156,7 @@ reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
154 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &reconnect, p); | 156 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &reconnect, p); |
155 | } | 157 | } |
156 | 158 | ||
159 | |||
157 | static void | 160 | static void |
158 | restart_cb (struct PeerContext *p, void *cls) | 161 | restart_cb (struct PeerContext *p, void *cls) |
159 | { | 162 | { |
@@ -171,6 +174,7 @@ restart_cb (struct PeerContext *p, void *cls) | |||
171 | reconnect_task = GNUNET_SCHEDULER_add_now (&reconnect, p); | 174 | reconnect_task = GNUNET_SCHEDULER_add_now (&reconnect, p); |
172 | } | 175 | } |
173 | 176 | ||
177 | |||
174 | static void | 178 | static void |
175 | restart (struct PeerContext *p, char *cfg_file) | 179 | restart (struct PeerContext *p, char *cfg_file) |
176 | { | 180 | { |
@@ -181,6 +185,7 @@ restart (struct PeerContext *p, char *cfg_file) | |||
181 | return; | 185 | return; |
182 | } | 186 | } |
183 | 187 | ||
188 | |||
184 | static void | 189 | static void |
185 | notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer, | 190 | notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer, |
186 | const struct GNUNET_MessageHeader *message, | 191 | const struct GNUNET_MessageHeader *message, |
@@ -356,7 +361,6 @@ testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls) | |||
356 | } | 361 | } |
357 | 362 | ||
358 | 363 | ||
359 | |||
360 | static void | 364 | static void |
361 | start_cb (struct PeerContext *p, void *cls) | 365 | start_cb (struct PeerContext *p, void *cls) |
362 | { | 366 | { |
@@ -382,6 +386,7 @@ start_cb (struct PeerContext *p, void *cls) | |||
382 | 386 | ||
383 | } | 387 | } |
384 | 388 | ||
389 | |||
385 | static void | 390 | static void |
386 | run (void *cls, char *const *args, const char *cfgfile, | 391 | run (void *cls, char *const *args, const char *cfgfile, |
387 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 392 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
@@ -433,6 +438,7 @@ check () | |||
433 | return ok; | 438 | return ok; |
434 | } | 439 | } |
435 | 440 | ||
441 | |||
436 | int | 442 | int |
437 | main (int argc, char *argv[]) | 443 | main (int argc, char *argv[]) |
438 | { | 444 | { |