/*
* This file is part of GNUnet
- * Copyright (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
*/
/**
- * @file psycstore/psyc_util_lib.c
+ * @file psycutil/psyc_message.c
* @brief PSYC utilities; receiving/transmitting/logging PSYC messages.
* @author Gabor X Toth
*/
/**
* Client connection to service.
*/
- struct GNUNET_CLIENT_MANAGER_Connection *client;
+ struct GNUNET_MQ_Handle *mq;
/**
* Message currently being received from the client.
*/
struct GNUNET_MessageHeader *msg;
+ /**
+ * Envelope for @a msg
+ */
+ struct GNUNET_MQ_Envelope *env;
+
/**
* Callback to request next modifier from client.
*/
/**
* Public key of the slave from which a message is being received.
*/
- struct GNUNET_CRYPTO_EcdsaPublicKey slave_key;
+ struct GNUNET_CRYPTO_EcdsaPublicKey slave_pub_key;
/**
* State of the currently being received message from the PSYC service.
pmeth = (struct GNUNET_PSYC_MessageMethod *) &msg[1];
pmeth->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_METHOD);
pmeth->header.size = htons (sizeof (*pmeth) + method_name_size);
- memcpy (&pmeth[1], method_name, method_name_size);
+ GNUNET_memcpy (&pmeth[1], method_name, method_name_size);
uint16_t p = sizeof (*msg) + sizeof (*pmeth) + method_name_size;
if (NULL != env)
pmod->name_size = htons (mod_name_size);
pmod->value_size = htonl (mod->value_size);
- memcpy (&pmod[1], mod->name, mod_name_size);
+ GNUNET_memcpy (&pmod[1], mod->name, mod_name_size);
if (0 < mod->value_size)
- memcpy ((char *) &pmod[1] + mod_name_size, mod->value, mod->value_size);
+ GNUNET_memcpy ((char *) &pmod[1] + mod_name_size, mod->value, mod->value_size);
mod = mod->next;
}
p += pmsg->size;
pmsg->size = htons (pmsg->size);
pmsg->type = htons (GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_DATA);
- memcpy (&pmsg[1], data, data_size);
+ GNUNET_memcpy (&pmsg[1], data, data_size);
}
pmsg = (struct GNUNET_MessageHeader *) ((char *) msg + p);
{
uint16_t size = ntohs (msg->size);
uint16_t type = ntohs (msg->type);
- GNUNET_log (kind, "Message of type %d and size %u:\n", type, size);
+
+ GNUNET_log (kind,
+ "Message of type %d and size %u:\n",
+ type,
+ size);
switch (type)
{
case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE:
{
- struct GNUNET_PSYC_MessageHeader *pmsg
- = (struct GNUNET_PSYC_MessageHeader *) msg;
- GNUNET_log (kind, "\tID: %" PRIu64 "\tflags: %x" PRIu32 "\n",
- GNUNET_ntohll (pmsg->message_id), ntohl (pmsg->flags));
+ const struct GNUNET_PSYC_MessageHeader *pmsg
+ = (const struct GNUNET_PSYC_MessageHeader *) msg;
+ GNUNET_log (kind,
+ "\tID: %" PRIu64 "\tflags: %x" PRIu32 "\n",
+ GNUNET_ntohll (pmsg->message_id),
+ ntohl (pmsg->flags));
break;
}
case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_METHOD:
{
- struct GNUNET_PSYC_MessageMethod *meth
- = (struct GNUNET_PSYC_MessageMethod *) msg;
- GNUNET_log (kind, "\t%.*s\n", size - sizeof (*meth), &meth[1]);
+ const struct GNUNET_PSYC_MessageMethod *meth
+ = (const struct GNUNET_PSYC_MessageMethod *) msg;
+ GNUNET_log (kind,
+ "\t%.*s\n",
+ (int) (size - sizeof (*meth)),
+ (const char *) &meth[1]);
break;
}
case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_MODIFIER:
{
- struct GNUNET_PSYC_MessageModifier *mod
- = (struct GNUNET_PSYC_MessageModifier *) msg;
+ const struct GNUNET_PSYC_MessageModifier *mod
+ = (const struct GNUNET_PSYC_MessageModifier *) msg;
uint16_t name_size = ntohs (mod->name_size);
char oper = ' ' < mod->oper ? mod->oper : ' ';
- GNUNET_log (kind, "\t%c%.*s\t%.*s\n", oper, name_size, &mod[1],
- size - sizeof (*mod) - name_size,
- ((char *) &mod[1]) + name_size);
+ GNUNET_log (kind,
+ "\t%c%.*s\t%.*s\n",
+ oper,
+ (int) name_size,
+ (const char *) &mod[1],
+ (int) (size - sizeof (*mod) - name_size),
+ ((const char *) &mod[1]) + name_size);
break;
}
case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_MOD_CONT:
case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_DATA:
- GNUNET_log (kind, "\t%.*s\n", size - sizeof (*msg), &msg[1]);
+ GNUNET_log (kind,
+ "\t%.*s\n",
+ (int) (size - sizeof (*msg)),
+ (const char *) &msg[1]);
break;
}
}
* Create a transmission handle.
*/
struct GNUNET_PSYC_TransmitHandle *
-GNUNET_PSYC_transmit_create (struct GNUNET_CLIENT_MANAGER_Connection *client)
+GNUNET_PSYC_transmit_create (struct GNUNET_MQ_Handle *mq)
{
- struct GNUNET_PSYC_TransmitHandle *tmit = GNUNET_malloc (sizeof (*tmit));
- tmit->client = client;
+ struct GNUNET_PSYC_TransmitHandle *tmit = GNUNET_new (struct GNUNET_PSYC_TransmitHandle);
+
+ tmit->mq = mq;
return tmit;
}
{
/* End of message or buffer is full, add it to transmission queue
* and start with empty buffer */
- tmit->msg->type = htons (GNUNET_MESSAGE_TYPE_PSYC_MESSAGE);
tmit->msg->size = htons (tmit->msg->size);
- GNUNET_CLIENT_MANAGER_transmit (tmit->client, tmit->msg);
+ GNUNET_MQ_send (tmit->mq, tmit->env);
+ tmit->env = NULL;
tmit->msg = NULL;
tmit->acks_pending++;
}
else
{
/* Message fits in current buffer, append */
- tmit->msg = GNUNET_realloc (tmit->msg, tmit->msg->size + size);
- memcpy ((char *) tmit->msg + tmit->msg->size, msg, size);
+ GNUNET_memcpy ((char *) tmit->msg + tmit->msg->size, msg, size);
tmit->msg->size += size;
}
}
if (NULL == tmit->msg && NULL != msg)
{
/* Empty buffer, copy over message. */
- tmit->msg = GNUNET_malloc (sizeof (*tmit->msg) + size);
+ tmit->env = GNUNET_MQ_msg_extra (tmit->msg,
+ GNUNET_MULTICAST_FRAGMENT_MAX_PAYLOAD,
+ GNUNET_MESSAGE_TYPE_PSYC_MESSAGE);
+ /* store current message size in host byte order
+ * then later switch it to network byte order before sending */
tmit->msg->size = sizeof (*tmit->msg) + size;
- memcpy (&tmit->msg[1], msg, size);
+
+ GNUNET_memcpy (&tmit->msg[1], msg, size);
}
if (NULL != tmit->msg
< tmit->msg->size + sizeof (struct GNUNET_MessageHeader))))
{
/* End of message or buffer is full, add it to transmission queue. */
- tmit->msg->type = htons (GNUNET_MESSAGE_TYPE_PSYC_MESSAGE);
tmit->msg->size = htons (tmit->msg->size);
- GNUNET_CLIENT_MANAGER_transmit (tmit->client, tmit->msg);
+ GNUNET_MQ_send (tmit->mq, tmit->env);
+ tmit->env = NULL;
tmit->msg = NULL;
tmit->acks_pending++;
}
tmit->mod_value = tmit->mod->value + value_size;
}
- memcpy (data, tmit->mod->name, name_size);
- memcpy ((char *)data + name_size, tmit->mod->value, value_size);
+ GNUNET_memcpy (data, tmit->mod->name, name_size);
+ GNUNET_memcpy ((char *)data + name_size, tmit->mod->value, value_size);
return GNUNET_NO;
}
else
}
*data_size = value_size;
- memcpy (data, value, value_size);
+ GNUNET_memcpy (data, value, value_size);
return (NULL == tmit->mod_value) ? GNUNET_YES : GNUNET_NO;
}
}
size_t size = strlen (method_name) + 1;
struct GNUNET_PSYC_MessageMethod *pmeth;
- tmit->msg = GNUNET_malloc (sizeof (*tmit->msg) + sizeof (*pmeth) + size);
+
+ tmit->env = GNUNET_MQ_msg_extra (tmit->msg,
+ GNUNET_MULTICAST_FRAGMENT_MAX_PAYLOAD,
+ GNUNET_MESSAGE_TYPE_PSYC_MESSAGE);
+ /* store current message size in host byte order
+ * then later switch it to network byte order before sending */
tmit->msg->size = sizeof (*tmit->msg) + sizeof (*pmeth) + size;
if (NULL != notify_mod)
pmeth->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_METHOD);
pmeth->header.size = htons (sizeof (*pmeth) + size);
pmeth->flags = htonl (flags);
- memcpy (&pmeth[1], method_name, size);
+ GNUNET_memcpy (&pmeth[1], method_name, size);
tmit->state = GNUNET_PSYC_MESSAGE_STATE_MODIFIER;
tmit->notify_data = notify_data;
}
tmit->acks_pending--;
+ if (GNUNET_YES == tmit->paused)
+ return;
+
switch (tmit->state)
{
case GNUNET_PSYC_MESSAGE_STATE_MODIFIER:
recv_error (struct GNUNET_PSYC_ReceiveHandle *recv)
{
if (NULL != recv->message_part_cb)
- recv->message_part_cb (recv->cb_cls, NULL, recv->message_id, recv->flags,
- 0, NULL);
+ recv->message_part_cb (recv->cb_cls, NULL, NULL);
if (NULL != recv->message_cb)
- recv->message_cb (recv->cb_cls, recv->message_id, recv->flags, NULL);
+ recv->message_cb (recv->cb_cls, NULL);
GNUNET_PSYC_receive_reset (recv);
}
{
uint16_t size = ntohs (msg->header.size);
uint32_t flags = ntohl (msg->flags);
- uint64_t message_id;
GNUNET_PSYC_log_message (GNUNET_ERROR_TYPE_DEBUG,
(struct GNUNET_MessageHeader *) msg);
{
recv->message_id = GNUNET_ntohll (msg->message_id);
recv->flags = flags;
- recv->slave_key = msg->slave_key;
+ recv->slave_pub_key = msg->slave_pub_key;
recv->mod_value_size = 0;
recv->mod_value_size_expected = 0;
}
recv_error (recv);
return GNUNET_SYSERR;
}
- message_id = recv->message_id;
uint16_t pos = 0, psize = 0, ptype, size_eq, size_min;
}
if (NULL != recv->message_part_cb)
- recv->message_part_cb (recv->cb_cls, &recv->slave_key,
- recv->message_id, recv->flags,
- 0, // FIXME: data_offset
- pmsg);
+ recv->message_part_cb (recv->cb_cls, msg, pmsg);
switch (ptype)
{
}
if (NULL != recv->message_cb)
- recv->message_cb (recv->cb_cls, message_id, flags, msg);
+ recv->message_cb (recv->cb_cls, msg);
return GNUNET_OK;
}
static void
parse_message_part_cb (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)
+ const struct GNUNET_PSYC_MessageHeader *msg,
+ const struct GNUNET_MessageHeader *pmsg)
{
struct ParseMessageClosure *pmc = cls;
- if (NULL == msg)
+ if (NULL == pmsg)
{
pmc->msg_state = GNUNET_PSYC_MESSAGE_STATE_ERROR;
return;
}
- switch (ntohs (msg->type))
+ switch (ntohs (pmsg->type))
{
case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_METHOD:
{
struct GNUNET_PSYC_MessageMethod *
- pmeth = (struct GNUNET_PSYC_MessageMethod *) msg;
+ pmeth = (struct GNUNET_PSYC_MessageMethod *) pmsg;
*pmc->method_name = (const char *) &pmeth[1];
pmc->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;
+ pmod = (struct GNUNET_PSYC_MessageModifier *) pmsg;
const char *name = (const char *) &pmod[1];
const void *value = name + ntohs (pmod->name_size);
}
case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_DATA:
- *pmc->data = &msg[1];
- *pmc->data_size = ntohs (msg->size) - sizeof (*msg);
+ *pmc->data = &pmsg[1];
+ *pmc->data_size = ntohs (pmsg->size) - sizeof (*pmsg);
pmc->msg_state = GNUNET_PSYC_MESSAGE_STATE_DATA;
break;
* @param env
* The environment for the message with a list of modifiers.
* @param[out] data
- * Pointer to data inside @a pmsg.
+ * Pointer to data inside @a msg.
* @param[out] data_size
* Size of @data is written here.
*
pmsg->fragment_offset = mmsg->fragment_offset;
pmsg->flags = htonl (flags);
- memcpy (&pmsg[1], &mmsg[1], size - sizeof (*mmsg));
+ GNUNET_memcpy (&pmsg[1], &mmsg[1], size - sizeof (*mmsg));
}
pmsg = GNUNET_malloc (sizeof (*pmsg) + msg_size - sizeof (*msg));
pmsg->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_MESSAGE);
pmsg->header.size = htons (sizeof (*pmsg) + msg_size - sizeof (*msg));
- memcpy (&pmsg[1], &msg[1], msg_size - sizeof (*msg));
+ GNUNET_memcpy (&pmsg[1], &msg[1], msg_size - sizeof (*msg));
return pmsg;
}
projects / oweals / gnunet.git / blobdiff