change default configurations on systems with UNIX domain sockets to NOT specify any port for TCP-based IPC (and interpret that as no TCP-based IPC desired), as we can and want to use UNIX domain sockets in this case by default

3 files changed, 33 insertions, 20 deletions

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index ec3884dc8..7f2e0cd48 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -5,7 +5,10 @@ plugindir = $(libdir)/gnunet
 pkgcfgdir= $(pkgdatadir)/config.d/
 
 dist_pkgcfg_DATA = \
-  util.conf resolver.conf
+  util.conf 
+
+pkgcfg_DATA = \
+  resolver.conf
 
 if MINGW
 noinst_LTLIBRARIES = \
diff --git a/src/util/client.c b/src/util/client.c
index e71ccdf39..2f09a9046 100644
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -289,25 +289,35 @@ do_connect (const char *service_name,
   }
 #endif
 
-  if ((GNUNET_OK !=
-       GNUNET_CONFIGURATION_get_value_number (cfg, service_name, "PORT", &port))
-      || (port > 65535) ||
-      (GNUNET_OK !=
-       GNUNET_CONFIGURATION_get_value_string (cfg, service_name, "HOSTNAME",
-                                              &hostname)))
+  if (GNUNET_YES ==
+      GNUNET_CONFIGURATION_have_value (cfg, service_name, "PORT"))
   {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         _
-         ("Could not determine valid hostname and port for service `%s' from configuration.\n"),
-         service_name);
-    return NULL;
+    if ((GNUNET_OK !=
+         GNUNET_CONFIGURATION_get_value_number (cfg, service_name, "PORT", &port))
+        || (port > 65535) ||
+        (GNUNET_OK !=
+         GNUNET_CONFIGURATION_get_value_string (cfg, service_name, "HOSTNAME",
+                                                &hostname)))
+    {
+      LOG (GNUNET_ERROR_TYPE_WARNING,
+           _
+           ("Could not determine valid hostname and port for service `%s' from configuration.\n"),
+           service_name);
+      return NULL;
+    }
+    if (0 == strlen (hostname))
+    {
+      GNUNET_free (hostname);
+      LOG (GNUNET_ERROR_TYPE_WARNING,
+           _("Need a non-empty hostname for service `%s'.\n"), service_name);
+      return NULL;
+    }
   }
-  if (0 == strlen (hostname))
+  else
   {
-    GNUNET_free (hostname);
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         _("Need a non-empty hostname for service `%s'.\n"), service_name);
-    return NULL;
+    /* unspecified means 0 (disabled) */
+    port = 0;
+    hostname = NULL;
   }
   if (port == 0)
   {
@@ -326,7 +336,7 @@ do_connect (const char *service_name,
         if (sock != NULL)
         {
           GNUNET_free (unixpath);
-          GNUNET_free (hostname);
+          GNUNET_free_non_null (hostname);
           return sock;
         }
       }
@@ -338,7 +348,7 @@ do_connect (const char *service_name,
          "Port is 0 for service `%s', UNIXPATH did not work, returning NULL!\n",
          service_name);
 #endif
-    GNUNET_free (hostname);
+    GNUNET_free_non_null (hostname);
     return NULL;
   }
 
diff --git a/src/util/resolver.conf b/src/util/resolver.conf.in
index a2690fcc3..671ea0ed6 100644
--- a/src/util/resolver.conf
+++ b/src/util/resolver.conf.in
@@ -1,6 +1,6 @@
 [resolver]
 AUTOSTART = YES
-PORT = 2089
+@UNIXONLY@ PORT = 2089
 HOSTNAME = localhost
 HOME = $SERVICEHOME
 CONFIG = $DEFAULTCONFIG