/*
This file is part of GNUnet.
- (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009-2016 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.
*/
-
/**
* @file core/core_api.c
* @brief core service; this is the main API for encrypted P2P
*/
struct PeerRecord *peer;
- /**
- * Corresponding SEND_REQUEST message. Only non-NULL
- * while SEND_REQUEST message is pending.
- */
- struct ControlMessage *cm;
-
/**
* Function that will be called to get the actual request
* (once we are ready to transmit this request to the core).
GNUNET_CONNECTION_TransmitReadyNotify get_message;
/**
- * Closure for get_message.
+ * Closure for @e get_message.
*/
void *get_message_cls;
/**
- * Timeout for this handle.
+ * Deadline for the transmission (the request does not get cancelled
+ * at this time, this is merely how soon the application wants this out).
*/
- struct GNUNET_TIME_Absolute timeout;
+ struct GNUNET_TIME_Absolute deadline;
+
+ /**
+ * When did this request get queued?
+ */
+ struct GNUNET_TIME_Absolute request_time;
/**
* How important is this message?
*/
- uint32_t priority;
+ enum GNUNET_CORE_Priority priority;
+
+ /**
+ * Is corking allowed?
+ */
+ int cork;
/**
* Size of this request.
*/
uint16_t smr_id;
- /**
- * Is corking allowed?
- */
- int cork;
-
};
{
/**
- * We generally do NOT keep peer records in a DLL; this
- * DLL is only used IF this peer's 'pending_head' message
- * is ready for transmission.
- */
- struct PeerRecord *prev;
-
- /**
- * We generally do NOT keep peer records in a DLL; this
- * DLL is only used IF this peer's 'pending_head' message
- * is ready for transmission.
- */
- struct PeerRecord *next;
-
- /**
- * Peer the record is about.
- */
- struct GNUNET_PeerIdentity peer;
-
- /**
- * Corresponding core handle.
+ * Corresponding CORE handle.
*/
struct GNUNET_CORE_Handle *ch;
/**
- * Pending request, if any. 'th->peer' is set to NULL if the
+ * Pending request, if any. 'th->peer' is set to NULL if the
* request is not active.
*/
struct GNUNET_CORE_TransmitHandle th;
/**
- * ID of timeout task for the 'pending_head' handle
- * which is the one with the smallest timeout.
- */
- GNUNET_SCHEDULER_TaskIdentifier timeout_task;
-
- /**
- * ID of task to run 'next_request_transmission'.
+ * Peer the record is about.
*/
- GNUNET_SCHEDULER_TaskIdentifier ntr_task;
+ struct GNUNET_PeerIdentity peer;
/**
* SendMessageRequest ID generator for this peer.
};
-struct CoreMQState
-{
- struct GNUNET_PeerIdentity target;
- struct GNUNET_CORE_Handle *core;
- struct GNUNET_CORE_TransmitHandle *th;
-};
-
-
-/**
- * Type of function called upon completion.
- *
- * @param cls closure
- * @param success GNUNET_OK on success (which for request_connect
- * ONLY means that we transmitted the connect request to CORE,
- * it does not mean that we are actually now connected!);
- * GNUNET_NO on timeout,
- * GNUNET_SYSERR if core was shut down
- */
-typedef void (*GNUNET_CORE_ControlContinuation) (void *cls, int success);
-
-
-/**
- * Entry in a doubly-linked list of control messages to be transmitted
- * to the core service. Control messages include traffic allocation,
- * connection requests and of course our initial 'init' request.
- *
- * The actual message is allocated at the end of this struct.
- */
-struct ControlMessage
-{
- /**
- * This is a doubly-linked list.
- */
- struct ControlMessage *next;
-
- /**
- * This is a doubly-linked list.
- */
- struct ControlMessage *prev;
-
- /**
- * Function to run after transmission failed/succeeded.
- */
- GNUNET_CORE_ControlContinuation cont;
-
- /**
- * Closure for 'cont'.
- */
- void *cont_cls;
-
- /**
- * Transmit handle (if one is associated with this ControlMessage), or NULL.
- */
- struct GNUNET_CORE_TransmitHandle *th;
-};
-
-
/**
* Context for the core service connection.
/**
* Function handlers for messages of particular type.
*/
- const struct GNUNET_CORE_MessageHandler *handlers;
+ struct GNUNET_CORE_MessageHandler *handlers;
/**
- * Our connection to the service.
+ * Our message queue for transmissions to the service.
*/
- struct GNUNET_CLIENT_Connection *client;
-
- /**
- * Handle for our current transmission request.
- */
- struct GNUNET_CLIENT_TransmitHandle *cth;
-
- /**
- * Head of doubly-linked list of pending requests.
- */
- struct ControlMessage *control_pending_head;
-
- /**
- * Tail of doubly-linked list of pending requests.
- */
- struct ControlMessage *control_pending_tail;
-
- /**
- * Head of doubly-linked list of peers that are core-approved
- * to send their next message.
- */
- struct PeerRecord *ready_peer_head;
-
- /**
- * Tail of doubly-linked list of peers that are core-approved
- * to send their next message.
- */
- struct PeerRecord *ready_peer_tail;
+ struct GNUNET_MQ_Handle *mq;
/**
* Hash map listing all of the peers that we are currently
/**
* ID of reconnect task (if any).
*/
- GNUNET_SCHEDULER_TaskIdentifier reconnect_task;
+ struct GNUNET_SCHEDULER_Task *reconnect_task;
/**
* Current delay we use for re-trying to connect to core.
*/
int currently_down;
+ /**
+ * Did we ever get INIT?
+ */
+ int have_init;
+
};
* @param tc task context
*/
static void
-reconnect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+reconnect_task (void *cls)
{
struct GNUNET_CORE_Handle *h = cls;
- h->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ h->reconnect_task = NULL;
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Connecting to CORE service after delay\n");
reconnect (h);
/**
- * Notify clients about disconnect and free
- * the entry for connected peer.
+ * Notify clients about disconnect and free the entry for connected
+ * peer.
*
* @param cls the `struct GNUNET_CORE_Handle *`
* @param key the peer identity (not used)
struct GNUNET_CORE_TransmitHandle *th;
struct PeerRecord *pr = value;
- if (GNUNET_SCHEDULER_NO_TASK != pr->timeout_task)
- {
- GNUNET_SCHEDULER_cancel (pr->timeout_task);
- pr->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- }
- if (GNUNET_SCHEDULER_NO_TASK != pr->ntr_task)
- {
- GNUNET_SCHEDULER_cancel (pr->ntr_task);
- pr->ntr_task = GNUNET_SCHEDULER_NO_TASK;
- }
- if ((NULL != pr->prev) || (NULL != pr->next) || (h->ready_peer_head == pr))
- GNUNET_CONTAINER_DLL_remove (h->ready_peer_head, h->ready_peer_tail, pr);
if (NULL != h->disconnects)
- h->disconnects (h->cls, &pr->peer);
+ h->disconnects (h->cls,
+ &pr->peer);
/* all requests should have been cancelled, clean up anyway, just in case */
th = &pr->th;
if (NULL != th->peer)
{
GNUNET_break (0);
th->peer = NULL;
- if (NULL != th->cm)
- th->cm->th = NULL;
}
/* done with 'voluntary' cleanups, now on to normal freeing */
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multipeermap_remove (h->peers, key, pr));
+ GNUNET_CONTAINER_multipeermap_remove (h->peers,
+ key,
+ pr));
GNUNET_assert (pr->ch == h);
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pr->timeout_task);
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pr->ntr_task);
GNUNET_free (pr);
return GNUNET_YES;
}
static void
reconnect_later (struct GNUNET_CORE_Handle *h)
{
- struct ControlMessage *cm;
- struct PeerRecord *pr;
-
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == h->reconnect_task);
- if (NULL != h->cth)
+ GNUNET_assert (NULL == h->reconnect_task);
+ if (NULL != h->mq)
{
- GNUNET_CLIENT_notify_transmit_ready_cancel (h->cth);
- h->cth = NULL;
- }
- if (NULL != h->client)
- {
- GNUNET_CLIENT_disconnect (h->client);
- h->client = NULL;
+ GNUNET_MQ_destroy (h->mq);
+ h->mq = NULL;
}
h->currently_down = GNUNET_YES;
- GNUNET_assert (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK);
+ GNUNET_assert (h->reconnect_task == NULL);
h->reconnect_task =
GNUNET_SCHEDULER_add_delayed (h->retry_backoff,
- &reconnect_task, h);
- while (NULL != (cm = h->control_pending_head))
- {
- GNUNET_CONTAINER_DLL_remove (h->control_pending_head,
- h->control_pending_tail, cm);
- if (NULL != cm->th)
- cm->th->cm = NULL;
- if (NULL != cm->cont)
- cm->cont (cm->cont_cls, GNUNET_NO);
- GNUNET_free (cm);
- }
+ &reconnect_task,
+ h);
GNUNET_CONTAINER_multipeermap_iterate (h->peers,
- &disconnect_and_free_peer_entry, h);
- while (NULL != (pr = h->ready_peer_head))
- GNUNET_CONTAINER_DLL_remove (h->ready_peer_head, h->ready_peer_tail, pr);
- GNUNET_assert (h->control_pending_head == NULL);
+ &disconnect_and_free_peer_entry,
+ h);
h->retry_backoff = GNUNET_TIME_STD_BACKOFF (h->retry_backoff);
}
/**
- * Check the list of pending requests, send the next
- * one to the core.
+ * Generic error handler, called with the appropriate error code and
+ * the same closure specified at the creation of the message queue.
+ * Not every message queue implementation supports an error handler.
*
- * @param h core handle
- * @param ignore_currently_down transmit message even if not initialized?
+ * @param cls closure, a `struct GNUNET_CORE_Handle *`
+ * @param error error code
*/
static void
-trigger_next_request (struct GNUNET_CORE_Handle *h, int ignore_currently_down);
-
+handle_mq_error (void *cls,
+ enum GNUNET_MQ_Error error)
+{
+ struct GNUNET_CORE_Handle *h = cls;
-/**
- * The given request hit its timeout. Remove from the
- * doubly-linked list and call the respective continuation.
- *
- * @param cls the transmit handle of the request that timed out
- * @param tc context, can be NULL (!)
- */
-static void
-transmission_timeout (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MQ ERROR: %d\n",
+ error);
+ reconnect_later (h);
+}
/**
- * Send a control message to the peer asking for transmission
- * of the message in the given peer record.
+ * Handle init reply message received from CORE service. Notify
+ * application that we are now connected to the CORE. Also fake
+ * loopback connection.
*
- * @param pr peer to request transmission to
+ * @param cls the `struct GNUNET_CORE_Handle`
+ * @param m the init reply
*/
static void
-request_next_transmission (struct PeerRecord *pr)
+handle_init_reply (void *cls,
+ const struct InitReplyMessage *m)
{
- struct GNUNET_CORE_Handle *h = pr->ch;
- struct ControlMessage *cm;
- struct SendMessageRequest *smr;
- struct GNUNET_CORE_TransmitHandle *th;
+ struct GNUNET_CORE_Handle *h = cls;
+ GNUNET_CORE_StartupCallback init;
+ struct PeerRecord *pr;
- if (pr->timeout_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_break (0 == ntohl (m->reserved));
+ GNUNET_break (GNUNET_YES == h->currently_down);
+ h->currently_down = GNUNET_NO;
+ h->retry_backoff = GNUNET_TIME_UNIT_MILLISECONDS;
+ if (NULL != (init = h->init))
{
- GNUNET_SCHEDULER_cancel (pr->timeout_task);
- pr->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ /* mark so we don't call init on reconnect */
+ h->init = NULL;
+ h->me = m->my_identity;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Connected to core service of peer `%s'.\n",
+ GNUNET_i2s (&h->me));
+ h->have_init = GNUNET_YES;
+ init (h->cls,
+ &h->me);
}
- th = &pr->th;
- if (NULL == th->peer)
+ else
{
- trigger_next_request (h, GNUNET_NO);
- return;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Successfully reconnected to core service.\n");
+ if (GNUNET_NO == h->have_init)
+ {
+ h->me = m->my_identity;
+ h->have_init = GNUNET_YES;
+ }
+ else
+ {
+ GNUNET_break (0 == memcmp (&h->me,
+ &m->my_identity,
+ sizeof (struct GNUNET_PeerIdentity)));
+ }
}
- if (th->cm != NULL)
- return; /* already done */
- GNUNET_assert (pr->prev == NULL);
- GNUNET_assert (pr->next == NULL);
- pr->timeout_task =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining
- (th->timeout), &transmission_timeout, pr);
- cm = GNUNET_malloc (sizeof (struct ControlMessage) +
- sizeof (struct SendMessageRequest));
- th->cm = cm;
- cm->th = th;
- smr = (struct SendMessageRequest *) &cm[1];
- smr->header.type = htons (GNUNET_MESSAGE_TYPE_CORE_SEND_REQUEST);
- smr->header.size = htons (sizeof (struct SendMessageRequest));
- smr->priority = htonl (th->priority);
- smr->deadline = GNUNET_TIME_absolute_hton (th->timeout);
- smr->peer = pr->peer;
- smr->reserved = htonl (0);
- smr->size = htons (th->msize);
- smr->smr_id = htons (th->smr_id = pr->smr_id_gen++);
- GNUNET_CONTAINER_DLL_insert_tail (h->control_pending_head,
- h->control_pending_tail, cm);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Adding SEND REQUEST for peer `%s' to message queue\n",
- GNUNET_i2s (&pr->peer));
- trigger_next_request (h, GNUNET_NO);
+ /* fake 'connect to self' */
+ pr = GNUNET_new (struct PeerRecord);
+ pr->peer = h->me;
+ pr->ch = h;
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multipeermap_put (h->peers,
+ &h->me,
+ pr,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ if (NULL != h->connects)
+ h->connects (h->cls,
+ &pr->peer);
}
/**
- * The given request hit its timeout. Remove from the
- * doubly-linked list and call the respective continuation.
+ * Handle connect message received from CORE service.
+ * Notify the application about the new connection.
*
- * @param cls the transmit handle of the request that timed out
- * @param tc context, can be NULL (!)
+ * @param cls the `struct GNUNET_CORE_Handle`
+ * @param cnm the connect message
*/
static void
-transmission_timeout (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+handle_connect_notify (void *cls,
+ const struct ConnectNotifyMessage *cnm)
{
- struct PeerRecord *pr = cls;
- struct GNUNET_CORE_Handle *h = pr->ch;
- struct GNUNET_CORE_TransmitHandle *th;
+ struct GNUNET_CORE_Handle *h = cls;
+ struct PeerRecord *pr;
- pr->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- if (GNUNET_SCHEDULER_NO_TASK != pr->ntr_task)
- {
- GNUNET_SCHEDULER_cancel (pr->ntr_task);
- pr->ntr_task = GNUNET_SCHEDULER_NO_TASK;
- }
- th = &pr->th;
- th->peer = NULL;
- if ((NULL != pr->prev) || (NULL != pr->next) || (pr == h->ready_peer_head))
+ GNUNET_break (GNUNET_NO == h->currently_down);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received notification about connection from `%s'.\n",
+ GNUNET_i2s (&cnm->peer));
+ if (0 == memcmp (&h->me,
+ &cnm->peer,
+ sizeof (struct GNUNET_PeerIdentity)))
{
- /* the request that was 'approved' by core was
- * canceled before it could be transmitted; remove
- * us from the 'ready' list */
- GNUNET_CONTAINER_DLL_remove (h->ready_peer_head, h->ready_peer_tail, pr);
+ /* connect to self!? */
+ GNUNET_break (0);
+ return;
}
- if (NULL != th->cm)
+ pr = GNUNET_CONTAINER_multipeermap_get (h->peers,
+ &cnm->peer);
+ if (NULL != pr)
{
- /* we're currently in the control queue, remove */
- GNUNET_CONTAINER_DLL_remove (h->control_pending_head,
- h->control_pending_tail, th->cm);
- GNUNET_free (th->cm);
+ GNUNET_break (0);
+ reconnect_later (h);
+ return;
}
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Signalling timeout of request for transmission to peer `%s' via CORE\n",
- GNUNET_i2s (&pr->peer));
- trigger_next_request (h, GNUNET_NO);
-
- GNUNET_assert (0 == th->get_message (th->get_message_cls, 0, NULL));
+ pr = GNUNET_new (struct PeerRecord);
+ pr->peer = cnm->peer;
+ pr->ch = h;
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multipeermap_put (h->peers,
+ &cnm->peer,
+ pr,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ if (NULL != h->connects)
+ h->connects (h->cls,
+ &pr->peer);
}
/**
- * Transmit the next message to the core service.
+ * Handle disconnect message received from CORE service.
+ * Notify the application about the lost connection.
*
- * @param cls closure with the `struct GNUNET_CORE_Handle`
- * @param size number of bytes available in @a buf
- * @param buf where the callee should write the message
- * @return number of bytes written to @a buf
+ * @param cls the `struct GNUNET_CORE_Handle`
+ * @param dnm message about the disconnect event
*/
-static size_t
-transmit_message (void *cls, size_t size, void *buf)
+static void
+handle_disconnect_notify (void *cls,
+ const struct DisconnectNotifyMessage * dnm)
{
struct GNUNET_CORE_Handle *h = cls;
- struct ControlMessage *cm;
- struct GNUNET_CORE_TransmitHandle *th;
struct PeerRecord *pr;
- struct SendMessage *sm;
- const struct GNUNET_MessageHeader *hdr;
- uint16_t msize;
- size_t ret;
-
- GNUNET_assert (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK);
- h->cth = NULL;
- if (NULL == buf)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Transmission failed, initiating reconnect\n");
- reconnect_later (h);
- return 0;
- }
- /* first check for control messages */
- if (NULL != (cm = h->control_pending_head))
- {
- hdr = (const struct GNUNET_MessageHeader *) &cm[1];
- msize = ntohs (hdr->size);
- if (size < msize)
- {
- trigger_next_request (h, GNUNET_NO);
- return 0;
- }
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Transmitting control message with %u bytes of type %u to core.\n",
- (unsigned int) msize, (unsigned int) ntohs (hdr->type));
- memcpy (buf, hdr, msize);
- GNUNET_CONTAINER_DLL_remove (h->control_pending_head,
- h->control_pending_tail, cm);
- if (NULL != cm->th)
- cm->th->cm = NULL;
- if (NULL != cm->cont)
- cm->cont (cm->cont_cls, GNUNET_OK);
- GNUNET_free (cm);
- trigger_next_request (h, GNUNET_NO);
- return msize;
- }
- /* now check for 'ready' P2P messages */
- if (NULL == (pr = h->ready_peer_head))
- return 0;
- GNUNET_assert (NULL != pr->th.peer);
- th = &pr->th;
- if (size < th->msize + sizeof (struct SendMessage))
- {
- trigger_next_request (h, GNUNET_NO);
- return 0;
- }
- GNUNET_CONTAINER_DLL_remove (h->ready_peer_head, h->ready_peer_tail, pr);
- th->peer = NULL;
- if (GNUNET_SCHEDULER_NO_TASK != pr->timeout_task)
- {
- GNUNET_SCHEDULER_cancel (pr->timeout_task);
- pr->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- }
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Transmitting SEND request to `%s' with %u bytes.\n",
- GNUNET_i2s (&pr->peer), (unsigned int) th->msize);
- sm = (struct SendMessage *) buf;
- sm->header.type = htons (GNUNET_MESSAGE_TYPE_CORE_SEND);
- sm->priority = htonl (th->priority);
- sm->deadline = GNUNET_TIME_absolute_hton (th->timeout);
- sm->peer = pr->peer;
- sm->cork = htonl ((uint32_t) th->cork);
- sm->reserved = htonl (0);
- ret =
- th->get_message (th->get_message_cls,
- size - sizeof (struct SendMessage), &sm[1]);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Transmitting SEND request to `%s' yielded %u bytes.\n",
- GNUNET_i2s (&pr->peer), ret);
- if (0 == ret)
+ GNUNET_break (GNUNET_NO == h->currently_down);
+ if (0 == memcmp (&h->me,
+ &dnm->peer,
+ sizeof (struct GNUNET_PeerIdentity)))
{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Size of clients message to peer %s is 0!\n",
- GNUNET_i2s (&pr->peer));
- /* client decided to send nothing! */
- request_next_transmission (pr);
- return 0;
+ /* connection to self!? */
+ GNUNET_break (0);
+ return;
}
+ GNUNET_break (0 == ntohl (dnm->reserved));
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Produced SEND message to core with %u bytes payload\n",
- (unsigned int) ret);
- GNUNET_assert (ret >= sizeof (struct GNUNET_MessageHeader));
- if (ret + sizeof (struct SendMessage) >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+ "Received notification about disconnect from `%s'.\n",
+ GNUNET_i2s (&dnm->peer));
+ pr = GNUNET_CONTAINER_multipeermap_get (h->peers,
+ &dnm->peer);
+ if (NULL == pr)
{
GNUNET_break (0);
- request_next_transmission (pr);
- return 0;
+ reconnect_later (h);
+ return;
}
- ret += sizeof (struct SendMessage);
- sm->header.size = htons (ret);
- GNUNET_assert (ret <= size);
- request_next_transmission (pr);
- return ret;
+ disconnect_and_free_peer_entry (h,
+ &dnm->peer,
+ pr);
}
/**
- * Check the list of pending requests, send the next
- * one to the core.
+ * Check that message received from CORE service is well-formed.
*
- * @param h core handle
- * @param ignore_currently_down transmit message even if not initialized?
+ * @param cls the `struct GNUNET_CORE_Handle`
+ * @param ntm the message we got
+ * @return #GNUNET_OK if the message is well-formed
*/
-static void
-trigger_next_request (struct GNUNET_CORE_Handle *h, int ignore_currently_down)
+static int
+check_notify_inbound (void *cls,
+ const struct NotifyTrafficMessage *ntm)
{
+ struct GNUNET_CORE_Handle *h = cls;
uint16_t msize;
+ const struct GNUNET_MessageHeader *em;
- if ((GNUNET_YES == h->currently_down) && (ignore_currently_down == GNUNET_NO))
+ GNUNET_break (GNUNET_NO == h->currently_down);
+ msize = ntohs (ntm->header.size) - sizeof (struct NotifyTrafficMessage);
+ if (msize < sizeof (struct GNUNET_MessageHeader))
{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Core connection down, not processing queue\n");
- return;
- }
- if (NULL != h->cth)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Request pending, not processing queue\n");
- return;
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
}
- if (NULL != h->control_pending_head)
- msize =
- ntohs (((struct GNUNET_MessageHeader *) &h->
- control_pending_head[1])->size);
- else if (h->ready_peer_head != NULL)
- msize =
- h->ready_peer_head->th.msize + sizeof (struct SendMessage);
- else
+ em = (const struct GNUNET_MessageHeader *) &ntm[1];
+ if ( (GNUNET_NO == h->inbound_hdr_only) &&
+ (msize != ntohs (em->size)) )
{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Request queue empty, not processing queue\n");
- return; /* no pending message */
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
}
- h->cth =
- GNUNET_CLIENT_notify_transmit_ready (h->client, msize,
- GNUNET_TIME_UNIT_FOREVER_REL,
- GNUNET_NO, &transmit_message, h);
+ return GNUNET_OK;
}
/**
- * Handler for notification messages received from the core.
+ * Handle inbound message received from CORE service. If applicable,
+ * notify the application.
*
- * @param cls our `struct GNUNET_CORE_Handle`
- * @param msg the message received from the core service
+ * @param cls the `struct GNUNET_CORE_Handle`
+ * @param ntm the message we got from CORE.
*/
static void
-main_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
+handle_notify_inbound (void *cls,
+ const struct NotifyTrafficMessage *ntm)
{
struct GNUNET_CORE_Handle *h = cls;
- const struct InitReplyMessage *m;
- const struct ConnectNotifyMessage *cnm;
- const struct DisconnectNotifyMessage *dnm;
- const struct NotifyTrafficMessage *ntm;
const struct GNUNET_MessageHeader *em;
- const struct SendMessageReady *smr;
- const struct GNUNET_CORE_MessageHandler *mh;
- GNUNET_CORE_StartupCallback init;
struct PeerRecord *pr;
- struct GNUNET_CORE_TransmitHandle *th;
- unsigned int hpos;
- int trigger;
- uint16_t msize;
uint16_t et;
- if (NULL == msg)
- {
- LOG (GNUNET_ERROR_TYPE_INFO,
- _("Client was disconnected from core service, trying to reconnect.\n"));
- reconnect_later (h);
- return;
- }
- msize = ntohs (msg->size);
+
+ GNUNET_break (GNUNET_NO == h->currently_down);
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Processing message of type %u and size %u from core service\n",
- ntohs (msg->type), msize);
- switch (ntohs (msg->type))
+ "Received inbound message from `%s'.\n",
+ GNUNET_i2s (&ntm->peer));
+ em = (const struct GNUNET_MessageHeader *) &ntm[1];
+ et = ntohs (em->type);
+ for (unsigned int hpos = 0; NULL != h->handlers[hpos].callback; hpos++)
{
- case GNUNET_MESSAGE_TYPE_CORE_INIT_REPLY:
- if (ntohs (msg->size) != sizeof (struct InitReplyMessage))
- {
- GNUNET_break (0);
- reconnect_later (h);
- return;
- }
- m = (const struct InitReplyMessage *) msg;
- GNUNET_break (0 == ntohl (m->reserved));
- /* start our message processing loop */
- if (GNUNET_YES == h->currently_down)
- {
- h->currently_down = GNUNET_NO;
- trigger_next_request (h, GNUNET_NO);
- }
- h->retry_backoff = GNUNET_TIME_UNIT_MILLISECONDS;
- h->me = m->my_identity;
- if (NULL != (init = h->init))
- {
- /* mark so we don't call init on reconnect */
- h->init = NULL;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Connected to core service of peer `%s'.\n",
- GNUNET_i2s (&h->me));
- init (h->cls, &h->me);
- }
- else
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Successfully reconnected to core service.\n");
- }
- /* fake 'connect to self' */
- pr = GNUNET_CONTAINER_multipeermap_get (h->peers, &h->me);
- GNUNET_assert (NULL == pr);
- pr = GNUNET_new (struct PeerRecord);
- pr->peer = h->me;
- pr->ch = h;
- GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multipeermap_put (h->peers,
- &h->me, pr,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
- if (NULL != h->connects)
- h->connects (h->cls, &h->me);
- break;
- case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_CONNECT:
- if (msize < sizeof (struct ConnectNotifyMessage))
- {
- GNUNET_break (0);
- reconnect_later (h);
- return;
- }
- cnm = (const struct ConnectNotifyMessage *) msg;
- if (msize !=
- sizeof (struct ConnectNotifyMessage))
- {
- GNUNET_break (0);
- reconnect_later (h);
- return;
- }
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Received notification about connection from `%s'.\n",
- GNUNET_i2s (&cnm->peer));
- if (0 == memcmp (&h->me, &cnm->peer, sizeof (struct GNUNET_PeerIdentity)))
- {
- /* connect to self!? */
- GNUNET_break (0);
- return;
- }
- pr = GNUNET_CONTAINER_multipeermap_get (h->peers, &cnm->peer);
- if (NULL != pr)
- {
- GNUNET_break (0);
- reconnect_later (h);
- return;
- }
- pr = GNUNET_new (struct PeerRecord);
- pr->peer = cnm->peer;
- pr->ch = h;
- GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multipeermap_put (h->peers,
- &cnm->peer, pr,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
- if (NULL != h->connects)
- h->connects (h->cls, &cnm->peer);
- break;
- case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_DISCONNECT:
- if (msize != sizeof (struct DisconnectNotifyMessage))
- {
- GNUNET_break (0);
- reconnect_later (h);
- return;
- }
- dnm = (const struct DisconnectNotifyMessage *) msg;
- if (0 == memcmp (&h->me, &dnm->peer, sizeof (struct GNUNET_PeerIdentity)))
- {
- /* connection to self!? */
- GNUNET_break (0);
- return;
- }
- GNUNET_break (0 == ntohl (dnm->reserved));
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Received notification about disconnect from `%s'.\n",
- GNUNET_i2s (&dnm->peer));
- pr = GNUNET_CONTAINER_multipeermap_get (h->peers, &dnm->peer);
- if (NULL == pr)
- {
- GNUNET_break (0);
- reconnect_later (h);
- return;
- }
- trigger = ((pr->prev != NULL) || (pr->next != NULL) ||
- (h->ready_peer_head == pr));
- disconnect_and_free_peer_entry (h, &dnm->peer, pr);
- if (trigger)
- trigger_next_request (h, GNUNET_NO);
- break;
- case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_INBOUND:
- if (msize < sizeof (struct NotifyTrafficMessage))
- {
- GNUNET_break (0);
- reconnect_later (h);
- return;
- }
- ntm = (const struct NotifyTrafficMessage *) msg;
- if ((msize <
- sizeof (struct NotifyTrafficMessage) +
- sizeof (struct GNUNET_MessageHeader)) )
- {
- GNUNET_break (0);
- reconnect_later (h);
- return;
- }
- em = (const struct GNUNET_MessageHeader *) &ntm[1];
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Received message of type %u and size %u from peer `%4s'\n",
- ntohs (em->type), ntohs (em->size), GNUNET_i2s (&ntm->peer));
- if ((GNUNET_NO == h->inbound_hdr_only) &&
- (msize !=
- ntohs (em->size) + sizeof (struct NotifyTrafficMessage)))
- {
- GNUNET_break (0);
- reconnect_later (h);
- return;
- }
- et = ntohs (em->type);
- for (hpos = 0; hpos < h->hcnt; hpos++)
- {
- mh = &h->handlers[hpos];
- if (mh->type != et)
- continue;
- if ((mh->expected_size != ntohs (em->size)) && (mh->expected_size != 0))
- {
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "Unexpected message size %u for message of type %u from peer `%4s'\n",
- htons (em->size), mh->type, GNUNET_i2s (&ntm->peer));
- GNUNET_break_op (0);
- continue;
- }
- pr = GNUNET_CONTAINER_multipeermap_get (h->peers, &ntm->peer);
- if (NULL == pr)
- {
- GNUNET_break (0);
- reconnect_later (h);
- return;
- }
- if (GNUNET_OK !=
- h->handlers[hpos].callback (h->cls, &ntm->peer, em))
- {
- /* error in processing, do not process other messages! */
- break;
- }
- }
- if (NULL != h->inbound_notify)
- h->inbound_notify (h->cls, &ntm->peer, em);
- break;
- case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_OUTBOUND:
- if (msize < sizeof (struct NotifyTrafficMessage))
- {
- GNUNET_break (0);
- reconnect_later (h);
- return;
- }
- ntm = (const struct NotifyTrafficMessage *) msg;
- if ((msize <
- sizeof (struct NotifyTrafficMessage) +
- sizeof (struct GNUNET_MessageHeader)) )
- {
- GNUNET_break (0);
- reconnect_later (h);
- return;
- }
- em = (const struct GNUNET_MessageHeader *) &ntm[1];
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Received notification about transmission to `%s'.\n",
- GNUNET_i2s (&ntm->peer));
- if ((GNUNET_NO == h->outbound_hdr_only) &&
- (msize !=
- ntohs (em->size) + sizeof (struct NotifyTrafficMessage)))
- {
- GNUNET_break (0);
- reconnect_later (h);
- return;
- }
- if (NULL == h->outbound_notify)
- {
- GNUNET_break (0);
- break;
- }
- h->outbound_notify (h->cls, &ntm->peer, em);
- break;
- case GNUNET_MESSAGE_TYPE_CORE_SEND_READY:
- if (msize != sizeof (struct SendMessageReady))
+ const struct GNUNET_CORE_MessageHandler *mh;
+
+ mh = &h->handlers[hpos];
+ if (mh->type != et)
+ continue;
+ if ( (mh->expected_size != ntohs (em->size)) &&
+ (0 != mh->expected_size) )
{
- GNUNET_break (0);
- reconnect_later (h);
- return;
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Unexpected message size %u for message of type %u from peer `%s'\n",
+ htons (em->size),
+ mh->type,
+ GNUNET_i2s (&ntm->peer));
+ GNUNET_break_op (0);
+ continue;
}
- smr = (const struct SendMessageReady *) msg;
- pr = GNUNET_CONTAINER_multipeermap_get (h->peers, &smr->peer);
+ pr = GNUNET_CONTAINER_multipeermap_get (h->peers,
+ &ntm->peer);
if (NULL == pr)
{
GNUNET_break (0);
reconnect_later (h);
return;
}
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Received notification about transmission readiness to `%s'.\n",
- GNUNET_i2s (&smr->peer));
- if (NULL == pr->th.peer)
+ if (GNUNET_OK !=
+ h->handlers[hpos].callback (h->cls,
+ &ntm->peer,
+ em))
{
- /* request must have been cancelled between the original request
- * and the response from core, ignore core's readiness */
+ /* error in processing, do not process other messages! */
break;
}
+ }
+ if (NULL != h->inbound_notify)
+ h->inbound_notify (h->cls,
+ &ntm->peer,
+ em);
+}
- th = &pr->th;
- if (ntohs (smr->smr_id) != th->smr_id)
- {
- /* READY message is for expired or cancelled message,
- * ignore! (we should have already sent another request) */
- break;
- }
- if ((NULL != pr->prev) || (NULL != pr->next) || (h->ready_peer_head == pr))
- {
- /* we should not already be on the ready list... */
- GNUNET_break (0);
- reconnect_later (h);
- return;
- }
- GNUNET_CONTAINER_DLL_insert (h->ready_peer_head, h->ready_peer_tail, pr);
- trigger_next_request (h, GNUNET_NO);
- break;
- default:
- reconnect_later (h);
- return;
+
+/**
+ * Check that message received from CORE service is well-formed.
+ *
+ * @param cls the `struct GNUNET_CORE_Handle`
+ * @param ntm the message we got
+ * @return #GNUNET_OK if the message is well-formed
+ */
+static int
+check_notify_outbound (void *cls,
+ const struct NotifyTrafficMessage *ntm)
+{
+ struct GNUNET_CORE_Handle *h = cls;
+ uint16_t msize;
+ const struct GNUNET_MessageHeader *em;
+
+ GNUNET_break (GNUNET_NO == h->currently_down);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received outbound message from `%s'.\n",
+ GNUNET_i2s (&ntm->peer));
+ msize = ntohs (ntm->header.size) - sizeof (struct NotifyTrafficMessage);
+ if (msize < sizeof (struct GNUNET_MessageHeader))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
}
- GNUNET_CLIENT_receive (h->client, &main_notify_handler, h,
- GNUNET_TIME_UNIT_FOREVER_REL);
+ em = (const struct GNUNET_MessageHeader *) &ntm[1];
+ if ( (GNUNET_NO == h->outbound_hdr_only) &&
+ (msize != ntohs (em->size)) )
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
}
/**
- * Task executed once we are done transmitting the INIT message.
- * Starts our 'receive' loop.
+ * Handle outbound message received from CORE service. If applicable,
+ * notify the application.
*
- * @param cls the 'struct GNUNET_CORE_Handle'
- * @param success were we successful
+ * @param cls the `struct GNUNET_CORE_Handle`
+ * @param ntm the message we got
*/
static void
-init_done_task (void *cls, int success)
+handle_notify_outbound (void *cls,
+ const struct NotifyTrafficMessage *ntm)
{
struct GNUNET_CORE_Handle *h = cls;
+ const struct GNUNET_MessageHeader *em;
- if (GNUNET_SYSERR == success)
- return; /* shutdown */
- if (GNUNET_NO == success)
+ GNUNET_break (GNUNET_NO == h->currently_down);
+ em = (const struct GNUNET_MessageHeader *) &ntm[1];
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received notification about transmission to `%s'.\n",
+ GNUNET_i2s (&ntm->peer));
+ if (NULL == h->outbound_notify)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Failed to exchange INIT with core, retrying\n");
- if (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK)
- reconnect_later (h);
+ GNUNET_break (0);
return;
}
- GNUNET_CLIENT_receive (h->client, &main_notify_handler, h,
- GNUNET_TIME_UNIT_FOREVER_REL);
+ h->outbound_notify (h->cls,
+ &ntm->peer,
+ em);
}
/**
- * Our current client connection went down. Clean it up
- * and try to reconnect!
+ * Handle message received from CORE service notifying us that we are
+ * now allowed to send a message to a peer. If that message is still
+ * pending, put it into the queue to be transmitted.
+ *
+ * @param cls the `struct GNUNET_CORE_Handle`
+ * @param ntm the message we got
+ */
+static void
+handle_send_ready (void *cls,
+ const struct SendMessageReady *smr)
+{
+ struct GNUNET_CORE_Handle *h = cls;
+ struct PeerRecord *pr;
+ struct GNUNET_CORE_TransmitHandle *th;
+ struct SendMessage *sm;
+ struct GNUNET_MQ_Envelope *env;
+ struct GNUNET_TIME_Relative delay;
+ struct GNUNET_TIME_Relative overdue;
+ unsigned int ret;
+
+ GNUNET_break (GNUNET_NO == h->currently_down);
+ pr = GNUNET_CONTAINER_multipeermap_get (h->peers,
+ &smr->peer);
+ if (NULL == pr)
+ {
+ GNUNET_break (0);
+ reconnect_later (h);
+ return;
+ }
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received notification about transmission readiness to `%s'.\n",
+ GNUNET_i2s (&smr->peer));
+ if (NULL == pr->th.peer)
+ {
+ /* request must have been cancelled between the original request
+ * and the response from CORE, ignore CORE's readiness */
+ return;
+ }
+ th = &pr->th;
+ if (ntohs (smr->smr_id) != th->smr_id)
+ {
+ /* READY message is for expired or cancelled message,
+ * ignore! (we should have already sent another request) */
+ return;
+ }
+ /* ok, all good, send message out! */
+ th->peer = NULL;
+ env = GNUNET_MQ_msg_extra (sm,
+ th->msize,
+ GNUNET_MESSAGE_TYPE_CORE_SEND);
+ sm->priority = htonl ((uint32_t) th->priority);
+ sm->deadline = GNUNET_TIME_absolute_hton (th->deadline);
+ sm->peer = pr->peer;
+ sm->cork = htonl ((uint32_t) th->cork);
+ sm->reserved = htonl (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Calling get_message with buffer of %u bytes\n",
+ (unsigned int) th->msize);
+ /* FIXME: this is ugly and a bit brutal, but "get_message"
+ may call GNUNET_CORE_notify_transmit_ready() which
+ may call GNUNET_MQ_send() as well, and we MUST get this
+ message out before the next SEND_REQUEST. So we queue
+ it (even though incomplete) and then---relying on MQ being
+ nice and not actually touching 'env' until much later---
+ fill it afterwards. This is horrible style, and once
+ the core_api abandons GNUNET_CORE_notify_transmit_ready
+ in favor of an MQ-style API, this hack should no longer
+ be required */
+ GNUNET_MQ_send (h->mq,
+ env);
+ ret = th->get_message (th->get_message_cls,
+ th->msize,
+ &sm[1]);
+ sm->header.size = htons (ret + sizeof (struct SendMessage));
+ delay = GNUNET_TIME_absolute_get_duration (th->request_time);
+ overdue = GNUNET_TIME_absolute_get_duration (th->deadline);
+ if (overdue.rel_value_us > GNUNET_CONSTANTS_LATENCY_WARN.rel_value_us)
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Transmitting overdue %u bytes to `%s' at priority %u with %s delay %s\n",
+ ret,
+ GNUNET_i2s (&pr->peer),
+ (unsigned int) th->priority,
+ GNUNET_STRINGS_relative_time_to_string (delay,
+ GNUNET_YES),
+ (th->cork) ? " (corked)" : "");
+ else
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Transmitting %u bytes to `%s' at priority %u with %s delay %s\n",
+ ret,
+ GNUNET_i2s (&pr->peer),
+ (unsigned int) th->priority,
+ GNUNET_STRINGS_relative_time_to_string (delay,
+ GNUNET_YES),
+ (th->cork) ? " (corked)" : "");
+}
+
+
+/**
+ * Our current client connection went down. Clean it up and try to
+ * reconnect!
*
* @param h our handle to the core service
*/
static void
reconnect (struct GNUNET_CORE_Handle *h)
{
- struct ControlMessage *cm;
+ GNUNET_MQ_hd_fixed_size (init_reply,
+ GNUNET_MESSAGE_TYPE_CORE_INIT_REPLY,
+ struct InitReplyMessage);
+ GNUNET_MQ_hd_fixed_size (connect_notify,
+ GNUNET_MESSAGE_TYPE_CORE_NOTIFY_CONNECT,
+ struct ConnectNotifyMessage);
+ GNUNET_MQ_hd_fixed_size (disconnect_notify,
+ GNUNET_MESSAGE_TYPE_CORE_NOTIFY_DISCONNECT,
+ struct DisconnectNotifyMessage);
+ GNUNET_MQ_hd_var_size (notify_inbound,
+ GNUNET_MESSAGE_TYPE_CORE_NOTIFY_INBOUND,
+ struct NotifyTrafficMessage);
+ GNUNET_MQ_hd_var_size (notify_outbound,
+ GNUNET_MESSAGE_TYPE_CORE_NOTIFY_OUTBOUND,
+ struct NotifyTrafficMessage);
+ GNUNET_MQ_hd_fixed_size (send_ready,
+ GNUNET_MESSAGE_TYPE_CORE_SEND_READY,
+ struct SendMessageReady);
+ struct GNUNET_MQ_MessageHandler handlers[] = {
+ make_init_reply_handler (h),
+ make_connect_notify_handler (h),
+ make_disconnect_notify_handler (h),
+ make_notify_inbound_handler (h),
+ make_notify_outbound_handler (h),
+ make_send_ready_handler (h),
+ GNUNET_MQ_handler_end ()
+ };
struct InitMessage *init;
+ struct GNUNET_MQ_Envelope *env;
uint32_t opt;
- uint16_t msize;
uint16_t *ts;
- unsigned int hpos;
- GNUNET_assert (NULL == h->client);
+ GNUNET_assert (NULL == h->mq);
GNUNET_assert (GNUNET_YES == h->currently_down);
- GNUNET_assert (NULL != h->cfg);
- h->client = GNUNET_CLIENT_connect ("core", h->cfg);
- if (NULL == h->client)
+ h->mq = GNUNET_CLIENT_connecT (h->cfg,
+ "core",
+ handlers,
+ &handle_mq_error,
+ h);
+ if (NULL == h->mq)
{
reconnect_later (h);
return;
}
- msize = h->hcnt * sizeof (uint16_t) + sizeof (struct InitMessage);
- cm = GNUNET_malloc (sizeof (struct ControlMessage) + msize);
- cm->cont = &init_done_task;
- cm->cont_cls = h;
- init = (struct InitMessage *) &cm[1];
- init->header.type = htons (GNUNET_MESSAGE_TYPE_CORE_INIT);
- init->header.size = htons (msize);
+ env = GNUNET_MQ_msg_extra (init,
+ sizeof (uint16_t) * h->hcnt,
+ GNUNET_MESSAGE_TYPE_CORE_INIT);
opt = 0;
- if (h->inbound_notify != NULL)
+ if (NULL != h->inbound_notify)
{
if (h->inbound_hdr_only)
opt |= GNUNET_CORE_OPTION_SEND_HDR_INBOUND;
else
opt |= GNUNET_CORE_OPTION_SEND_FULL_INBOUND;
}
- if (h->outbound_notify != NULL)
+ if (NULL != h->outbound_notify)
{
if (h->outbound_hdr_only)
opt |= GNUNET_CORE_OPTION_SEND_HDR_OUTBOUND;
LOG (GNUNET_ERROR_TYPE_INFO,
"(Re)connecting to CORE service, monitoring messages of type %u\n",
opt);
-
init->options = htonl (opt);
- ts = (uint16_t *) & init[1];
- for (hpos = 0; hpos < h->hcnt; hpos++)
+ ts = (uint16_t *) &init[1];
+ for (unsigned int hpos = 0; hpos < h->hcnt; hpos++)
ts[hpos] = htons (h->handlers[hpos].type);
- GNUNET_CONTAINER_DLL_insert (h->control_pending_head, h->control_pending_tail,
- cm);
- trigger_next_request (h, GNUNET_YES);
+ GNUNET_MQ_send (h->mq,
+ env);
}
-
/**
- * Connect to the core service. Note that the connection may
- * complete (or fail) asynchronously.
+ * Connect to the core service. Note that the connection may complete
+ * (or fail) asynchronously.
*
* @param cfg configuration to use
* @param cls closure for the various callbacks that follow (including handlers in the handlers array)
* @param inbound_notify function to call for all inbound messages, can be NULL
* @param inbound_hdr_only set to #GNUNET_YES if inbound_notify will only read the
* GNUNET_MessageHeader and hence we do not need to give it the full message;
- * can be used to improve efficiency, ignored if @a inbound_notify is NULLL
+ * can be used to improve efficiency, ignored if @a inbound_notify is NULL
* @param outbound_notify function to call for all outbound messages, can be NULL
* @param outbound_hdr_only set to #GNUNET_YES if outbound_notify will only read the
* GNUNET_MessageHeader and hence we do not need to give it the full message
- * can be used to improve efficiency, ignored if @a outbound_notify is NULLL
+ * can be used to improve efficiency, ignored if @a outbound_notify is NULL
* @param handlers callbacks for messages we care about, NULL-terminated
- * @return handle to the core service (only useful for disconnect until 'init' is called);
+ * @return handle to the core service (only useful for disconnect until @a init is called);
* NULL on error (in this case, init is never called)
*/
struct GNUNET_CORE_Handle *
const struct GNUNET_CORE_MessageHandler *handlers)
{
struct GNUNET_CORE_Handle *h;
+ unsigned int hcnt;
- GNUNET_assert (NULL != cfg);
h = GNUNET_new (struct GNUNET_CORE_Handle);
h->cfg = cfg;
h->cls = cls;
h->outbound_notify = outbound_notify;
h->inbound_hdr_only = inbound_hdr_only;
h->outbound_hdr_only = outbound_hdr_only;
- h->handlers = handlers;
- h->hcnt = 0;
h->currently_down = GNUNET_YES;
h->peers = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_NO);
+ hcnt = 0;
+ if (NULL != handlers)
+ while (NULL != handlers[hcnt].callback)
+ hcnt++;
+ h->handlers = GNUNET_new_array (hcnt + 1,
+ struct GNUNET_CORE_MessageHandler);
if (NULL != handlers)
- while (handlers[h->hcnt].callback != NULL)
- h->hcnt++;
- GNUNET_assert (h->hcnt <
+ memcpy (h->handlers,
+ handlers,
+ hcnt * sizeof (struct GNUNET_CORE_MessageHandler));
+ h->hcnt = hcnt;
+ GNUNET_assert (hcnt <
(GNUNET_SERVER_MAX_MESSAGE_SIZE -
sizeof (struct InitMessage)) / sizeof (uint16_t));
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Connecting to CORE service\n");
reconnect (h);
+ if (NULL == h->mq)
+ {
+ GNUNET_CORE_disconnect (h);
+ return NULL;
+ }
return h;
}
/**
* Disconnect from the core service. This function can only
- * be called *after* all pending 'GNUNET_CORE_notify_transmit_ready'
+ * be called *after* all pending #GNUNET_CORE_notify_transmit_ready()
* requests have been explicitly canceled.
*
* @param handle connection to core to disconnect
void
GNUNET_CORE_disconnect (struct GNUNET_CORE_Handle *handle)
{
- struct ControlMessage *cm;
-
- GNUNET_assert (NULL != handle);
-
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from CORE service\n");
- if (NULL != handle->cth)
- {
- GNUNET_CLIENT_notify_transmit_ready_cancel (handle->cth);
- handle->cth = NULL;
- }
- while (NULL != (cm = handle->control_pending_head))
- {
- GNUNET_CONTAINER_DLL_remove (handle->control_pending_head,
- handle->control_pending_tail, cm);
- if (NULL != cm->th)
- cm->th->cm = NULL;
- if (NULL != cm->cont)
- cm->cont (cm->cont_cls, GNUNET_SYSERR);
- GNUNET_free (cm);
- }
- if (NULL != handle->client)
- {
- GNUNET_CLIENT_disconnect (handle->client);
- handle->client = NULL;
- }
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Disconnecting from CORE service\n");
GNUNET_CONTAINER_multipeermap_iterate (handle->peers,
&disconnect_and_free_peer_entry,
handle);
- if (handle->reconnect_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_CONTAINER_multipeermap_destroy (handle->peers);
+ handle->peers = NULL;
+ if (NULL != handle->reconnect_task)
{
GNUNET_SCHEDULER_cancel (handle->reconnect_task);
- handle->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ handle->reconnect_task = NULL;
}
- GNUNET_CONTAINER_multipeermap_destroy (handle->peers);
- handle->peers = NULL;
- GNUNET_break (handle->ready_peer_head == NULL);
+ if (NULL != handle->mq)
+ {
+ GNUNET_MQ_destroy (handle->mq);
+ handle->mq = NULL;
+ }
+ GNUNET_free (handle->handlers);
GNUNET_free (handle);
}
-/**
- * Task that calls 'request_next_transmission'.
- *
- * @param cls the 'struct PeerRecord *'
- * @param tc scheduler context
- */
-static void
-run_request_next_transmission (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct PeerRecord *pr = cls;
-
- pr->ntr_task = GNUNET_SCHEDULER_NO_TASK;
- request_next_transmission (pr);
-}
-
-
/**
* Ask the core to call @a notify once it is ready to transmit the
* given number of bytes to the specified @a target. Must only be
* @param handle connection to core service
* @param cork is corking allowed for this transmission?
* @param priority how important is the message?
- * @param maxdelay how long can the message wait?
+ * @param maxdelay how long can the message wait? Only effective if @a cork is #GNUNET_YES
* @param target who should receive the message, never NULL (can be this peer's identity for loopback)
* @param notify_size how many bytes of buffer space does @a notify want?
* @param notify function to call when buffer space is available;
* will be called with NULL on timeout; clients MUST cancel
* all pending transmission requests DURING the disconnect
* handler
- * @param notify_cls closure for notify
+ * @param notify_cls closure for @a notify
* @return non-NULL if the notify callback was queued,
* NULL if we can not even queue the request (request already pending);
* if NULL is returned, @a notify will NOT be called.
*/
struct GNUNET_CORE_TransmitHandle *
-GNUNET_CORE_notify_transmit_ready (struct GNUNET_CORE_Handle *handle, int cork,
- uint32_t priority,
+GNUNET_CORE_notify_transmit_ready (struct GNUNET_CORE_Handle *handle,
+ int cork,
+ enum GNUNET_CORE_Priority priority,
struct GNUNET_TIME_Relative maxdelay,
const struct GNUNET_PeerIdentity *target,
size_t notify_size,
{
struct PeerRecord *pr;
struct GNUNET_CORE_TransmitHandle *th;
+ struct SendMessageRequest *smr;
+ struct GNUNET_MQ_Envelope *env;
- GNUNET_assert (NULL != handle);
- GNUNET_assert (NULL != target);
-
- if (notify_size > GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE)
+ if (NULL == handle->mq)
{
- GNUNET_break (0);
- return NULL;
+ GNUNET_break (0); /* SEE #4588: do not call NTR from disconnect notification! */
+ return NULL;
}
GNUNET_assert (NULL != notify);
+ if ( (notify_size > GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE) ||
+ (notify_size + sizeof (struct SendMessage) >= GNUNET_SERVER_MAX_MESSAGE_SIZE) )
+ {
+ GNUNET_break (0);
+ return NULL;
+ }
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Asking core for transmission of %u bytes to `%s'\n",
(unsigned int) notify_size,
GNUNET_i2s (target));
- pr = GNUNET_CONTAINER_multipeermap_get (handle->peers, target);
+ pr = GNUNET_CONTAINER_multipeermap_get (handle->peers,
+ target);
if (NULL == pr)
{
/* attempt to send to peer that is not connected */
GNUNET_break (0);
return NULL;
}
- GNUNET_assert (notify_size + sizeof (struct SendMessage) <
- GNUNET_SERVER_MAX_MESSAGE_SIZE);
th = &pr->th;
- memset (th, 0, sizeof (struct GNUNET_CORE_TransmitHandle));
+ memset (th,
+ 0,
+ sizeof (struct GNUNET_CORE_TransmitHandle));
th->peer = pr;
th->get_message = notify;
th->get_message_cls = notify_cls;
- th->timeout = GNUNET_TIME_relative_to_absolute (maxdelay);
+ th->request_time = GNUNET_TIME_absolute_get ();
+ if (GNUNET_YES == cork)
+ th->deadline = GNUNET_TIME_relative_to_absolute (maxdelay);
+ else
+ th->deadline = th->request_time;
th->priority = priority;
th->msize = notify_size;
th->cork = cork;
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pr->ntr_task);
- pr->ntr_task =
- GNUNET_SCHEDULER_add_now (&run_request_next_transmission, pr);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Transmission request added to queue\n");
+ if (NULL == handle->mq)
+ return th; /* see #4588 (hack until we transition core fully to MQ) */
+ env = GNUNET_MQ_msg (smr,
+ GNUNET_MESSAGE_TYPE_CORE_SEND_REQUEST);
+ smr->priority = htonl ((uint32_t) th->priority);
+ smr->deadline = GNUNET_TIME_absolute_hton (th->deadline);
+ smr->peer = pr->peer;
+ smr->reserved = htonl (0);
+ smr->size = htons (th->msize);
+ smr->smr_id = htons (th->smr_id = pr->smr_id_gen++);
+ GNUNET_MQ_send (handle->mq,
+ env);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Transmission request added to queue\n");
return th;
}
/**
* Cancel the specified transmission-ready notification.
*
- * @param th handle that was returned by "notify_transmit_ready".
+ * @param th handle that was returned by #GNUNET_CORE_notify_transmit_ready().
*/
void
GNUNET_CORE_notify_transmit_ready_cancel (struct GNUNET_CORE_TransmitHandle *th)
{
struct PeerRecord *pr = th->peer;
- struct GNUNET_CORE_Handle *h;
- GNUNET_assert (NULL != th);
- GNUNET_assert (NULL != pr);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Aborting transmission request to core for %u bytes to `%s'\n",
(unsigned int) th->msize,
GNUNET_i2s (&pr->peer));
th->peer = NULL;
- h = pr->ch;
- if (NULL != th->cm)
- {
- /* we're currently in the control queue, remove */
- GNUNET_CONTAINER_DLL_remove (h->control_pending_head,
- h->control_pending_tail, th->cm);
- GNUNET_free (th->cm);
- th->cm = NULL;
- }
- if ((NULL != pr->prev) || (NULL != pr->next) || (pr == h->ready_peer_head))
- {
- /* the request that was 'approved' by core was
- * canceled before it could be transmitted; remove
- * us from the 'ready' list */
- GNUNET_CONTAINER_DLL_remove (h->ready_peer_head, h->ready_peer_tail, pr);
- }
- if (GNUNET_SCHEDULER_NO_TASK != pr->ntr_task)
- {
- GNUNET_SCHEDULER_cancel (pr->ntr_task);
- pr->ntr_task = GNUNET_SCHEDULER_NO_TASK;
- }
}
* Check if the given peer is currently connected. This function is for special
* cirumstances (GNUNET_TESTBED uses it), normal users of the CORE API are
* expected to track which peers are connected based on the connect/disconnect
- * callbacks from GNUNET_CORE_connect. This function is NOT part of the
+ * callbacks from #GNUNET_CORE_connect(). This function is NOT part of the
* 'versioned', 'official' API. The difference between this function and the
* function GNUNET_CORE_is_peer_connected() is that this one returns
* synchronously after looking in the CORE API cache. The function
*
* @param h the core handle
* @param pid the identity of the peer to check if it has been connected to us
- * @return GNUNET_YES if the peer is connected to us; GNUNET_NO if not
+ * @return #GNUNET_YES if the peer is connected to us; #GNUNET_NO if not
*/
int
GNUNET_CORE_is_peer_connected_sync (const struct GNUNET_CORE_Handle *h,
const struct GNUNET_PeerIdentity *pid)
{
- GNUNET_assert (NULL != h);
- GNUNET_assert (NULL != pid);
- return GNUNET_CONTAINER_multipeermap_contains (h->peers, pid);
-}
-
-
-/**
- * Function called to notify a client about the connection
- * begin ready to queue more data. "buf" will be
- * NULL and "size" zero if the connection was closed for
- * writing in the meantime.
- *
- * @param cls closure
- * @param size number of bytes available in buf
- * @param buf where the callee should write the message
- * @return number of bytes written to buf
- */
-static size_t
-core_mq_ntr (void *cls, size_t size,
- void *buf)
-{
- struct GNUNET_MQ_Handle *mq = cls;
- struct CoreMQState *mqs = GNUNET_MQ_impl_state (mq);
- const struct GNUNET_MessageHeader *mh = GNUNET_MQ_impl_current (mq);
- size_t msg_size = ntohs (mh->size);
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "core-mq", "ntr called (size %u, type %u)\n",
- msg_size, ntohs (mh->type));
- mqs->th = NULL;
- if (NULL == buf)
- {
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "core-mq", "send error\n");
- GNUNET_MQ_inject_error (mq, GNUNET_MQ_ERROR_WRITE);
- return 0;
- }
- memcpy (buf, mh, msg_size);
- GNUNET_MQ_impl_send_continue (mq);
- return msg_size;
-}
-
-
-/**
- * Signature of functions implementing the
- * sending functionality of a message queue.
- *
- * @param mq the message queue
- * @param msg the message to send
- * @param impl_state state of the implementation
- */
-static void
-core_mq_send (struct GNUNET_MQ_Handle *mq,
- const struct GNUNET_MessageHeader *msg,
- void *impl_state)
-{
- struct CoreMQState *mqs = impl_state;
- GNUNET_assert (NULL == mqs->th);
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "core-mq", "Sending queued message (size %u)\n",
- ntohs (msg->size));
- mqs->th = GNUNET_CORE_notify_transmit_ready (mqs->core, GNUNET_YES, 0,
- GNUNET_TIME_UNIT_FOREVER_REL,
- &mqs->target,
- ntohs (msg->size), core_mq_ntr, mq);
-}
-
-
-/**
- * Signature of functions implementing the
- * destruction of a message queue.
- * Implementations must not free @a mq, but should
- * take care of @a impl_state.
- *
- * @param mq the message queue to destroy
- * @param impl_state state of the implementation
- */
-static void
-core_mq_destroy (struct GNUNET_MQ_Handle *mq, void *impl_state)
-{
- struct CoreMQState *mqs = impl_state;
- if (NULL != mqs->th)
- {
- GNUNET_CORE_notify_transmit_ready_cancel (mqs->th);
- mqs->th = NULL;
- }
- GNUNET_free (mqs);
-}
-
-
-/**
- * Implementation function that cancels the currently sent message.
- *
- * @param mq message queue
- * @param impl_state state specific to the implementation
- */
-static void
-core_mq_cancel (struct GNUNET_MQ_Handle *mq, void *impl_state)
-{
- struct CoreMQState *mqs = impl_state;
- GNUNET_assert (NULL != mqs->th);
- GNUNET_CORE_notify_transmit_ready_cancel (mqs->th);
+ return GNUNET_CONTAINER_multipeermap_contains (h->peers,
+ pid);
}
-/**
- * Create a message queue for sending messages to a peer with CORE.
- * Messages may only be queued with #GNUNET_MQ_send once the init callback has
- * been called for the given handle.
- * There must only be one queue per peer for each core handle.
- * The message queue can only be used to transmit messages,
- * not to receive them.
- *
- * @param h the core handle
- * @param target the target peer for this queue, may not be NULL
- * @return a message queue for sending messages over the core handle
- * to the target peer
- */
-struct GNUNET_MQ_Handle *
-GNUNET_CORE_mq_create (struct GNUNET_CORE_Handle *h,
- const struct GNUNET_PeerIdentity *target)
-{
- struct CoreMQState *mqs = GNUNET_new (struct CoreMQState);
- mqs->core = h;
- mqs->target = *target;
- return GNUNET_MQ_queue_for_callbacks (core_mq_send, core_mq_destroy,
- core_mq_cancel, mqs,
- NULL, NULL, NULL);
-}
-
/* end of core_api.c */
projects / oweals / gnunet.git / blobdiff