regex on w32 only

2 files changed, 40 insertions, 30 deletions

diff --git a/src/setup/Makefile.am b/src/setup/Makefile.am
index ebb7c27c..a30485ed 100644
--- a/src/setup/Makefile.am
+++ b/src/setup/Makefile.am
@@ -7,6 +7,10 @@ INCLUDES = \
   @GNUNET_CFLAGS@ \
   @GLADE_CFLAGS@
 
+if MINGW
+  WINLIBS = -lregex 
+endif
+
 bin_PROGRAMS = gnunet-setup
 
 gnunet_setup_SOURCES = \
@@ -26,7 +30,7 @@ gnunet_setup_SOURCES = \
 gnunet_setup_LDADD = \
   $(top_builddir)/src/lib/libgnunetgtk.la \
   @GTK_LIBS@ \
-  -lregex \
+  $(WINLIBS) \
   -lgnunetutil -lgnunetnat \
   $(INTLLIBS) 
 gnunet_setup_LDFLAGS = \
diff --git a/src/setup/gnunet-setup-transport.c b/src/setup/gnunet-setup-transport.c
index 652c356b..85792964 100644
--- a/src/setup/gnunet-setup-transport.c
+++ b/src/setup/gnunet-setup-transport.c
@@ -43,6 +43,30 @@ static struct GNUNET_NAT_Test *tst;
  */
 static GNUNET_SCHEDULER_TaskIdentifier tsk;
 
+static struct GNUNET_OS_Process *resolver;
+
+
+/**
+ * Update the ICMP server button based on the result.
+ *
+ * @param on GNUNET_YES to enable, GNUNET_NO to disable
+ */
+static void
+update_icmp_server_enable_button (int on)
+{
+  GtkToggleButton *button;
+
+  button = GTK_TOGGLE_BUTTON (GNUNET_SETUP_get_object ("GNUNET_setup_transport_icmp_server_enable_checkbutton"));
+  if (button == NULL)
+    {
+      GNUNET_break (0);
+      return;
+    }
+  gtk_toggle_button_set_active (button,
+                                on ? TRUE : FALSE);
+}
+
+
 
 /**
  * Function called by NAT on success.
@@ -55,13 +79,16 @@ 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;
+  if (NULL != resolver)
+    {
+      GNUNET_break (0 == GNUNET_OS_process_kill (resolver, SIGTERM));
+      GNUNET_OS_process_close (resolver);
+    }
+  update_icmp_server_enable_button (success);
 }
 
 
@@ -76,15 +103,14 @@ static void
 fail_timeout (void *cls,
               const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  int *ok = cls;
-  
   GNUNET_assert (NULL != tst);
-  *ok = GNUNET_NO;
   tsk = GNUNET_SCHEDULER_NO_TASK;
   GNUNET_NAT_test_stop (tst);
   tst = NULL;
+  update_icmp_server_enable_button (GNUNET_NO);
 }
 
+
 /**
  * Main function for the connection reversal test.
  *
@@ -116,26 +142,14 @@ reversal_test (void *cls,
 
 /**
  * Test if connection reversal (ICMP method) works.
- *
- * @return GNUNET_YES if it works, GNUNET_NO if not.
  */
-static int
+static void
 test_connection_reversal ()
 {
-  int ok;
-  struct GNUNET_OS_Process *resolver;
-
   resolver = GNUNET_OS_start_process (NULL, NULL,
                                       "gnunet-service-resolver", 
                                       "gnunet-service-resolver", NULL);
-  ok = GNUNET_NO;
-  GNUNET_SCHEDULER_run (&reversal_test, &ok);
-  if (NULL != resolver)
-    {
-      GNUNET_break (0 == GNUNET_OS_process_kill (resolver, SIGTERM));
-      GNUNET_OS_process_close (resolver);
-    }
-  return ok;
+  GNUNET_SCHEDULER_add_now (&reversal_test, NULL);
 }
 
 
@@ -255,16 +269,8 @@ GNUNET_setup_transport_autoconfig_button_clicked_cb ()
            GNUNET_OS_check_helper_binary ("gnunet-helper-nat-server")) );
   GNUNET_free_non_null (tmp);
   if (hns)    
-    hns = test_connection_reversal ();    
+    test_connection_reversal ();    
 
-  button = GTK_TOGGLE_BUTTON (GNUNET_SETUP_get_object ("GNUNET_setup_transport_icmp_server_enable_checkbutton"));
-  if (button == NULL)
-    {
-      GNUNET_break (0);
-      return;
-    }
-  gtk_toggle_button_set_active (button,
-                                hns ? TRUE : FALSE);
     
 
   /* test gnunet-helper-nat-client */