diff options
Diffstat (limited to 'src/setup/gnunet-setup-transport.c')
-rw-r--r-- | src/setup/gnunet-setup-transport.c | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/src/setup/gnunet-setup-transport.c b/src/setup/gnunet-setup-transport.c index ad588e12..9ec9cda0 100644 --- a/src/setup/gnunet-setup-transport.c +++ b/src/setup/gnunet-setup-transport.c | |||
@@ -194,32 +194,6 @@ result_callback (void *cls, | |||
194 | 194 | ||
195 | 195 | ||
196 | /** | 196 | /** |
197 | * Function called if NAT failed to confirm success. | ||
198 | * Clean up and update GUI (with failure). | ||
199 | * | ||
200 | * @param cls closure with setup context | ||
201 | * @param tc scheduler callback | ||
202 | */ | ||
203 | static void | ||
204 | fail_timeout (void *cls, | ||
205 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
206 | { | ||
207 | struct GNUNET_SetupAutoContext *ac = cls; | ||
208 | |||
209 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | ||
210 | _("NAT traversal with ICMP Server timed out.\n")); | ||
211 | GNUNET_assert (NULL != ac->tst); | ||
212 | ac->tsk = GNUNET_SCHEDULER_NO_TASK; | ||
213 | GNUNET_NAT_test_stop (ac->tst); | ||
214 | ac->tst = NULL; | ||
215 | update_icmp_server_enable_button (GNUNET_NO); | ||
216 | if (NULL != cfg) | ||
217 | GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "ENABLE_ICMP_SERVER", "NO"); | ||
218 | next_phase (ac); | ||
219 | } | ||
220 | |||
221 | |||
222 | /** | ||
223 | * Main function for the connection reversal test. | 197 | * Main function for the connection reversal test. |
224 | * | 198 | * |
225 | * @param cls the 'int*' for the result | 199 | * @param cls the 'int*' for the result |
@@ -237,14 +211,13 @@ reversal_test (void *cls, | |||
237 | GNUNET_RESOLVER_connect (cfg); | 211 | GNUNET_RESOLVER_connect (cfg); |
238 | ac->tst = GNUNET_NAT_test_start (cfg, | 212 | ac->tst = GNUNET_NAT_test_start (cfg, |
239 | GNUNET_YES, | 213 | GNUNET_YES, |
240 | 0, 0, | 214 | 0, 0, TIMEOUT, |
241 | &result_callback, ac); | 215 | &result_callback, ac); |
242 | if (NULL == ac->tst) | 216 | if (NULL == ac->tst) |
243 | { | 217 | { |
244 | next_phase (ac); | 218 | next_phase (ac); |
245 | return; | 219 | return; |
246 | } | 220 | } |
247 | ac->tsk = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &fail_timeout, ac); | ||
248 | } | 221 | } |
249 | 222 | ||
250 | 223 | ||