diff options
author | Florian Dold <florian.dold@gmail.com> | 2014-01-07 00:14:11 +0000 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2014-01-07 00:14:11 +0000 |
commit | 6a86f1fc448e219364d547d167d0a655eff2b531 (patch) | |
tree | 681e2a680f33f40da4d2235089946a9e4aa0089a /src/consensus/consensus_api.c | |
parent | 4d1b8809fe1df0f2524abc0e65f2f770c88adbdf (diff) | |
download | gnunet-6a86f1fc448e219364d547d167d0a655eff2b531.tar.gz gnunet-6a86f1fc448e219364d547d167d0a655eff2b531.zip |
- profiler actually added to svn
- test for signature segfault with secretsharing
- rudimentary implementation of cooperative decryption
- consensus uses absolute time instead of relative
- working DKG without zero knowledge proofs
Diffstat (limited to 'src/consensus/consensus_api.c')
-rw-r--r-- | src/consensus/consensus_api.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/consensus/consensus_api.c b/src/consensus/consensus_api.c index 0a2a7d7ac..14a1bf54e 100644 --- a/src/consensus/consensus_api.c +++ b/src/consensus/consensus_api.c | |||
@@ -259,14 +259,14 @@ GNUNET_CONSENSUS_insert (struct GNUNET_CONSENSUS_Handle *consensus, | |||
259 | * inserted by the client. | 259 | * inserted by the client. |
260 | * | 260 | * |
261 | * @param consensus consensus session | 261 | * @param consensus consensus session |
262 | * @param timeout timeout after which the conculde callback | 262 | * @param deadline deadline after which the conculde callback |
263 | * must be called | 263 | * must be called |
264 | * @param conclude called when the conclusion was successful | 264 | * @param conclude called when the conclusion was successful |
265 | * @param conclude_cls closure for the conclude callback | 265 | * @param conclude_cls closure for the conclude callback |
266 | */ | 266 | */ |
267 | void | 267 | void |
268 | GNUNET_CONSENSUS_conclude (struct GNUNET_CONSENSUS_Handle *consensus, | 268 | GNUNET_CONSENSUS_conclude (struct GNUNET_CONSENSUS_Handle *consensus, |
269 | struct GNUNET_TIME_Relative timeout, | 269 | struct GNUNET_TIME_Absolute deadline, |
270 | GNUNET_CONSENSUS_ConcludeCallback conclude, | 270 | GNUNET_CONSENSUS_ConcludeCallback conclude, |
271 | void *conclude_cls) | 271 | void *conclude_cls) |
272 | { | 272 | { |
@@ -280,7 +280,7 @@ GNUNET_CONSENSUS_conclude (struct GNUNET_CONSENSUS_Handle *consensus, | |||
280 | consensus->conclude_cb = conclude; | 280 | consensus->conclude_cb = conclude; |
281 | 281 | ||
282 | ev = GNUNET_MQ_msg (conclude_msg, GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_CONCLUDE); | 282 | ev = GNUNET_MQ_msg (conclude_msg, GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_CONCLUDE); |
283 | conclude_msg->timeout = GNUNET_TIME_relative_hton (timeout); | 283 | conclude_msg->deadline = GNUNET_TIME_absolute_hton (deadline); |
284 | 284 | ||
285 | GNUNET_MQ_send (consensus->mq, ev); | 285 | GNUNET_MQ_send (consensus->mq, ev); |
286 | } | 286 | } |