[GNUnet-SVN] r33609 - gnunet-gtk/src/setup

[gnunet]

Author: cfuchs
Date: 2014-06-09 08:52:07 +0200 (Mon, 09 Jun 2014)
New Revision: 33609

Modified:
   gnunet-gtk/src/setup/gnunet-setup-transport-test.c
   gnunet-gtk/src/setup/gnunet-setup-transport.c
Log:
- fixbuild: modified gnunet-gtk to conform with new nat-test behavior 
(dedicated redundant timeout task removed)

Modified: gnunet-gtk/src/setup/gnunet-setup-transport-test.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-transport-test.c  2014-06-08 21:05:40 UTC 
(rev 33608)
+++ gnunet-gtk/src/setup/gnunet-setup-transport-test.c  2014-06-09 06:52:07 UTC 
(rev 33609)
@@ -42,11 +42,6 @@
   struct GNUNET_NAT_Test *tst;
 
   /**
-   * Task identifier for the timeout.
-   */
-  GNUNET_SCHEDULER_TaskIdentifier tsk;
-
-  /**
    * Name of widget to show on success.
    */
   const char *success_image;
@@ -88,11 +83,6 @@
     if (NULL != w)
       gtk_widget_show (GTK_WIDGET (w));
   }
-  if (GNUNET_SCHEDULER_NO_TASK != tc->tsk)
-  {
-    GNUNET_SCHEDULER_cancel (tc->tsk);
-    tc->tsk = GNUNET_SCHEDULER_NO_TASK;
-  }
   if (NULL != tc->tst)
   {
     GNUNET_NAT_test_stop (tc->tst);
@@ -123,24 +113,6 @@
 
 
 /**
- * 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, GNUNET_NO);
-}
-
-
-/**
  * Function called whenever the user wants to test a
  * transport configuration.
  *
@@ -179,14 +151,13 @@
   GNUNET_RESOLVER_connect (cfg);
   tc->tst =
       GNUNET_NAT_test_start (cfg, is_tcp, (uint16_t) bnd_port,
-                             (uint16_t) adv_port,
+                             (uint16_t) adv_port, TIMEOUT,
                              &result_callback, tc);
   if (NULL == tc->tst)
   {
     display_test_result (tc, GNUNET_SYSERR);
     return;
   }
-  tc->tsk = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &fail_timeout, tc);
 }
 
 /* end of gnunet-setup-transport-test.c */

Modified: gnunet-gtk/src/setup/gnunet-setup-transport.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-transport.c       2014-06-08 21:05:40 UTC 
(rev 33608)
+++ gnunet-gtk/src/setup/gnunet-setup-transport.c       2014-06-09 06:52:07 UTC 
(rev 33609)
@@ -194,32 +194,6 @@
 
 
 /**
- * Function called if NAT failed to confirm success.
- * Clean up and update GUI (with failure).
- *
- * @param cls closure with setup context
- * @param tc scheduler callback
- */
-static void
-fail_timeout (void *cls,
-              const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct GNUNET_SetupAutoContext *ac = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-             _("NAT traversal with ICMP Server timed out.\n"));
-  GNUNET_assert (NULL != ac->tst);
-  ac->tsk = GNUNET_SCHEDULER_NO_TASK;
-  GNUNET_NAT_test_stop (ac->tst);
-  ac->tst = NULL;
-  update_icmp_server_enable_button (GNUNET_NO);
-  if (NULL != cfg)
-    GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "ENABLE_ICMP_SERVER", 
"NO");
-  next_phase (ac);
-}
-
-
-/**
  * Main function for the connection reversal test.
  *
  * @param cls the 'int*' for the result
@@ -237,14 +211,13 @@
   GNUNET_RESOLVER_connect (cfg);
   ac->tst = GNUNET_NAT_test_start (cfg,
                                   GNUNET_YES,
-                                  0, 0,
+                                  0, 0, TIMEOUT,
                                   &result_callback, ac);
   if (NULL == ac->tst)
   {
     next_phase (ac);
     return;
   }
-  ac->tsk = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &fail_timeout, ac);
 }