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

[gnunet]

Author: grothoff
Date: 2012-11-01 17:50:46 +0100 (Thu, 01 Nov 2012)
New Revision: 24664

Modified:
   gnunet-gtk/src/setup/gnunet-setup-transport.c
Log:
-better logging, libexec fixes

Modified: gnunet-gtk/src/setup/gnunet-setup-transport.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-transport.c       2012-11-01 16:45:45 UTC 
(rev 24663)
+++ gnunet-gtk/src/setup/gnunet-setup-transport.c       2012-11-01 16:50:46 UTC 
(rev 24664)
@@ -177,7 +177,14 @@
   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 @@
 {
   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 @@
 {
   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 @@
        (! 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 @@
     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 @@
                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 @@
         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 @@
         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"));