gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r31614 - gnunet/src/exit


From: gnunet
Subject: [GNUnet-SVN] r31614 - gnunet/src/exit
Date: Fri, 20 Dec 2013 15:12:18 +0100

Author: grothoff
Date: 2013-12-20 15:12:18 +0100 (Fri, 20 Dec 2013)
New Revision: 31614

Modified:
   gnunet/src/exit/gnunet-daemon-exit.c
Log:
-check for working app, use correct option

Modified: gnunet/src/exit/gnunet-daemon-exit.c
===================================================================
--- gnunet/src/exit/gnunet-daemon-exit.c        2013-12-20 14:05:49 UTC (rev 
31613)
+++ gnunet/src/exit/gnunet-daemon-exit.c        2013-12-20 14:12:18 UTC (rev 
31614)
@@ -3543,7 +3543,7 @@
 
   dns_exit = NULL;
   if ( (GNUNET_YES ==
-       GNUNET_CONFIGURATION_get_value_yesno (cfg_, "exit", "ENABLE_DNS")) &&
+       GNUNET_CONFIGURATION_get_value_yesno (cfg_, "exit", "EXIT_DNS")) &&
        ( (GNUNET_OK !=
          GNUNET_CONFIGURATION_get_value_string (cfg, "exit",
                                                 "DNS_RESOLVER",
@@ -3557,20 +3557,14 @@
     GNUNET_free_non_null (dns_exit);
     dns_exit = NULL;
   }
-  if (NULL != dns_exit)
-    dnsstub = GNUNET_DNSSTUB_start (dns_exit);
-
-
   app_idx = 0;
   if (GNUNET_YES == ipv4_exit)
   {
-    // FIXME use regex to put info
     apptypes[app_idx] = GNUNET_APPLICATION_TYPE_IPV4_GATEWAY;
     app_idx++;
   }
   if (GNUNET_YES == ipv6_exit)
   {
-    // FIXME use regex to put info
     apptypes[app_idx] = GNUNET_APPLICATION_TYPE_IPV6_GATEWAY;
     app_idx++;
   }
@@ -3702,11 +3696,18 @@
 
   connections_map = GNUNET_CONTAINER_multihashmap_create (65536, GNUNET_NO);
   connections_heap = GNUNET_CONTAINER_heap_create 
(GNUNET_CONTAINER_HEAP_ORDER_MIN);
+  if (0 == app_idx)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+               _("No useful service enabled.  Exiting.\n"));
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
   mesh_handle
     = GNUNET_MESH_connect (cfg, NULL,
                           &new_channel,
                           &clean_channel, handlers,
-                           apptypes); // FIXME use ports
+                           apptypes);
   if (NULL == mesh_handle)
   {
     GNUNET_SCHEDULER_shutdown ();




reply via email to

[Prev in Thread] Current Thread [Next in Thread]