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/gnunet-service-consensus.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/gnunet-service-consensus.c')
-rw-r--r-- | src/consensus/gnunet-service-consensus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/consensus/gnunet-service-consensus.c b/src/consensus/gnunet-service-consensus.c index 914943f11..688190c14 100644 --- a/src/consensus/gnunet-service-consensus.c +++ b/src/consensus/gnunet-service-consensus.c | |||
@@ -146,7 +146,7 @@ struct ConsensusSession | |||
146 | * with a fraction of the conclude timeout. | 146 | * with a fraction of the conclude timeout. |
147 | * Only valid once the current round is not CONSENSUS_ROUND_BEGIN. | 147 | * Only valid once the current round is not CONSENSUS_ROUND_BEGIN. |
148 | */ | 148 | */ |
149 | struct GNUNET_TIME_Relative conclude_timeout; | 149 | struct GNUNET_TIME_Absolute conclude_deadline; |
150 | 150 | ||
151 | /** | 151 | /** |
152 | * Timeout task identifier for the current round. | 152 | * Timeout task identifier for the current round. |
@@ -1194,7 +1194,7 @@ client_conclude (void *cls, | |||
1194 | } | 1194 | } |
1195 | else | 1195 | else |
1196 | { | 1196 | { |
1197 | session->conclude_timeout = GNUNET_TIME_relative_ntoh (cmsg->timeout); | 1197 | session->conclude_deadline = GNUNET_TIME_absolute_ntoh (cmsg->deadline); |
1198 | /* the 'begin' round is over, start with the next, actual round */ | 1198 | /* the 'begin' round is over, start with the next, actual round */ |
1199 | round_over (session, NULL); | 1199 | round_over (session, NULL); |
1200 | } | 1200 | } |