eliminate SCHEDULER_run, simplify code

1 files changed, 7 insertions, 135 deletions

diff --git a/src/setup/gnunet-setup-transport-udp.c b/src/setup/gnunet-setup-transport-udp.c
index 989b5bf3..f758f8d0 100644
--- a/src/setup/gnunet-setup-transport-udp.c
+++ b/src/setup/gnunet-setup-transport-udp.c
@@ -19,157 +19,29 @@
 */
 
 /**
- * @file src/gnunet-setup-transport-udp.c
+ * @file src/setup/gnunet-setup-transport-udp.c
  * @brief support for UDP configuration
  * @author Christian Grothoff
  */
 #include "gnunet-setup.h"
 #include <gnunet/gnunet_resolver_service.h>
 #include <gnunet/gnunet_nat_lib.h>
-
-/**
- * How long do we wait for the NAT test to report success?
- */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
-
-/**
- * Handle to the active NAT test.
- */
-static struct GNUNET_NAT_Test *tst;
-
-/**
- * Task identifier for the timeout.
- */
-static GNUNET_SCHEDULER_TaskIdentifier tsk;
-
-
-/**
- * Function called by NAT on success.
- * Clean up and update GUI (with success).
- *
- * @param cls closure (unused)
- * @param success currently always GNUNET_OK
- */
-static void
-result_callback (void *cls,
-                 int success)
-{
-  int *ok = cls;
-
-  *ok = success;
-  GNUNET_SCHEDULER_cancel (tsk);
-  tsk = GNUNET_SCHEDULER_NO_TASK;
-  GNUNET_NAT_test_stop (tst);
-  tst = NULL;
-}
+#include "gnunet-setup-transport-test.h"
 
 
 /**
- * Function called if NAT failed to confirm success.
- * Clean up and update GUI (with failure).
- *
- * @param cls closure (unused)
- * @param tc scheduler callback
- */
-static void
-fail_timeout (void *cls,
-              const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  int *ok = cls;
-
-  *ok = GNUNET_NO;
-  tsk = GNUNET_SCHEDULER_NO_TASK;
-  GNUNET_NAT_test_stop (tst);
-  tst = NULL;
-}
-
-
-/**
- * Main function for the NAT test.
- *
- * @param cls the 'int*' for the result
- * @param tc scheduler context
- */
-static void 
-test (void *cls,
-      const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  int *ok = cls;
-  unsigned long long bnd_port;
-  unsigned long long adv_port;
-
-  GNUNET_assert (NULL != cfg);
-  GNUNET_RESOLVER_connect (cfg);
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg, 
-                                             "transport-udp",
-                                             "PORT",
-                                             &bnd_port))
-    {
-      GNUNET_break (0);
-      return;
-    }
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg, 
-                                             "transport-udp",
-                                             "ADVERTISED_PORT",
-                                             &adv_port))
-    adv_port = bnd_port;
-  tst = GNUNET_NAT_test_start (cfg,
-                               GNUNET_NO,
-                               (uint16_t) bnd_port,
-                               (uint16_t) adv_port,
-                               &result_callback,
-                               ok);
-  if (NULL == tst)
-    {
-      *ok = GNUNET_SYSERR;
-      return;
-    }
-  tsk = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
-                                      &fail_timeout,
-                                      ok);
-}
-
-/**
  * Function called whenever the user wants to test the
  * UDP configuration.
  */
 void
 GNUNET_setup_transport_udp_test_button_clicked_cb ()
 {
-  GtkWidget *w;
-  int ok;
-  struct GNUNET_OS_Process *resolver;
 
-  GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == tsk);
-  GNUNET_assert (NULL == tst);
-  w = GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_transport_udp_test_success_image"));
-  gtk_widget_hide (w);
-  resolver = GNUNET_OS_start_process (NULL, NULL,
-                                      "gnunet-service-resolver", 
-                                      "gnunet-service-resolver", NULL);
-  ok = GNUNET_NO;
-  GNUNET_SCHEDULER_run (&test, &ok);
-  if (NULL != resolver)
-    {
-      GNUNET_break (0 == GNUNET_OS_process_kill (resolver, SIGTERM));
-      GNUNET_OS_process_close (resolver);
-    }
-  if (GNUNET_YES != ok)
-    {
-      w = GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_transport_udp_test_fail_image"));
-      gtk_widget_show (w);
-      w = GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_transport_udp_test_success_image"));
-      gtk_widget_hide (w);
-    }
-  else
-    {
-      w = GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_transport_udp_test_fail_image"));
-      gtk_widget_hide (w);
-      w = GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_transport_udp_test_success_image"));
-      gtk_widget_show (w);
-    }
+  GNUNET_setup_transport_test ("transport-udp",
+                               GNUNET_NO,
+                               "GNUNET_setup_transport_udp_test_success_image",
+                               "GNUNET_setup_transport_udp_test_fail_image");
+
 }