aboutsummaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-03-21 14:58:57 +0000
committerChristian Grothoff <christian@grothoff.org>2011-03-21 14:58:57 +0000
commitb9128ce69b899c41b989d680dbf8ea3385d551c7 (patch)
treebe4d0ff0caebf73933453d3fbabc053b9a652b2d /src/util
parenta1746a2857e3d63f9e12f46ba310446443668ccf (diff)
downloadgnunet-b9128ce69b899c41b989d680dbf8ea3385d551c7.tar.gz
gnunet-b9128ce69b899c41b989d680dbf8ea3385d551c7.zip
hate-it
Diffstat (limited to 'src/util')
-rw-r--r--src/util/client.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/util/client.c b/src/util/client.c
index 11be6adb9..b9ef744df 100644
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -291,7 +291,9 @@ do_connect (const char *service_name,
291 while ((NULL == sock) && (count < UNIXPATH_RETRIES)) 291 while ((NULL == sock) && (count < UNIXPATH_RETRIES))
292 { 292 {
293#if DEBUG_CLIENT 293#if DEBUG_CLIENT
294 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Failed to connect to unixpath `%s', retrying!\n", unixpath); 294 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
295 "Failed to connect to UNIXPATH `%s', retrying!\n",
296 unixpath);
295#endif 297#endif
296 count++; 298 count++;
297 sleep(1); 299 sleep(1);
@@ -324,8 +326,7 @@ do_connect (const char *service_name,
324 "HOSTNAME", &hostname))) 326 "HOSTNAME", &hostname)))
325 { 327 {
326 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 328 GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
327 _ 329 _("Could not determine valid hostname and port for service `%s' from configuration.\n"),
328 ("Could not determine valid hostname and port for service `%s' from configuration.\n"),
329 service_name); 330 service_name);
330 return NULL; 331 return NULL;
331 } 332 }
@@ -353,13 +354,16 @@ do_connect (const char *service_name,
353 unixpath); 354 unixpath);
354 GNUNET_free (unixpath); 355 GNUNET_free (unixpath);
355 if (sock != NULL) 356 if (sock != NULL)
356 { 357 return sock;
357 return sock;
358 }
359 } 358 }
360 } 359 }
361#endif 360#endif
362 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Port is 0 for service `%s', unixpath didn't work, returning NULL(!)!\n", service_name); 361#if DEBUG_CLIENT
362 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
363 "Port is 0 for service `%s', UNIXPATH did not work, returning NULL!\n",
364 service_name);
365#endif
366 GNUNET_free (hostname);
363 return NULL; 367 return NULL;
364 } 368 }
365 369