*/
#define MAX_ATTEMPTS 50
-
/**
* Handle for a transmission request.
*/
*/
struct GNUNET_CONNECTION_Handle *sock;
- /**
- * Our scheduler.
- */
- struct GNUNET_SCHEDULER_Handle *sched;
-
/**
* Our configuration.
* FIXME: why do we DUP the configuration? Avoid this!
* Are we ignoring shutdown signals?
*/
int ignore_shutdown;
+
+ /**
+ * How often have we tried to connect?
+ */
+ unsigned int attempts;
};
+/**
+ * Try to connect to the service.
+ *
+ * @param service_name name of service to connect to
+ * @param cfg configuration to use
+ * @param attempt counter used to alternate between IP and UNIX domain sockets
+ * @return NULL on error
+ */
static struct GNUNET_CONNECTION_Handle *
-do_connect (struct GNUNET_SCHEDULER_Handle *sched,
- const char *service_name,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+do_connect (const char *service_name,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ unsigned int attempt)
{
struct GNUNET_CONNECTION_Handle *sock;
char *hostname;
+ char *unixpath;
unsigned long long port;
+ sock = NULL;
+#if AF_UNIX
+ if (0 == (attempt % 2))
+ {
+ /* on even rounds, try UNIX */
+ if ((GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string (cfg,
+ service_name,
+ "UNIXPATH", &unixpath)) &&
+ (0 < strlen (unixpath))) /* We have a non-NULL unixpath, does that mean it's valid? */
+ {
+ sock = GNUNET_CONNECTION_create_from_connect_to_unixpath (cfg, 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
+
if ((GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (cfg,
service_name,
"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;
}
service_name);
return NULL;
}
- sock = GNUNET_CONNECTION_create_from_connect (sched,
- cfg,
+ if (port == 0)
+ {
+#if AF_UNIX
+ if (0 != (attempt % 2))
+ {
+ /* try UNIX */
+ if ((GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string (cfg,
+ service_name,
+ "UNIXPATH", &unixpath)) &&
+ (0 < strlen (unixpath)))
+ {
+ sock = GNUNET_CONNECTION_create_from_connect_to_unixpath (cfg,
+ unixpath);
+ GNUNET_free (unixpath);
+ if (sock != NULL)
+ return sock;
+ }
+ }
+#endif
+#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;
+ }
+
+ sock = GNUNET_CONNECTION_create_from_connect (cfg,
hostname,
- port,
- GNUNET_SERVER_MAX_MESSAGE_SIZE);
+ port);
GNUNET_free (hostname);
return sock;
}
/**
* Get a connection with a service.
*
- * @param sched scheduler to use
* @param service_name name of the service
* @param cfg configuration to use
* @return NULL on error (service unknown to configuration)
*/
struct GNUNET_CLIENT_Connection *
-GNUNET_CLIENT_connect (struct GNUNET_SCHEDULER_Handle *sched,
- const char *service_name,
+GNUNET_CLIENT_connect (const char *service_name,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
struct GNUNET_CLIENT_Connection *ret;
struct GNUNET_CONNECTION_Handle *sock;
- sock = do_connect (sched, service_name, cfg);
+ sock = do_connect (service_name,
+ cfg, 0);
if (sock == NULL)
return NULL;
ret = GNUNET_malloc (sizeof (struct GNUNET_CLIENT_Connection));
+ ret->attempts = 1;
ret->sock = sock;
- ret->sched = sched;
ret->service_name = GNUNET_strdup (service_name);
ret->cfg = GNUNET_CONFIGURATION_dup (cfg);
ret->back_off = GNUNET_TIME_UNIT_MILLISECONDS;
GNUNET_CLIENT_notify_transmit_ready_cancel (sock->th);
if (sock->receive_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (sock->sched, sock->receive_task);
+ GNUNET_SCHEDULER_cancel (sock->receive_task);
sock->receive_task = GNUNET_SCHEDULER_NO_TASK;
}
GNUNET_array_grow (sock->received_buf, sock->received_size, 0);
if ((available == 0) || (conn->sock == NULL) || (errCode != 0))
{
/* signal timeout! */
+#if DEBUG_CLIENT
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "timeout in receive_helper, available %d, conn->sock %s, errCode %d\n", available, conn->sock == NULL ? "NULL" : "non-NULL", errCode);
+#endif
if (NULL != (receive_handler = conn->receiver_handler))
{
receive_handler_cls = conn->receiver_handler_cls;
check_complete (conn);
/* check for timeout */
remaining = GNUNET_TIME_absolute_get_remaining (conn->receive_timeout);
- if (remaining.value == 0)
+ if (remaining.rel_value == 0)
{
/* signal timeout! */
conn->receiver_handler (conn->receiver_handler_cls, NULL);
#if DEBUG_CLIENT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received message of size %u\n",
+ "Received message of type %u and size %u\n",
+ ntohs (cmsg->type),
msize);
#endif
sock->receive_task = GNUNET_SCHEDULER_NO_TASK;
sock->receive_timeout = GNUNET_TIME_relative_to_absolute (timeout);
if (GNUNET_YES == sock->msg_complete)
{
- sock->receive_task = GNUNET_SCHEDULER_add_after (sock->sched,
- GNUNET_SCHEDULER_NO_TASK,
+ sock->receive_task = GNUNET_SCHEDULER_add_after (GNUNET_SCHEDULER_NO_TASK,
&receive_task, sock);
}
else
{
GNUNET_assert (sock->in_receive == GNUNET_NO);
sock->in_receive = GNUNET_YES;
+#if DEBUG_CLIENT
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "calling GNUNET_CONNECTION_receive\n");
+#endif
GNUNET_CONNECTION_receive (sock->sock,
- GNUNET_SERVER_MAX_MESSAGE_SIZE,
+ GNUNET_SERVER_MAX_MESSAGE_SIZE - 1,
timeout, &receive_helper, sock);
}
}
* Report service unavailable.
*/
static void
-service_test_error (struct GNUNET_SCHEDULER_Handle *s,
- GNUNET_SCHEDULER_Task task, void *task_cls)
+service_test_error (GNUNET_SCHEDULER_Task task, void *task_cls)
{
- GNUNET_SCHEDULER_add_continuation (s,
- task,
+ GNUNET_SCHEDULER_add_continuation (task,
task_cls,
GNUNET_SCHEDULER_REASON_TIMEOUT);
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received confirmation that service is running.\n");
#endif
- GNUNET_SCHEDULER_add_continuation (conn->sched,
- conn->test_cb,
+ GNUNET_SCHEDULER_add_continuation (conn->test_cb,
conn->test_cb_cls,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
}
else
{
- service_test_error (conn->sched, conn->test_cb, conn->test_cb_cls);
+ service_test_error (conn->test_cb, conn->test_cb_cls);
}
GNUNET_CLIENT_disconnect (conn, GNUNET_NO);
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Failure to transmit TEST request.\n"));
#endif
- service_test_error (conn->sched, conn->test_cb, conn->test_cb_cls);
+ service_test_error (conn->test_cb, conn->test_cb_cls);
GNUNET_CLIENT_disconnect (conn, GNUNET_NO);
return 0; /* client disconnected */
}
/**
* Wait until the service is running.
*
- * @param sched scheduler to use
* @param service name of the service to wait for
* @param cfg configuration to use
* @param timeout how long to wait at most in ms
* @param task_cls closure for task
*/
void
-GNUNET_CLIENT_service_test (struct GNUNET_SCHEDULER_Handle *sched,
- const char *service,
+GNUNET_CLIENT_service_test (const char *service,
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_TIME_Relative timeout,
GNUNET_SCHEDULER_Task task, void *task_cls)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Testing if service `%s' is running.\n", service);
#endif
- conn = GNUNET_CLIENT_connect (sched, service, cfg);
+ conn = GNUNET_CLIENT_connect (service, cfg);
if (conn == NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_
("Could not connect to service `%s', must not be running.\n"),
service);
- service_test_error (sched, task, task_cls);
+ service_test_error (task, task_cls);
return;
}
conn->test_cb = task;
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_("Failure to transmit request to service `%s'\n"),
service);
- service_test_error (sched, task, task_cls);
+ service_test_error (task, task_cls);
GNUNET_CLIENT_disconnect (conn, GNUNET_NO);
return;
}
if (buf == NULL)
{
delay = GNUNET_TIME_absolute_get_remaining (th->timeout);
- delay.value /= 2;
- if ( (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & GNUNET_SCHEDULER_get_reason (th->sock->sched))) ||
+ delay.rel_value /= 2;
+ if ( (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & GNUNET_SCHEDULER_get_reason ())) ||
(GNUNET_YES != th->auto_retry) ||
(0 == --th->attempts_left) ||
- (delay.value < 1) )
+ (delay.rel_value < 1) )
{
#if DEBUG_CLIENT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
}
/* auto-retry */
GNUNET_CONNECTION_destroy (th->sock->sock, GNUNET_NO);
- th->sock->sock = do_connect (th->sock->sched,
- th->sock->service_name, th->sock->cfg);
+ th->sock->sock = do_connect (th->sock->service_name,
+ th->sock->cfg,
+ th->sock->attempts++);
GNUNET_assert (NULL != th->sock->sock);
GNUNET_CONNECTION_ignore_shutdown (th->sock->sock,
th->sock->ignore_shutdown);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Transmission failed %u times, trying again in %llums.\n",
MAX_ATTEMPTS - th->attempts_left,
- (unsigned long long) delay.value);
+ (unsigned long long) delay.rel_value);
#endif
- th->reconnect_task = GNUNET_SCHEDULER_add_delayed (th->sock->sched,
- delay,
+ th->reconnect_task = GNUNET_SCHEDULER_add_delayed (delay,
&client_delayed_retry,
th);
th->sock->th = th;
if (th->reconnect_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_break (NULL == th->th);
- GNUNET_SCHEDULER_cancel (th->sock->sched, th->reconnect_task);
+ GNUNET_SCHEDULER_cancel (th->reconnect_task);
th->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
}
else
{
- GNUNET_break (NULL != th->th);
+ GNUNET_assert (NULL != th->th);
GNUNET_CONNECTION_notify_transmit_ready_cancel (th->th);
}
th->sock->th = NULL;
projects / oweals / gnunet.git / blobdiff