- 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, 1 insertions, 15 deletions

diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c
index 39bd6612e..e8f0f5a47 100644
--- a/src/nat/test_nat_test.c
+++ b/src/nat/test_nat_test.c
@@ -39,23 +39,12 @@ static int ret = 1;
 
 static struct GNUNET_NAT_Test *tst;
 
-static GNUNET_SCHEDULER_TaskIdentifier end;
-
-static void
-end_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  GNUNET_NAT_test_stop (tst);
-}
-
-
 static void
 report_success (void *cls,
                 enum GNUNET_NAT_FailureCode aret)
 {
   GNUNET_assert (GNUNET_NAT_ERROR_SUCCESS == aret);
   ret = 0;
-  GNUNET_SCHEDULER_cancel (end);
-  end = GNUNET_SCHEDULER_add_now (&end_test, NULL);
 }
 
 
@@ -67,12 +56,9 @@ run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   tst =
-      GNUNET_NAT_test_start (cfg, GNUNET_YES, 1285, 1285,
+      GNUNET_NAT_test_start (cfg, GNUNET_YES, 1285, 1285, TIMEOUT
                              &report_success,
                              NULL);
-  if (NULL == tst)
-    return;
-  end = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_test, NULL);
 }