-better logging, libexec fixes

1 files changed, 30 insertions, 0 deletions

diff --git a/src/setup/gnunet-setup-transport.c b/src/setup/gnunet-setup-transport.c
index aead2a43..02e27490 100644
--- a/src/setup/gnunet-setup-transport.c
+++ b/src/setup/gnunet-setup-transport.c
@@ -177,7 +177,14 @@ result_callback (void *cls, int success)
   ac->tsk = GNUNET_SCHEDULER_NO_TASK;
   GNUNET_NAT_test_stop (ac->tst);
   ac->tst = NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              success 
+              ? _("NAT traversal with ICMP Server succeeded.\n")
+              : _("NAT traversal with ICMP Server failed.\n"));
   update_icmp_server_enable_button (success);
+  if (NULL != cfg)
+    GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "ENABLE_ICMP_SERVER", 
+                                           success ? "YES": "NO");
   next_phase (ac);
 }
 
@@ -194,11 +201,15 @@ 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);
 }
 
@@ -214,6 +225,8 @@ reversal_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_SetupAutoContext *ac = cls;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              _("Testing connection reversal with ICMP server.\n"));
   GNUNET_assert (NULL != cfg);
   GNUNET_RESOLVER_connect (cfg);
   ac->tst = GNUNET_NAT_test_start (cfg, GNUNET_YES, 0, 0, &result_callback, ac);
@@ -332,6 +345,8 @@ nipo (void *cls, const char *name, int isDefault, const struct sockaddr *addr,
        (! IN6_IS_ADDR_LINKLOCAL(addr)) )
   {
     *have_v6 = GNUNET_YES;
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                _("This system has a global IPv6 address, setting IPv6 to supported.\n"));
     return GNUNET_OK;
   }
   if (addrlen != sizeof (struct sockaddr_in))
@@ -345,6 +360,9 @@ nipo (void *cls, const char *name, int isDefault, const struct sockaddr *addr,
     return GNUNET_OK;
   }
   GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "INTERNAL_ADDRESS", buf);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              _("Detected internal network address `%s'.\n"),
+              buf);
   entry =
       GTK_ENTRY (GNUNET_SETUP_get_object
                  ("GNUNET_setup_transport_internal_ip_entry"));
@@ -407,6 +425,10 @@ test_upnpc (struct GNUNET_SetupAutoContext *ac)
                 GNUNET_OS_check_helper_binary ("upnpc"));
   /* FIXME: test if upnpc is actually working, that is, if transports
      start to work once we use UPnP */
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              (have_upnpc) 
+              ? _("upnpc found, enabling its use\n")
+              : _("upnpc not found\n"));
   gtk_toggle_button_set_active (button,
                                 have_upnpc
                                 ? TRUE
@@ -442,6 +464,10 @@ test_icmp_server (struct GNUNET_SetupAutoContext *ac)
         GNUNET_OS_check_helper_binary (binary)));
   GNUNET_free_non_null (tmp);
   GNUNET_free (binary);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              (hns) 
+              ? _("gnunet-helper-nat-server found, testing it\n")
+              : _("No working gnunet-helper-nat-server found\n"));
   if (hns)
      GNUNET_SCHEDULER_add_now (&reversal_test, ac);
   else
@@ -474,6 +500,10 @@ test_icmp_client (struct GNUNET_SetupAutoContext *ac)
         GNUNET_OS_check_helper_binary (binary)));
   GNUNET_free_non_null (tmp);
   GNUNET_free (binary);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              (hnc) 
+              ? _("gnunet-helper-nat-client found, enabling it\n")
+              : _("gnunet-helper-nat-client not found or behind NAT, disabling it\n"));
   button =
       GTK_TOGGLE_BUTTON (GNUNET_SETUP_get_object
                          ("GNUNET_setup_transport_icmp_client_enable_checkbutton"));