- moved timeout handling responsibility from for nat tests from caller to the library

- updated NAT API accordingly
- removed obsolete timeout handling code from gnunet-transport
- updated result callback for nat-test gnunet-transport to not always just report success, but we now actually report the proper result code we got from the NAT API
- updated nat tests

1 files changed, 3 insertions, 25 deletions

diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c
index 85f97e04c..edc253dae 100644
--- a/src/transport/gnunet-transport.c
+++ b/src/transport/gnunet-transport.c
@@ -537,8 +537,8 @@ display_test_result (struct TestContext *tc, enum TestResult result)
 }
 
 /**
- * Function called by NAT on success.
- * Clean up and update GUI (with success).
+ * Function called by NAT to report the outcome of the nat-test.
+ * Clean up and update GUI.
  *
  * @param cls test context
  * @param success currently always #GNUNET_OK
@@ -551,23 +551,6 @@ result_callback (void *cls, enum GNUNET_NAT_FailureCode result)
   display_test_result (tc, result);
 }
 
-/**
- * Function called if NAT failed to confirm success.
- * Clean up and update GUI (with failure).
- *
- * @param cls test context
- * @param tc scheduler callback
- */
-static void
-fail_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct TestContext *tstc = cls;
-
-  tstc->tsk = GNUNET_SCHEDULER_NO_TASK;
-  display_test_result (tstc, NAT_TEST_TIMEOUT);
-}
-
-
 static void
 resolve_validation_address (const struct GNUNET_PeerIdentity *id,
                             const struct GNUNET_HELLO_Address *address,
@@ -751,13 +734,8 @@ run_nat_test ()
       (0 == strcasecmp (head->name, "udp")) ? GNUNET_NO : GNUNET_YES,
       (uint16_t) head->bnd_port,
       (uint16_t) head->adv_port,
+      TIMEOUT,
       &result_callback, head);
-  if (NULL == head->tst)
-  {
-    display_test_result (head, NAT_TEST_FAILED_TO_START);
-    return;
-  }
-  head->tsk = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &fail_timeout, head);
 }