*/
#include "platform.h"
-#include "gnunet_common.h"
+#include "gnunet_util_lib.h"
#include "gnunet_protocols.h"
#include "gnunet_applications.h"
-#include "gnunet_util_lib.h"
#include "gnunet_set_service.h"
#include "gnunet_consensus_service.h"
#include "consensus_protocol.h"
*/
struct GNUNET_MQ_Handle *client_mq;
+ /**
+ * Time when the conclusion of the consensus should begin.
+ */
+ struct GNUNET_TIME_Absolute conclude_start;
+
/**
* Timeout for all rounds together, single rounds will schedule a timeout task
* with a fraction of the conclude timeout.
* Only valid once the current round is not CONSENSUS_ROUND_BEGIN.
*/
- struct GNUNET_TIME_Relative conclude_timeout;
-
+ struct GNUNET_TIME_Absolute conclude_deadline;
+
/**
* Timeout task identifier for the current round.
*/
{
int not_finished;
not_finished = 0;
- if ( (NULL != session->partner_outgoing) &&
+ if ( (NULL != session->partner_outgoing) &&
(GNUNET_NO == session->partner_outgoing->exp_subround_finished) )
not_finished++;
if ( (NULL != session->partner_incoming) &&
/**
* Destroy a session, free all resources associated with it.
- *
+ *
* @param session the session to destroy
*/
static void
* @param tc task context, for when this task is invoked by the scheduler,
* NULL if invoked for another reason
*/
-static void
+static void
round_over (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct ConsensusSession *session;
if (NULL == session->shuffle_inv)
session->shuffle_inv = GNUNET_malloc (session->num_peers * sizeof (*session->shuffle_inv));
- GNUNET_CRYPTO_kdf (randomness, sizeof (randomness),
+ GNUNET_CRYPTO_kdf (randomness, sizeof (randomness),
&session->exp_round, sizeof (uint32_t),
&session->global_id, sizeof (struct GNUNET_HashCode),
NULL);
* @param element a result element, only valid if status is GNUNET_SET_STATUS_OK
* @param status see enum GNUNET_SET_Status
*/
-static void
+static void
set_result_cb (void *cls,
const struct GNUNET_SET_Element *element,
enum GNUNET_SET_Status status)
* Compare the round the session is in with the round of the given context message.
*
* @param session a consensus session
- * @param round a round context message
+ * @param ri a round context message
* @return 0 if it's the same round, -1 if the session is in an earlier round,
* 1 if the session is in a later round
*/
GNUNET_SCHEDULER_cancel (session->round_timeout_tid);
session->round_timeout_tid = GNUNET_SCHEDULER_NO_TASK;
}
-
+
if (session->exp_round >= NUM_EXP_ROUNDS)
{
round_over (session, NULL);
session->exp_subround = 0;
shuffle (session);
}
- else
+ else
{
session->exp_subround++;
}
* @param session_id local id of the consensus session
*/
static void
-compute_global_id (struct ConsensusSession *session, const struct GNUNET_HashCode *session_id)
+compute_global_id (struct ConsensusSession *session,
+ const struct GNUNET_HashCode *session_id)
{
int i;
struct GNUNET_HashCode tmp;
+ struct GNUNET_HashCode phash;
/* FIXME: use kdf? */
session->global_id = *session_id;
for (i = 0; i < session->num_peers; ++i)
{
- GNUNET_CRYPTO_hash_xor (&session->global_id, &session->info[i].peer_id.hashPubKey, &tmp);
+ GNUNET_CRYPTO_hash (&session->info[i].peer_id, sizeof (struct GNUNET_PeerIdentity), &phash);
+ GNUNET_CRYPTO_hash_xor (&session->global_id, &phash, &tmp);
session->global_id = tmp;
GNUNET_CRYPTO_hash (&session->global_id, sizeof (struct GNUNET_PeerIdentity), &tmp);
session->global_id = tmp;
/* peers in the join message, may or may not include the local peer */
listed_peers = ntohl (join_msg->num_peers);
-
+
session->num_peers = listed_peers;
msg_peers = (struct GNUNET_PeerIdentity *) &join_msg[1];
other_session = sessions_head;
while (NULL != other_session)
{
- if ((other_session != session) &&
+ if ((other_session != session) &&
(0 == GNUNET_CRYPTO_hash_cmp (&session->global_id, &other_session->global_id)))
{
if (CONSENSUS_ROUND_FINISH != other_session->current_round)
other_session = other_session->next;
}
+ session->conclude_deadline = GNUNET_TIME_absolute_ntoh (join_msg->deadline);
+ session->conclude_start = GNUNET_TIME_absolute_ntoh (join_msg->start);
+
session->local_peer_idx = get_peer_idx (&my_peer, session);
GNUNET_assert (-1 != session->local_peer_idx);
session->element_set = GNUNET_SET_create (cfg, GNUNET_SET_OPERATION_UNION);
const struct GNUNET_MessageHeader *message)
{
struct ConsensusSession *session;
- struct GNUNET_CONSENSUS_ConcludeMessage *cmsg;
-
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "conclude requested\n");
- cmsg = (struct GNUNET_CONSENSUS_ConcludeMessage *) message;
session = get_session_by_client (client);
if (NULL == session)
{
}
else
{
- session->conclude_timeout = GNUNET_TIME_relative_ntoh (cmsg->timeout);
/* the 'begin' round is over, start with the next, actual round */
round_over (session, NULL);
}
{
static const struct GNUNET_SERVER_MessageHandler server_handlers[] = {
{&client_conclude, NULL, GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_CONCLUDE,
- sizeof (struct GNUNET_CONSENSUS_ConcludeMessage)},
+ sizeof (struct GNUNET_MessageHeader)},
{&client_insert, NULL, GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_INSERT, 0},
{&client_join, NULL, GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_JOIN, 0},
{NULL, NULL, 0, 0}
cfg = c;
srv = server;
- if (GNUNET_OK != GNUNET_CRYPTO_get_host_identity (cfg, &my_peer))
+ if (GNUNET_OK != GNUNET_CRYPTO_get_peer_identity (cfg, &my_peer))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "could not retrieve host identity\n");
GNUNET_break (0);