*/
const struct GNUNET_CONFIGURATION_Handle *cfg;
- /**
- * Our scheduler.
- */
- struct GNUNET_SCHEDULER_Handle *sched;
-
/**
* Connection to the service.
*/
/**
* Connect to the peerinfo service.
*
- * @param sched scheduler to use
* @param cfg configuration to use
* @return NULL on error (configuration related, actual connection
* establishment may happen asynchronously).
*/
struct GNUNET_PEERINFO_Handle *
-GNUNET_PEERINFO_connect (struct GNUNET_SCHEDULER_Handle *sched,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+GNUNET_PEERINFO_connect (const struct GNUNET_CONFIGURATION_Handle *cfg)
{
struct GNUNET_CLIENT_Connection *client;
struct GNUNET_PEERINFO_Handle *ret;
- client = GNUNET_CLIENT_connect (sched, "peerinfo", cfg);
+ client = GNUNET_CLIENT_connect ("peerinfo", cfg);
if (client == NULL)
return NULL;
ret = GNUNET_malloc (sizeof (struct GNUNET_PEERINFO_Handle));
ret->client = client;
ret->cfg = cfg;
- ret->sched = sched;
return ret;
}
reconnect (struct GNUNET_PEERINFO_Handle *h)
{
GNUNET_CLIENT_disconnect (h->client, GNUNET_SYSERR);
- h->client = GNUNET_CLIENT_connect (h->sched, "peerinfo", h->cfg);
+ h->th = NULL;
+ h->client = GNUNET_CLIENT_connect ("peerinfo", h->cfg);
GNUNET_assert (h->client != NULL);
}
h->th = NULL;
if (buf == NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
_("Failed to transmit message to `%s' service.\n"),
"PEERINFO");
if (tqe != NULL)
}
return 0;
}
+ /* If it can be NULL above, it can be NULL here to... */
+ if (tqe == NULL)
+ return 0;
+
ret = tqe->size;
GNUNET_assert (size >= ret);
memcpy (buf, &tqe[1], ret);
ic->h->in_receive = GNUNET_NO;
if (msg == NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to receive response from `%s' service.\n"),
- "PEERINFO");
+ char * err_msg;
+ GNUNET_asprintf(&err_msg,_("Failed to receive response from `%s' service.\n"),"PEERINFO");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,err_msg);
reconnect (ic->h);
trigger_transmit (ic->h);
if (ic->timeout_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (ic->h->sched,
- ic->timeout_task);
+ GNUNET_SCHEDULER_cancel (ic->timeout_task);
if (ic->callback != NULL)
- ic->callback (ic->callback_cls, NULL, NULL);
+ ic->callback (ic->callback_cls, NULL, NULL, err_msg);
+ GNUNET_free (err_msg);
GNUNET_free (ic);
return;
}
#endif
trigger_transmit (ic->h);
if (ic->timeout_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (ic->h->sched,
- ic->timeout_task);
+ GNUNET_SCHEDULER_cancel (ic->timeout_task);
if (ic->callback != NULL)
- ic->callback (ic->callback_cls, NULL, NULL);
+ ic->callback (ic->callback_cls, NULL, NULL, NULL);
GNUNET_free (ic);
return;
}
if ((ms < sizeof (struct InfoMessage)) ||
(ntohs (msg->type) != GNUNET_MESSAGE_TYPE_PEERINFO_INFO))
{
+ char * err_msg;
+ GNUNET_asprintf(&err_msg,_("Received invalid message from `%s' service.\n"),"PEERINFO");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,err_msg);
GNUNET_break (0);
reconnect (ic->h);
trigger_transmit (ic->h);
if (ic->timeout_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (ic->h->sched,
- ic->timeout_task);
+ GNUNET_SCHEDULER_cancel (ic->timeout_task);
if (ic->callback != NULL)
- ic->callback (ic->callback_cls, NULL, NULL);
+ ic->callback (ic->callback_cls, NULL, NULL, err_msg);
+ GNUNET_free (err_msg);
GNUNET_free (ic);
return;
}
im = (const struct InfoMessage *) msg;
+ GNUNET_break (0 == ntohl (im->reserved));
hello = NULL;
if (ms > sizeof (struct InfoMessage) + sizeof (struct GNUNET_MessageHeader))
{
hello = (const struct GNUNET_HELLO_Message *) &im[1];
if (ms != sizeof (struct InfoMessage) + GNUNET_HELLO_size (hello))
{
- GNUNET_break (0);
+ char * err_msg;
+ GNUNET_asprintf(&err_msg,_("Received invalid message from `%s' service.\n"),"PEERINFO");
+ GNUNET_break (0);
reconnect (ic->h);
trigger_transmit (ic->h);
if (ic->timeout_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (ic->h->sched,
- ic->timeout_task);
+ GNUNET_SCHEDULER_cancel (ic->timeout_task);
if (ic->callback != NULL)
- ic->callback (ic->callback_cls, NULL, NULL);
+ ic->callback (ic->callback_cls, NULL, NULL, err_msg);
GNUNET_free (ic);
+ GNUNET_free (err_msg);
return;
}
}
#endif
ic->h->in_receive = GNUNET_YES;
if (ic->callback != NULL)
- ic->callback (ic->callback_cls, &im->peer, hello);
+ ic->callback (ic->callback_cls, &im->peer, hello, NULL);
GNUNET_CLIENT_receive (ic->h->client,
&peerinfo_handler,
ic,
if (GNUNET_OK != transmit_success)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to transmit iteration request to `%s' service (%d).\n"),
- "PEERINFO",
- transmit_success);
+ char * err_msg;
+ GNUNET_asprintf(&err_msg,_("Failed to transmit iteration request to `%s' service (%d).\n"),"PEERINFO",transmit_success);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,err_msg);
if (ic->timeout_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (ic->h->sched,
- ic->timeout_task);
+ GNUNET_SCHEDULER_cancel (ic->timeout_task);
ic->timeout_task = GNUNET_SCHEDULER_NO_TASK;
}
reconnect (ic->h);
trigger_transmit (ic->h);
if (ic->callback != NULL)
- ic->callback (ic->callback_cls, NULL, NULL);
+ ic->callback (ic->callback_cls, NULL, NULL, err_msg);
+ GNUNET_free (err_msg);
GNUNET_free (ic);
return;
}
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_PEERINFO_IteratorContext *ic = cls;
+ char * err_msg;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Timeout transmitting iteration request to `%s' service.\n"),
+ GNUNET_asprintf(&err_msg,_("Timeout transmitting iteration request to `%s' service.\n"),
"PEERINFO");
+
ic->timeout_task = GNUNET_SCHEDULER_NO_TASK;
if (! ic->in_receive)
GNUNET_CONTAINER_DLL_remove (ic->h->tq_head,
ic->h->tq_tail,
ic->tqe);
- ic->callback (ic->callback_cls, NULL, NULL);
+ reconnect (ic->h);
+ ic->callback (ic->callback_cls, NULL, NULL, err_msg);
ic->callback = NULL;
- if (ic->in_receive)
- return;
- GNUNET_free (ic->tqe);
+ GNUNET_free_non_null (ic->tqe);
+ GNUNET_free (err_msg);
GNUNET_free (ic);
}
* @param timeout how long to wait until timing out
* @param callback the method to call for each peer
* @param callback_cls closure for callback
- * @return NULL on error (in this case, 'callback' is never called!),
- * otherwise an iterator context
+ * @return iterator context
*/
struct GNUNET_PEERINFO_IteratorContext *
GNUNET_PEERINFO_iterate (struct GNUNET_PEERINFO_Handle *h,
ic->callback = callback;
ic->callback_cls = callback_cls;
ic->timeout = GNUNET_TIME_relative_to_absolute (timeout);
- ic->timeout_task = GNUNET_SCHEDULER_add_delayed (h->sched,
- timeout,
+ ic->timeout_task = GNUNET_SCHEDULER_add_delayed (timeout,
&signal_timeout,
ic);
tqe->timeout = ic->timeout;
{
if (ic->timeout_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (ic->h->sched,
- ic->timeout_task);
+ GNUNET_SCHEDULER_cancel (ic->timeout_task);
ic->timeout_task = GNUNET_SCHEDULER_NO_TASK;
}
ic->callback = NULL;