/*
This file is part of GNUnet
- Copyright (C) 2012, 2013 GNUnet e.V.
+ Copyright (C) 2012, 2013, 2017 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
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Affero General Public License for more details.
- 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., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ SPDX-License-Identifier: AGPL3.0-or-later
+ */
/**
* @file consensus/gnunet-service-consensus.c
* @brief multi-peer set reconciliation
- * @author Florian Dold
+ * @author Florian Dold <flo@dold.me>
*/
#include "platform.h"
#include "gnunet_util_lib.h"
+#include "gnunet_block_lib.h"
#include "gnunet_protocols.h"
#include "gnunet_applications.h"
#include "gnunet_set_service.h"
#include "consensus_protocol.h"
#include "consensus.h"
-#define ELEMENT_TYPE_CONTESTED_MARKER (GNUNET_CONSENSUS_ELEMENT_TYPE_USER_MAX + 1)
-
enum ReferendumVote
{
GNUNET_NETWORK_STRUCT_BEGIN
-
-struct ContestedPayload
-{
-};
-
/**
* Tuple of integers that together
* identify a task uniquely.
*/
-struct TaskKey {
+struct TaskKey
+{
/**
* A value from 'enum PhaseKind'.
*/
};
-
struct SetKey
{
int set_kind GNUNET_PACKED;
enum PhaseKind
{
PHASE_KIND_ALL_TO_ALL,
+ PHASE_KIND_ALL_TO_ALL_2,
PHASE_KIND_GRADECAST_LEADER,
PHASE_KIND_GRADECAST_ECHO,
PHASE_KIND_GRADECAST_ECHO_GRADE,
struct GNUNET_CONTAINER_MultiHashMap *changes;
};
+struct SetHandle
+{
+ struct SetHandle *prev;
+ struct SetHandle *next;
+
+ struct GNUNET_SET_Handle *h;
+};
/**
int conclude_done;
/**
- * Global consensus identification, computed
- * from the session id and participating authorities.
- */
+ * Global consensus identification, computed
+ * from the session id and participating authorities.
+ */
struct GNUNET_HashCode global_id;
/**
* Client that inhabits the session
*/
- struct GNUNET_SERVER_Client *client;
+ struct GNUNET_SERVICE_Client *client;
/**
* Queued messages to the client.
* State of our early stopping scheme.
*/
int early_stopping;
+
+ /**
+ * Our set size from the first round.
+ */
+ uint64_t first_size;
+
+ uint64_t *first_sizes_received;
+
+ /**
+ * Bounded Eppstein lower bound.
+ */
+ uint64_t lower_bound;
+
+ struct SetHandle *set_handles_head;
+ struct SetHandle *set_handles_tail;
};
/**
*/
static const struct GNUNET_CONFIGURATION_Handle *cfg;
-/**
- * Handle to the server for this service.
- */
-static struct GNUNET_SERVER_Handle *srv;
-
/**
* Peer that runs this service.
*/
static void
finish_task (struct TaskEntry *task);
+
static void
run_ready_steps (struct ConsensusSession *session);
+
static const char *
phasename (uint16_t phase)
{
switch (phase)
{
- case PHASE_KIND_ALL_TO_ALL: return "ALL_TO_ALL";
- case PHASE_KIND_FINISH: return "FINISH";
- case PHASE_KIND_GRADECAST_LEADER: return "GRADECAST_LEADER";
- case PHASE_KIND_GRADECAST_ECHO: return "GRADECAST_ECHO";
- case PHASE_KIND_GRADECAST_ECHO_GRADE: return "GRADECAST_ECHO_GRADE";
- case PHASE_KIND_GRADECAST_CONFIRM: return "GRADECAST_CONFIRM";
- case PHASE_KIND_GRADECAST_CONFIRM_GRADE: return "GRADECAST_CONFIRM_GRADE";
- case PHASE_KIND_APPLY_REP: return "APPLY_REP";
- default: return "(unknown)";
+ case PHASE_KIND_ALL_TO_ALL: return "ALL_TO_ALL";
+
+ case PHASE_KIND_ALL_TO_ALL_2: return "ALL_TO_ALL_2";
+
+ case PHASE_KIND_FINISH: return "FINISH";
+
+ case PHASE_KIND_GRADECAST_LEADER: return "GRADECAST_LEADER";
+
+ case PHASE_KIND_GRADECAST_ECHO: return "GRADECAST_ECHO";
+
+ case PHASE_KIND_GRADECAST_ECHO_GRADE: return "GRADECAST_ECHO_GRADE";
+
+ case PHASE_KIND_GRADECAST_CONFIRM: return "GRADECAST_CONFIRM";
+
+ case PHASE_KIND_GRADECAST_CONFIRM_GRADE: return "GRADECAST_CONFIRM_GRADE";
+
+ case PHASE_KIND_APPLY_REP: return "APPLY_REP";
+
+ default: return "(unknown)";
}
}
{
switch (kind)
{
- case SET_KIND_CURRENT: return "CURRENT";
- case SET_KIND_LEADER_PROPOSAL: return "LEADER_PROPOSAL";
- case SET_KIND_NONE: return "NONE";
- default: return "(unknown)";
+ case SET_KIND_CURRENT: return "CURRENT";
+
+ case SET_KIND_LEADER_PROPOSAL: return "LEADER_PROPOSAL";
+
+ case SET_KIND_NONE: return "NONE";
+
+ default: return "(unknown)";
}
}
+
static const char *
rfnname (uint16_t kind)
{
switch (kind)
{
- case RFN_KIND_NONE: return "NONE";
- case RFN_KIND_ECHO: return "ECHO";
- case RFN_KIND_CONFIRM: return "CONFIRM";
- default: return "(unknown)";
+ case RFN_KIND_NONE: return "NONE";
+
+ case RFN_KIND_ECHO: return "ECHO";
+
+ case RFN_KIND_CONFIRM: return "CONFIRM";
+
+ default: return "(unknown)";
}
}
+
static const char *
diffname (uint16_t kind)
{
switch (kind)
{
- case DIFF_KIND_NONE: return "NONE";
- case DIFF_KIND_LEADER_CONSENSUS: return "LEADER_CONSENSUS";
- case DIFF_KIND_GRADECAST_RESULT: return "GRADECAST_RESULT";
- case DIFF_KIND_LEADER_PROPOSAL: return "LEADER_PROPOSAL";
- default: return "(unknown)";
+ case DIFF_KIND_NONE: return "NONE";
+
+ case DIFF_KIND_LEADER_CONSENSUS: return "LEADER_CONSENSUS";
+
+ case DIFF_KIND_GRADECAST_RESULT: return "GRADECAST_RESULT";
+
+ case DIFF_KIND_LEADER_PROPOSAL: return "LEADER_PROPOSAL";
+
+ default: return "(unknown)";
}
}
+
#ifdef GNUNET_EXTRA_LOGGING
return GNUNET_h2s (&hash);
}
+
static const char *
debug_str_task_key (struct TaskKey *tk)
{
static char buf[256];
- snprintf (buf, sizeof (buf),
+ snprintf (buf, sizeof(buf),
"TaskKey kind=%s, p1=%d, p2=%d, l=%d, rep=%d",
phasename (tk->kind), tk->peer1, tk->peer2,
tk->leader, tk->repetition);
return buf;
}
+
static const char *
debug_str_diff_key (struct DiffKey *dk)
{
static char buf[256];
- snprintf (buf, sizeof (buf),
+ snprintf (buf, sizeof(buf),
"DiffKey kind=%s, k1=%d, k2=%d",
diffname (dk->diff_kind), dk->k1, dk->k2);
return buf;
}
+
static const char *
debug_str_set_key (const struct SetKey *sk)
{
static char buf[256];
- snprintf (buf, sizeof (buf),
+ snprintf (buf, sizeof(buf),
"SetKey kind=%s, k1=%d, k2=%d",
setname (sk->set_kind), sk->k1, sk->k2);
{
static char buf[256];
- snprintf (buf, sizeof (buf),
+ snprintf (buf, sizeof(buf),
"RfnKey kind=%s, k1=%d, k2=%d",
rfnname (rk->rfn_kind), rk->k1, rk->k2);
return buf;
}
-#endif /* GNUNET_EXTRA_LOGGING */
-
-/**
- * Destroy a session, free all resources associated with it.
- *
- * @param session the session to destroy
- */
-static void
-destroy_session (struct ConsensusSession *session)
-{
- GNUNET_CONTAINER_DLL_remove (sessions_head, sessions_tail, session);
- if (NULL != session->set_listener)
- {
- GNUNET_SET_listen_cancel (session->set_listener);
- session->set_listener = NULL;
- }
- if (NULL != session->client_mq)
- {
- GNUNET_MQ_destroy (session->client_mq);
- session->client_mq = NULL;
- /* The MQ cleanup will also disconnect the underlying client. */
- session->client = NULL;
- }
- if (NULL != session->client)
- {
- GNUNET_SERVER_client_disconnect (session->client);
- session->client = NULL;
- }
- GNUNET_free (session);
-}
+#endif /* GNUNET_EXTRA_LOGGING */
/**
if (NULL != element)
{
struct GNUNET_CONSENSUS_ElementMessage *m;
+ const struct ConsensusElement *ce;
+
+ GNUNET_assert (GNUNET_BLOCK_TYPE_CONSENSUS_ELEMENT ==
+ element->element_type);
+ ce = element->data;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "marker is %u\n",
+ (unsigned) ce->marker);
+
+ if (0 != ce->marker)
+ return GNUNET_YES;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"P%d: sending element %s to client\n",
session->local_peer_idx,
debug_str_element (element));
- ev = GNUNET_MQ_msg_extra (m, element->size,
+ ev = GNUNET_MQ_msg_extra (m, element->size - sizeof(struct
+ ConsensusElement),
GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_RECEIVED_ELEMENT);
- m->element_type = htons (element->element_type);
- GNUNET_memcpy (&m[1], element->data, element->size);
+ m->element_type = ce->payload_type;
+ GNUNET_memcpy (&m[1], &ce[1], element->size - sizeof(struct
+ ConsensusElement));
GNUNET_MQ_send (session->client_mq, ev);
}
else
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"P%d: finished iterating elements for client\n",
session->local_peer_idx);
- ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_CONCLUDE_DONE);
+ ev = GNUNET_MQ_msg_header (
+ GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_CONCLUDE_DONE);
GNUNET_MQ_send (session->client_mq, ev);
}
return GNUNET_YES;
debug_str_set_key (key));
GNUNET_assert (SET_KIND_NONE != key->set_kind);
- GNUNET_CRYPTO_hash (key, sizeof (struct SetKey), &hash);
+ GNUNET_CRYPTO_hash (key, sizeof(struct SetKey), &hash);
return GNUNET_CONTAINER_multihashmap_get (session->setmap, &hash);
}
debug_str_diff_key (key));
GNUNET_assert (DIFF_KIND_NONE != key->diff_kind);
- GNUNET_CRYPTO_hash (key, sizeof (struct DiffKey), &hash);
+ GNUNET_CRYPTO_hash (key, sizeof(struct DiffKey), &hash);
return GNUNET_CONTAINER_multihashmap_get (session->diffmap, &hash);
}
debug_str_rfn_key (key));
GNUNET_assert (RFN_KIND_NONE != key->rfn_kind);
- GNUNET_CRYPTO_hash (key, sizeof (struct RfnKey), &hash);
+ GNUNET_CRYPTO_hash (key, sizeof(struct RfnKey), &hash);
return GNUNET_CONTAINER_multihashmap_get (session->rfnmap, &hash);
}
struct DiffElementInfo *di;
struct GNUNET_HashCode hash;
- GNUNET_assert ( (1 == weight) || (-1 == weight));
+ GNUNET_assert ((1 == weight) || (-1 == weight));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"diff_insert with element size %u\n",
ret = 0;
for (i = 0; i < rfn->num_peers; i++)
- if ( (GNUNET_YES == rfn->peer_commited[i]) && (GNUNET_NO == rfn->peer_contested[i]) )
+ if ((GNUNET_YES == rfn->peer_commited[i]) && (GNUNET_NO ==
+ rfn->peer_contested[i]))
ret++;
return ret;
/* Explicit voting only makes sense with VOTE_ADD or VOTE_REMOTE,
since VOTE_KEEP is implicit in not voting. */
- GNUNET_assert ( (VOTE_ADD == vote) || (VOTE_REMOVE == vote) );
+ GNUNET_assert ((VOTE_ADD == vote) || (VOTE_REMOVE == vote));
GNUNET_SET_element_hash (element, &hash);
ri = GNUNET_CONTAINER_multihashmap_get (rfn->rfn_elements, &hash);
}
-uint16_t
+static uint16_t
task_other_peer (struct TaskEntry *task)
{
uint16_t me = task->step->session->local_peer_idx;
+
if (task->key.peer1 == me)
return task->key.peer2;
return task->key.peer1;
}
+static int
+cmp_uint64_t (const void *pa, const void *pb)
+{
+ uint64_t a = *(uint64_t *) pa;
+ uint64_t b = *(uint64_t *) pb;
+
+ if (a == b)
+ return 0;
+ if (a < b)
+ return -1;
+ return 1;
+}
+
+
/**
* Callback for set operation results. Called for each element
* in the result set.
*
* @param cls closure
- * @param element a result element, only valid if status is GNUNET_SET_STATUS_OK
+ * @param element a result element, only valid if status is #GNUNET_SET_STATUS_OK
+ * @param current_size current set size
* @param status see enum GNUNET_SET_Status
*/
static void
set_result_cb (void *cls,
const struct GNUNET_SET_Element *element,
+ uint64_t current_size,
enum GNUNET_SET_Status status)
{
struct TaskEntry *task = cls;
struct ReferendumEntry *output_rfn = NULL;
unsigned int other_idx;
struct SetOpCls *setop;
+ const struct ConsensusElement *consensus_element = NULL;
+
+ if (NULL != element)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: got element of type %u, status %u\n",
+ session->local_peer_idx,
+ (unsigned) element->element_type,
+ (unsigned) status);
+ GNUNET_assert (GNUNET_BLOCK_TYPE_CONSENSUS_ELEMENT ==
+ element->element_type);
+ consensus_element = element->data;
+ }
setop = &task->cls.setop;
return;
}
- if ( (GNUNET_SET_STATUS_ADD_LOCAL == status) || (GNUNET_SET_STATUS_ADD_REMOTE == status) )
+ if ((NULL != consensus_element) && (0 != consensus_element->marker))
{
- if ( (GNUNET_YES == setop->transceive_contested) && (ELEMENT_TYPE_CONTESTED_MARKER == element->element_type) )
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: got some marker\n",
+ session->local_peer_idx);
+ if ((GNUNET_YES == setop->transceive_contested) &&
+ (CONSENSUS_MARKER_CONTESTED == consensus_element->marker))
{
GNUNET_assert (NULL != output_rfn);
rfn_contest (output_rfn, task_other_peer (task));
return;
}
+
+ if (CONSENSUS_MARKER_SIZE == consensus_element->marker)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: got size marker\n",
+ session->local_peer_idx);
+
+
+ struct ConsensusSizeElement *cse = (void *) consensus_element;
+
+ if (cse->sender_index == other_idx)
+ {
+ if (NULL == session->first_sizes_received)
+ session->first_sizes_received = GNUNET_new_array (session->num_peers,
+ uint64_t);
+ session->first_sizes_received[other_idx] = GNUNET_ntohll (cse->size);
+
+ uint64_t *copy = GNUNET_memdup (session->first_sizes_received,
+ sizeof(uint64_t) * session->num_peers);
+ qsort (copy, session->num_peers, sizeof(uint64_t), cmp_uint64_t);
+ session->lower_bound = copy[session->num_peers / 3 + 1];
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: lower bound %llu\n",
+ session->local_peer_idx,
+ (long long) session->lower_bound);
+ GNUNET_free (copy);
+ }
+ return;
+ }
+
+ return;
}
switch (status)
{
- case GNUNET_SET_STATUS_ADD_LOCAL:
+ case GNUNET_SET_STATUS_ADD_LOCAL:
+ GNUNET_assert (NULL != consensus_element);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding element in Task {%s}\n",
+ debug_str_task_key (&task->key));
+ if (NULL != output_set)
+ {
+ // FIXME: record pending adds, use callback
+ GNUNET_SET_add_element (output_set->h,
+ element,
+ NULL,
+ NULL);
+#ifdef GNUNET_EXTRA_LOGGING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Adding element in Task {%s}\n",
+ "P%u: adding element %s into set {%s} of task {%s}\n",
+ session->local_peer_idx,
+ debug_str_element (element),
+ debug_str_set_key (&setop->output_set),
debug_str_task_key (&task->key));
- if (NULL != output_set)
- {
- // FIXME: record pending adds, use callback
- GNUNET_SET_add_element (output_set->h,
- element,
- NULL,
- NULL);
-#ifdef GNUNET_EXTRA_LOGGING
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "P%u: adding element %s into set {%s} of task {%s}\n",
- session->local_peer_idx,
- debug_str_element (element),
- debug_str_set_key (&setop->output_set),
- debug_str_task_key (&task->key));
#endif
- }
- if (NULL != output_diff)
- {
- diff_insert (output_diff, 1, element);
+ }
+ if (NULL != output_diff)
+ {
+ diff_insert (output_diff, 1, element);
#ifdef GNUNET_EXTRA_LOGGING
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "P%u: adding element %s into diff {%s} of task {%s}\n",
- session->local_peer_idx,
- debug_str_element (element),
- debug_str_diff_key (&setop->output_diff),
- debug_str_task_key (&task->key));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: adding element %s into diff {%s} of task {%s}\n",
+ session->local_peer_idx,
+ debug_str_element (element),
+ debug_str_diff_key (&setop->output_diff),
+ debug_str_task_key (&task->key));
#endif
- }
- if (NULL != output_rfn)
- {
- rfn_vote (output_rfn, task_other_peer (task), VOTE_ADD, element);
+ }
+ if (NULL != output_rfn)
+ {
+ rfn_vote (output_rfn, task_other_peer (task), VOTE_ADD, element);
#ifdef GNUNET_EXTRA_LOGGING
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "P%u: adding element %s into rfn {%s} of task {%s}\n",
- session->local_peer_idx,
- debug_str_element (element),
- debug_str_rfn_key (&setop->output_rfn),
- debug_str_task_key (&task->key));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: adding element %s into rfn {%s} of task {%s}\n",
+ session->local_peer_idx,
+ debug_str_element (element),
+ debug_str_rfn_key (&setop->output_rfn),
+ debug_str_task_key (&task->key));
#endif
- }
- // XXX: add result to structures in task
+ }
+ // XXX: add result to structures in task
+ break;
+
+ case GNUNET_SET_STATUS_ADD_REMOTE:
+ GNUNET_assert (NULL != consensus_element);
+ if (GNUNET_YES == setop->do_not_remove)
break;
- case GNUNET_SET_STATUS_ADD_REMOTE:
- if (GNUNET_YES == setop->do_not_remove)
- break;
- if (ELEMENT_TYPE_CONTESTED_MARKER == element->element_type)
- break;
+ if (CONSENSUS_MARKER_CONTESTED == consensus_element->marker)
+ break;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Removing element in Task {%s}\n",
+ debug_str_task_key (&task->key));
+ if (NULL != output_set)
+ {
+ // FIXME: record pending adds, use callback
+ GNUNET_SET_remove_element (output_set->h,
+ element,
+ NULL,
+ NULL);
+#ifdef GNUNET_EXTRA_LOGGING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Removing element in Task {%s}\n",
+ "P%u: removing element %s from set {%s} of task {%s}\n",
+ session->local_peer_idx,
+ debug_str_element (element),
+ debug_str_set_key (&setop->output_set),
debug_str_task_key (&task->key));
- if (NULL != output_set)
- {
- // FIXME: record pending adds, use callback
- GNUNET_SET_remove_element (output_set->h,
- element,
- NULL,
- NULL);
-#ifdef GNUNET_EXTRA_LOGGING
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "P%u: removing element %s from set {%s} of task {%s}\n",
- session->local_peer_idx,
- debug_str_element (element),
- debug_str_set_key (&setop->output_set),
- debug_str_task_key (&task->key));
#endif
- }
- if (NULL != output_diff)
- {
- diff_insert (output_diff, -1, element);
+ }
+ if (NULL != output_diff)
+ {
+ diff_insert (output_diff, -1, element);
#ifdef GNUNET_EXTRA_LOGGING
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "P%u: removing element %s from diff {%s} of task {%s}\n",
- session->local_peer_idx,
- debug_str_element (element),
- debug_str_diff_key (&setop->output_diff),
- debug_str_task_key (&task->key));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: removing element %s from diff {%s} of task {%s}\n",
+ session->local_peer_idx,
+ debug_str_element (element),
+ debug_str_diff_key (&setop->output_diff),
+ debug_str_task_key (&task->key));
#endif
- }
- if (NULL != output_rfn)
- {
- rfn_vote (output_rfn, task_other_peer (task), VOTE_REMOVE, element);
+ }
+ if (NULL != output_rfn)
+ {
+ rfn_vote (output_rfn, task_other_peer (task), VOTE_REMOVE, element);
#ifdef GNUNET_EXTRA_LOGGING
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "P%u: removing element %s from rfn {%s} of task {%s}\n",
- session->local_peer_idx,
- debug_str_element (element),
- debug_str_rfn_key (&setop->output_rfn),
- debug_str_task_key (&task->key));
-#endif
- }
- break;
- case GNUNET_SET_STATUS_DONE:
- // XXX: check first if any changes to the underlying
- // set are still pending
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Finishing setop in Task {%s}\n",
+ "P%u: removing element %s from rfn {%s} of task {%s}\n",
+ session->local_peer_idx,
+ debug_str_element (element),
+ debug_str_rfn_key (&setop->output_rfn),
debug_str_task_key (&task->key));
- if (NULL != output_rfn)
- {
- rfn_commit (output_rfn, task_other_peer (task));
- }
- finish_task (task);
- break;
- case GNUNET_SET_STATUS_FAILURE:
- // XXX: cleanup
- GNUNET_break_op (0);
- finish_task (task);
- return;
- default:
- /* not reached */
- GNUNET_assert (0);
+#endif
+ }
+ break;
+
+ case GNUNET_SET_STATUS_DONE:
+ // XXX: check first if any changes to the underlying
+ // set are still pending
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: Finishing setop in Task {%s} (%u/%u)\n",
+ session->local_peer_idx,
+ debug_str_task_key (&task->key),
+ (unsigned int) task->step->finished_tasks,
+ (unsigned int) task->step->tasks_len);
+ if (NULL != output_rfn)
+ {
+ rfn_commit (output_rfn, task_other_peer (task));
+ }
+ if (PHASE_KIND_ALL_TO_ALL == task->key.kind)
+ {
+ session->first_size = current_size;
+ }
+ finish_task (task);
+ break;
+
+ case GNUNET_SET_STATUS_FAILURE:
+ // XXX: cleanup
+ GNUNET_break_op (0);
+ finish_task (task);
+ return;
+
+ default:
+ /* not reached */
+ GNUNET_assert (0);
}
}
+
#ifdef EVIL
enum EvilnessType
EVILNESS_CRAM_LEAD,
EVILNESS_CRAM_ECHO,
EVILNESS_SLACK,
+ EVILNESS_SLACK_A2A,
};
enum EvilnessSubType
static int
-parse_evilness_cram_subtype (const char *evil_subtype_str, struct Evilness *evil)
+parse_evilness_cram_subtype (const char *evil_subtype_str, struct
+ Evilness *evil)
{
if (0 == strcmp ("replace", evil_subtype_str))
{
GNUNET_assert (NULL != evil);
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, "consensus", "EVIL_SPEC", &evil_spec))
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, "consensus",
+ "EVIL_SPEC",
+ &evil_spec))
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"P%u: no evilness\n",
evil_type_str = NULL;
evil_subtype_str = NULL;
- ret = sscanf (field, "%u;%m[a-z-];%m[a-z-];%u", &peer_num, &evil_type_str, &evil_subtype_str, &evil_num);
+ ret = sscanf (field, "%u;%m[a-z-];%m[a-z-];%u", &peer_num, &evil_type_str,
+ &evil_subtype_str, &evil_num);
if (ret != 4)
{
{
evil->type = EVILNESS_SLACK;
}
+ if (0 == strcmp ("slack-a2a", evil_type_str))
+ {
+ evil->type = EVILNESS_SLACK_A2A;
+ }
else if (0 == strcmp ("cram-all", evil_type_str))
{
evil->type = EVILNESS_CRAM_ALL;
free (evil_subtype_str);
}
+
#endif
set = lookup_set (session, &setop->input_set);
GNUNET_assert (NULL != set);
+ if ((GNUNET_YES == setop->transceive_contested) && (GNUNET_YES ==
+ set->is_contested))
+ {
+ struct GNUNET_SET_Element element;
+ struct ConsensusElement ce = { 0 };
+ ce.marker = CONSENSUS_MARKER_CONTESTED;
+ element.data = &ce;
+ element.size = sizeof(struct ConsensusElement);
+ element.element_type = GNUNET_BLOCK_TYPE_CONSENSUS_ELEMENT;
+ GNUNET_SET_add_element (set->h, &element, NULL, NULL);
+ }
+
+ if (PHASE_KIND_ALL_TO_ALL_2 == task->key.kind)
+ {
+ struct GNUNET_SET_Element element;
+ struct ConsensusSizeElement cse = {
+ .size = 0,
+ .sender_index = 0
+ };
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "inserting size marker\n");
+ cse.ce.marker = CONSENSUS_MARKER_SIZE;
+ cse.size = GNUNET_htonll (session->first_size);
+ cse.sender_index = session->local_peer_idx;
+ element.data = &cse;
+ element.size = sizeof(struct ConsensusSizeElement);
+ element.element_type = GNUNET_BLOCK_TYPE_CONSENSUS_ELEMENT;
+ GNUNET_SET_add_element (set->h, &element, NULL, NULL);
+ }
+
#ifdef EVIL
{
unsigned int i;
}
switch (evil.type)
{
- case EVILNESS_CRAM_ALL:
- case EVILNESS_CRAM_LEAD:
- case EVILNESS_CRAM_ECHO:
- /* We're not cramming elements in the
- all-to-all round, since that would just
- add more elements to the result set, but
- wouldn't test robustness. */
- if (PHASE_KIND_ALL_TO_ALL == task->key.kind)
+ case EVILNESS_CRAM_ALL:
+ case EVILNESS_CRAM_LEAD:
+ case EVILNESS_CRAM_ECHO:
+ /* We're not cramming elements in the
+ all-to-all round, since that would just
+ add more elements to the result set, but
+ wouldn't test robustness. */
+ if (PHASE_KIND_ALL_TO_ALL == task->key.kind)
+ {
+ GNUNET_SET_commit (setop->op, set->h);
+ break;
+ }
+ if ((EVILNESS_CRAM_LEAD == evil.type) &&
+ ((PHASE_KIND_GRADECAST_LEADER != task->key.kind) ||
+ (SET_KIND_CURRENT != set->key.set_kind) ))
+ {
+ GNUNET_SET_commit (setop->op, set->h);
+ break;
+ }
+ if ((EVILNESS_CRAM_ECHO == evil.type) && (PHASE_KIND_GRADECAST_ECHO !=
+ task->key.kind))
+ {
+ GNUNET_SET_commit (setop->op, set->h);
+ break;
+ }
+ for (i = 0; i < evil.num; i++)
+ {
+ struct GNUNET_SET_Element element;
+ struct ConsensusStuffedElement se = {
+ .ce.payload_type = 0,
+ .ce.marker = 0,
+ };
+ element.data = &se;
+ element.size = sizeof(struct ConsensusStuffedElement);
+ element.element_type = GNUNET_BLOCK_TYPE_CONSENSUS_ELEMENT;
+
+ if (EVILNESS_SUB_REPLACEMENT == evil.subtype)
{
- GNUNET_SET_commit (setop->op, set->h);
- break;
+ /* Always generate a new element. */
+ GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK,
+ &se.rand);
}
- if ((EVILNESS_CRAM_LEAD == evil.type) &&
- ((PHASE_KIND_GRADECAST_LEADER != task->key.kind) || SET_KIND_CURRENT != set->key.set_kind))
+ else if (EVILNESS_SUB_NO_REPLACEMENT == evil.subtype)
{
- GNUNET_SET_commit (setop->op, set->h);
- break;
+ /* Always cram the same elements, derived from counter. */
+ GNUNET_CRYPTO_hash (&i, sizeof(i), &se.rand);
}
- if (EVILNESS_CRAM_ECHO == evil.type && (PHASE_KIND_GRADECAST_ECHO != task->key.kind))
+ else
{
- GNUNET_SET_commit (setop->op, set->h);
- break;
+ GNUNET_assert (0);
}
- for (i = 0; i < evil.num; i++)
- {
- struct GNUNET_HashCode hash;
- struct GNUNET_SET_Element element;
- element.data = &hash;
- element.size = sizeof (struct GNUNET_HashCode);
- element.element_type = 0;
-
- if (EVILNESS_SUB_REPLACEMENT == evil.subtype)
- {
- /* Always generate a new element. */
- GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, &hash);
- }
- else if (EVILNESS_SUB_NO_REPLACEMENT == evil.subtype)
- {
- /* Always cram the same elements, derived from counter. */
- GNUNET_CRYPTO_hash (&i, sizeof (i), &hash);
- }
- else
- {
- GNUNET_assert (0);
- }
- GNUNET_SET_add_element (set->h, &element, NULL, NULL);
+ GNUNET_SET_add_element (set->h, &element, NULL, NULL);
#ifdef GNUNET_EXTRA_LOGGING
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "P%u: evil peer: cramming element %s into set {%s} of task {%s}\n",
- session->local_peer_idx,
- debug_str_element (&element),
- debug_str_set_key (&setop->input_set),
- debug_str_task_key (&task->key));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: evil peer: cramming element %s into set {%s} of task {%s}\n",
+ session->local_peer_idx,
+ debug_str_element (&element),
+ debug_str_set_key (&setop->input_set),
+ debug_str_task_key (&task->key));
#endif
- }
- GNUNET_STATISTICS_update (statistics,
- "# stuffed elements",
- evil.num,
- GNUNET_NO);
- GNUNET_SET_commit (setop->op, set->h);
- break;
- case EVILNESS_SLACK:
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "P%u: evil peer: slacking\n",
- (unsigned int) session->local_peer_idx);
- /* Do nothing. */
- break;
- case EVILNESS_NONE:
+ }
+ GNUNET_STATISTICS_update (statistics,
+ "# stuffed elements",
+ evil.num,
+ GNUNET_NO);
+ GNUNET_SET_commit (setop->op, set->h);
+ break;
+
+ case EVILNESS_SLACK:
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: evil peer: slacking\n",
+ (unsigned int) session->local_peer_idx);
+
+ /* Do nothing. */
+ case EVILNESS_SLACK_A2A:
+ if ((PHASE_KIND_ALL_TO_ALL_2 == task->key.kind) ||
+ (PHASE_KIND_ALL_TO_ALL == task->key.kind))
+ {
+ struct GNUNET_SET_Handle *empty_set;
+ empty_set = GNUNET_SET_create (cfg, GNUNET_SET_OPERATION_UNION);
+ GNUNET_SET_commit (setop->op, empty_set);
+ GNUNET_SET_destroy (empty_set);
+ }
+ else
+ {
GNUNET_SET_commit (setop->op, set->h);
- break;
+ }
+ break;
+
+ case EVILNESS_NONE:
+ GNUNET_SET_commit (setop->op, set->h);
+ break;
}
}
#else
- if ( (GNUNET_YES == setop->transceive_contested) && (GNUNET_YES == set->is_contested) )
- {
- struct GNUNET_SET_Element element;
- struct ContestedPayload payload;
- element.data = &payload;
- element.size = sizeof (struct ContestedPayload);
- element.element_type = ELEMENT_TYPE_CONTESTED_MARKER;
- GNUNET_SET_add_element (set->h, &element, NULL, NULL);
- }
if (GNUNET_NO == session->peers_blacklisted[task_other_peer (task)])
{
GNUNET_SET_commit (setop->op, set->h);
peers to wait. */
GNUNET_SET_operation_cancel (setop->op);
setop->op = NULL;
+ finish_task (task);
}
#endif
}
static void
put_diff (struct ConsensusSession *session,
- struct DiffEntry *diff)
+ struct DiffEntry *diff)
{
struct GNUNET_HashCode hash;
GNUNET_assert (NULL != diff);
- GNUNET_CRYPTO_hash (&diff->key, sizeof (struct DiffKey), &hash);
+ GNUNET_CRYPTO_hash (&diff->key, sizeof(struct DiffKey), &hash);
GNUNET_assert (GNUNET_OK ==
- GNUNET_CONTAINER_multihashmap_put (session->diffmap, &hash, diff,
+ GNUNET_CONTAINER_multihashmap_put (session->diffmap, &hash,
+ diff,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
}
+
static void
put_set (struct ConsensusSession *session,
struct SetEntry *set)
"Putting set %s\n",
debug_str_set_key (&set->key));
- GNUNET_CRYPTO_hash (&set->key, sizeof (struct SetKey), &hash);
+ GNUNET_CRYPTO_hash (&set->key, sizeof(struct SetKey), &hash);
GNUNET_assert (GNUNET_SYSERR !=
GNUNET_CONTAINER_multihashmap_put (session->setmap, &hash, set,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE));
{
struct GNUNET_HashCode hash;
- GNUNET_CRYPTO_hash (&rfn->key, sizeof (struct RfnKey), &hash);
+ GNUNET_CRYPTO_hash (&rfn->key, sizeof(struct RfnKey), &hash);
GNUNET_assert (GNUNET_OK ==
GNUNET_CONTAINER_multihashmap_put (session->rfnmap, &hash, rfn,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
}
-
static void
task_cancel_reconcile (struct TaskEntry *task)
{
diff_new = diff_create ();
iter = GNUNET_CONTAINER_multihashmap_iterator_create (diff_1->changes);
- while (GNUNET_YES == GNUNET_CONTAINER_multihashmap_iterator_next (iter, NULL, (const void **) &di))
+ while (GNUNET_YES == GNUNET_CONTAINER_multihashmap_iterator_next (iter, NULL,
+ (const
+ void **) &
+ di))
{
diff_insert (diff_new, di->weight, di->element);
}
GNUNET_CONTAINER_multihashmap_iterator_destroy (iter);
iter = GNUNET_CONTAINER_multihashmap_iterator_create (diff_2->changes);
- while (GNUNET_YES == GNUNET_CONTAINER_multihashmap_iterator_next (iter, NULL, (const void **) &di))
+ while (GNUNET_YES == GNUNET_CONTAINER_multihashmap_iterator_next (iter, NULL,
+ (const
+ void **) &
+ di))
{
diff_insert (diff_new, di->weight, di->element);
}
}
-void
+#if UNUSED
+static void
diff_destroy (struct DiffEntry *diff)
{
GNUNET_CONTAINER_multihashmap_destroy (diff->changes);
}
+#endif
+
+
/**
* For a given majority, count what the outcome
* is (add/remove/keep), and give the number
struct TaskEntry *task = scc->task;
struct SetKey dst_set_key = scc->dst_set_key;
struct SetEntry *set;
+ struct SetHandle *sh = GNUNET_new (struct SetHandle);
+
+ sh->h = copy;
+ GNUNET_CONTAINER_DLL_insert (task->step->session->set_handles_head,
+ task->step->session->set_handles_tail,
+ sh);
GNUNET_free (scc);
set = GNUNET_new (struct SetEntry);
"Decreased pending_prereq to %u for step `%s'.\n",
(unsigned int) step->subordinates[i]->pending_prereq,
step->subordinates[i]->debug_name);
-
#endif
try_finish_step_early (step->subordinates[i]);
}
"Decreased pending_prereq to %u for step `%s'.\n",
(unsigned int) step->subordinates[i]->pending_prereq,
step->subordinates[i]->debug_name);
-
#endif
}
}
-
/**
* Apply the result from one round of gradecasts (i.e. every peer
* should have gradecasted) to the peer's current set.
iter = GNUNET_CONTAINER_multihashmap_iterator_create (rfn_in->rfn_elements);
- while (GNUNET_YES == GNUNET_CONTAINER_multihashmap_iterator_next (iter, NULL, (const void **) &ri))
+ while (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_iterator_next (iter,
+ NULL,
+ (const void **) &ri))
{
uint16_t majority_num;
enum ReferendumVote majority_vote;
switch (majority_vote)
{
- case VOTE_ADD:
- progress_cls->num_pending++;
- GNUNET_assert (GNUNET_OK ==
- GNUNET_SET_add_element (set_out->h,
- ri->element,
- set_mutation_done,
- progress_cls));
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "P%u: apply round: adding element %s with %u-majority.\n",
- session->local_peer_idx,
- debug_str_element (ri->element), majority_num);
- break;
- case VOTE_REMOVE:
- progress_cls->num_pending++;
- GNUNET_assert (GNUNET_OK ==
- GNUNET_SET_remove_element (set_out->h,
- ri->element,
- set_mutation_done,
- progress_cls));
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "P%u: apply round: deleting element %s with %u-majority.\n",
- session->local_peer_idx,
- debug_str_element (ri->element), majority_num);
- break;
- case VOTE_STAY:
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "P%u: apply round: keeping element %s with %u-majority.\n",
- session->local_peer_idx,
- debug_str_element (ri->element), majority_num);
- // do nothing
- break;
- default:
- GNUNET_assert (0);
- break;
+ case VOTE_ADD:
+ progress_cls->num_pending++;
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_SET_add_element (set_out->h,
+ ri->element,
+ &set_mutation_done,
+ progress_cls));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: apply round: adding element %s with %u-majority.\n",
+ session->local_peer_idx,
+ debug_str_element (ri->element), majority_num);
+ break;
+
+ case VOTE_REMOVE:
+ progress_cls->num_pending++;
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_SET_remove_element (set_out->h,
+ ri->element,
+ &set_mutation_done,
+ progress_cls));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: apply round: deleting element %s with %u-majority.\n",
+ session->local_peer_idx,
+ debug_str_element (ri->element), majority_num);
+ break;
+
+ case VOTE_STAY:
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: apply round: keeping element %s with %u-majority.\n",
+ session->local_peer_idx,
+ debug_str_element (ri->element), majority_num);
+ // do nothing
+ break;
+
+ default:
+ GNUNET_assert (0);
+ break;
}
}
- if (progress_cls->num_pending == 0)
+ if (0 == progress_cls->num_pending)
{
// call closure right now, no pending ops
GNUNET_free (progress_cls);
{
switch (session->early_stopping)
{
- case EARLY_STOPPING_NONE:
- session->early_stopping = EARLY_STOPPING_ONE_MORE;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "P%u: Stopping early (after one more superround)\n",
- session->local_peer_idx);
- break;
- case EARLY_STOPPING_ONE_MORE:
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "P%u: finishing steps due to early finish\n",
- session->local_peer_idx);
- session->early_stopping = EARLY_STOPPING_DONE;
- {
- struct Step *step;
- for (step = session->steps_head; NULL != step; step = step->next)
- try_finish_step_early (step);
- }
- break;
- case EARLY_STOPPING_DONE:
- /* We shouldn't be here anymore after early stopping */
- GNUNET_break (0);
- break;
- default:
- GNUNET_assert (0);
- break;
+ case EARLY_STOPPING_NONE:
+ session->early_stopping = EARLY_STOPPING_ONE_MORE;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "P%u: Stopping early (after one more superround)\n",
+ session->local_peer_idx);
+ break;
+
+ case EARLY_STOPPING_ONE_MORE:
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "P%u: finishing steps due to early finish\n",
+ session->local_peer_idx);
+ session->early_stopping = EARLY_STOPPING_DONE;
+ {
+ struct Step *step;
+ for (step = session->steps_head; NULL != step; step = step->next)
+ try_finish_step_early (step);
+ }
+ break;
+
+ case EARLY_STOPPING_DONE:
+ /* We shouldn't be here anymore after early stopping */
+ GNUNET_break (0);
+ break;
+
+ default:
+ GNUNET_assert (0);
+ break;
}
}
else if (EARLY_STOPPING_NONE != session->early_stopping)
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "P%u: NOT finishing early (majority not good enough)\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "P%u: NOT finishing early (majority not good enough)\n",
session->local_peer_idx);
}
}
-
+ GNUNET_CONTAINER_multihashmap_iterator_destroy (iter);
}
put_rfn (session, output_rfn);
}
- diff_key = (struct DiffKey) { DIFF_KIND_LEADER_PROPOSAL, task->key.repetition, task->key.leader };
+ diff_key = (struct DiffKey) { DIFF_KIND_LEADER_PROPOSAL, task->key.repetition,
+ task->key.leader };
input_diff = lookup_diff (session, &diff_key);
GNUNET_assert (NULL != input_diff);
- rfn_key = (struct RfnKey) { RFN_KIND_ECHO, task->key.repetition, task->key.leader };
+ rfn_key = (struct RfnKey) { RFN_KIND_ECHO, task->key.repetition,
+ task->key.leader };
input_rfn = lookup_rfn (session, &rfn_key);
GNUNET_assert (NULL != input_rfn);
- iter = GNUNET_CONTAINER_multihashmap_iterator_create (input_rfn->rfn_elements);
+ iter = GNUNET_CONTAINER_multihashmap_iterator_create (
+ input_rfn->rfn_elements);
- apply_diff_to_rfn (input_diff, output_rfn, task->key.leader, session->num_peers);
+ apply_diff_to_rfn (input_diff, output_rfn, task->key.leader,
+ session->num_peers);
- while (GNUNET_YES == GNUNET_CONTAINER_multihashmap_iterator_next (iter, NULL, (const void **) &ri))
+ while (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_iterator_next (iter,
+ NULL,
+ (const void **) &ri))
{
uint16_t majority_num;
enum ReferendumVote majority_vote;
switch (majority_vote)
{
- case VOTE_STAY:
- break;
- case VOTE_ADD:
- rfn_vote (output_rfn, task->key.leader, VOTE_ADD, ri->element);
- break;
- case VOTE_REMOVE:
- rfn_vote (output_rfn, task->key.leader, VOTE_REMOVE, ri->element);
- break;
- default:
- GNUNET_assert (0);
- break;
+ case VOTE_STAY:
+ break;
+
+ case VOTE_ADD:
+ rfn_vote (output_rfn, task->key.leader, VOTE_ADD, ri->element);
+ break;
+
+ case VOTE_REMOVE:
+ rfn_vote (output_rfn, task->key.leader, VOTE_REMOVE, ri->element);
+ break;
+
+ default:
+ GNUNET_assert (0);
+ break;
}
}
+ GNUNET_CONTAINER_multihashmap_iterator_destroy (iter);
{
uint16_t noncontested;
noncontested = rfn_noncontested (input_rfn);
if (noncontested < (session->num_peers / 3) * 2)
{
- gradecast_confidence = GNUNET_MIN(1, gradecast_confidence);
+ gradecast_confidence = GNUNET_MIN (1, gradecast_confidence);
}
if (noncontested < (session->num_peers / 3) + 1)
{
}
}
- if ( (task->key.peer1 == session->local_peer_idx) && (task->key.peer2 == session->local_peer_idx) )
+ if ((task->key.peer1 == session->local_peer_idx) && (task->key.peer2 ==
+ session->local_peer_idx))
{
/* XXX: mark the corresponding rfn as commited if necessary */
finish_task (task);
if (task->key.peer1 == session->local_peer_idx)
{
- struct GNUNET_CONSENSUS_RoundContextMessage rcm = { 0 };
+ struct GNUNET_CONSENSUS_RoundContextMessage rcm;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"P%u: Looking up set {%s} to run remote union\n",
debug_str_set_key (&setop->input_set));
rcm.header.type = htons (GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_ROUND_CONTEXT);
- rcm.header.size = htons (sizeof (struct GNUNET_CONSENSUS_RoundContextMessage));
+ rcm.header.size = htons (sizeof(struct
+ GNUNET_CONSENSUS_RoundContextMessage));
rcm.kind = htons (task->key.kind);
rcm.peer1 = htons (task->key.peer1);
rcm.peer2 = htons (task->key.peer2);
rcm.leader = htons (task->key.leader);
rcm.repetition = htons (task->key.repetition);
+ rcm.is_contested = htons (0);
GNUNET_assert (NULL == setop->op);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%u: initiating set op with P%u, our set is %s\n",
- session->local_peer_idx, task->key.peer2, debug_str_set_key (&setop->input_set));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: initiating set op with P%u, our set is %s\n",
+ session->local_peer_idx, task->key.peer2, debug_str_set_key (
+ &setop->input_set));
+
+ struct GNUNET_SET_Option opts[] = {
+ { GNUNET_SET_OPTION_BYZANTINE, { .num = session->lower_bound } },
+ { GNUNET_SET_OPTION_END },
+ };
// XXX: maybe this should be done while
// setting up tasks alreays?
&session->global_id,
&rcm.header,
GNUNET_SET_RESULT_SYMMETRIC,
+ opts,
set_result_cb,
task);
struct SetKey sk_out;
struct RfnKey rk_in;
- sk_in = (struct SetKey) { SET_KIND_LEADER_PROPOSAL, task->key.repetition, task->key.leader };
- sk_out = (struct SetKey) { SET_KIND_ECHO_RESULT, task->key.repetition, task->key.leader };
+ sk_in = (struct SetKey) { SET_KIND_LEADER_PROPOSAL, task->key.repetition,
+ task->key.leader };
+ sk_out = (struct SetKey) { SET_KIND_ECHO_RESULT, task->key.repetition,
+ task->key.leader };
output_set = lookup_set (session, &sk_out);
if (NULL == output_set)
{
progress_cls = GNUNET_new (struct SetMutationProgressCls);
progress_cls->task = task;
- rk_in = (struct RfnKey) { RFN_KIND_ECHO, task->key.repetition, task->key.leader };
+ rk_in = (struct RfnKey) { RFN_KIND_ECHO, task->key.repetition,
+ task->key.leader };
input_rfn = lookup_rfn (session, &rk_in);
GNUNET_assert (NULL != input_rfn);
- iter = GNUNET_CONTAINER_multihashmap_iterator_create (input_rfn->rfn_elements);
+ iter = GNUNET_CONTAINER_multihashmap_iterator_create (
+ input_rfn->rfn_elements);
GNUNET_assert (NULL != iter);
while (GNUNET_YES ==
can't simply send "nothing" for the value. Thus we mark our 'confirm'
reconciliation as contested. Other peers might not know that the
leader is faulty, thus we still re-distribute in the confirmation
- round. */
- output_set->is_contested = GNUNET_YES;
+ round. */output_set->is_contested = GNUNET_YES;
}
switch (majority_vote)
{
- case VOTE_ADD:
- progress_cls->num_pending++;
- GNUNET_assert (GNUNET_OK ==
- GNUNET_SET_add_element (output_set->h,
- ri->element,
- set_mutation_done,
- progress_cls));
- break;
- case VOTE_REMOVE:
- progress_cls->num_pending++;
- GNUNET_assert (GNUNET_OK ==
- GNUNET_SET_remove_element (output_set->h,
- ri->element,
- set_mutation_done,
- progress_cls));
- break;
- case VOTE_STAY:
- /* Nothing to do. */
- break;
- default:
- /* not reached */
- GNUNET_assert (0);
+ case VOTE_ADD:
+ progress_cls->num_pending++;
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_SET_add_element (output_set->h,
+ ri->element,
+ set_mutation_done,
+ progress_cls));
+ break;
+
+ case VOTE_REMOVE:
+ progress_cls->num_pending++;
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_SET_remove_element (output_set->h,
+ ri->element,
+ set_mutation_done,
+ progress_cls));
+ break;
+
+ case VOTE_STAY:
+ /* Nothing to do. */
+ break;
+
+ default:
+ /* not reached */
+ GNUNET_assert (0);
}
}
GNUNET_CONTAINER_multihashmap_iterator_destroy (iter);
- if (progress_cls->num_pending == 0)
+ if (0 == progress_cls->num_pending)
{
// call closure right now, no pending ops
GNUNET_free (progress_cls);
task);
}
+
static void
start_task (struct ConsensusSession *session, struct TaskEntry *task)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%u: starting task {%s}\n", session->local_peer_idx, debug_str_task_key (&task->key));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%u: starting task {%s}\n",
+ session->local_peer_idx, debug_str_task_key (&task->key));
GNUNET_assert (GNUNET_NO == task->is_started);
GNUNET_assert (GNUNET_NO == task->is_finished);
}
-
-
/*
* Run all steps of the session that don't any
* more dependencies.
while (NULL != step)
{
- if ( (GNUNET_NO == step->is_running) && (0 == step->pending_prereq) && (GNUNET_NO == step->is_finished) )
+ if ((GNUNET_NO == step->is_running) && (0 == step->pending_prereq) &&
+ (GNUNET_NO == step->is_finished))
{
size_t i;
GNUNET_assert (0 == step->finished_tasks);
#ifdef GNUNET_EXTRA_LOGGING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%u: Running step `%s' of round %d with %d tasks and %d subordinates\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: Running step `%s' of round %d with %d tasks and %d subordinates\n",
session->local_peer_idx,
step->debug_name,
step->round, step->tasks_len, step->subordinates_len);
start_task (session, step->tasks[i]);
/* Sometimes there is no task to trigger finishing the step, so we have to do it here. */
- if ( (step->finished_tasks == step->tasks_len) && (GNUNET_NO == step->is_finished))
+ if ((step->finished_tasks == step->tasks_len) && (GNUNET_NO ==
+ step->is_finished))
finish_step (step);
/* Running the next ready steps will be triggered by task completion */
}
-
static void
finish_task (struct TaskEntry *task)
{
task->step->finished_tasks++;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "P%u: Finishing Task {%s} (now %u/%u tasks finished in step)\n",
+ task->step->session->local_peer_idx,
+ debug_str_task_key (&task->key),
+ (unsigned int) task->step->finished_tasks,
+ (unsigned int) task->step->tasks_len);
+
if (task->step->finished_tasks == task->step->tasks_len)
finish_step (task->step);
}
* @return index of peer, -1 if peer is not in session
*/
static int
-get_peer_idx (const struct GNUNET_PeerIdentity *peer, const struct ConsensusSession *session)
+get_peer_idx (const struct GNUNET_PeerIdentity *peer, const struct
+ ConsensusSession *session)
{
int i;
+
for (i = 0; i < session->num_peers; i++)
- if (0 == memcmp (peer, &session->peers[i], sizeof (struct GNUNET_PeerIdentity)))
+ if (0 == GNUNET_memcmp (peer, &session->peers[i]))
return i;
return -1;
}
*/
static void
compute_global_id (struct ConsensusSession *session,
- const struct GNUNET_HashCode *local_session_id)
+ const struct GNUNET_HashCode *local_session_id)
{
const char *salt = "gnunet-service-consensus/session_id";
GNUNET_assert (GNUNET_YES ==
GNUNET_CRYPTO_kdf (&session->global_id,
- sizeof (struct GNUNET_HashCode),
+ sizeof(struct GNUNET_HashCode),
salt,
strlen (salt),
session->peers,
- session->num_peers * sizeof (struct GNUNET_PeerIdentity),
+ session->num_peers * sizeof(struct
+ GNUNET_PeerIdentity),
local_session_id,
- sizeof (struct GNUNET_HashCode),
+ sizeof(struct GNUNET_HashCode),
NULL));
}
static int
peer_id_cmp (const void *h1, const void *h2)
{
- return memcmp (h1, h2, sizeof (struct GNUNET_PeerIdentity));
+ return memcmp (h1, h2, sizeof(struct GNUNET_PeerIdentity));
}
/**
* Create the sorted list of peers for the session,
* add the local peer if not in the join message.
+ *
+ * @param session session to initialize
+ * @param join_msg join message with the list of peers participating at the end
*/
static void
initialize_session_peer_list (struct ConsensusSession *session,
- struct GNUNET_CONSENSUS_JoinMessage *join_msg)
+ const struct
+ GNUNET_CONSENSUS_JoinMessage *join_msg)
{
- unsigned int local_peer_in_list;
- uint32_t listed_peers;
- const struct GNUNET_PeerIdentity *msg_peers;
- unsigned int i;
+ const struct GNUNET_PeerIdentity *msg_peers
+ = (const struct GNUNET_PeerIdentity *) &join_msg[1];
+ int local_peer_in_list;
- GNUNET_assert (NULL != join_msg);
-
- /* 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];
+ session->num_peers = ntohl (join_msg->num_peers);
+ /* Peers in the join message, may or may not include the local peer,
+ Add it if it is missing. */
local_peer_in_list = GNUNET_NO;
- for (i = 0; i < listed_peers; i++)
+ for (unsigned int i = 0; i < session->num_peers; i++)
{
- if (0 == memcmp (&msg_peers[i], &my_peer, sizeof (struct GNUNET_PeerIdentity)))
+ if (0 == GNUNET_memcmp (&msg_peers[i],
+ &my_peer))
{
local_peer_in_list = GNUNET_YES;
break;
}
}
-
if (GNUNET_NO == local_peer_in_list)
session->num_peers++;
- session->peers = GNUNET_malloc (session->num_peers * sizeof (struct GNUNET_PeerIdentity));
-
+ session->peers = GNUNET_new_array (session->num_peers,
+ struct GNUNET_PeerIdentity);
if (GNUNET_NO == local_peer_in_list)
session->peers[session->num_peers - 1] = my_peer;
- GNUNET_memcpy (session->peers, msg_peers, listed_peers * sizeof (struct GNUNET_PeerIdentity));
- qsort (session->peers, session->num_peers, sizeof (struct GNUNET_PeerIdentity), &peer_id_cmp);
+ GNUNET_memcpy (session->peers,
+ msg_peers,
+ ntohl (join_msg->num_peers) * sizeof(struct
+ GNUNET_PeerIdentity));
+ qsort (session->peers,
+ session->num_peers,
+ sizeof(struct GNUNET_PeerIdentity),
+ &peer_id_cmp);
}
struct GNUNET_HashCode hash;
- GNUNET_CRYPTO_hash (key, sizeof (struct TaskKey), &hash);
+ GNUNET_CRYPTO_hash (key, sizeof(struct TaskKey), &hash);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Looking up task hash %s\n",
GNUNET_h2s (&hash));
return GNUNET_CONTAINER_multihashmap_get (session->taskmap, &hash);
return;
}
- if (GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_ROUND_CONTEXT != ntohs (context_msg->type))
+ if (GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_ROUND_CONTEXT != ntohs (
+ context_msg->type))
{
GNUNET_break_op (0);
return;
}
- if (sizeof (struct GNUNET_CONSENSUS_RoundContextMessage) != ntohs (context_msg->size))
+ if (sizeof(struct GNUNET_CONSENSUS_RoundContextMessage) != ntohs (
+ context_msg->size))
{
GNUNET_break_op (0);
return;
cm = (struct GNUNET_CONSENSUS_RoundContextMessage *) context_msg;
tk = ((struct TaskKey) {
- .kind = ntohs (cm->kind),
- .peer1 = ntohs (cm->peer1),
- .peer2 = ntohs (cm->peer2),
- .repetition = ntohs (cm->repetition),
- .leader = ntohs (cm->leader),
+ .kind = ntohs (cm->kind),
+ .peer1 = ntohs (cm->peer1),
+ .peer2 = ntohs (cm->peer2),
+ .repetition = ntohs (cm->repetition),
+ .leader = ntohs (cm->leader),
});
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%u: got req for task %s\n",
GNUNET_assert (! ((task->key.peer1 == session->local_peer_idx) &&
(task->key.peer2 == session->local_peer_idx)));
+ struct GNUNET_SET_Option opts[] = {
+ { GNUNET_SET_OPTION_BYZANTINE, { .num = session->lower_bound } },
+ { GNUNET_SET_OPTION_END },
+ };
+
task->cls.setop.op = GNUNET_SET_accept (request,
GNUNET_SET_RESULT_SYMMETRIC,
+ opts,
set_result_cb,
task);
}
-
static void
put_task (struct GNUNET_CONTAINER_MultiHashMap *taskmap,
struct TaskEntry *t)
GNUNET_assert (NULL != t->step);
- t = GNUNET_memdup (t, sizeof (struct TaskEntry));
+ t = GNUNET_memdup (t, sizeof(struct TaskEntry));
s = t->step;
s->tasks[s->tasks_len] = t;
s->tasks_len++;
- GNUNET_CRYPTO_hash (&t->key, sizeof (struct TaskKey), &round_hash);
+ GNUNET_CRYPTO_hash (&t->key, sizeof(struct TaskKey), &round_hash);
GNUNET_assert (GNUNET_OK ==
- GNUNET_CONTAINER_multihashmap_put (taskmap, &round_hash, t,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ GNUNET_CONTAINER_multihashmap_put (taskmap, &round_hash, t,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
}
}
-
/*
* Arrange two peers in some canonical order.
*/
create_step (struct ConsensusSession *session, int round, int early_finishable)
{
struct Step *step;
+
step = GNUNET_new (struct Step);
step->session = session;
step->round = round;
step = create_step (session, round, GNUNET_YES);
#ifdef GNUNET_EXTRA_LOGGING
- GNUNET_asprintf (&step->debug_name, "disseminate leader %u rep %u", lead, rep);
+ GNUNET_asprintf (&step->debug_name, "disseminate leader %u rep %u", lead,
+ rep);
#endif
step_depend_on (step, step_before);
.step = step,
.start = task_start_reconcile,
.cancel = task_cancel_reconcile,
- .key = (struct TaskKey) { PHASE_KIND_GRADECAST_LEADER, p1, p2, rep, me },
+ .key = (struct TaskKey) { PHASE_KIND_GRADECAST_LEADER, p1, p2, rep,
+ me },
});
task.cls.setop.input_set = (struct SetKey) { SET_KIND_CURRENT, rep };
put_task (session->taskmap, &task);
}
/* We run this task to make sure that the leader
has the stored the SET_KIND_LEADER set of himself,
- so he can participate in the rest of the gradecast
+ so it can participate in the rest of the gradecast
without the code having to handle any special cases. */
task = ((struct TaskEntry) {
.step = step,
.cancel = task_cancel_reconcile,
});
task.cls.setop.input_set = (struct SetKey) { SET_KIND_CURRENT, rep };
- task.cls.setop.output_set = (struct SetKey) { SET_KIND_LEADER_PROPOSAL, rep, me };
- task.cls.setop.output_diff = (struct DiffKey) { DIFF_KIND_LEADER_PROPOSAL, rep, me };
+ task.cls.setop.output_set = (struct SetKey) { SET_KIND_LEADER_PROPOSAL, rep,
+ me };
+ task.cls.setop.output_diff = (struct DiffKey) { DIFF_KIND_LEADER_PROPOSAL,
+ rep, me };
put_task (session->taskmap, &task);
}
else
arrange_peers (&p1, &p2, n);
task = ((struct TaskEntry) {
.step = step,
- .key = (struct TaskKey) { PHASE_KIND_GRADECAST_LEADER, p1, p2, rep, lead },
+ .key = (struct TaskKey) { PHASE_KIND_GRADECAST_LEADER, p1, p2, rep,
+ lead },
.start = task_start_reconcile,
.cancel = task_cancel_reconcile,
});
task.cls.setop.input_set = (struct SetKey) { SET_KIND_CURRENT, rep };
- task.cls.setop.output_set = (struct SetKey) { SET_KIND_LEADER_PROPOSAL, rep, lead };
- task.cls.setop.output_diff = (struct DiffKey) { DIFF_KIND_LEADER_PROPOSAL, rep, lead };
+ task.cls.setop.output_set = (struct SetKey) { SET_KIND_LEADER_PROPOSAL, rep,
+ lead };
+ task.cls.setop.output_diff = (struct DiffKey) { DIFF_KIND_LEADER_PROPOSAL,
+ rep, lead };
put_task (session->taskmap, &task);
}
.start = task_start_reconcile,
.cancel = task_cancel_reconcile,
});
- task.cls.setop.input_set = (struct SetKey) { SET_KIND_LEADER_PROPOSAL, rep, lead };
+ task.cls.setop.input_set = (struct SetKey) { SET_KIND_LEADER_PROPOSAL, rep,
+ lead };
task.cls.setop.output_rfn = (struct RfnKey) { RFN_KIND_ECHO, rep, lead };
put_task (session->taskmap, &task);
}
arrange_peers (&p1, &p2, n);
task = ((struct TaskEntry) {
- .key = (struct TaskKey) { PHASE_KIND_GRADECAST_ECHO_GRADE, -1, -1, rep, lead },
+ .key = (struct TaskKey) { PHASE_KIND_GRADECAST_ECHO_GRADE, -1, -1, rep,
+ lead },
.step = step,
.start = task_start_eval_echo
});
.step = step,
.start = task_start_reconcile,
.cancel = task_cancel_reconcile,
- .key = (struct TaskKey) { PHASE_KIND_GRADECAST_CONFIRM, p1, p2, rep, lead},
+ .key = (struct TaskKey) { PHASE_KIND_GRADECAST_CONFIRM, p1, p2, rep,
+ lead },
});
- task.cls.setop.input_set = (struct SetKey) { SET_KIND_ECHO_RESULT, rep, lead };
+ task.cls.setop.input_set = (struct SetKey) { SET_KIND_ECHO_RESULT, rep,
+ lead };
task.cls.setop.output_rfn = (struct RfnKey) { RFN_KIND_CONFIRM, rep, lead };
/* If there was at least one element in the echo round that was
contested (i.e. it had no n-t majority), then we let the other peers
/* Same round, since step only has local tasks */
step = create_step (session, round, GNUNET_YES);
#ifdef GNUNET_EXTRA_LOGGING
- GNUNET_asprintf (&step->debug_name, "confirm grade leader %u rep %u", lead, rep);
+ GNUNET_asprintf (&step->debug_name, "confirm grade leader %u rep %u", lead,
+ rep);
#endif
step_depend_on (step, prev_step);
task = ((struct TaskEntry) {
.step = step,
- .key = (struct TaskKey) { PHASE_KIND_GRADECAST_CONFIRM_GRADE, -1, -1, rep, lead },
+ .key = (struct TaskKey) { PHASE_KIND_GRADECAST_CONFIRM_GRADE, -1, -1, rep,
+ lead },
.start = task_start_grade,
});
put_task (session->taskmap, &task);
put_task (session->taskmap, &task);
}
+ round += 1;
prev_step = step;
- step = NULL;
+ step = create_step (session, round, GNUNET_NO);;
+#ifdef GNUNET_EXTRA_LOGGING
+ step->debug_name = GNUNET_strdup ("all to all 2");
+#endif
+ step_depend_on (step, prev_step);
+
+
+ for (i = 0; i < n; i++)
+ {
+ uint16_t p1;
+ uint16_t p2;
+
+ p1 = me;
+ p2 = i;
+ arrange_peers (&p1, &p2, n);
+ task = ((struct TaskEntry) {
+ .key = (struct TaskKey) { PHASE_KIND_ALL_TO_ALL_2, p1, p2, -1, -1 },
+ .step = step,
+ .start = task_start_reconcile,
+ .cancel = task_cancel_reconcile,
+ });
+ task.cls.setop.input_set = (struct SetKey) { SET_KIND_CURRENT, 0 };
+ task.cls.setop.output_set = task.cls.setop.input_set;
+ task.cls.setop.do_not_remove = GNUNET_YES;
+ put_task (session->taskmap, &task);
+ }
round += 1;
+ prev_step = step;
+ step = NULL;
+
+
/* Byzantine union */
/* sequential repetitions of the gradecasts */
/* parallel gradecasts */
for (lead = 0; lead < n; lead++)
- construct_task_graph_gradecast (session, i, lead, step_rep_start, step_rep_end);
+ construct_task_graph_gradecast (session, i, lead, step_rep_start,
+ step_rep_end);
task = ((struct TaskEntry) {
.step = step_rep_end,
- .key = (struct TaskKey) { PHASE_KIND_APPLY_REP, -1, -1, i, -1},
+ .key = (struct TaskKey) { PHASE_KIND_APPLY_REP, -1, -1, i, -1 },
.start = task_start_apply_round,
});
put_task (session->taskmap, &task);
prev_step = step_rep_end;
}
- /* There is no next gradecast round, thus the final
- start step is the overall end step of the gradecasts */
+ /* There is no next gradecast round, thus the final
+ start step is the overall end step of the gradecasts */
round += 1;
step = create_step (session, round, GNUNET_NO);
#ifdef GNUNET_EXTRA_LOGGING
/**
- * Initialize the session, continue receiving messages from the owning client
+ * Check join message.
*
- * @param session the session to initialize
- * @param join_msg the join message from the client
+ * @param cls session of client that sent the message
+ * @param m message sent by the client
+ * @return #GNUNET_OK if @a m is well-formed
+ */
+static int
+check_client_join (void *cls,
+ const struct GNUNET_CONSENSUS_JoinMessage *m)
+{
+ uint32_t listed_peers = ntohl (m->num_peers);
+
+ if ((ntohs (m->header.size) - sizeof(*m)) !=
+ listed_peers * sizeof(struct GNUNET_PeerIdentity))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
+}
+
+
+/**
+ * Called when a client wants to join a consensus session.
+ *
+ * @param cls session of client that sent the message
+ * @param m message sent by the client
*/
static void
-initialize_session (struct ConsensusSession *session,
- struct GNUNET_CONSENSUS_JoinMessage *join_msg)
+handle_client_join (void *cls,
+ const struct GNUNET_CONSENSUS_JoinMessage *m)
{
+ struct ConsensusSession *session = cls;
struct ConsensusSession *other_session;
- initialize_session_peer_list (session, join_msg);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "session with %u peers\n", session->num_peers);
- compute_global_id (session, &join_msg->session_id);
+ initialize_session_peer_list (session,
+ m);
+ compute_global_id (session,
+ &m->session_id);
/* Check if some local client already owns the session.
It is only legal to have a session with an existing global id
if all other sessions with this global id are finished.*/
- other_session = sessions_head;
- while (NULL != other_session)
+ for (other_session = sessions_head;
+ NULL != other_session;
+ other_session = other_session->next)
{
if ((other_session != session) &&
- (0 == GNUNET_CRYPTO_hash_cmp (&session->global_id, &other_session->global_id)))
- {
- //if (CONSENSUS_ROUND_FINISH != other_session->current_round)
- //{
- // GNUNET_break (0);
- // destroy_session (session);
- // return;
- //}
+ (0 == GNUNET_CRYPTO_hash_cmp (&session->global_id,
+ &other_session->global_id)))
break;
- }
- 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);
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "consensus with timeout %llums created\n",
- (long long) (GNUNET_TIME_absolute_get_difference (session->conclude_start, session->conclude_deadline)).rel_value_us / 1000);
-
- session->local_peer_idx = get_peer_idx (&my_peer, session);
+ session->conclude_deadline
+ = GNUNET_TIME_absolute_ntoh (m->deadline);
+ session->conclude_start
+ = GNUNET_TIME_absolute_ntoh (m->start);
+ session->local_peer_idx = get_peer_idx (&my_peer,
+ session);
GNUNET_assert (-1 != session->local_peer_idx);
- session->set_listener = GNUNET_SET_listen (cfg, GNUNET_SET_OPERATION_UNION,
- &session->global_id,
- set_listen_cb, session);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%d is the local peer\n", session->local_peer_idx);
- session->setmap = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO);
- session->taskmap = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO);
- session->diffmap = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO);
- session->rfnmap = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Joining consensus session %s containing %u peers as %u with timeout %s\n",
+ GNUNET_h2s (&m->session_id),
+ session->num_peers,
+ session->local_peer_idx,
+ GNUNET_STRINGS_relative_time_to_string
+ (GNUNET_TIME_absolute_get_difference (session->conclude_start,
+ session->conclude_deadline),
+ GNUNET_YES));
+
+ session->set_listener
+ = GNUNET_SET_listen (cfg,
+ GNUNET_SET_OPERATION_UNION,
+ &session->global_id,
+ &set_listen_cb,
+ session);
+
+ session->setmap = GNUNET_CONTAINER_multihashmap_create (1,
+ GNUNET_NO);
+ session->taskmap = GNUNET_CONTAINER_multihashmap_create (1,
+ GNUNET_NO);
+ session->diffmap = GNUNET_CONTAINER_multihashmap_create (1,
+ GNUNET_NO);
+ session->rfnmap = GNUNET_CONTAINER_multihashmap_create (1,
+ GNUNET_NO);
{
struct SetEntry *client_set;
+
client_set = GNUNET_new (struct SetEntry);
- client_set->h = GNUNET_SET_create (cfg, GNUNET_SET_OPERATION_UNION);
+ client_set->h = GNUNET_SET_create (cfg,
+ GNUNET_SET_OPERATION_UNION);
+ struct SetHandle *sh = GNUNET_new (struct SetHandle);
+ sh->h = client_set->h;
+ GNUNET_CONTAINER_DLL_insert (session->set_handles_head,
+ session->set_handles_tail,
+ sh);
client_set->key = ((struct SetKey) { SET_KIND_CURRENT, 0, 0 });
- put_set (session, client_set);
+ put_set (session,
+ client_set);
}
- session->peers_blacklisted = GNUNET_new_array (session->num_peers, int);
+ session->peers_blacklisted = GNUNET_new_array (session->num_peers,
+ int);
/* Just construct the task graph,
but don't run anything until the client calls conclude. */
construct_task_graph (session);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "session %s initialized\n", GNUNET_h2s (&session->global_id));
+ GNUNET_SERVICE_client_continue (session->client);
}
-static struct ConsensusSession *
-get_session_by_client (struct GNUNET_SERVER_Client *client)
+static void
+client_insert_done (void *cls)
{
- struct ConsensusSession *session;
-
- session = sessions_head;
- while (NULL != session)
- {
- if (session->client == client)
- return session;
- session = session->next;
- }
- return NULL;
+ // FIXME: implement
}
/**
- * Called when a client wants to join a consensus session.
+ * Called when a client performs an insert operation.
*
- * @param cls unused
- * @param client client that sent the message
- * @param m message sent by the client
+ * @param cls client handle
+ * @param msg message sent by the client
+ * @return #GNUNET_OK (always well-formed)
*/
-static void
-client_join (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *m)
-{
- struct ConsensusSession *session;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "join message sent by client\n");
-
- session = get_session_by_client (client);
- if (NULL != session)
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- session = GNUNET_new (struct ConsensusSession);
- session->client = client;
- session->client_mq = GNUNET_MQ_queue_for_server_client (client);
- GNUNET_CONTAINER_DLL_insert (sessions_head, sessions_tail, session);
- initialize_session (session, (struct GNUNET_CONSENSUS_JoinMessage *) m);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "join done\n");
-}
-
-
-static void
-client_insert_done (void *cls)
+static int
+check_client_insert (void *cls,
+ const struct GNUNET_CONSENSUS_ElementMessage *msg)
{
- // FIXME: implement
+ return GNUNET_OK;
}
/**
* Called when a client performs an insert operation.
*
- * @param cls (unused)
- * @param client client handle
- * @param m message sent by the client
+ * @param cls client handle
+ * @param msg message sent by the client
*/
-void
-client_insert (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *m)
+static void
+handle_client_insert (void *cls,
+ const struct GNUNET_CONSENSUS_ElementMessage *msg)
{
- struct ConsensusSession *session;
- struct GNUNET_CONSENSUS_ElementMessage *msg;
- struct GNUNET_SET_Element *element;
+ struct ConsensusSession *session = cls;
ssize_t element_size;
struct GNUNET_SET_Handle *initial_set;
-
- session = get_session_by_client (client);
-
- if (NULL == session)
- {
- GNUNET_break (0);
- GNUNET_SERVER_client_disconnect (client);
- return;
- }
+ struct ConsensusElement *ce;
if (GNUNET_YES == session->conclude_started)
{
GNUNET_break (0);
- GNUNET_SERVER_client_disconnect (client);
+ GNUNET_SERVICE_client_drop (session->client);
return;
}
- msg = (struct GNUNET_CONSENSUS_ElementMessage *) m;
- element_size = ntohs (msg->header.size) - sizeof (struct GNUNET_CONSENSUS_ElementMessage);
- if (element_size < 0)
- {
- GNUNET_break (0);
- return;
- }
+ element_size = ntohs (msg->header.size) - sizeof(struct
+ GNUNET_CONSENSUS_ElementMessage);
+ ce = GNUNET_malloc (sizeof(struct ConsensusElement) + element_size);
+ GNUNET_memcpy (&ce[1], &msg[1], element_size);
+ ce->payload_type = msg->element_type;
+
+ struct GNUNET_SET_Element element = {
+ .element_type = GNUNET_BLOCK_TYPE_CONSENSUS_ELEMENT,
+ .size = sizeof(struct ConsensusElement) + element_size,
+ .data = ce,
+ };
- element = GNUNET_malloc (sizeof (struct GNUNET_SET_Element) + element_size);
- element->element_type = msg->element_type;
- element->size = element_size;
- GNUNET_memcpy (&element[1], &msg[1], element_size);
- element->data = &element[1];
{
struct SetKey key = { SET_KIND_CURRENT, 0, 0 };
struct SetEntry *entry;
- entry = lookup_set (session, &key);
+
+ entry = lookup_set (session,
+ &key);
GNUNET_assert (NULL != entry);
initial_set = entry->h;
}
+
session->num_client_insert_pending++;
- GNUNET_SET_add_element (initial_set, element, client_insert_done, session);
+ GNUNET_SET_add_element (initial_set,
+ &element,
+ &client_insert_done,
+ session);
#ifdef GNUNET_EXTRA_LOGGING
{
- struct GNUNET_HashCode hash;
-
- GNUNET_SET_element_hash (element, &hash);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%u: element %s added\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "P%u: element %s added\n",
session->local_peer_idx,
- GNUNET_h2s (&hash));
+ debug_str_element (&element));
}
#endif
-
- GNUNET_free (element);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_free (ce);
+ GNUNET_SERVICE_client_continue (session->client);
}
/**
* Called when a client performs the conclude operation.
*
- * @param cls (unused)
- * @param client client handle
+ * @param cls client handle
* @param message message sent by the client
*/
static void
-client_conclude (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+handle_client_conclude (void *cls,
+ const struct GNUNET_MessageHeader *message)
{
- struct ConsensusSession *session;
-
- session = get_session_by_client (client);
- if (NULL == session)
- {
- /* client not found */
- GNUNET_break (0);
- GNUNET_SERVER_client_disconnect (client);
- return;
- }
+ struct ConsensusSession *session = cls;
if (GNUNET_YES == session->conclude_started)
{
/* conclude started twice */
GNUNET_break (0);
- GNUNET_SERVER_client_disconnect (client);
- destroy_session (session);
+ GNUNET_SERVICE_client_drop (session->client);
return;
}
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "conclude requested\n");
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "conclude requested\n");
session->conclude_started = GNUNET_YES;
-
install_step_timeouts (session);
run_ready_steps (session);
-
-
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVICE_client_continue (session->client);
}
static void
shutdown_task (void *cls)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "shutting down\n");
- while (NULL != sessions_head)
- destroy_session (sessions_head);
-
- GNUNET_STATISTICS_destroy (statistics, GNUNET_NO);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "shutting down\n");
+ GNUNET_STATISTICS_destroy (statistics,
+ GNUNET_NO);
+ statistics = NULL;
}
/**
- * Clean up after a client after it is
- * disconnected (either by us or by itself)
+ * Start processing consensus requests.
*
- * @param cls closure, unused
- * @param client the client to clean up after
+ * @param cls closure
+ * @param c configuration to use
+ * @param service the initialized service
*/
-void
-handle_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client)
+static void
+run (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *c,
+ struct GNUNET_SERVICE_Handle *service)
{
- struct ConsensusSession *session;
-
- session = get_session_by_client (client);
- if (NULL == session)
+ cfg = c;
+ if (GNUNET_OK !=
+ GNUNET_CRYPTO_get_peer_identity (cfg,
+ &my_peer))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Could not retrieve host identity\n");
+ GNUNET_SCHEDULER_shutdown ();
return;
- // FIXME: destroy if we can
+ }
+ statistics = GNUNET_STATISTICS_create ("consensus",
+ cfg);
+ GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
+ NULL);
}
+/**
+ * Callback called when a client connects to the service.
+ *
+ * @param cls closure for the service
+ * @param c the new client that connected to the service
+ * @param mq the message queue used to send messages to the client
+ * @return @a c
+ */
+static void *
+client_connect_cb (void *cls,
+ struct GNUNET_SERVICE_Client *c,
+ struct GNUNET_MQ_Handle *mq)
+{
+ struct ConsensusSession *session = GNUNET_new (struct ConsensusSession);
+
+ session->client = c;
+ session->client_mq = mq;
+ GNUNET_CONTAINER_DLL_insert (sessions_head,
+ sessions_tail,
+ session);
+ return session;
+}
+
/**
- * Start processing consensus requests.
+ * Callback called when a client disconnected from the service
*
- * @param cls closure
- * @param server the initialized server
- * @param c configuration to use
+ * @param cls closure for the service
+ * @param c the client that disconnected
+ * @param internal_cls should be equal to @a c
*/
static void
-run (void *cls, struct GNUNET_SERVER_Handle *server,
- const struct GNUNET_CONFIGURATION_Handle *c)
-{
- static const struct GNUNET_SERVER_MessageHandler server_handlers[] = {
- {&client_conclude, NULL, GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_CONCLUDE,
- 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}
- };
+client_disconnect_cb (void *cls,
+ struct GNUNET_SERVICE_Client *c,
+ void *internal_cls)
+{
+ struct ConsensusSession *session = internal_cls;
- cfg = c;
- srv = server;
- if (GNUNET_OK != GNUNET_CRYPTO_get_peer_identity (cfg, &my_peer))
+ if (NULL != session->set_listener)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "could not retrieve host identity\n");
- GNUNET_break (0);
- GNUNET_SCHEDULER_shutdown ();
- return;
+ GNUNET_SET_listen_cancel (session->set_listener);
+ session->set_listener = NULL;
+ }
+ GNUNET_CONTAINER_DLL_remove (sessions_head,
+ sessions_tail,
+ session);
+
+ while (session->set_handles_head)
+ {
+ struct SetHandle *sh = session->set_handles_head;
+ session->set_handles_head = sh->next;
+ GNUNET_SET_destroy (sh->h);
+ GNUNET_free (sh);
}
- statistics = GNUNET_STATISTICS_create ("consensus", cfg);
- GNUNET_SERVER_add_handlers (server, server_handlers);
- GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
- GNUNET_SERVER_disconnect_notify (server, handle_client_disconnect, NULL);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "consensus running\n");
+ GNUNET_free (session);
}
/**
- * The main function for the consensus service.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
+ * Define "main" method using service macro.
*/
-int
-main (int argc, char *const *argv)
-{
- int ret;
- ret = GNUNET_SERVICE_run (argc, argv, "consensus", GNUNET_SERVICE_OPTION_NONE, &run, NULL);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "exit (%d)\n", GNUNET_OK != ret);
- return (GNUNET_OK == ret) ? 0 : 1;
-}
+GNUNET_SERVICE_MAIN
+ ("consensus",
+ GNUNET_SERVICE_OPTION_NONE,
+ &run,
+ &client_connect_cb,
+ &client_disconnect_cb,
+ NULL,
+ GNUNET_MQ_hd_fixed_size (client_conclude,
+ GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_CONCLUDE,
+ struct GNUNET_MessageHeader,
+ NULL),
+ GNUNET_MQ_hd_var_size (client_insert,
+ GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_INSERT,
+ struct GNUNET_CONSENSUS_ElementMessage,
+ NULL),
+ GNUNET_MQ_hd_var_size (client_join,
+ GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_JOIN,
+ struct GNUNET_CONSENSUS_JoinMessage,
+ NULL),
+ GNUNET_MQ_handler_end ());
+
+/* end of gnunet-service-consensus.c */
projects / oweals / gnunet.git / blobdiff