/*
This file is part of GNUnet.
- (C) 2001, 2002, 2004, 2005, 2007, 2009, 2010 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2001-2014 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @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, "nse-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);
+#define LOG(kind,...) GNUNET_log_from (kind, "peerinfo-api",__VA_ARGS__)
/**
- * Entry in the transmission queue to PEERINFO service.
+ * Context for an iteration request.
*/
-struct TransmissionQueueEntry
+struct GNUNET_PEERINFO_IteratorContext
{
+
/**
- * This is a linked list.
+ * Kept in a DLL.
+ */
+ struct GNUNET_PEERINFO_IteratorContext *next;
+
+ /**
+ * Kept in a DLL.
+ */
+ struct GNUNET_PEERINFO_IteratorContext *prev;
+
+ /**
+ * Handle to the PEERINFO service.
*/
- struct TransmissionQueueEntry *next;
+ struct GNUNET_PEERINFO_Handle *h;
/**
- * This is a linked list.
+ * Function to call with the results.
*/
- struct TransmissionQueueEntry *prev;
+ GNUNET_PEERINFO_Processor callback;
/**
- * Function to call after request has been transmitted, or NULL (in which
- * case we must consider sending the next entry immediately).
+ * Closure for @e callback.
*/
- TransmissionContinuation cont;
+ void *callback_cls;
/**
- * Closure for 'cont'.
+ * Peer we are interested in (only valid if iteration was restricted to one peer).
*/
- void *cont_cls;
+ struct GNUNET_PeerIdentity peer;
/**
- * Timeout for the operation.
+ * Is @e peer set?
*/
- struct GNUNET_TIME_Absolute timeout;
+ int have_peer;
/**
- * Number of bytes of the request message (follows after this struct).
+ * Only include friends in reply?
*/
- size_t size;
+ int include_friend_only;
};
/**
* Connection to the service.
*/
- struct GNUNET_CLIENT_Connection *client;
-
- /**
- * Head of transmission queue.
- */
- struct TransmissionQueueEntry *tq_head;
+ struct GNUNET_MQ_Handle *mq;
/**
- * Tail of transmission queue.
+ * Head of iterator DLL.
*/
- struct TransmissionQueueEntry *tq_tail;
+ struct GNUNET_PEERINFO_IteratorContext *ic_head;
/**
- * Handle for the current transmission request, or NULL if none is pending.
+ * Tail of iterator DLL.
*/
- struct GNUNET_CLIENT_TransmitHandle *th;
+ struct GNUNET_PEERINFO_IteratorContext *ic_tail;
/**
* ID for a reconnect task.
*/
- GNUNET_SCHEDULER_TaskIdentifier r_task;
-
- /**
- * Set to GNUNET_YES if we are currently receiving replies from the
- * service.
- */
- int in_receive;
+ struct GNUNET_SCHEDULER_Task *r_task;
};
+/**
+ * Close the existing connection to PEERINFO and reconnect.
+ *
+ * @param h handle to the service
+ */
+static void
+reconnect (struct GNUNET_PEERINFO_Handle *h);
+
+
/**
* Connect to the peerinfo service.
*
struct GNUNET_PEERINFO_Handle *
GNUNET_PEERINFO_connect (const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- struct GNUNET_PEERINFO_Handle *ret;
+ struct GNUNET_PEERINFO_Handle *h;
- ret = GNUNET_malloc (sizeof (struct GNUNET_PEERINFO_Handle));
- ret->client = GNUNET_CLIENT_connect ("peerinfo", cfg);
- ret->cfg = cfg;
- return ret;
+ h = GNUNET_new (struct GNUNET_PEERINFO_Handle);
+ h->cfg = cfg;
+ reconnect (h);
+ if (NULL == h->mq)
+ {
+ GNUNET_free (h);
+ return NULL;
+ }
+ return h;
}
* Disconnect from the peerinfo service. Note that all iterators must
* have completed or have been cancelled by the time this function is
* called (otherwise, calling this function is a serious error).
- * Furthermore, if 'GNUNET_PEERINFO_add_peer' operations are still
+ * Furthermore, if #GNUNET_PEERINFO_add_peer() operations are still
* pending, they will be cancelled silently on disconnect.
*
* @param h handle to disconnect
void
GNUNET_PEERINFO_disconnect (struct GNUNET_PEERINFO_Handle *h)
{
- struct TransmissionQueueEntry *tqe;
+ struct GNUNET_PEERINFO_IteratorContext *ic;
- while (NULL != (tqe = h->tq_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);
- }
- if (h->th != NULL)
+ while (NULL != (ic = h->ic_head))
{
- GNUNET_CLIENT_notify_transmit_ready_cancel (h->th);
- h->th = NULL;
+ GNUNET_CONTAINER_DLL_remove (h->ic_head,
+ h->ic_tail,
+ ic);
+ GNUNET_free (ic);
}
- if (NULL != h->client)
+ if (NULL != h->mq)
{
- GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
- h->client = NULL;
+ GNUNET_MQ_destroy (h->mq);
+ h->mq = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != h->r_task)
+ if (NULL != h->r_task)
{
GNUNET_SCHEDULER_cancel (h->r_task);
- h->r_task = GNUNET_SCHEDULER_NO_TASK;
+ h->r_task = NULL;
}
GNUNET_free (h);
}
-/**
- * Check if we have a request pending in the transmission queue and are
- * able to transmit it right now. If so, schedule transmission.
- *
- * @param h handle to the service
- */
-static void
-trigger_transmit (struct GNUNET_PEERINFO_Handle *h);
-
-
-/**
- * Close the existing connection to PEERINFO and reconnect.
- *
- * @param h handle to the service
- */
-static void
-reconnect (struct GNUNET_PEERINFO_Handle *h);
-
/**
* Task scheduled to re-try connecting to the peerinfo service.
*
- * @param cls the 'struct GNUNET_PEERINFO_Handle'
- * @param tc scheduler context
+ * @param cls the `struct GNUNET_PEERINFO_Handle *`
*/
static void
-reconnect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+reconnect_task (void *cls)
{
struct GNUNET_PEERINFO_Handle *h = cls;
- h->r_task = GNUNET_SCHEDULER_NO_TASK;
+ h->r_task = NULL;
reconnect (h);
}
/**
- * Close the existing connection to PEERINFO and reconnect.
+ * We encountered an error, reconnect to the PEERINFO service.
*
- * @param h handle to the service
+ * @param h handle to reconnect
*/
static void
-reconnect (struct GNUNET_PEERINFO_Handle *h)
+do_reconnect (struct GNUNET_PEERINFO_Handle *h)
{
- if (h->r_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (h->r_task);
- h->r_task = GNUNET_SCHEDULER_NO_TASK;
- }
- if (NULL != h->th)
- {
- GNUNET_CLIENT_notify_transmit_ready_cancel (h->th);
- h->th = NULL;
- }
- if (NULL != h->client)
- {
- GNUNET_CLIENT_disconnect (h->client, GNUNET_SYSERR);
- h->client = NULL;
- }
- h->client = GNUNET_CLIENT_connect ("peerinfo", h->cfg);
- if (NULL == h->client)
+ struct GNUNET_PEERINFO_IteratorContext *ic = h->ic_head;
+
+ GNUNET_MQ_destroy (h->mq);
+ h->mq = NULL;
+ if (NULL != ic)
{
- h->r_task =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &reconnect_task,
- h);
- return;
+ GNUNET_CONTAINER_DLL_remove (h->ic_head,
+ h->ic_tail,
+ ic);
+ if (NULL != ic->callback)
+ ic->callback (ic->callback_cls,
+ NULL,
+ NULL,
+ _("Failed to receive response from `PEERINFO' service."));
+ GNUNET_free (ic);
}
- trigger_transmit (h);
+ h->r_task = GNUNET_SCHEDULER_add_now (&reconnect_task,
+ h);
}
/**
- * Transmit the request at the head of the transmission queue
- * and trigger continuation (if any).
+ * We got a disconnect after asking regex to do the announcement.
+ * Retry.
*
- * @param cls the 'struct GNUNET_PEERINFO_Handle' (with the queue)
- * @param size size of the buffer (0 on error)
- * @param buf where to copy the message
- * @return number of bytes copied to buf
+ * @param cls the `struct GNUNET_PEERINFO_Handle` to retry
+ * @param error error code
*/
-static size_t
-do_transmit (void *cls, size_t size, void *buf)
+static void
+mq_error_handler (void *cls,
+ enum GNUNET_MQ_Error error)
{
struct GNUNET_PEERINFO_Handle *h = cls;
- struct TransmissionQueueEntry *tqe = h->tq_head;
- size_t ret;
- h->th = NULL;
- if (tqe == NULL)
- return 0;
- if (buf == NULL)
- {
-#if DEBUG_PEERINFO
- LOG (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
- _("Failed to transmit message to `%s' service.\n"), "PEERINFO");
-#endif
- GNUNET_CONTAINER_DLL_remove (h->tq_head, h->tq_tail, tqe);
- reconnect (h);
- if (tqe->cont != NULL)
- tqe->cont (tqe->cont_cls, GNUNET_SYSERR);
- GNUNET_free (tqe);
- return 0;
- }
- ret = tqe->size;
- GNUNET_assert (size >= ret);
- memcpy (buf, &tqe[1], ret);
-#if DEBUG_PEERINFO
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Transmitting request of size %u to `%s' service.\n", ret, "PEERINFO");
-#endif
- GNUNET_CONTAINER_DLL_remove (h->tq_head, h->tq_tail, tqe);
- if (tqe->cont != NULL)
- tqe->cont (tqe->cont_cls, GNUNET_OK);
- else
- trigger_transmit (h);
- GNUNET_free (tqe);
- return ret;
+ do_reconnect (h);
}
+
/**
- * Check if we have a request pending in the transmission queue and are
- * able to transmit it right now. If so, schedule transmission.
+ * Function called when we receive an info message. Check it is
+ * well-formed.
*
- * @param h handle to the service
+ * @param cls closure
+ * @param im message received
+ * @return #GNUNET_OK if the message is OK
*/
-static void
-trigger_transmit (struct GNUNET_PEERINFO_Handle *h)
+static int
+check_info (void *cls,
+ const struct InfoMessage *im)
{
- struct TransmissionQueueEntry *tqe;
+ struct GNUNET_PEERINFO_Handle *h = cls;
+ struct GNUNET_PEERINFO_IteratorContext *ic = h->ic_head;
+ uint16_t ms = ntohs (im->header.size) - sizeof (*im);
- if (NULL == (tqe = h->tq_head))
- return;
- if (h->th != NULL)
- return;
- if (h->in_receive == GNUNET_YES)
- return;
- if (NULL == h->client)
+ if (0 != ntohl (im->reserved))
{
- reconnect (h);
- return;
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ if (NULL == ic)
+ {
+ /* didn't expect a response, bad */
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ 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);
+ return GNUNET_SYSERR;
+ }
+ if (ms > sizeof (struct GNUNET_MessageHeader))
+ {
+ const struct GNUNET_HELLO_Message *hello;
+ struct GNUNET_PeerIdentity id;
+
+ hello = (const struct GNUNET_HELLO_Message *) &im[1];
+ if (ms != GNUNET_HELLO_size (hello))
+ {
+ /* malformed message */
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ if (GNUNET_OK !=
+ GNUNET_HELLO_get_id (hello,
+ &id))
+ {
+ /* malformed message */
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ if (0 != memcmp (&im->peer,
+ &id,
+ sizeof (struct GNUNET_PeerIdentity)))
+ {
+ /* malformed message */
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ }
+ else if (0 != ms)
+ {
+ /* malformed message */
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
}
- h->th =
- GNUNET_CLIENT_notify_transmit_ready (h->client, tqe->size,
- GNUNET_TIME_absolute_get_remaining
- (tqe->timeout), GNUNET_YES,
- &do_transmit, h);
+ return GNUNET_OK;
}
/**
- * Add a host to the persistent list. This method operates in
- * semi-reliable mode: if the transmission is not completed by
- * the time 'GNUNET_PEERINFO_disconnect' is called, it will be
- * aborted. Furthermore, if a second HELLO is added for the
- * same peer before the first one was transmitted, PEERINFO may
- * merge the two HELLOs prior to transmission to the service.
+ * Handle info message.
*
- * @param h handle to the peerinfo service
- * @param hello the verified (!) HELLO message
+ * @param cls closure
+ * @param im message received
*/
-void
-GNUNET_PEERINFO_add_peer (struct GNUNET_PEERINFO_Handle *h,
- const struct GNUNET_HELLO_Message *hello)
+static void
+handle_info (void *cls,
+ const struct InfoMessage *im)
{
- uint16_t hs = GNUNET_HELLO_size (hello);
- struct TransmissionQueueEntry *tqe;
-
-#if DEBUG_PEERINFO
- struct GNUNET_PeerIdentity peer;
+ struct GNUNET_PEERINFO_Handle *h = cls;
+ struct GNUNET_PEERINFO_IteratorContext *ic = h->ic_head;
+ const struct GNUNET_HELLO_Message *hello;
+ uint16_t ms;
- 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");
-#endif
- tqe = GNUNET_malloc (sizeof (struct TransmissionQueueEntry) + hs);
- tqe->size = hs;
- tqe->timeout = GNUNET_TIME_UNIT_FOREVER_ABS;
- memcpy (&tqe[1], hello, hs);
- GNUNET_CONTAINER_DLL_insert_after (h->tq_head, h->tq_tail, h->tq_tail, tqe);
- trigger_transmit (h);
+ ms = ntohs (im->header.size);
+ hello = (0 == ms) ? NULL : (const struct GNUNET_HELLO_Message *) &im[1];
+ if (NULL != ic->callback)
+ ic->callback (ic->callback_cls,
+ &im->peer,
+ hello,
+ NULL);
}
/**
- * Context for an iteration request.
- */
-struct GNUNET_PEERINFO_IteratorContext
-{
- /**
- * Handle to the PEERINFO service.
- */
- struct GNUNET_PEERINFO_Handle *h;
-
- /**
- * Function to call with the results.
- */
- GNUNET_PEERINFO_Processor callback;
-
- /**
- * Closure for 'callback'.
- */
- void *callback_cls;
-
- /**
- * Our entry in the transmission queue.
- */
- struct TransmissionQueueEntry *tqe;
-
- /**
- * Task responsible for timeout.
- */
- GNUNET_SCHEDULER_TaskIdentifier timeout_task;
-
- /**
- * Timeout for the operation.
- */
- struct GNUNET_TIME_Absolute timeout;
-
- /**
- * Are we now receiving?
- */
- int in_receive;
-};
-
-
-/**
- * Type of a function to call when we receive a message
- * from the service.
+ * Send the next IC request at the head of the queue.
*
- * @param cls closure
- * @param msg message received, NULL on timeout or fatal error
+ * @param h handle
*/
static void
-peerinfo_handler (void *cls, const struct GNUNET_MessageHeader *msg)
+send_ic_request (struct GNUNET_PEERINFO_Handle *h)
{
- struct GNUNET_PEERINFO_IteratorContext *ic = cls;
- const struct InfoMessage *im;
- const struct GNUNET_HELLO_Message *hello;
- uint16_t ms;
+ struct GNUNET_PEERINFO_IteratorContext *ic = h->ic_head;
+ struct GNUNET_MQ_Envelope *env;
+ struct ListAllPeersMessage *lapm;
+ struct ListPeerMessage *lpm;
- ic->h->in_receive = GNUNET_NO;
- if (msg == NULL)
+ if (NULL == ic)
{
- reconnect (ic->h);
- if (ic->timeout_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (ic->timeout_task);
- if (ic->callback != NULL)
- ic->callback (ic->callback_cls, NULL, NULL,
- _("Failed to receive response from `PEERINFO' service."));
- GNUNET_free (ic);
+ GNUNET_break (0);
return;
}
- if (ntohs (msg->type) == GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END)
+ if (NULL == h->mq)
{
-#if DEBUG_PEERINFO
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Received end of list of peers from `%s' service\n", "PEERINFO");
-#endif
- trigger_transmit (ic->h);
- if (ic->timeout_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (ic->timeout_task);
- if (ic->callback != NULL)
- ic->callback (ic->callback_cls, NULL, NULL, NULL);
- GNUNET_free (ic);
+ GNUNET_break (0);
return;
}
- ms = ntohs (msg->size);
- if ((ms < sizeof (struct InfoMessage)) ||
- (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_PEERINFO_INFO))
+ if (GNUNET_NO == ic->have_peer)
{
- GNUNET_break (0);
- reconnect (ic->h);
- if (ic->timeout_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (ic->timeout_task);
- if (ic->callback != NULL)
- ic->callback (ic->callback_cls, NULL, NULL,
- _("Received invalid message from `PEERINFO' service.\n"));
- GNUNET_free (ic);
- return;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Requesting list of peers from PEERINFO service\n");
+ env = GNUNET_MQ_msg (lapm,
+ GNUNET_MESSAGE_TYPE_PEERINFO_GET_ALL);
+ lapm->include_friend_only = htonl (ic->include_friend_only);
}
- im = (const struct InfoMessage *) msg;
- GNUNET_break (0 == ntohl (im->reserved));
- hello = NULL;
- if (ms > sizeof (struct InfoMessage) + sizeof (struct GNUNET_MessageHeader))
+ else
{
- hello = (const struct GNUNET_HELLO_Message *) &im[1];
- if (ms != sizeof (struct InfoMessage) + GNUNET_HELLO_size (hello))
- {
- GNUNET_break (0);
- reconnect (ic->h);
- if (ic->timeout_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (ic->timeout_task);
- if (ic->callback != NULL)
- ic->callback (ic->callback_cls, NULL, NULL,
- _("Received invalid message from `PEERINFO' service.\n"));
- GNUNET_free (ic);
- return;
- }
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Requesting information on peer `%s' from PEERINFO service\n",
+ GNUNET_i2s (&ic->peer));
+ env = GNUNET_MQ_msg (lpm,
+ GNUNET_MESSAGE_TYPE_PEERINFO_GET);
+ lpm->include_friend_only = htonl (ic->include_friend_only);
+ lpm->peer = ic->peer;
}
-#if DEBUG_PEERINFO
- 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");
-#endif
- ic->h->in_receive = GNUNET_YES;
- if (ic->callback != NULL)
- ic->callback (ic->callback_cls, &im->peer, hello, NULL);
- GNUNET_CLIENT_receive (ic->h->client, &peerinfo_handler, ic,
- GNUNET_TIME_absolute_get_remaining (ic->timeout));
+ GNUNET_MQ_send (h->mq,
+ env);
}
/**
- * We've transmitted the iteration request. Now get ready to process
- * the results (or handle transmission error).
+ * Type of a function to call when we receive a message from the
+ * service. Call the iterator with the result and (if applicable)
+ * continue to receive more messages or trigger processing the next
+ * event (if applicable).
*
- * @param cls the 'struct GNUNET_PEERINFO_IteratorContext'
- * @param transmit_success GNUNET_OK if transmission worked
+ * @param cls closure
+ * @param msg message received, NULL on timeout or fatal error
*/
static void
-iterator_start_receive (void *cls, int transmit_success)
+handle_end_iteration (void *cls,
+ const struct GNUNET_MessageHeader *msg)
{
- struct GNUNET_PEERINFO_IteratorContext *ic = cls;
+ struct GNUNET_PEERINFO_Handle *h = cls;
+ struct GNUNET_PEERINFO_IteratorContext *ic = h->ic_head;
- if (GNUNET_OK != transmit_success)
+ if (NULL == ic)
{
- if (ic->timeout_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (ic->timeout_task);
- ic->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- }
- reconnect (ic->h);
- if (ic->callback != NULL)
- ic->callback (ic->callback_cls, NULL, NULL,
- _
- ("Failed to transmit iteration request to `PEERINFO' service\n"));
- GNUNET_free (ic);
+ /* didn't expect a response, reconnect */
+ GNUNET_break (0);
+ reconnect (h);
return;
}
-#if DEBUG_PEERINFO
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Waiting for response from `%s' service.\n",
- "PEERINFO");
-#endif
- ic->h->in_receive = GNUNET_YES;
- ic->in_receive = GNUNET_YES;
- ic->tqe = NULL;
- GNUNET_CLIENT_receive (ic->h->client, &peerinfo_handler, ic,
- GNUNET_TIME_absolute_get_remaining (ic->timeout));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received end of list of peers from PEERINFO service\n");
+ GNUNET_CONTAINER_DLL_remove (h->ic_head,
+ h->ic_tail,
+ ic);
+ if (NULL != h->ic_head)
+ send_ic_request (h);
+ if (NULL != ic->callback)
+ ic->callback (ic->callback_cls,
+ NULL,
+ NULL,
+ NULL);
+ GNUNET_free (ic);
}
/**
- * Peerinfo iteration request has timed out.
+ * Close the existing connection to PEERINFO and reconnect.
*
- * @param cls the 'struct GNUNET_PEERINFO_IteratorContext*'
- * @param tc scheduler context
+ * @param h handle to the service
*/
static void
-signal_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+reconnect (struct GNUNET_PEERINFO_Handle *h)
{
- struct GNUNET_PEERINFO_IteratorContext *ic = cls;
-
- 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);
- else
- reconnect (ic->h);
- ic->callback (ic->callback_cls, NULL, NULL,
- _
- ("Timeout transmitting iteration request to `PEERINFO' service.\n"));
- ic->callback = NULL;
- GNUNET_free_non_null (ic->tqe);
- GNUNET_free (ic);
+ struct GNUNET_MQ_MessageHandler handlers[] = {
+ GNUNET_MQ_hd_var_size (info,
+ GNUNET_MESSAGE_TYPE_PEERINFO_INFO,
+ struct InfoMessage,
+ h),
+ GNUNET_MQ_hd_fixed_size (end_iteration,
+ GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END,
+ struct GNUNET_MessageHeader,
+ h),
+ GNUNET_MQ_handler_end ()
+ };
+
+ if (NULL != h->r_task)
+ {
+ GNUNET_SCHEDULER_cancel (h->r_task);
+ h->r_task = NULL;
+ }
+ if (NULL != h->mq)
+ {
+ GNUNET_MQ_destroy (h->mq);
+ h->mq = NULL;
+ }
+ h->mq = GNUNET_CLIENT_connect (h->cfg,
+ "peerinfo",
+ handlers,
+ &mq_error_handler,
+ h);
+ if (NULL != h->ic_head)
+ send_ic_request (h);
}
/**
- * 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'.
+ * 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
- * @param callback_cls closure for callback
+ * @param callback_cls closure for @a callback
* @return iterator context
*/
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)
+ GNUNET_PEERINFO_Processor callback,
+ void *callback_cls)
{
- struct GNUNET_MessageHeader *lapm;
- struct ListPeerMessage *lpm;
struct GNUNET_PEERINFO_IteratorContext *ic;
- struct TransmissionQueueEntry *tqe;
- if (peer == NULL)
- {
-#if DEBUG_PEERINFO
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Requesting list of peers from PEERINFO service\n");
-#endif
- 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);
- }
- else
- {
-#if DEBUG_PEERINFO
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Requesting information on peer `%4s' from PEERINFO service\n",
- GNUNET_i2s (peer));
-#endif
- tqe =
- GNUNET_malloc (sizeof (struct TransmissionQueueEntry) +
- sizeof (struct ListPeerMessage));
- tqe->size = sizeof (struct ListPeerMessage);
- lpm = (struct ListPeerMessage *) &tqe[1];
- lpm->header.size = htons (sizeof (struct ListPeerMessage));
- lpm->header.type = htons (GNUNET_MESSAGE_TYPE_PEERINFO_GET);
- memcpy (&lpm->peer, peer, sizeof (struct GNUNET_PeerIdentity));
- }
- ic = GNUNET_malloc (sizeof (struct GNUNET_PEERINFO_IteratorContext));
+ ic = GNUNET_new (struct GNUNET_PEERINFO_IteratorContext);
ic->h = h;
- ic->tqe = tqe;
+ ic->include_friend_only = include_friend_only;
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->timeout = ic->timeout;
- tqe->cont = &iterator_start_receive;
- tqe->cont_cls = ic;
- tqe->timeout = ic->timeout;
- GNUNET_CONTAINER_DLL_insert_after (h->tq_head, h->tq_tail, h->tq_tail, tqe);
- trigger_transmit (h);
+ if (NULL != peer)
+ {
+ ic->have_peer = GNUNET_YES;
+ ic->peer = *peer;
+ }
+ GNUNET_CONTAINER_DLL_insert_tail (h->ic_head,
+ h->ic_tail,
+ ic);
+ if (h->ic_head == ic)
+ send_ic_request (h);
return ic;
}
void
GNUNET_PEERINFO_iterate_cancel (struct GNUNET_PEERINFO_IteratorContext *ic)
{
- if (ic->timeout_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (ic->timeout_task);
- ic->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- }
+ struct GNUNET_PEERINFO_Handle *h = ic->h;
+
ic->callback = NULL;
- if (GNUNET_YES == ic->in_receive)
- return; /* need to finish processing */
- GNUNET_CONTAINER_DLL_remove (ic->h->tq_head, ic->h->tq_tail, ic->tqe);
- GNUNET_free (ic->tqe);
+ if (ic == h->ic_head)
+ return;
+ GNUNET_CONTAINER_DLL_remove (h->ic_head,
+ h->ic_tail,
+ ic);
GNUNET_free (ic);
}
+/**
+ * Add a host to the persistent list. This method operates in
+ * semi-reliable mode: if the transmission is not completed by
+ * the time #GNUNET_PEERINFO_disconnect() is called, it will be
+ * aborted. Furthermore, if a second HELLO is added for the
+ * same peer before the first one was transmitted, PEERINFO may
+ * merge the two HELLOs prior to transmission to the service.
+ *
+ * @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 @a 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 @a cont is NULL and at some point
+ * calling @a cont must be prevented)
+ */
+struct GNUNET_MQ_Envelope *
+GNUNET_PEERINFO_add_peer (struct GNUNET_PEERINFO_Handle *h,
+ const struct GNUNET_HELLO_Message *hello,
+ GNUNET_SCHEDULER_TaskCallback cont,
+ void *cont_cls)
+{
+ struct GNUNET_MQ_Envelope *env;
+ struct GNUNET_PeerIdentity peer;
+
+ if (NULL == h->mq)
+ return NULL;
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_HELLO_get_id (hello,
+ &peer));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding peer `%s' to PEERINFO database\n",
+ GNUNET_i2s (&peer));
+ env = GNUNET_MQ_msg_copy ((const struct GNUNET_MessageHeader *) hello);
+ if (NULL != cont)
+ GNUNET_MQ_notify_sent (env,
+ cont,
+ cont_cls);
+ GNUNET_MQ_send (h->mq,
+ env);
+ return env;
+}
+
+
/* end of peerinfo_api.c */
projects / oweals / gnunet.git / blobdiff