/*
* This file is part of GNUnet
- * (C) 2013 Christian Grothoff (and other contributing authors)
+ * Copyright (C) 2013 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.
*/
/**
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_env_lib.h"
#include "gnunet_multicast_service.h"
#include "gnunet_psyc_service.h"
#include "gnunet_psyc_util_lib.h"
#define LOG(kind,...) GNUNET_log_from (kind, "psyc-api",__VA_ARGS__)
-struct OperationListItem
+/**
+ * Handle to access PSYC channel operations for both the master and slaves.
+ */
+struct GNUNET_PSYC_Channel
{
- struct OperationListItem *prev;
- struct OperationListItem *next;
-
/**
- * Operation ID.
+ * Configuration to use.
*/
- uint64_t op_id;
+ const struct GNUNET_CONFIGURATION_Handle *cfg;
/**
- * Continuation to invoke with the result of an operation.
+ * Client connection to the service.
*/
- GNUNET_PSYC_ResultCallback result_cb;
+ struct GNUNET_MQ_Handle *mq;
/**
- * State variable result callback.
+ * Message to send on connect.
*/
- GNUNET_PSYC_StateVarCallback state_var_cb;
+ struct GNUNET_MQ_Envelope *connect_env;
/**
- * Closure for the callbacks.
+ * Time to wait until we try to reconnect on failure.
*/
- void *cls;
-};
+ struct GNUNET_TIME_Relative reconnect_delay;
-
-/**
- * Handle to access PSYC channel operations for both the master and slaves.
- */
-struct GNUNET_PSYC_Channel
-{
/**
- * Configuration to use.
+ * Task for reconnecting when the listener fails.
*/
- const struct GNUNET_CONFIGURATION_Handle *cfg;
+ struct GNUNET_SCHEDULER_Task *reconnect_task;
/**
- * Client connection to the service.
+ * Async operations.
*/
- struct GNUNET_CLIENT_MANAGER_Connection *client;
+ struct GNUNET_OP_Handle *op;
/**
* Transmission handle;
*/
struct GNUNET_PSYC_ReceiveHandle *recv;
- /**
- * Message to send on reconnect.
- */
- struct GNUNET_MessageHeader *connect_msg;
-
/**
* Function called after disconnected from the service.
*/
*/
void *disconnect_cls;
- /**
- * First operation in the linked list.
- */
- struct OperationListItem *op_head;
-
- /**
- * Last operation in the linked list.
- */
- struct OperationListItem *op_tail;
-
- /**
- * Last operation ID used.
- */
- uint64_t last_op_id;
-
/**
* Are we polling for incoming messages right now?
*/
struct GNUNET_PSYC_JoinHandle
{
struct GNUNET_PSYC_Master *mst;
- struct GNUNET_CRYPTO_EcdsaPublicKey slave_key;
+ struct GNUNET_CRYPTO_EcdsaPublicKey slave_pub_key;
};
};
-/**
- * Get a fresh operation ID to distinguish between PSYCstore requests.
- *
- * @param h Handle to the PSYCstore service.
- * @return next operation id to use
- */
-static uint64_t
-op_get_next_id (struct GNUNET_PSYC_Channel *chn)
+struct GNUNET_PSYC_HistoryRequest
{
- return ++chn->last_op_id;
-}
+ /**
+ * Channel.
+ */
+ struct GNUNET_PSYC_Channel *chn;
+ /**
+ * Operation ID.
+ */
+ uint64_t op_id;
-/**
- * Find operation by ID.
- *
- * @return Operation, or NULL if none found.
- */
-static struct OperationListItem *
-op_find_by_id (struct GNUNET_PSYC_Channel *chn, uint64_t op_id)
+ /**
+ * Message handler.
+ */
+ struct GNUNET_PSYC_ReceiveHandle *recv;
+
+ /**
+ * Function to call when the operation finished.
+ */
+ GNUNET_ResultCallback result_cb;
+
+ /**
+ * Closure for @a result_cb.
+ */
+ void *cls;
+};
+
+
+struct GNUNET_PSYC_StateRequest
{
- struct OperationListItem *op = chn->op_head;
- while (NULL != op)
- {
- if (op->op_id == op_id)
- return op;
- op = op->next;
- }
- return NULL;
+ /**
+ * Channel.
+ */
+ struct GNUNET_PSYC_Channel *chn;
+
+ /**
+ * Operation ID.
+ */
+ uint64_t op_id;
+
+ /**
+ * State variable result callback.
+ */
+ GNUNET_PSYC_StateVarCallback var_cb;
+
+ /**
+ * Function to call when the operation finished.
+ */
+ GNUNET_ResultCallback result_cb;
+
+ /**
+ * Closure for @a result_cb.
+ */
+ void *cls;
+};
+
+
+static int
+check_channel_result (void *cls,
+ const struct GNUNET_OperationResultMessage *res)
+{
+ return GNUNET_OK;
}
-static uint64_t
-op_add (struct GNUNET_PSYC_Channel *chn, GNUNET_PSYC_ResultCallback result_cb,
- void *cls)
+static void
+handle_channel_result (void *cls,
+ const struct GNUNET_OperationResultMessage *res)
{
- if (NULL == result_cb)
- return 0;
+ struct GNUNET_PSYC_Channel *chn = cls;
- struct OperationListItem *op = GNUNET_malloc (sizeof (*op));
- op->op_id = op_get_next_id (chn);
- op->result_cb = result_cb;
- op->cls = cls;
- GNUNET_CONTAINER_DLL_insert_tail (chn->op_head, chn->op_tail, op);
+ uint16_t size = ntohs (res->header.size);
+ if (size < sizeof (*res))
+ { /* Error, message too small. */
+ GNUNET_break (0);
+ return;
+ }
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "%p Added operation #%" PRIu64 "\n", chn, op->op_id);
- return op->op_id;
+ uint16_t data_size = size - sizeof (*res);
+ const char *data = (0 < data_size) ? (void *) &res[1] : NULL;
+ GNUNET_OP_result (chn->op, GNUNET_ntohll (res->op_id),
+ GNUNET_ntohll (res->result_code),
+ data, data_size, NULL);
}
-static int
-op_result (struct GNUNET_PSYC_Channel *chn, uint64_t op_id,
- int64_t result_code, const char *err_msg)
+static void
+op_recv_history_result (void *cls, int64_t result,
+ const void *data, uint16_t data_size)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "%p Received result for operation #%" PRIu64 ": %" PRId64 " (%s)\n",
- chn, op_id, result_code, err_msg);
- if (0 == op_id)
- return GNUNET_NO;
+ "Received history replay result: %" PRId64 ".\n", result);
- struct OperationListItem *op = op_find_by_id (chn, op_id);
- if (NULL == op)
- {
- LOG (GNUNET_ERROR_TYPE_WARNING,
- "Could not find operation #%" PRIu64 "\n", op_id);
- return GNUNET_NO;
- }
+ struct GNUNET_PSYC_HistoryRequest *hist = cls;
- GNUNET_CONTAINER_DLL_remove (chn->op_head, chn->op_tail, op);
+ if (NULL != hist->result_cb)
+ hist->result_cb (hist->cls, result, data, data_size);
- if (NULL != op->result_cb)
- op->result_cb (op->cls, result_code, err_msg);
-
- GNUNET_free (op);
- return GNUNET_YES;
+ GNUNET_PSYC_receive_destroy (hist->recv);
+ GNUNET_free (hist);
}
static void
-channel_send_connect_msg (struct GNUNET_PSYC_Channel *chn)
+op_recv_state_result (void *cls, int64_t result,
+ const void *data, uint16_t data_size)
{
- uint16_t cmsg_size = ntohs (chn->connect_msg->size);
- struct GNUNET_MessageHeader * cmsg = GNUNET_malloc (cmsg_size);
- memcpy (cmsg, chn->connect_msg, cmsg_size);
- GNUNET_CLIENT_MANAGER_transmit_now (chn->client, cmsg);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received state request result: %" PRId64 ".\n", result);
+
+ struct GNUNET_PSYC_StateRequest *sr = cls;
+
+ if (NULL != sr->result_cb)
+ sr->result_cb (sr->cls, result, data, data_size);
+
+ GNUNET_free (sr);
}
-static void
-channel_recv_disconnect (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+static int
+check_channel_history_result (void *cls,
+ const struct GNUNET_OperationResultMessage *res)
{
- struct GNUNET_PSYC_Channel *
- chn = GNUNET_CLIENT_MANAGER_get_user_context_ (client, sizeof (*chn));
- GNUNET_CLIENT_MANAGER_reconnect (client);
- channel_send_connect_msg (chn);
+ struct GNUNET_PSYC_MessageHeader *
+ pmsg = (struct GNUNET_PSYC_MessageHeader *) GNUNET_MQ_extract_nested_mh (res);
+ uint16_t size = ntohs (res->header.size);
+
+ if ( (NULL == pmsg) ||
+ (size < sizeof (*res) + sizeof (*pmsg)) )
+ { /* Error, message too small. */
+ GNUNET_break_op (0);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
}
static void
-channel_recv_result (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_channel_history_result (void *cls,
+ const struct GNUNET_OperationResultMessage *res)
{
- struct GNUNET_PSYC_Channel *
- chn = GNUNET_CLIENT_MANAGER_get_user_context_ (client, sizeof (*chn));
+ struct GNUNET_PSYC_Channel *chn = cls;
+ struct GNUNET_PSYC_MessageHeader *
+ pmsg = (struct GNUNET_PSYC_MessageHeader *) GNUNET_MQ_extract_nested_mh (res);
+ GNUNET_ResultCallback result_cb = NULL;
+ struct GNUNET_PSYC_HistoryRequest *hist = NULL;
- uint16_t size = ntohs (msg->size);
- const struct OperationResult *res = (const struct OperationResult *) msg;
- const char *err_msg = NULL;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "%p Received historic fragment for message #%" PRIu64 ".\n",
+ chn,
+ GNUNET_ntohll (pmsg->message_id));
+
+ if (GNUNET_YES != GNUNET_OP_get (chn->op,
+ GNUNET_ntohll (res->op_id),
+ &result_cb, (void *) &hist, NULL))
+ { /* Operation not found. */
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "%p Replay operation not found for historic fragment of message #%"
+ PRIu64 ".\n",
+ chn, GNUNET_ntohll (pmsg->message_id));
+ return;
+ }
+
+ GNUNET_PSYC_receive_message (hist->recv,
+ (const struct GNUNET_PSYC_MessageHeader *) pmsg);
+}
- if (sizeof (struct OperationResult) < size)
+
+static int
+check_channel_state_result (void *cls,
+ const struct GNUNET_OperationResultMessage *res)
+{
+ const struct GNUNET_MessageHeader *mod = GNUNET_MQ_extract_nested_mh (res);
+ uint16_t mod_size;
+ uint16_t size;
+
+ if (NULL == mod)
{
- err_msg = (const char *) &res[1];
- if ('\0' != err_msg[size - sizeof (struct OperationResult) - 1])
- {
- GNUNET_break (0);
- err_msg = NULL;
- }
+ GNUNET_break_op (0);
+ return GNUNET_SYSERR;
}
-
- op_result (chn, GNUNET_ntohll (res->op_id),
- GNUNET_ntohll (res->result_code) + INT64_MIN, err_msg);
+ mod_size = ntohs (mod->size);
+ size = ntohs (res->header.size);
+ if (size - sizeof (*res) != mod_size)
+ {
+ GNUNET_break_op (0);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
}
static void
-channel_recv_state_result (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_channel_state_result (void *cls,
+ const struct GNUNET_OperationResultMessage *res)
{
- struct GNUNET_PSYC_Channel *
- chn = GNUNET_CLIENT_MANAGER_get_user_context_ (client, sizeof (*chn));
+ struct GNUNET_PSYC_Channel *chn = cls;
- const struct OperationResult *res = (const struct OperationResult *) msg;
- struct OperationListItem *op = op_find_by_id (chn, GNUNET_ntohll (res->op_id));
- if (NULL == op || NULL == op->state_var_cb)
+ GNUNET_ResultCallback result_cb = NULL;
+ struct GNUNET_PSYC_StateRequest *sr = NULL;
+
+ if (GNUNET_YES != GNUNET_OP_get (chn->op,
+ GNUNET_ntohll (res->op_id),
+ &result_cb, (void *) &sr, NULL))
+ { /* Operation not found. */
return;
+ }
- const struct GNUNET_MessageHeader *modc = (struct GNUNET_MessageHeader *) &op[1];
- uint16_t modc_size = ntohs (modc->size);
- if (ntohs (msg->size) - sizeof (*msg) != modc_size)
+ const struct GNUNET_MessageHeader *mod = GNUNET_MQ_extract_nested_mh (res);
+ if (NULL == mod)
{
- GNUNET_break (0);
+ GNUNET_break_op (0);
return;
}
- switch (ntohs (modc->type))
+ uint16_t mod_size = ntohs (mod->size);
+
+ switch (ntohs (mod->type))
{
case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_MODIFIER:
{
const struct GNUNET_PSYC_MessageModifier *
- mod = (const struct GNUNET_PSYC_MessageModifier *) modc;
+ pmod = (const struct GNUNET_PSYC_MessageModifier *) mod;
- const char *name = (const char *) &mod[1];
- uint16_t name_size = ntohs (mod->name_size);
- if ('\0' != name[name_size - 1])
+ const char *name = (const char *) &pmod[1];
+ uint16_t name_size = ntohs (pmod->name_size);
+ if (0 == name_size
+ || mod_size - sizeof (*pmod) < name_size
+ || '\0' != name[name_size - 1])
{
- GNUNET_break (0);
+ GNUNET_break_op (0);
return;
}
- op->state_var_cb (op->cls, name, name + name_size, ntohs (mod->value_size));
+ sr->var_cb (sr->cls, mod, name, name + name_size,
+ ntohs (pmod->header.size) - sizeof (*pmod),
+ ntohs (pmod->value_size));
break;
}
case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_MOD_CONT:
- op->state_var_cb (op->cls, NULL, (const char *) &modc[1],
- modc_size - sizeof (*modc));
+ sr->var_cb (sr->cls, mod, NULL, (const char *) &mod[1],
+ mod_size - sizeof (*mod), 0);
break;
}
}
+static int
+check_channel_message (void *cls,
+ const struct GNUNET_PSYC_MessageHeader *pmsg)
+{
+ return GNUNET_OK;
+}
+
+
static void
-channel_recv_message (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_channel_message (void *cls,
+ const struct GNUNET_PSYC_MessageHeader *pmsg)
{
- struct GNUNET_PSYC_Channel *
- chn = GNUNET_CLIENT_MANAGER_get_user_context_ (client, sizeof (*chn));
- GNUNET_PSYC_receive_message (chn->recv,
- (const struct GNUNET_PSYC_MessageHeader *) msg);
+ struct GNUNET_PSYC_Channel *chn = cls;
+
+ GNUNET_PSYC_receive_message (chn->recv, pmsg);
}
static void
-channel_recv_message_ack (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_channel_message_ack (void *cls,
+ const struct GNUNET_MessageHeader *msg)
{
- struct GNUNET_PSYC_Channel *
- chn = GNUNET_CLIENT_MANAGER_get_user_context_ (client, sizeof (*chn));
+ struct GNUNET_PSYC_Channel *chn = cls;
+
GNUNET_PSYC_transmit_got_ack (chn->tmit);
}
static void
-master_recv_start_ack (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_master_start_ack (void *cls,
+ const struct GNUNET_PSYC_CountersResultMessage *cres)
{
- struct GNUNET_PSYC_Master *
- mst = GNUNET_CLIENT_MANAGER_get_user_context_ (client,
- sizeof (struct GNUNET_PSYC_Channel));
+ struct GNUNET_PSYC_Master *mst = cls;
- struct GNUNET_PSYC_CountersResultMessage *
- cres = (struct GNUNET_PSYC_CountersResultMessage *) msg;
- int32_t result = ntohl (cres->result_code) + INT32_MIN;
+ int32_t result = ntohl (cres->result_code);
if (GNUNET_OK != result && GNUNET_NO != result)
{
- LOG (GNUNET_ERROR_TYPE_ERROR, "Could not start master.\n");
+ LOG (GNUNET_ERROR_TYPE_ERROR, "Could not start master: %ld\n", result);
GNUNET_break (0);
+ /* FIXME: disconnect */
}
if (NULL != mst->start_cb)
mst->start_cb (mst->cb_cls, result, GNUNET_ntohll (cres->max_message_id));
}
+static int
+check_master_join_request (void *cls,
+ const struct GNUNET_PSYC_JoinRequestMessage *req)
+{
+ if ( ((sizeof (*req) + sizeof (struct GNUNET_PSYC_Message)) <= ntohs (req->header.size)) &&
+ (NULL == GNUNET_MQ_extract_nested_mh (req)) )
+ {
+ GNUNET_break_op (0);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
+}
+
+
static void
-master_recv_join_request (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_master_join_request (void *cls,
+ const struct GNUNET_PSYC_JoinRequestMessage *req)
{
- struct GNUNET_PSYC_Master *
- mst = GNUNET_CLIENT_MANAGER_get_user_context_ (client,
- sizeof (struct GNUNET_PSYC_Channel));
+ struct GNUNET_PSYC_Master *mst = cls;
+
if (NULL == mst->join_req_cb)
return;
- const struct GNUNET_PSYC_JoinRequestMessage *
- req = (const struct GNUNET_PSYC_JoinRequestMessage *) msg;
const struct GNUNET_PSYC_Message *join_msg = NULL;
if (sizeof (*req) + sizeof (*join_msg) <= ntohs (req->header.size))
{
- join_msg = (struct GNUNET_PSYC_Message *) &req[1];
- LOG (GNUNET_ERROR_TYPE_ERROR,
+ join_msg = (struct GNUNET_PSYC_Message *) GNUNET_MQ_extract_nested_mh (req);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Received join_msg of type %u and size %u.\n",
- ntohs (join_msg->header.type), ntohs (join_msg->header.size));
+ ntohs (join_msg->header.type),
+ ntohs (join_msg->header.size));
}
struct GNUNET_PSYC_JoinHandle *jh = GNUNET_malloc (sizeof (*jh));
jh->mst = mst;
- jh->slave_key = req->slave_key;
+ jh->slave_pub_key = req->slave_pub_key;
if (NULL != mst->join_req_cb)
- mst->join_req_cb (mst->cb_cls, req, &req->slave_key, join_msg, jh);
+ mst->join_req_cb (mst->cb_cls, req, &req->slave_pub_key, join_msg, jh);
}
static void
-slave_recv_join_ack (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_slave_join_ack (void *cls,
+ const struct GNUNET_PSYC_CountersResultMessage *cres)
{
- struct GNUNET_PSYC_Slave *
- slv = GNUNET_CLIENT_MANAGER_get_user_context_ (client,
- sizeof (struct GNUNET_PSYC_Channel));
- struct GNUNET_PSYC_CountersResultMessage *
- cres = (struct GNUNET_PSYC_CountersResultMessage *) msg;
- int32_t result = ntohl (cres->result_code) + INT32_MIN;
+ struct GNUNET_PSYC_Slave *slv = cls;
+
+ int32_t result = ntohl (cres->result_code);
if (GNUNET_YES != result && GNUNET_NO != result)
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Could not join slave.\n");
GNUNET_break (0);
+ /* FIXME: disconnect */
}
if (NULL != slv->connect_cb)
slv->connect_cb (slv->cb_cls, result, GNUNET_ntohll (cres->max_message_id));
}
+static int
+check_slave_join_decision (void *cls,
+ const struct GNUNET_PSYC_JoinDecisionMessage *dcsn)
+{
+ return GNUNET_OK;
+}
+
+
static void
-slave_recv_join_decision (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_slave_join_decision (void *cls,
+ const struct GNUNET_PSYC_JoinDecisionMessage *dcsn)
{
- struct GNUNET_PSYC_Slave *
- slv = GNUNET_CLIENT_MANAGER_get_user_context_ (client,
- sizeof (struct GNUNET_PSYC_Channel));
- const struct GNUNET_PSYC_JoinDecisionMessage *
- dcsn = (const struct GNUNET_PSYC_JoinDecisionMessage *) msg;
+ struct GNUNET_PSYC_Slave *slv = cls;
struct GNUNET_PSYC_Message *pmsg = NULL;
if (ntohs (dcsn->header.size) <= sizeof (*dcsn) + sizeof (*pmsg))
}
-static struct GNUNET_CLIENT_MANAGER_MessageHandler master_handlers[] =
+static void
+channel_cleanup (struct GNUNET_PSYC_Channel *chn)
{
- { &channel_recv_message, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_MESSAGE,
- sizeof (struct GNUNET_PSYC_MessageHeader), GNUNET_YES },
-
- { &channel_recv_message_ack, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_ACK,
- sizeof (struct GNUNET_MessageHeader), GNUNET_NO },
-
- { &master_recv_start_ack, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_MASTER_START_ACK,
- sizeof (struct GNUNET_PSYC_CountersResultMessage), GNUNET_NO },
-
- { &master_recv_join_request, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_JOIN_REQUEST,
- sizeof (struct GNUNET_PSYC_JoinRequestMessage), GNUNET_YES },
-
- { &channel_recv_state_result, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_STATE_RESULT,
- sizeof (struct OperationResult), GNUNET_YES },
-
- { &channel_recv_result, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_RESULT_CODE,
- sizeof (struct OperationResult), GNUNET_YES },
-
- { &channel_recv_disconnect, NULL, 0, 0, GNUNET_NO },
-
- { NULL, NULL, 0, 0, GNUNET_NO }
-};
+ if (NULL != chn->tmit)
+ {
+ GNUNET_PSYC_transmit_destroy (chn->tmit);
+ chn->tmit = NULL;
+ }
+ if (NULL != chn->recv)
+ {
+ GNUNET_PSYC_receive_destroy (chn->recv);
+ chn->recv = NULL;
+ }
+ if (NULL != chn->connect_env)
+ {
+ GNUNET_MQ_discard (chn->connect_env);
+ chn->connect_env = NULL;
+ }
+ if (NULL != chn->mq)
+ {
+ GNUNET_MQ_destroy (chn->mq);
+ chn->mq = NULL;
+ }
+ if (NULL != chn->disconnect_cb)
+ {
+ chn->disconnect_cb (chn->disconnect_cls);
+ chn->disconnect_cb = NULL;
+ }
+ GNUNET_free (chn);
+}
-static struct GNUNET_CLIENT_MANAGER_MessageHandler slave_handlers[] =
+static void
+channel_disconnect (struct GNUNET_PSYC_Channel *chn,
+ GNUNET_ContinuationCallback cb,
+ void *cls)
{
- { &channel_recv_message, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_MESSAGE,
- sizeof (struct GNUNET_PSYC_MessageHeader), GNUNET_YES },
-
- { &channel_recv_message_ack, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_ACK,
- sizeof (struct GNUNET_MessageHeader), GNUNET_NO },
-
- { &slave_recv_join_ack, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_SLAVE_JOIN_ACK,
- sizeof (struct GNUNET_PSYC_CountersResultMessage), GNUNET_NO },
+ chn->is_disconnecting = GNUNET_YES;
+ chn->disconnect_cb = cb;
+ chn->disconnect_cls = cls;
- { &slave_recv_join_decision, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_JOIN_DECISION,
- sizeof (struct GNUNET_PSYC_JoinDecisionMessage), GNUNET_YES },
+ if (NULL != chn->mq)
+ {
+ struct GNUNET_MQ_Envelope *env = GNUNET_MQ_get_last_envelope (chn->mq);
+ if (NULL != env)
+ {
+ GNUNET_MQ_notify_sent (env, (GNUNET_SCHEDULER_TaskCallback) channel_cleanup, chn);
+ }
+ else
+ {
+ channel_cleanup (chn);
+ }
+ }
+ else
+ {
+ channel_cleanup (chn);
+ }
+}
- { &channel_recv_state_result, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_STATE_RESULT,
- sizeof (struct OperationResult), GNUNET_YES },
- { &channel_recv_result, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_RESULT_CODE,
- sizeof (struct OperationResult), GNUNET_YES },
+/*** MASTER ***/
- { &channel_recv_disconnect, NULL, 0, 0, GNUNET_NO },
- { NULL, NULL, 0, 0, GNUNET_NO }
-};
+static void
+master_connect (struct GNUNET_PSYC_Master *mst);
static void
-channel_cleanup (struct GNUNET_PSYC_Channel *chn)
+master_reconnect (void *cls)
{
- GNUNET_PSYC_transmit_destroy (chn->tmit);
- GNUNET_PSYC_receive_destroy (chn->recv);
- GNUNET_free (chn->connect_msg);
- if (NULL != chn->disconnect_cb)
- chn->disconnect_cb (chn->disconnect_cls);
+ master_connect (cls);
}
+/**
+ * Master client disconnected from service.
+ *
+ * Reconnect after backoff period.
+ */
static void
-master_cleanup (void *cls)
+master_disconnected (void *cls, enum GNUNET_MQ_Error error)
{
struct GNUNET_PSYC_Master *mst = cls;
- channel_cleanup (&mst->chn);
- GNUNET_free (mst);
+ struct GNUNET_PSYC_Channel *chn = &mst->chn;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Master client disconnected (%d), re-connecting\n",
+ (int) error);
+ if (NULL != chn->tmit)
+ {
+ GNUNET_PSYC_transmit_destroy (chn->tmit);
+ chn->tmit = NULL;
+ }
+ if (NULL != chn->mq)
+ {
+ GNUNET_MQ_destroy (chn->mq);
+ chn->mq = NULL;
+ }
+ chn->reconnect_task = GNUNET_SCHEDULER_add_delayed (chn->reconnect_delay,
+ master_reconnect,
+ mst);
+ chn->reconnect_delay = GNUNET_TIME_STD_BACKOFF (chn->reconnect_delay);
}
static void
-slave_cleanup (void *cls)
+master_connect (struct GNUNET_PSYC_Master *mst)
{
- struct GNUNET_PSYC_Slave *slv = cls;
- channel_cleanup (&slv->chn);
- GNUNET_free (slv);
+ struct GNUNET_PSYC_Channel *chn = &mst->chn;
+
+ struct GNUNET_MQ_MessageHandler handlers[] = {
+ GNUNET_MQ_hd_fixed_size (master_start_ack,
+ GNUNET_MESSAGE_TYPE_PSYC_MASTER_START_ACK,
+ struct GNUNET_PSYC_CountersResultMessage,
+ mst),
+ GNUNET_MQ_hd_var_size (master_join_request,
+ GNUNET_MESSAGE_TYPE_PSYC_JOIN_REQUEST,
+ struct GNUNET_PSYC_JoinRequestMessage,
+ mst),
+ GNUNET_MQ_hd_var_size (channel_message,
+ GNUNET_MESSAGE_TYPE_PSYC_MESSAGE,
+ struct GNUNET_PSYC_MessageHeader,
+ chn),
+ GNUNET_MQ_hd_fixed_size (channel_message_ack,
+ GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_ACK,
+ struct GNUNET_MessageHeader,
+ chn),
+ GNUNET_MQ_hd_var_size (channel_history_result,
+ GNUNET_MESSAGE_TYPE_PSYC_HISTORY_RESULT,
+ struct GNUNET_OperationResultMessage,
+ chn),
+ GNUNET_MQ_hd_var_size (channel_state_result,
+ GNUNET_MESSAGE_TYPE_PSYC_STATE_RESULT,
+ struct GNUNET_OperationResultMessage,
+ chn),
+ GNUNET_MQ_hd_var_size (channel_result,
+ GNUNET_MESSAGE_TYPE_PSYC_RESULT_CODE,
+ struct GNUNET_OperationResultMessage,
+ chn),
+ GNUNET_MQ_handler_end ()
+ };
+
+ chn->mq = GNUNET_CLIENT_connect (chn->cfg, "psyc",
+ handlers, master_disconnected, mst);
+ GNUNET_assert (NULL != chn->mq);
+ chn->tmit = GNUNET_PSYC_transmit_create (chn->mq);
+
+ GNUNET_MQ_send_copy (chn->mq, chn->connect_env);
}
GNUNET_PSYC_MessagePartCallback message_part_cb,
void *cls)
{
- struct GNUNET_PSYC_Master *mst = GNUNET_malloc (sizeof (*mst));
+ struct GNUNET_PSYC_Master *mst = GNUNET_new (struct GNUNET_PSYC_Master);
struct GNUNET_PSYC_Channel *chn = &mst->chn;
+ struct MasterStartRequest *req;
- struct MasterStartRequest *req = GNUNET_malloc (sizeof (*req));
- req->header.size = htons (sizeof (*req));
- req->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_MASTER_START);
+ chn->connect_env = GNUNET_MQ_msg (req,
+ GNUNET_MESSAGE_TYPE_PSYC_MASTER_START);
req->channel_key = *channel_key;
req->policy = policy;
- chn->connect_msg = (struct GNUNET_MessageHeader *) req;
chn->cfg = cfg;
chn->is_master = GNUNET_YES;
+ chn->reconnect_delay = GNUNET_TIME_UNIT_MILLISECONDS;
+
+ chn->op = GNUNET_OP_create ();
+ chn->recv = GNUNET_PSYC_receive_create (message_cb, message_part_cb, cls);
mst->start_cb = start_cb;
mst->join_req_cb = join_request_cb;
mst->cb_cls = cls;
- chn->client = GNUNET_CLIENT_MANAGER_connect (cfg, "psyc", master_handlers);
- GNUNET_CLIENT_MANAGER_set_user_context_ (chn->client, mst, sizeof (*chn));
-
- chn->tmit = GNUNET_PSYC_transmit_create (chn->client);
- chn->recv = GNUNET_PSYC_receive_create (message_cb, message_part_cb, cls);
-
- channel_send_connect_msg (chn);
+ master_connect (mst);
return mst;
}
/* FIXME: send msg to service */
- chn->is_disconnecting = GNUNET_YES;
- chn->disconnect_cb = stop_cb;
- chn->disconnect_cls = stop_cls;
-
- GNUNET_CLIENT_MANAGER_disconnect (mst->chn.client, GNUNET_YES,
- &master_cleanup, mst);
+ channel_disconnect (chn, stop_cb, stop_cls);
}
< sizeof (*dcsn) + relay_size + join_resp_size)
return GNUNET_SYSERR;
- dcsn = GNUNET_malloc (sizeof (*dcsn) + relay_size + join_resp_size);
- dcsn->header.size = htons (sizeof (*dcsn) + relay_size + join_resp_size);
- dcsn->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_JOIN_DECISION);
+ struct GNUNET_MQ_Envelope *
+ env = GNUNET_MQ_msg_extra (dcsn, relay_size + join_resp_size,
+ GNUNET_MESSAGE_TYPE_PSYC_JOIN_DECISION);
dcsn->is_admitted = htonl (is_admitted);
- dcsn->slave_key = jh->slave_key;
+ dcsn->slave_pub_key = jh->slave_pub_key;
if (0 < join_resp_size)
- memcpy (&dcsn[1], join_resp, join_resp_size);
+ GNUNET_memcpy (&dcsn[1], join_resp, join_resp_size);
- GNUNET_CLIENT_MANAGER_transmit (chn->client, &dcsn->header);
+ GNUNET_MQ_send (chn->mq, env);
GNUNET_free (jh);
return GNUNET_OK;
}
}
+/*** SLAVE ***/
+
+
+static void
+slave_connect (struct GNUNET_PSYC_Slave *slv);
+
+
+static void
+slave_reconnect (void *cls)
+{
+ slave_connect (cls);
+}
+
+
+/**
+ * Slave client disconnected from service.
+ *
+ * Reconnect after backoff period.
+ */
+static void
+slave_disconnected (void *cls, enum GNUNET_MQ_Error error)
+{
+ struct GNUNET_PSYC_Slave *slv = cls;
+ struct GNUNET_PSYC_Channel *chn = &slv->chn;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Slave client disconnected (%d), re-connecting\n",
+ (int) error);
+ if (NULL != chn->tmit)
+ {
+ GNUNET_PSYC_transmit_destroy (chn->tmit);
+ chn->tmit = NULL;
+ }
+ if (NULL != chn->mq)
+ {
+ GNUNET_MQ_destroy (chn->mq);
+ chn->mq = NULL;
+ }
+ chn->reconnect_task = GNUNET_SCHEDULER_add_delayed (chn->reconnect_delay,
+ slave_reconnect,
+ slv);
+ chn->reconnect_delay = GNUNET_TIME_STD_BACKOFF (chn->reconnect_delay);
+}
+
+
+static void
+slave_connect (struct GNUNET_PSYC_Slave *slv)
+{
+ struct GNUNET_PSYC_Channel *chn = &slv->chn;
+
+ struct GNUNET_MQ_MessageHandler handlers[] = {
+ GNUNET_MQ_hd_fixed_size (slave_join_ack,
+ GNUNET_MESSAGE_TYPE_PSYC_SLAVE_JOIN_ACK,
+ struct GNUNET_PSYC_CountersResultMessage,
+ slv),
+ GNUNET_MQ_hd_var_size (slave_join_decision,
+ GNUNET_MESSAGE_TYPE_PSYC_JOIN_DECISION,
+ struct GNUNET_PSYC_JoinDecisionMessage,
+ slv),
+ GNUNET_MQ_hd_var_size (channel_message,
+ GNUNET_MESSAGE_TYPE_PSYC_MESSAGE,
+ struct GNUNET_PSYC_MessageHeader,
+ chn),
+ GNUNET_MQ_hd_fixed_size (channel_message_ack,
+ GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_ACK,
+ struct GNUNET_MessageHeader,
+ chn),
+ GNUNET_MQ_hd_var_size (channel_history_result,
+ GNUNET_MESSAGE_TYPE_PSYC_HISTORY_RESULT,
+ struct GNUNET_OperationResultMessage,
+ chn),
+ GNUNET_MQ_hd_var_size (channel_state_result,
+ GNUNET_MESSAGE_TYPE_PSYC_STATE_RESULT,
+ struct GNUNET_OperationResultMessage,
+ chn),
+ GNUNET_MQ_hd_var_size (channel_result,
+ GNUNET_MESSAGE_TYPE_PSYC_RESULT_CODE,
+ struct GNUNET_OperationResultMessage,
+ chn),
+ GNUNET_MQ_handler_end ()
+ };
+
+ chn->mq = GNUNET_CLIENT_connect (chn->cfg, "psyc",
+ handlers, slave_disconnected, slv);
+ GNUNET_assert (NULL != chn->mq);
+ chn->tmit = GNUNET_PSYC_transmit_create (chn->mq);
+
+ GNUNET_MQ_send_copy (chn->mq, chn->connect_env);
+}
+
+
/**
* Join a PSYC channel.
*
* notification on failure (as the channel may simply take days to approve,
* and disapproval is simply being ignored).
*
- * @param cfg Configuration to use.
+ * @param cfg
+ * Configuration to use.
* @param channel_key ECC public key that identifies the channel we wish to join.
* @param slave_key ECC private-public key pair that identifies the slave, and
* used by multicast to sign the join request and subsequent unicast
*/
struct GNUNET_PSYC_Slave *
GNUNET_PSYC_slave_join (const struct GNUNET_CONFIGURATION_Handle *cfg,
- const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key,
+ const struct GNUNET_CRYPTO_EddsaPublicKey *channel_pub_key,
const struct GNUNET_CRYPTO_EcdsaPrivateKey *slave_key,
+ enum GNUNET_PSYC_SlaveJoinFlags flags,
const struct GNUNET_PeerIdentity *origin,
uint32_t relay_count,
const struct GNUNET_PeerIdentity *relays,
{
struct GNUNET_PSYC_Slave *slv = GNUNET_malloc (sizeof (*slv));
struct GNUNET_PSYC_Channel *chn = &slv->chn;
-
uint16_t relay_size = relay_count * sizeof (*relays);
- uint16_t join_msg_size = ntohs (join_msg->header.size);
- struct SlaveJoinRequest *req
- = GNUNET_malloc (sizeof (*req) + relay_size + join_msg_size);
- req->header.size = htons (sizeof (*req)
- + relay_count * sizeof (*relays));
- req->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_SLAVE_JOIN);
- req->channel_key = *channel_key;
+ uint16_t join_msg_size;
+ if (NULL == join_msg)
+ join_msg_size = 0;
+ else
+ join_msg_size = ntohs (join_msg->header.size);
+
+ struct SlaveJoinRequest *req;
+ chn->connect_env = GNUNET_MQ_msg_extra (req, relay_size + join_msg_size,
+ GNUNET_MESSAGE_TYPE_PSYC_SLAVE_JOIN);
+ req->channel_pub_key = *channel_pub_key;
req->slave_key = *slave_key;
req->origin = *origin;
req->relay_count = htonl (relay_count);
+ req->flags = htonl (flags);
if (0 < relay_size)
- memcpy (&req[1], relays, relay_size);
+ GNUNET_memcpy (&req[1], relays, relay_size);
- if (0 < join_msg_size)
- memcpy ((char *) &req[1] + relay_size, join_msg, join_msg_size);
+ if (NULL != join_msg)
+ GNUNET_memcpy ((char *) &req[1] + relay_size, join_msg, join_msg_size);
- chn->connect_msg = (struct GNUNET_MessageHeader *) req;
chn->cfg = cfg;
chn->is_master = GNUNET_NO;
+ chn->reconnect_delay = GNUNET_TIME_UNIT_MILLISECONDS;
+
+ chn->op = GNUNET_OP_create ();
+ chn->recv = GNUNET_PSYC_receive_create (message_cb, message_part_cb, cls);
slv->connect_cb = connect_cb;
slv->join_dcsn_cb = join_decision_cb;
slv->cb_cls = cls;
- chn->client = GNUNET_CLIENT_MANAGER_connect (cfg, "psyc", slave_handlers);
- GNUNET_CLIENT_MANAGER_set_user_context_ (chn->client, slv, sizeof (*chn));
-
- chn->recv = GNUNET_PSYC_receive_create (message_cb, message_part_cb, cls);
- chn->tmit = GNUNET_PSYC_transmit_create (chn->client);
-
- channel_send_connect_msg (chn);
+ slave_connect (slv);
return slv;
}
/* FIXME: send msg to service */
- chn->is_disconnecting = GNUNET_YES;
- chn->disconnect_cb = part_cb;
- chn->disconnect_cls = part_cls;
-
- GNUNET_CLIENT_MANAGER_disconnect (slv->chn.client, GNUNET_YES,
- &slave_cleanup, slv);
+ channel_disconnect (chn, part_cb, part_cls);
}
* correctly; not doing so correctly will result in either denying other slaves
* access or offering access to channel data to non-members.
*
- * @param channel Channel handle.
- * @param slave_key Identity of channel slave to add.
- * @param announced_at ID of the message that announced the membership change.
- * @param effective_since Addition of slave is in effect since this message ID.
+ * @param chn
+ * Channel handle.
+ * @param slave_pub_key
+ * Identity of channel slave to add.
+ * @param announced_at
+ * ID of the message that announced the membership change.
+ * @param effective_since
+ * Addition of slave is in effect since this message ID.
+ * @param result_cb
+ * Function to call with the result of the operation.
+ * The @e result_code argument is #GNUNET_OK on success, or
+ * #GNUNET_SYSERR on error. In case of an error, the @e data argument
+ * can contain an optional error message.
+ * @param cls
+ * Closure for @a result_cb.
*/
void
GNUNET_PSYC_channel_slave_add (struct GNUNET_PSYC_Channel *chn,
- const struct GNUNET_CRYPTO_EcdsaPublicKey *slave_key,
+ const struct GNUNET_CRYPTO_EcdsaPublicKey *slave_pub_key,
uint64_t announced_at,
uint64_t effective_since,
- GNUNET_PSYC_ResultCallback result_cb,
+ GNUNET_ResultCallback result_cb,
void *cls)
{
- struct ChannelMembershipStoreRequest *req = GNUNET_malloc (sizeof (*req));
- req->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_CHANNEL_MEMBERSHIP_STORE);
- req->header.size = htons (sizeof (*req));
- req->slave_key = *slave_key;
+ struct ChannelMembershipStoreRequest *req;
+ struct GNUNET_MQ_Envelope *
+ env = GNUNET_MQ_msg (req, GNUNET_MESSAGE_TYPE_PSYC_CHANNEL_MEMBERSHIP_STORE);
+ req->slave_pub_key = *slave_pub_key;
req->announced_at = GNUNET_htonll (announced_at);
req->effective_since = GNUNET_htonll (effective_since);
req->did_join = GNUNET_YES;
- req->op_id = GNUNET_htonll (op_add (chn, result_cb, cls));
+ req->op_id = GNUNET_htonll (GNUNET_OP_add (chn->op, result_cb, cls, NULL));
- GNUNET_CLIENT_MANAGER_transmit (chn->client, &req->header);
+ GNUNET_MQ_send (chn->mq, env);
}
* denying members access or offering access to channel data to
* non-members.
*
- * @param channel Channel handle.
- * @param slave_key Identity of channel slave to remove.
- * @param announced_at ID of the message that announced the membership change.
+ * @param chn
+ * Channel handle.
+ * @param slave_pub_key
+ * Identity of channel slave to remove.
+ * @param announced_at
+ * ID of the message that announced the membership change.
+ * @param result_cb
+ * Function to call with the result of the operation.
+ * The @e result_code argument is #GNUNET_OK on success, or
+ * #GNUNET_SYSERR on error. In case of an error, the @e data argument
+ * can contain an optional error message.
+ * @param cls
+ * Closure for @a result_cb.
*/
void
GNUNET_PSYC_channel_slave_remove (struct GNUNET_PSYC_Channel *chn,
- const struct GNUNET_CRYPTO_EcdsaPublicKey *slave_key,
+ const struct GNUNET_CRYPTO_EcdsaPublicKey *slave_pub_key,
uint64_t announced_at,
- GNUNET_PSYC_ResultCallback result_cb,
+ GNUNET_ResultCallback result_cb,
void *cls)
{
- struct ChannelMembershipStoreRequest *req = GNUNET_malloc (sizeof (*req));
- req->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_CHANNEL_MEMBERSHIP_STORE);
- req->header.size = htons (sizeof (*req));
- req->slave_key = *slave_key;
+ struct ChannelMembershipStoreRequest *req;
+ struct GNUNET_MQ_Envelope *
+ env = GNUNET_MQ_msg (req, GNUNET_MESSAGE_TYPE_PSYC_CHANNEL_MEMBERSHIP_STORE);
+ req->slave_pub_key = *slave_pub_key;
req->announced_at = GNUNET_htonll (announced_at);
req->did_join = GNUNET_NO;
- req->op_id = GNUNET_htonll (op_add (chn, result_cb, cls));
+ req->op_id = GNUNET_htonll (GNUNET_OP_add (chn->op, result_cb, cls, NULL));
+
+ GNUNET_MQ_send (chn->mq, env);
+}
+
+
+static struct GNUNET_PSYC_HistoryRequest *
+channel_history_replay (struct GNUNET_PSYC_Channel *chn,
+ uint64_t start_message_id,
+ uint64_t end_message_id,
+ uint64_t message_limit,
+ const char *method_prefix,
+ uint32_t flags,
+ GNUNET_PSYC_MessageCallback message_cb,
+ GNUNET_PSYC_MessagePartCallback message_part_cb,
+ GNUNET_ResultCallback result_cb,
+ void *cls)
+{
+ struct GNUNET_PSYC_HistoryRequestMessage *req;
+ struct GNUNET_PSYC_HistoryRequest *hist = GNUNET_malloc (sizeof (*hist));
+ hist->chn = chn;
+ hist->recv = GNUNET_PSYC_receive_create (message_cb, message_part_cb, cls);
+ hist->result_cb = result_cb;
+ hist->cls = cls;
+ hist->op_id = GNUNET_OP_add (chn->op, op_recv_history_result, hist, NULL);
+
+ GNUNET_assert (NULL != method_prefix);
+ uint16_t method_size = strnlen (method_prefix,
+ GNUNET_SERVER_MAX_MESSAGE_SIZE
+ - sizeof (*req)) + 1;
+ GNUNET_assert ('\0' == method_prefix[method_size - 1]);
+
+ struct GNUNET_MQ_Envelope *
+ env = GNUNET_MQ_msg_extra (req, method_size,
+ GNUNET_MESSAGE_TYPE_PSYC_HISTORY_REPLAY);
+ req->start_message_id = GNUNET_htonll (start_message_id);
+ req->end_message_id = GNUNET_htonll (end_message_id);
+ req->message_limit = GNUNET_htonll (message_limit);
+ req->flags = htonl (flags);
+ req->op_id = GNUNET_htonll (hist->op_id);
+ GNUNET_memcpy (&req[1], method_prefix, method_size);
- GNUNET_CLIENT_MANAGER_transmit (chn->client, &req->header);
+ GNUNET_MQ_send (chn->mq, env);
+ return hist;
}
/**
* Request to replay a part of the message history of the channel.
*
- * Historic messages (but NOT the state at the time) will be replayed (given to
- * the normal method handlers) if available and if access is permitted.
+ * Historic messages (but NOT the state at the time) will be replayed and given
+ * to the normal method handlers with a #GNUNET_PSYC_MESSAGE_HISTORIC flag set.
+ *
+ * Messages are retrieved from the local PSYCstore if available,
+ * otherwise requested from the network.
*
* @param channel
* Which channel should be replayed?
* Earliest interesting point in history.
* @param end_message_id
* Last (inclusive) interesting point in history.
- * FIXME: @param method_prefix
+ * @param method_prefix
* Retrieve only messages with a matching method prefix.
+ * @param flags
+ * OR'ed enum GNUNET_PSYC_HistoryReplayFlags
* @param result_cb
* Function to call when the requested history has been fully replayed.
* @param cls
*
* @return Handle to cancel history replay operation.
*/
-void
+struct GNUNET_PSYC_HistoryRequest *
GNUNET_PSYC_channel_history_replay (struct GNUNET_PSYC_Channel *chn,
uint64_t start_message_id,
uint64_t end_message_id,
- /* FIXME: const char *method_prefix, */
- GNUNET_PSYC_ResultCallback result_cb,
+ const char *method_prefix,
+ uint32_t flags,
+ GNUNET_PSYC_MessageCallback message_cb,
+ GNUNET_PSYC_MessagePartCallback message_part_cb,
+ GNUNET_ResultCallback result_cb,
void *cls)
{
- struct HistoryRequest *req = GNUNET_malloc (sizeof (*req));
- req->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_HISTORY_REPLAY);
- req->header.size = htons (sizeof (*req));
- req->start_message_id = GNUNET_htonll (start_message_id);
- req->end_message_id = GNUNET_htonll (end_message_id);
- req->op_id = GNUNET_htonll (op_add (chn, result_cb, cls));
-
- GNUNET_CLIENT_MANAGER_transmit (chn->client, &req->header);
+ return channel_history_replay (chn, start_message_id, end_message_id, 0,
+ method_prefix, flags,
+ message_cb, message_part_cb, result_cb, cls);
}
* Which channel should be replayed?
* @param message_limit
* Maximum number of messages to replay.
- * FIXME: @param method_prefix
+ * @param method_prefix
* Retrieve only messages with a matching method prefix.
+ * Use NULL or "" to retrieve all.
+ * @param flags
+ * OR'ed enum GNUNET_PSYC_HistoryReplayFlags
* @param result_cb
* Function to call when the requested history has been fully replayed.
* @param cls
*
* @return Handle to cancel history replay operation.
*/
-void
+struct GNUNET_PSYC_HistoryRequest *
GNUNET_PSYC_channel_history_replay_latest (struct GNUNET_PSYC_Channel *chn,
uint64_t message_limit,
- /* FIXME: const char *method_prefix, */
- GNUNET_PSYC_ResultCallback result_cb,
+ const char *method_prefix,
+ uint32_t flags,
+ GNUNET_PSYC_MessageCallback message_cb,
+ GNUNET_PSYC_MessagePartCallback message_part_cb,
+ GNUNET_ResultCallback result_cb,
void *cls)
{
- struct HistoryRequest *req = GNUNET_malloc (sizeof (*req));
- req->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_HISTORY_REPLAY);
- req->header.size = htons (sizeof (*req));
- req->message_limit = GNUNET_htonll (message_limit);
- req->op_id = GNUNET_htonll (op_add (chn, result_cb, cls));
+ return channel_history_replay (chn, 0, 0, message_limit, method_prefix, flags,
+ message_cb, message_part_cb, result_cb, cls);
+}
+
- GNUNET_CLIENT_MANAGER_transmit (chn->client, &req->header);
+void
+GNUNET_PSYC_channel_history_replay_cancel (struct GNUNET_PSYC_Channel *channel,
+ struct GNUNET_PSYC_HistoryRequest *hist)
+{
+ GNUNET_PSYC_receive_destroy (hist->recv);
+ GNUNET_OP_remove (hist->chn->op, hist->op_id);
+ GNUNET_free (hist);
}
* @param cls
* Closure for the callbacks.
*/
-void
+static struct GNUNET_PSYC_StateRequest *
+channel_state_get (struct GNUNET_PSYC_Channel *chn,
+ uint16_t type, const char *name,
+ GNUNET_PSYC_StateVarCallback var_cb,
+ GNUNET_ResultCallback result_cb, void *cls)
+{
+ struct StateRequest *req;
+ struct GNUNET_PSYC_StateRequest *sr = GNUNET_malloc (sizeof (*sr));
+ sr->chn = chn;
+ sr->var_cb = var_cb;
+ sr->result_cb = result_cb;
+ sr->cls = cls;
+ sr->op_id = GNUNET_OP_add (chn->op, op_recv_state_result, sr, NULL);
+
+ GNUNET_assert (NULL != name);
+ size_t name_size = strnlen (name, GNUNET_SERVER_MAX_MESSAGE_SIZE
+ - sizeof (*req)) + 1;
+ struct GNUNET_MQ_Envelope *
+ env = GNUNET_MQ_msg_extra (req, name_size, type);
+ req->op_id = GNUNET_htonll (sr->op_id);
+ GNUNET_memcpy (&req[1], name, name_size);
+
+ GNUNET_MQ_send (chn->mq, env);
+ return sr;
+}
+
+
+/**
+ * Retrieve the best matching channel state variable.
+ *
+ * If the requested variable name is not present in the state, the nearest
+ * less-specific name is matched; for example, requesting "_a_b" will match "_a"
+ * if "_a_b" does not exist.
+ *
+ * @param channel
+ * Channel handle.
+ * @param full_name
+ * Full name of the requested variable.
+ * The actual variable returned might have a shorter name.
+ * @param var_cb
+ * Function called once when a matching state variable is found.
+ * Not called if there's no matching state variable.
+ * @param result_cb
+ * Function called after the operation finished.
+ * (i.e. all state variables have been returned via @a state_cb)
+ * @param cls
+ * Closure for the callbacks.
+ */
+struct GNUNET_PSYC_StateRequest *
GNUNET_PSYC_channel_state_get (struct GNUNET_PSYC_Channel *chn,
const char *full_name,
GNUNET_PSYC_StateVarCallback var_cb,
- GNUNET_PSYC_ResultCallback result_cb,
+ GNUNET_ResultCallback result_cb,
void *cls)
{
- size_t name_size = strlen (full_name) + 1;
- struct StateRequest *req = GNUNET_malloc (sizeof (*req) + name_size);
- req->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_STATE_GET);
- req->header.size = htons (sizeof (*req) + name_size);
- req->op_id = GNUNET_htonll (op_add (chn, result_cb, cls));
- memcpy (&req[1], full_name, name_size);
-
- GNUNET_CLIENT_MANAGER_transmit (chn->client, &req->header);
+ return channel_state_get (chn, GNUNET_MESSAGE_TYPE_PSYC_STATE_GET,
+ full_name, var_cb, result_cb, cls);
+
}
* @param cls
* Closure for the callbacks.
*/
-void
+struct GNUNET_PSYC_StateRequest *
GNUNET_PSYC_channel_state_get_prefix (struct GNUNET_PSYC_Channel *chn,
const char *name_prefix,
GNUNET_PSYC_StateVarCallback var_cb,
- GNUNET_PSYC_ResultCallback result_cb,
+ GNUNET_ResultCallback result_cb,
void *cls)
{
- size_t name_size = strlen (name_prefix) + 1;
- struct StateRequest *req = GNUNET_malloc (sizeof (*req) + name_size);
- req->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_STATE_GET);
- req->header.size = htons (sizeof (*req) + name_size);
- req->op_id = GNUNET_htonll (op_add (chn, result_cb, cls));
- memcpy (&req[1], name_prefix, name_size);
-
- GNUNET_CLIENT_MANAGER_transmit (chn->client, &req->header);
+ return channel_state_get (chn, GNUNET_MESSAGE_TYPE_PSYC_STATE_GET_PREFIX,
+ name_prefix, var_cb, result_cb, cls);
+}
+
+
+/**
+ * Cancel a state request operation.
+ *
+ * @param sr
+ * Handle for the operation to cancel.
+ */
+void
+GNUNET_PSYC_channel_state_get_cancel (struct GNUNET_PSYC_StateRequest *sr)
+{
+ GNUNET_OP_remove (sr->chn->op, sr->op_id);
+ GNUNET_free (sr);
}
/* end of psyc_api.c */