/*
This file is part of GNUnet.
- (C) 2012 Christian Grothoff (and other contributing authors)
+ (C) 2012-2014 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
*/
GNUNET_MQ_DestroyImpl destroy_impl;
+ /**
+ * Implementation-dependent send cancel function
+ */
+ GNUNET_MQ_CancelImpl cancel_impl;
+
/**
* Implementation-specific state
*/
};
-
-
+/**
+ * Implementation-specific state for connection to
+ * client (MQ for server).
+ */
struct ServerClientSocketState
{
+ /**
+ * Handle of the client that connected to the server.
+ */
struct GNUNET_SERVER_Client *client;
+
+ /**
+ * Active transmission request to the client.
+ */
struct GNUNET_SERVER_TransmitHandle* th;
};
+/**
+ * Implementation-specific state for connection to
+ * service (MQ for clients).
+ */
struct ClientConnectionState
{
/**
* Do we also want to receive?
*/
int receive_requested;
+
+ /**
+ * Connection to the service.
+ */
struct GNUNET_CLIENT_Connection *connection;
+
+ /**
+ * Active transmission request (or NULL).
+ */
struct GNUNET_CLIENT_TransmitHandle *th;
};
* @param mh message to dispatch
*/
void
-GNUNET_MQ_inject_message (struct GNUNET_MQ_Handle *mq, const struct GNUNET_MessageHeader *mh)
+GNUNET_MQ_inject_message (struct GNUNET_MQ_Handle *mq,
+ const struct GNUNET_MessageHeader *mh)
{
const struct GNUNET_MQ_MessageHandler *handler;
int handled = GNUNET_NO;
handler = mq->handlers;
if (NULL == handler)
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "No handler for message of type %d\n",
+ ntohs (mh->type));
return;
+ }
for (; NULL != handler->cb; handler++)
{
if (handler->type == ntohs (mh->type))
}
if (GNUNET_NO == handled)
- LOG (GNUNET_ERROR_TYPE_WARNING, "no handler for message of type %d\n", ntohs (mh->type));
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "No handler for message of type %d\n",
+ ntohs (mh->type));
}
{
if (NULL == mq->error_handler)
{
- /* FIXME: log what kind of error occured */
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "mq: got error, but no handler installed\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "mq: got error %d, but no handler installed\n",
+ (int) error);
return;
}
mq->error_handler (mq->handlers_cls, error);
* @param ev the envelope with the message to send.
*/
void
-GNUNET_MQ_send (struct GNUNET_MQ_Handle *mq, struct GNUNET_MQ_Envelope *ev)
+GNUNET_MQ_send (struct GNUNET_MQ_Handle *mq,
+ struct GNUNET_MQ_Envelope *ev)
{
GNUNET_assert (NULL != mq);
GNUNET_assert (NULL == ev->parent_queue);
+ ev->parent_queue = mq;
/* is the implementation busy? queue it! */
if (NULL != mq->current_envelope)
{
- GNUNET_CONTAINER_DLL_insert_tail (mq->envelope_head, mq->envelope_tail, ev);
+ GNUNET_CONTAINER_DLL_insert_tail (mq->envelope_head,
+ mq->envelope_tail,
+ ev);
return;
}
mq->current_envelope = ev;
* a message */
current_envelope = mq->current_envelope;
GNUNET_assert (NULL != current_envelope);
+ current_envelope->parent_queue = NULL;
if (NULL == mq->envelope_head)
{
mq->current_envelope = NULL;
mq = GNUNET_new (struct GNUNET_MQ_Handle);
mq->send_impl = send;
mq->destroy_impl = destroy;
+ mq->cancel_impl = cancel;
mq->handlers = handlers;
mq->handlers_cls = cls;
mq->impl_state = impl_state;
struct GNUNET_MQ_Envelope *
-GNUNET_MQ_msg_ (struct GNUNET_MessageHeader **mhp, uint16_t size, uint16_t type)
+GNUNET_MQ_msg_ (struct GNUNET_MessageHeader **mhp,
+ uint16_t size,
+ uint16_t type)
{
struct GNUNET_MQ_Envelope *mqm;
* @param nested_mh the message to append to the message after base_size
*/
struct GNUNET_MQ_Envelope *
-GNUNET_MQ_msg_nested_mh_ (struct GNUNET_MessageHeader **mhp, uint16_t base_size, uint16_t type,
+GNUNET_MQ_msg_nested_mh_ (struct GNUNET_MessageHeader **mhp,
+ uint16_t base_size,
+ uint16_t type,
const struct GNUNET_MessageHeader *nested_mh)
{
struct GNUNET_MQ_Envelope *mqm;
static void
server_client_send_impl (struct GNUNET_MQ_Handle *mq,
- const struct GNUNET_MessageHeader *msg, void *impl_state)
+ const struct GNUNET_MessageHeader *msg,
+ void *impl_state)
{
struct ServerClientSocketState *state = impl_state;
GNUNET_TIME_UNIT_FOREVER_REL);
}
-
msg_size = ntohs (msg->size);
GNUNET_assert (size >= msg_size);
memcpy (buf, msg, msg_size);
static void
-connection_client_destroy_impl (struct GNUNET_MQ_Handle *mq, void *impl_state)
+connection_client_destroy_impl (struct GNUNET_MQ_Handle *mq,
+ void *impl_state)
{
GNUNET_free (impl_state);
}
static void
connection_client_send_impl (struct GNUNET_MQ_Handle *mq,
- const struct GNUNET_MessageHeader *msg, void *impl_state)
+ const struct GNUNET_MessageHeader *msg,
+ void *impl_state)
{
struct ClientConnectionState *state = impl_state;
}
+static void
+connection_client_cancel_impl (struct GNUNET_MQ_Handle *mq,
+ void *impl_state)
+{
+ struct ClientConnectionState *state = impl_state;
+ GNUNET_assert (NULL != state->th);
+ GNUNET_CLIENT_notify_transmit_ready_cancel (state->th);
+ state->th = NULL;
+}
+
+
struct GNUNET_MQ_Handle *
GNUNET_MQ_queue_for_connection_client (struct GNUNET_CLIENT_Connection *connection,
const struct GNUNET_MQ_MessageHandler *handlers,
mq->impl_state = state;
mq->send_impl = connection_client_send_impl;
mq->destroy_impl = connection_client_destroy_impl;
+ mq->cancel_impl = connection_client_cancel_impl;
if (NULL != handlers)
state->receive_requested = GNUNET_YES;
void *
-GNUNET_MQ_assoc_get (struct GNUNET_MQ_Handle *mq, uint32_t request_id)
+GNUNET_MQ_assoc_get (struct GNUNET_MQ_Handle *mq,
+ uint32_t request_id)
{
if (NULL == mq->assoc_map)
return NULL;
void *
-GNUNET_MQ_assoc_remove (struct GNUNET_MQ_Handle *mq, uint32_t request_id)
+GNUNET_MQ_assoc_remove (struct GNUNET_MQ_Handle *mq,
+ uint32_t request_id)
{
void *val;
if (NULL != mq->current_envelope)
{
+ /* we can only discard envelopes that
+ * are not queued! */
+ mq->current_envelope->parent_queue = NULL;
GNUNET_MQ_discard (mq->current_envelope);
mq->current_envelope = NULL;
}
struct GNUNET_MessageHeader *
-GNUNET_MQ_extract_nested_mh_ (const struct GNUNET_MessageHeader *mh, uint16_t base_size)
+GNUNET_MQ_extract_nested_mh_ (const struct GNUNET_MessageHeader *mh,
+ uint16_t base_size)
{
uint16_t whole_size;
uint16_t nested_size;
}
+/**
+ * Cancel sending the message. Message must have been sent with
+ * #GNUNET_MQ_send before. May not be called after the notify sent
+ * callback has been called
+ *
+ * @param ev queued envelope to cancel
+ */
+void
+GNUNET_MQ_send_cancel (struct GNUNET_MQ_Envelope *ev)
+{
+ struct GNUNET_MQ_Handle *mq = ev->parent_queue;
+
+ GNUNET_assert (NULL != mq);
+ GNUNET_assert (NULL != mq->cancel_impl);
+
+ if (mq->current_envelope == ev) {
+ // complex case, we already started with transmitting
+ // the message
+ mq->cancel_impl (mq, mq->impl_state);
+ // continue sending the next message, if any
+ if (NULL == mq->envelope_head)
+ {
+ mq->current_envelope = NULL;
+ }
+ else
+ {
+ mq->current_envelope = mq->envelope_head;
+ GNUNET_CONTAINER_DLL_remove (mq->envelope_head,
+ mq->envelope_tail,
+ mq->current_envelope);
+ mq->send_impl (mq, mq->current_envelope->mh, mq->impl_state);
+ }
+ } else {
+ // simple case, message is still waiting in the queue
+ GNUNET_CONTAINER_DLL_remove (mq->envelope_head, mq->envelope_tail, ev);
+ }
+
+ ev->parent_queue = NULL;
+ ev->mh = NULL;
+ GNUNET_free (ev);
+}
+
+/* end of mq.c */
projects / oweals / gnunet.git / blobdiff