/*
* This file is part of GNUnet
- * (C) 2013 Christian Grothoff (and other contributing authors)
+ * Copyright (C) 2013 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
*
* 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 "gnunet_constants.h"
#include "gnunet_protocols.h"
#include "gnunet_statistics_service.h"
+#include "gnunet_psyc_util_lib.h"
#include "gnunet_psycstore_service.h"
#include "gnunet_psycstore_plugin.h"
#include "psycstore.h"
if (NULL != err_msg)
err_size = strnlen (err_msg,
- GNUNET_SERVER_MAX_MESSAGE_SIZE - sizeof (*res)) + 1;
+ GNUNET_SERVER_MAX_MESSAGE_SIZE - sizeof (*res) - 1) + 1;
res = GNUNET_malloc (sizeof (struct OperationResult) + err_size);
res->header.type = htons (GNUNET_MESSAGE_TYPE_PSYCSTORE_RESULT_CODE);
res->header.size = htons (sizeof (struct OperationResult) + err_size);
static int
send_state_var (void *cls, const char *name,
- const void *value, size_t value_size)
+ const void *value, uint32_t value_size)
{
struct SendClosure *sc = cls;
struct StateResult *res;
size_t name_size = strlen (name) + 1;
- /* FIXME: split up value into 64k chunks */
+ /** @todo FIXME: split up value into 64k chunks */
res = GNUNET_malloc (sizeof (struct StateResult) + name_size + value_size);
res->header.type = htons (GNUNET_MESSAGE_TYPE_PSYCSTORE_RESULT_STATE);
first_fragment_id, last_fragment_id,
&ret_frags, &send_fragment, &sc);
else
- ret = db->fragment_get_latest (db->cls, &req->channel_key, limit,
+ ret = db->fragment_get_latest (db->cls, &req->channel_key, limit,
&ret_frags, &send_fragment, &sc);
switch (ret)
{
const struct MessageGetRequest *
req = (const struct MessageGetRequest *) msg;
+ uint16_t size = ntohs (msg->size);
+ const char *method_prefix = (const char *) &req[1];
+
+ if (size < sizeof (*req) + 1
+ || '\0' != method_prefix[size - sizeof (*req) - 1])
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Message get: invalid method prefix. size: %u < %u?\n",
+ size, sizeof (*req) + 1);
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+
struct SendClosure
sc = { .op_id = req->op_id, .client = client,
.channel_key = req->channel_key, .slave_key = req->slave_key,
uint64_t last_message_id = GNUNET_ntohll (req->last_message_id);
uint64_t limit = GNUNET_ntohll (req->message_limit);
+ /** @todo method_prefix */
if (0 == limit)
ret = db->message_get (db->cls, &req->channel_key,
first_message_id, last_message_id,
res.header.type = htons (GNUNET_MESSAGE_TYPE_PSYCSTORE_RESULT_COUNTERS);
res.header.size = htons (sizeof (res));
- res.result_code = htonl (ret - INT32_MIN);
+ res.result_code = htonl (ret);
res.op_id = req->op_id;
res.max_fragment_id = GNUNET_htonll (res.max_fragment_id);
res.max_message_id = GNUNET_htonll (res.max_message_id);
}
-/* FIXME: stop processing further state modify messages after an error */
+struct StateModifyClosure
+{
+ const struct GNUNET_CRYPTO_EddsaPublicKey channel_key;
+ struct GNUNET_PSYC_ReceiveHandle *recv;
+ enum GNUNET_PSYC_MessageState msg_state;
+ char mod_oper;
+ char *mod_name;
+ char *mod_value;
+ uint32_t mod_value_size;
+ uint32_t mod_value_remaining;
+};
+
+
+static void
+recv_state_message_part (void *cls,
+ const struct GNUNET_CRYPTO_EcdsaPublicKey *slave_key,
+ uint64_t message_id, uint32_t flags, uint64_t data_offset,
+ const struct GNUNET_MessageHeader *msg)
+{
+ struct StateModifyClosure *scls = cls;
+ uint16_t psize;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "recv_state_message_part() message_id: %" PRIu64
+ ", data_offset: %" PRIu64 ", flags: %u\n",
+ message_id, data_offset, flags);
+
+ if (NULL == msg)
+ {
+ scls->msg_state = GNUNET_PSYC_MESSAGE_STATE_ERROR;
+ return;
+ }
+
+ switch (ntohs (msg->type))
+ {
+ case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_METHOD:
+ {
+ scls->msg_state = GNUNET_PSYC_MESSAGE_STATE_METHOD;
+ break;
+ }
+
+ case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_MODIFIER:
+ {
+ struct GNUNET_PSYC_MessageModifier *
+ pmod = (struct GNUNET_PSYC_MessageModifier *) msg;
+ psize = ntohs (pmod->header.size);
+ uint16_t name_size = ntohs (pmod->name_size);
+ uint32_t value_size = ntohl (pmod->value_size);
+
+ const char *name = (const char *) &pmod[1];
+ const void *value = name + name_size;
+
+ if (GNUNET_ENV_OP_SET != pmod->oper)
+ { // Apply non-transient operation.
+ if (psize == sizeof (*pmod) + name_size + value_size)
+ {
+ db->state_modify_op (db->cls, &scls->channel_key,
+ pmod->oper, name, value, value_size);
+ }
+ else
+ {
+ scls->mod_oper = pmod->oper;
+ scls->mod_name = GNUNET_malloc (name_size);
+ memcpy (scls->mod_name, name, name_size);
+
+ scls->mod_value_size = value_size;
+ scls->mod_value = GNUNET_malloc (scls->mod_value_size);
+ scls->mod_value_remaining
+ = scls->mod_value_size - (psize - sizeof (*pmod) - name_size);
+ memcpy (scls->mod_value, value, value_size - scls->mod_value_remaining);
+ }
+ }
+ scls->msg_state = GNUNET_PSYC_MESSAGE_STATE_MODIFIER;
+ break;
+ }
+
+ case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_MOD_CONT:
+ if (GNUNET_ENV_OP_SET != scls->mod_oper)
+ {
+ if (scls->mod_value_remaining == 0)
+ {
+ GNUNET_break_op (0);
+ scls->msg_state = GNUNET_PSYC_MESSAGE_STATE_ERROR;
+ }
+ psize = ntohs (msg->size);
+ memcpy (scls->mod_value + (scls->mod_value_size - scls->mod_value_remaining),
+ &msg[1], psize - sizeof (*msg));
+ scls->mod_value_remaining -= psize - sizeof (*msg);
+ if (0 == scls->mod_value_remaining)
+ {
+ db->state_modify_op (db->cls, &scls->channel_key,
+ scls->mod_oper, scls->mod_name,
+ scls->mod_value, scls->mod_value_size);
+ GNUNET_free (scls->mod_name);
+ GNUNET_free (scls->mod_value);
+ scls->mod_oper = 0;
+ scls->mod_name = NULL;
+ scls->mod_value = NULL;
+ scls->mod_value_size = 0;
+ }
+ }
+ scls->msg_state = GNUNET_PSYC_MESSAGE_STATE_MOD_CONT;
+ break;
+
+ case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_DATA:
+ scls->msg_state = GNUNET_PSYC_MESSAGE_STATE_DATA;
+ break;
+
+ case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_END:
+ scls->msg_state = GNUNET_PSYC_MESSAGE_STATE_END;
+ break;
+
+ default:
+ scls->msg_state = GNUNET_PSYC_MESSAGE_STATE_ERROR;
+ }
+}
+
+
+static int
+recv_state_fragment (void *cls, struct GNUNET_MULTICAST_MessageHeader *msg,
+ enum GNUNET_PSYCSTORE_MessageFlags flags)
+{
+ struct StateModifyClosure *scls = cls;
+
+ if (NULL == scls->recv)
+ {
+ scls->recv = GNUNET_PSYC_receive_create (NULL, recv_state_message_part,
+ scls);
+ }
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "recv_state_fragment: %" PRIu64 "\n", GNUNET_ntohll (msg->fragment_id));
+
+ struct GNUNET_PSYC_MessageHeader *
+ pmsg = GNUNET_PSYC_message_header_create (msg, flags);
+ GNUNET_PSYC_receive_message (scls->recv, pmsg);
+ GNUNET_free (pmsg);
+
+ return GNUNET_YES;
+}
+
+
static void
handle_state_modify (void *cls,
struct GNUNET_SERVER_Client *client,
const struct StateModifyRequest *req
= (const struct StateModifyRequest *) msg;
- int ret = GNUNET_SYSERR;
- const char *name = (const char *) &req[1];
- uint16_t name_size = ntohs (req->name_size);
+ uint64_t message_id = GNUNET_ntohll (req->message_id);
+ uint64_t state_delta = GNUNET_ntohll (req->state_delta);
+ uint64_t ret_frags = 0;
+ struct StateModifyClosure
+ scls = { .channel_key = req->channel_key };
- if (name_size <= 2 || '\0' != name[name_size - 1])
+ int ret = db->state_modify_begin (db->cls, &req->channel_key,
+ message_id, state_delta);
+
+ if (GNUNET_OK != ret)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Tried to set invalid state variable name!\n"));
- GNUNET_break_op (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to begin modifying state: %d\n"), ret);
}
else
{
- ret = GNUNET_OK;
-
- if (req->flags & STATE_OP_FIRST)
- {
- ret = db->state_modify_begin (db->cls, &req->channel_key,
- GNUNET_ntohll (req->message_id),
- GNUNET_ntohll (req->state_delta));
- }
- if (ret != GNUNET_OK)
+ ret = db->message_get (db->cls, &req->channel_key,
+ message_id, message_id,
+ &ret_frags, recv_state_fragment, &scls);
+ if (GNUNET_OK != ret)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to begin modifying state!\n"));
+ _("Failed to modify state: %d\n"), ret);
+ GNUNET_break (0);
}
else
{
- switch (req->oper)
+ if (GNUNET_OK != db->state_modify_end (db->cls, &req->channel_key, message_id))
{
- case GNUNET_ENV_OP_ASSIGN:
- ret = db->state_modify_set (db->cls, &req->channel_key,
- (const char *) &req[1],
- name + ntohs (req->name_size),
- ntohs (req->header.size) - sizeof (*req)
- - ntohs (req->name_size));
- break;
- default:
-#if TODO
- ret = GNUNET_ENV_operation ((const char *) &req[1],
- current_value, current_value_size,
- req->oper, name + ntohs (req->name_size),
- ntohs (req->header.size) - sizeof (*req)
- - ntohs (req->name_size), &value, &value_size);
-#endif
- ret = GNUNET_SYSERR;
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Unknown operator: %c\n"), req->oper);
+ _("Failed to end modifying state!\n"));
+ GNUNET_break (0);
}
}
-
- if (GNUNET_OK == ret && req->flags & STATE_OP_LAST)
+ if (NULL != scls.recv)
{
- ret = db->state_modify_end (db->cls, &req->channel_key,
- GNUNET_ntohll (req->message_id));
- if (ret != GNUNET_OK)
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to end modifying state!\n"));
+ GNUNET_PSYC_receive_destroy (scls.recv);
}
}
+
send_result_code (client, req->op_id, ret, NULL);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
-/* FIXME: stop processing further state sync messages after an error */
+/** @todo FIXME: stop processing further state sync messages after an error */
static void
handle_state_sync (void *cls,
struct GNUNET_SERVER_Client *client,
}
else
{
- ret = db->state_sync_set (db->cls, &req->channel_key, name,
- name + ntohs (req->name_size),
- ntohs (req->header.size) - sizeof (*req)
- - ntohs (req->name_size));
+ ret = db->state_sync_assign (db->cls, &req->channel_key, name,
+ name + ntohs (req->name_size),
+ ntohs (req->header.size) - sizeof (*req)
+ - ntohs (req->name_size));
}
if (GNUNET_OK == ret && req->flags & STATE_OP_LAST)
{
ret = db->state_sync_end (db->cls, &req->channel_key,
- GNUNET_ntohll (req->message_id));
+ GNUNET_ntohll (req->max_state_message_id),
+ GNUNET_ntohll (req->state_hash_message_id));
if (ret != GNUNET_OK)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Failed to end synchronizing state!\n"));
sizeof (struct FragmentGetRequest) },
{ &handle_message_get, NULL,
- GNUNET_MESSAGE_TYPE_PSYCSTORE_MESSAGE_GET,
- sizeof (struct MessageGetRequest) },
+ GNUNET_MESSAGE_TYPE_PSYCSTORE_MESSAGE_GET, 0 },
{ &handle_message_get_fragment, NULL,
GNUNET_MESSAGE_TYPE_PSYCSTORE_MESSAGE_GET_FRAGMENT,
projects / oweals / gnunet.git / blobdiff