diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-06-03 13:08:11 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-06-03 13:08:11 +0000 |
commit | a960f943c1d0bc9b5f5986c1d29835b63bf3e2ef (patch) | |
tree | fbc5ff7eaeedcfc4ee2a43f2ef31502dd40bba2b | |
parent | 4593a0ee9f3e6a86520d4dd493430f0f1d88dcd2 (diff) | |
download | gnunet-a960f943c1d0bc9b5f5986c1d29835b63bf3e2ef.tar.gz gnunet-a960f943c1d0bc9b5f5986c1d29835b63bf3e2ef.zip |
-notes
-rw-r--r-- | src/consensus/gnunet-service-consensus.c | 8 | ||||
-rw-r--r-- | src/include/gnunet_set_service.h | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/consensus/gnunet-service-consensus.c b/src/consensus/gnunet-service-consensus.c index 21123b24f..5ebff524c 100644 --- a/src/consensus/gnunet-service-consensus.c +++ b/src/consensus/gnunet-service-consensus.c | |||
@@ -35,7 +35,7 @@ | |||
35 | #include "consensus.h" | 35 | #include "consensus.h" |
36 | 36 | ||
37 | 37 | ||
38 | /* | 38 | /** |
39 | * Log macro that prefixes the local peer and the peer we are in contact with. | 39 | * Log macro that prefixes the local peer and the peer we are in contact with. |
40 | */ | 40 | */ |
41 | #define LOG_PP(kind, cpi, m,...) GNUNET_log (kind, "P%d for P%d: " m, \ | 41 | #define LOG_PP(kind, cpi, m,...) GNUNET_log (kind, "P%d for P%d: " m, \ |
@@ -362,8 +362,10 @@ shuffle (struct ConsensusSession *session) | |||
362 | if (NULL == session->shuffle) | 362 | if (NULL == session->shuffle) |
363 | session->shuffle = GNUNET_malloc (session->num_peers * sizeof (*session->shuffle)); | 363 | session->shuffle = GNUNET_malloc (session->num_peers * sizeof (*session->shuffle)); |
364 | 364 | ||
365 | GNUNET_CRYPTO_kdf (randomness, sizeof (randomness), &session->exp_round, sizeof (uint32_t), | 365 | GNUNET_CRYPTO_kdf (randomness, sizeof (randomness), |
366 | &session->global_id, sizeof (struct GNUNET_HashCode)); | 366 | &session->exp_round, sizeof (uint32_t), |
367 | &session->global_id, sizeof (struct GNUNET_HashCode), | ||
368 | NULL); | ||
367 | 369 | ||
368 | for (i = 0; i < session->num_peers; i++) | 370 | for (i = 0; i < session->num_peers; i++) |
369 | session->shuffle[i] = i; | 371 | session->shuffle[i] = i; |
diff --git a/src/include/gnunet_set_service.h b/src/include/gnunet_set_service.h index 2684df00a..34c9312d1 100644 --- a/src/include/gnunet_set_service.h +++ b/src/include/gnunet_set_service.h | |||
@@ -273,7 +273,7 @@ GNUNET_SET_destroy (struct GNUNET_SET_Handle *set); | |||
273 | * @param result_cls closure for result_cb | 273 | * @param result_cls closure for result_cb |
274 | * @return a handle to cancel the operation | 274 | * @return a handle to cancel the operation |
275 | */ | 275 | */ |
276 | struct GNUNET_SET_OperationHandle * | 276 | struct GNUNET_SET_OperationHandle * // FIXME: rename to _connect? |
277 | GNUNET_SET_evaluate (const struct GNUNET_PeerIdentity *other_peer, | 277 | GNUNET_SET_evaluate (const struct GNUNET_PeerIdentity *other_peer, |
278 | const struct GNUNET_HashCode *app_id, | 278 | const struct GNUNET_HashCode *app_id, |
279 | const struct GNUNET_MessageHeader *context_msg, | 279 | const struct GNUNET_MessageHeader *context_msg, |
@@ -344,7 +344,7 @@ GNUNET_SET_accept (struct GNUNET_SET_Request *request, | |||
344 | * @param oh handle to the set operation | 344 | * @param oh handle to the set operation |
345 | * @param set the set to use for the operation | 345 | * @param set the set to use for the operation |
346 | */ | 346 | */ |
347 | void | 347 | void // FIXME: rename to _commit |
348 | GNUNET_SET_conclude (struct GNUNET_SET_OperationHandle *oh, | 348 | GNUNET_SET_conclude (struct GNUNET_SET_OperationHandle *oh, |
349 | struct GNUNET_SET_Handle *set); | 349 | struct GNUNET_SET_Handle *set); |
350 | 350 | ||