* @author Christian Grothoff
*/
#include "platform.h"
-#include "gnunet_client_lib.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_peerinfo_service.h"
+#include "gnunet_util_lib.h"
#include "gnunet_protocols.h"
-#include "gnunet_time_lib.h"
#include "peerinfo.h"
#define LOG(kind,...) GNUNET_log_from (kind, "peerinfo-api",__VA_ARGS__)
-/**
- * Function to call after transmission has succeeded.
- *
- * @param cls closure
- * @param success GNUNET_OK if transmission worked, GNUNET_SYSERR on error
- */
-typedef void (*TransmissionContinuation) (void *cls, int success);
-
/**
- * Entry in the transmission queue to PEERINFO service.
+ * Entry in the transmission queue to PEERINFO service. We use
+ * the same structure for queueing 'iteration' requests and
+ * actual 'add' messages.
*/
-struct TransmissionQueueEntry
+struct GNUNET_PEERINFO_AddContext
{
/**
* This is a linked list.
*/
- struct TransmissionQueueEntry *next;
+ struct GNUNET_PEERINFO_AddContext *next;
/**
* This is a linked list.
*/
- struct TransmissionQueueEntry *prev;
+ struct GNUNET_PEERINFO_AddContext *prev;
/**
- * Function to call after request has been transmitted, or NULL (in which
- * case we must consider sending the next entry immediately).
+ * Handle to the PEERINFO service.
*/
- TransmissionContinuation cont;
+ struct GNUNET_PEERINFO_Handle *h;
+
+ /**
+ * Function to call after request has been transmitted, or NULL.
+ */
+ GNUNET_PEERINFO_Continuation cont;
/**
* Closure for 'cont'.
/**
* Our entry in the transmission queue.
*/
- struct TransmissionQueueEntry *tqe;
+ struct GNUNET_PEERINFO_AddContext *ac;
/**
* Task responsible for timeout.
struct GNUNET_TIME_Absolute timeout;
/**
- * Are we now receiving?
+ * Peer we are interested in (only valid if iteration was restricted to one peer).
*/
- int in_receive;
+ struct GNUNET_PeerIdentity peer;
+
+ /**
+ * Is 'peer' set?
+ */
+ int have_peer;
+
+ /**
+ * Set to GNUNET_YES if we are currently receiving replies from the
+ * service.
+ */
+ int request_transmitted;
+
};
/**
* Head of transmission queue.
*/
- struct TransmissionQueueEntry *tq_head;
+ struct GNUNET_PEERINFO_AddContext *ac_head;
/**
* Tail of transmission queue.
*/
- struct TransmissionQueueEntry *tq_tail;
+ struct GNUNET_PEERINFO_AddContext *ac_tail;
/**
* Handle for the current transmission request, or NULL if none is pending.
GNUNET_SCHEDULER_TaskIdentifier r_task;
/**
- * Set to GNUNET_YES if we are currently receiving replies from the
- * service.
+ * Are we now receiving?
*/
int in_receive;
void
GNUNET_PEERINFO_disconnect (struct GNUNET_PEERINFO_Handle *h)
{
- struct TransmissionQueueEntry *tqe;
+ struct GNUNET_PEERINFO_AddContext *ac;
struct GNUNET_PEERINFO_IteratorContext *ic;
while (NULL != (ic = h->ic_head))
{
- GNUNET_break (GNUNET_YES == ic->in_receive);
- ic->in_receive = GNUNET_NO;
+ GNUNET_break (GNUNET_YES == ic->request_transmitted);
+ ic->request_transmitted = GNUNET_NO;
GNUNET_PEERINFO_iterate_cancel (ic);
}
- while (NULL != (tqe = h->tq_head))
+ while (NULL != (ac = h->ac_head))
{
- GNUNET_CONTAINER_DLL_remove (h->tq_head, h->tq_tail, tqe);
- if (tqe->cont != NULL)
- tqe->cont (tqe->cont_cls, GNUNET_SYSERR);
- GNUNET_free (tqe);
+ GNUNET_CONTAINER_DLL_remove (h->ac_head, h->ac_tail, ac);
+ if (NULL != ac->cont)
+ ac->cont (ac->cont_cls, _("aborted due to explicit disconnect request"));
+ GNUNET_free (ac);
}
if (NULL != h->th)
{
do_transmit (void *cls, size_t size, void *buf)
{
struct GNUNET_PEERINFO_Handle *h = cls;
- struct TransmissionQueueEntry *tqe = h->tq_head;
+ struct GNUNET_PEERINFO_AddContext *ac = h->ac_head;
size_t ret;
h->th = NULL;
- if (NULL == tqe)
+ if (NULL == ac)
return 0; /* request was cancelled in the meantime */
if (NULL == buf)
{
/* peerinfo service died */
LOG (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
"Failed to transmit message to `%s' service.\n", "PEERINFO");
- GNUNET_CONTAINER_DLL_remove (h->tq_head, h->tq_tail, tqe);
+ GNUNET_CONTAINER_DLL_remove (h->ac_head, h->ac_tail, ac);
reconnect (h);
- if (NULL != tqe->cont)
- tqe->cont (tqe->cont_cls, GNUNET_SYSERR);
- GNUNET_free (tqe);
+ if (NULL != ac->cont)
+ ac->cont (ac->cont_cls, _("failed to transmit request (service down?)"));
+ GNUNET_free (ac);
return 0;
}
- ret = tqe->size;
+ ret = ac->size;
if (size < ret)
{
/* change in head of queue (i.e. cancel + add), try again */
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Transmitting request of size %u to `%s' service.\n", ret, "PEERINFO");
- memcpy (buf, &tqe[1], ret);
- GNUNET_CONTAINER_DLL_remove (h->tq_head, h->tq_tail, tqe);
- if (NULL != tqe->cont)
- tqe->cont (tqe->cont_cls, GNUNET_OK);
- else
- trigger_transmit (h);
- GNUNET_free (tqe);
+ memcpy (buf, &ac[1], ret);
+ GNUNET_CONTAINER_DLL_remove (h->ac_head, h->ac_tail, ac);
+ trigger_transmit (h);
+ if (NULL != ac->cont)
+ ac->cont (ac->cont_cls, NULL);
+ GNUNET_free (ac);
return ret;
}
static void
trigger_transmit (struct GNUNET_PEERINFO_Handle *h)
{
- struct TransmissionQueueEntry *tqe;
+ struct GNUNET_PEERINFO_AddContext *ac;
- if (NULL == (tqe = h->tq_head))
+ if (NULL == (ac = h->ac_head))
return; /* no requests queued */
if (NULL != h->th)
return; /* request already pending */
- if (GNUNET_YES == h->in_receive)
- return; /* still reading replies from last request */
if (NULL == h->client)
{
/* disconnected, try to reconnect */
return;
}
h->th =
- GNUNET_CLIENT_notify_transmit_ready (h->client, tqe->size,
+ GNUNET_CLIENT_notify_transmit_ready (h->client, ac->size,
GNUNET_TIME_UNIT_FOREVER_REL,
GNUNET_YES,
&do_transmit, h);
*
* @param h handle to the peerinfo service
* @param hello the verified (!) HELLO message
+ * @param cont continuation to call when done, NULL is allowed
+ * @param cont_cls closure for 'cont'
+ * @return handle to cancel add operation; all pending
+ * 'add' operations will be cancelled automatically
+ * on disconnect, so it is not necessary to keep this
+ * handle (unless 'cont' is NULL and at some point
+ * calling 'cont' must be prevented)
*/
-void
+struct GNUNET_PEERINFO_AddContext *
GNUNET_PEERINFO_add_peer (struct GNUNET_PEERINFO_Handle *h,
- const struct GNUNET_HELLO_Message *hello)
+ const struct GNUNET_HELLO_Message *hello,
+ GNUNET_PEERINFO_Continuation cont,
+ void *cont_cls)
{
uint16_t hs = GNUNET_HELLO_size (hello);
- struct TransmissionQueueEntry *tqe;
+ struct GNUNET_PEERINFO_AddContext *ac;
struct GNUNET_PeerIdentity peer;
GNUNET_assert (GNUNET_OK == GNUNET_HELLO_get_id (hello, &peer));
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Adding peer `%s' to PEERINFO database (%u bytes of `%s')\n",
GNUNET_i2s (&peer), hs, "HELLO");
- tqe = GNUNET_malloc (sizeof (struct TransmissionQueueEntry) + hs);
- tqe->size = hs;
- memcpy (&tqe[1], hello, hs);
- GNUNET_CONTAINER_DLL_insert_after (h->tq_head, h->tq_tail, h->tq_tail, tqe);
+ ac = GNUNET_malloc (sizeof (struct GNUNET_PEERINFO_AddContext) + hs);
+ ac->h = h;
+ ac->size = hs;
+ ac->cont = cont;
+ ac->cont_cls = cont_cls;
+ memcpy (&ac[1], hello, hs);
+ GNUNET_CONTAINER_DLL_insert_tail (h->ac_head, h->ac_tail, ac);
trigger_transmit (h);
+ return ac;
+}
+
+
+/**
+ * Cancel pending 'add' operation. Must only be called before
+ * either 'cont' or 'GNUNET_PEERINFO_disconnect' are invoked.
+ *
+ * @param ac handle for the add operation to cancel
+ */
+void
+GNUNET_PEERINFO_add_peer_cancel (struct GNUNET_PEERINFO_AddContext *ac)
+{
+ struct GNUNET_PEERINFO_Handle *h = ac->h;
+
+ GNUNET_CONTAINER_DLL_remove (h->ac_head, h->ac_tail, ac);
+ GNUNET_free (ac);
}
static void
peerinfo_handler (void *cls, const struct GNUNET_MessageHeader *msg)
{
- struct GNUNET_PEERINFO_IteratorContext *ic = cls;
- struct GNUNET_PEERINFO_Handle *h = ic->h;
+ struct GNUNET_PEERINFO_Handle *h = cls;
+ struct GNUNET_PEERINFO_IteratorContext *ic = h->ic_head;
const struct InfoMessage *im;
const struct GNUNET_HELLO_Message *hello;
GNUNET_PEERINFO_Processor cb;
+ struct GNUNET_PeerIdentity id;
void *cb_cls;
uint16_t ms;
h->in_receive = GNUNET_NO;
- ic->in_receive = GNUNET_NO;
- cb = ic->callback;
- cb_cls = ic->callback_cls;
if (NULL == msg)
{
/* peerinfo service died, signal error */
- GNUNET_PEERINFO_iterate_cancel (ic);
+ if (NULL != ic)
+ {
+ cb = ic->callback;
+ cb_cls = ic->callback_cls;
+ GNUNET_PEERINFO_iterate_cancel (ic);
+ }
+ else
+ {
+ cb = NULL;
+ }
reconnect (h);
if (NULL != cb)
cb (cb_cls, NULL, NULL,
_("Failed to receive response from `PEERINFO' service."));
return;
}
+ if (NULL == ic)
+ {
+ /* didn't expect a response, reconnect */
+ reconnect (h);
+ return;
+ }
+ ic->request_transmitted = GNUNET_NO;
+ cb = ic->callback;
+ cb_cls = ic->callback_cls;
if (GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END == ntohs (msg->type))
{
/* normal end of list of peers, signal end, process next pending request */
"Received end of list of peers from `%s' service\n", "PEERINFO");
GNUNET_PEERINFO_iterate_cancel (ic);
trigger_transmit (h);
+ if ( (GNUNET_NO == h->in_receive) &&
+ (NULL != h->ic_head) )
+ {
+ h->in_receive = GNUNET_YES;
+ GNUNET_CLIENT_receive (h->client, &peerinfo_handler, h,
+ GNUNET_TIME_absolute_get_remaining (h->ic_head->timeout));
+ }
if (NULL != cb)
cb (cb_cls, NULL, NULL, NULL);
return;
}
+
ms = ntohs (msg->size);
if ((ms < sizeof (struct InfoMessage)) ||
(ntohs (msg->type) != GNUNET_MESSAGE_TYPE_PEERINFO_INFO))
}
im = (const struct InfoMessage *) msg;
GNUNET_break (0 == ntohl (im->reserved));
+ if ( (GNUNET_YES == ic->have_peer) &&
+ (0 != memcmp (&ic->peer, &im->peer, sizeof (struct GNUNET_PeerIdentity))) )
+ {
+ /* bogus message (from a different iteration call?); out of sequence! */
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Received HELLO for peer `%s', expected peer `%s'\n",
+ GNUNET_i2s (&im->peer),
+ GNUNET_i2s (&ic->peer));
+
+ GNUNET_break (0);
+ GNUNET_PEERINFO_iterate_cancel (ic);
+ reconnect (h);
+ if (NULL != cb)
+ cb (cb_cls, NULL, NULL,
+ _("Received invalid message from `PEERINFO' service."));
+ return;
+ }
hello = NULL;
if (ms > sizeof (struct InfoMessage) + sizeof (struct GNUNET_MessageHeader))
{
_("Received invalid message from `PEERINFO' service."));
return;
}
+ if (GNUNET_OK != GNUNET_HELLO_get_id (hello, &id))
+ {
+ /* malformed message */
+ GNUNET_break (0);
+ GNUNET_PEERINFO_iterate_cancel (ic);
+ reconnect (h);
+ if (NULL != cb)
+ cb (cb_cls, NULL, NULL,
+ _("Received invalid message from `PEERINFO' service."));
+ return;
+ }
+ if (0 != memcmp (&im->peer, &id, sizeof (struct GNUNET_PeerIdentity)))
+ {
+ /* malformed message */
+ GNUNET_break (0);
+ GNUNET_PEERINFO_iterate_cancel (ic);
+ reconnect (h);
+ if (NULL != cb)
+ cb (cb_cls, NULL, NULL,
+ _("Received invalid message from `PEERINFO' service."));
+ return;
+ }
}
+
/* normal data message */
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Received %u bytes of `%s' information about peer `%s' from `%s' service\n",
(hello == NULL) ? 0 : (unsigned int) GNUNET_HELLO_size (hello), "HELLO",
GNUNET_i2s (&im->peer), "PEERINFO");
h->in_receive = GNUNET_YES;
- ic->in_receive = GNUNET_YES;
- GNUNET_CLIENT_receive (h->client, &peerinfo_handler, ic,
+ GNUNET_CLIENT_receive (h->client, &peerinfo_handler, h,
GNUNET_TIME_absolute_get_remaining (ic->timeout));
if (NULL != cb)
cb (cb_cls, &im->peer, hello, NULL);
* the results (or handle transmission error).
*
* @param cls the 'struct GNUNET_PEERINFO_IteratorContext'
- * @param transmit_success GNUNET_OK if transmission worked
+ * @param emsg error message, NULL if transmission worked
*/
static void
-iterator_start_receive (void *cls, int transmit_success)
+iterator_start_receive (void *cls, const char *emsg)
{
struct GNUNET_PEERINFO_IteratorContext *ic = cls;
struct GNUNET_PEERINFO_Handle *h = ic->h;
GNUNET_PEERINFO_Processor cb;
void *cb_cls;
- ic->tqe = NULL;
- if (GNUNET_OK != transmit_success)
+ ic->ac = NULL;
+ if (NULL != emsg)
{
cb = ic->callback;
cb_cls = ic->callback_cls;
GNUNET_PEERINFO_iterate_cancel (ic);
reconnect (h);
if (NULL != cb)
- cb (cb_cls, NULL, NULL,
- _("Failed to transmit iteration request to `PEERINFO' service"));
+ cb (cb_cls, NULL, NULL, emsg);
return;
}
LOG (GNUNET_ERROR_TYPE_DEBUG, "Waiting for response from `%s' service.\n",
"PEERINFO");
- h->in_receive = GNUNET_YES;
- ic->in_receive = GNUNET_YES;
- GNUNET_CLIENT_receive (h->client, &peerinfo_handler, ic,
- GNUNET_TIME_absolute_get_remaining (ic->timeout));
+ ic->request_transmitted = GNUNET_YES;
+ if (GNUNET_NO == h->in_receive)
+ {
+ h->in_receive = GNUNET_YES;
+ GNUNET_CLIENT_receive (h->client, &peerinfo_handler, h,
+ GNUNET_TIME_absolute_get_remaining (ic->timeout));
+ }
}
/**
- * Call a method for each known matching host and change its trust
- * value. The callback method will be invoked once for each matching
- * host and then finally once with a NULL pointer. After that final
- * invocation, the iterator context must no longer be used.
+ * Call a method for each known matching host. The callback method
+ * will be invoked once for each matching host and then finally once
+ * with a NULL pointer. After that final invocation, the iterator
+ * context must no longer be used.
*
* Instead of calling this function with 'peer == NULL' it is often
* better to use 'GNUNET_PEERINFO_notify'.
*
* @param h handle to the peerinfo service
+ * @param include_friend_only include HELLO messages for friends only
* @param peer restrict iteration to this peer only (can be NULL)
* @param timeout how long to wait until timing out
* @param callback the method to call for each peer
*/
struct GNUNET_PEERINFO_IteratorContext *
GNUNET_PEERINFO_iterate (struct GNUNET_PEERINFO_Handle *h,
+ int include_friend_only,
const struct GNUNET_PeerIdentity *peer,
struct GNUNET_TIME_Relative timeout,
GNUNET_PEERINFO_Processor callback, void *callback_cls)
{
- struct GNUNET_MessageHeader *lapm;
+ struct ListAllPeersMessage *lapm;
struct ListPeerMessage *lpm;
struct GNUNET_PEERINFO_IteratorContext *ic;
- struct TransmissionQueueEntry *tqe;
+ struct GNUNET_PEERINFO_AddContext *ac;
+ ic = GNUNET_malloc (sizeof (struct GNUNET_PEERINFO_IteratorContext));
if (NULL == peer)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Requesting list of peers from PEERINFO service\n");
- tqe =
- GNUNET_malloc (sizeof (struct TransmissionQueueEntry) +
- sizeof (struct GNUNET_MessageHeader));
- tqe->size = sizeof (struct GNUNET_MessageHeader);
- lapm = (struct GNUNET_MessageHeader *) &tqe[1];
- lapm->size = htons (sizeof (struct GNUNET_MessageHeader));
- lapm->type = htons (GNUNET_MESSAGE_TYPE_PEERINFO_GET_ALL);
+ ac =
+ GNUNET_malloc (sizeof (struct GNUNET_PEERINFO_AddContext) +
+ sizeof (struct ListAllPeersMessage));
+ ac->size = sizeof (struct ListAllPeersMessage);
+ lapm = (struct ListAllPeersMessage *) &ac[1];
+ lapm->header.size = htons (sizeof (struct ListAllPeersMessage));
+ lapm->header.type = htons (GNUNET_MESSAGE_TYPE_PEERINFO_GET_ALL);
+ lapm->include_friend_only = htonl (include_friend_only);
}
else
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Requesting information on peer `%4s' from PEERINFO service\n",
GNUNET_i2s (peer));
- tqe =
- GNUNET_malloc (sizeof (struct TransmissionQueueEntry) +
+ ac =
+ GNUNET_malloc (sizeof (struct GNUNET_PEERINFO_AddContext) +
sizeof (struct ListPeerMessage));
- tqe->size = sizeof (struct ListPeerMessage);
- lpm = (struct ListPeerMessage *) &tqe[1];
+ ac->size = sizeof (struct ListPeerMessage);
+ lpm = (struct ListPeerMessage *) &ac[1];
lpm->header.size = htons (sizeof (struct ListPeerMessage));
lpm->header.type = htons (GNUNET_MESSAGE_TYPE_PEERINFO_GET);
+ lpm->include_friend_only = htonl (include_friend_only);
memcpy (&lpm->peer, peer, sizeof (struct GNUNET_PeerIdentity));
+ ic->have_peer = GNUNET_YES;
+ ic->peer = *peer;
}
- ic = GNUNET_malloc (sizeof (struct GNUNET_PEERINFO_IteratorContext));
ic->h = h;
- ic->tqe = tqe;
+ ic->ac = ac;
ic->callback = callback;
ic->callback_cls = callback_cls;
ic->timeout = GNUNET_TIME_relative_to_absolute (timeout);
ic->timeout_task =
GNUNET_SCHEDULER_add_delayed (timeout, &signal_timeout, ic);
- tqe->cont = &iterator_start_receive;
- tqe->cont_cls = ic;
- GNUNET_CONTAINER_DLL_insert_after (h->tq_head, h->tq_tail, h->tq_tail, tqe);
- GNUNET_CONTAINER_DLL_insert (h->ic_head,
- h->ic_tail,
- ic);
+ ac->cont = &iterator_start_receive;
+ ac->cont_cls = ic;
+ GNUNET_CONTAINER_DLL_insert_tail (h->ac_head, h->ac_tail, ac);
+ GNUNET_CONTAINER_DLL_insert_tail (h->ic_head,
+ h->ic_tail,
+ ic);
trigger_transmit (h);
return ic;
}
struct GNUNET_PEERINFO_Handle *h;
h = ic->h;
- GNUNET_CONTAINER_DLL_remove (h->ic_head,
- h->ic_tail,
- ic);
if (GNUNET_SCHEDULER_NO_TASK != ic->timeout_task)
{
GNUNET_SCHEDULER_cancel (ic->timeout_task);
ic->timeout_task = GNUNET_SCHEDULER_NO_TASK;
}
ic->callback = NULL;
- if (GNUNET_YES == ic->in_receive)
+ if (GNUNET_YES == ic->request_transmitted)
return; /* need to finish processing */
- if (NULL != ic->tqe)
+ GNUNET_CONTAINER_DLL_remove (h->ic_head,
+ h->ic_tail,
+ ic);
+ if (NULL != ic->ac)
{
- GNUNET_CONTAINER_DLL_remove (h->tq_head, h->tq_tail, ic->tqe);
- GNUNET_free (ic->tqe);
+ GNUNET_CONTAINER_DLL_remove (h->ac_head, h->ac_tail, ic->ac);
+ GNUNET_free (ic->ac);
}
GNUNET_free (ic);
}
projects / oweals / gnunet.git / blobdiff