*/
#define MAX_ATTEMPTS 50
-#define UNIXPATH_RETRIES 0
-
-
/**
* Handle for a transmission request.
*/
char *hostname;
char *unixpath;
unsigned long long port;
- unsigned int count;
sock = NULL;
#if AF_UNIX
"UNIXPATH", &unixpath)) &&
(0 < strlen (unixpath))) /* We have a non-NULL unixpath, does that mean it's valid? */
{
- count = 0;
sock = GNUNET_CONNECTION_create_from_connect_to_unixpath (cfg, unixpath);
- while ((NULL == sock) && (count < UNIXPATH_RETRIES))
- {
-#if DEBUG_CLIENT
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Failed to connect to unixpath `%s', retrying!\n", unixpath);
-#endif
- count++;
- sleep(1);
- sock = GNUNET_CONNECTION_create_from_connect_to_unixpath (cfg, unixpath);
- }
-
- GNUNET_free (unixpath);
if (sock != NULL)
{
#if DEBUG_CLIENT
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Connected to unixpath `%s'!\n", unixpath);
#endif
+ GNUNET_free(unixpath);
return sock;
}
}
+ GNUNET_free_non_null (unixpath);
}
#endif
"HOSTNAME", &hostname)))
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _
- ("Could not determine valid hostname and port for service `%s' from configuration.\n"),
+ _("Could not determine valid hostname and port for service `%s' from configuration.\n"),
service_name);
return NULL;
}
unixpath);
GNUNET_free (unixpath);
if (sock != NULL)
- {
- return sock;
- }
+ return sock;
}
}
#endif
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Port is 0 for service `%s', unixpath didn't work, returning NULL(!)!\n", service_name);
+#if DEBUG_CLIENT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Port is 0 for service `%s', UNIXPATH did not work, returning NULL!\n",
+ service_name);
+#endif
+ GNUNET_free (hostname);
return NULL;
}
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Creating from connect!\n");
+
sock = GNUNET_CONNECTION_create_from_connect (cfg,
hostname,
port);