diff options
author | Bart Polot <bart@net.in.tum.de> | 2015-10-08 17:27:15 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2015-10-08 17:27:15 +0000 |
commit | 203a03682ced3c1cc1d4feee820248bfd8bd8cbe (patch) | |
tree | 5535f0c6d5b22427c18ad457c9512c09e5d7f3d1 /src/consensus | |
parent | 8d96ccbc80ee877a5dcd3a82859775f63865e99c (diff) | |
download | gnunet-203a03682ced3c1cc1d4feee820248bfd8bd8cbe.tar.gz gnunet-203a03682ced3c1cc1d4feee820248bfd8bd8cbe.zip |
- FTBFS
Diffstat (limited to 'src/consensus')
-rw-r--r-- | src/consensus/gnunet-service-consensus.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/consensus/gnunet-service-consensus.c b/src/consensus/gnunet-service-consensus.c index 6cd0244b5..296095f41 100644 --- a/src/consensus/gnunet-service-consensus.c +++ b/src/consensus/gnunet-service-consensus.c | |||
@@ -33,7 +33,7 @@ | |||
33 | #include "consensus_protocol.h" | 33 | #include "consensus_protocol.h" |
34 | #include "consensus.h" | 34 | #include "consensus.h" |
35 | 35 | ||
36 | 36 | #define GNUNET_CONSENSUS_ELEMENT_TYPE_USER_MAX 1 // FIXME | |
37 | #define ELEMENT_TYPE_CONTESTED_MARKER (GNUNET_CONSENSUS_ELEMENT_TYPE_USER_MAX + 1) | 37 | #define ELEMENT_TYPE_CONTESTED_MARKER (GNUNET_CONSENSUS_ELEMENT_TYPE_USER_MAX + 1) |
38 | 38 | ||
39 | 39 | ||
@@ -875,7 +875,7 @@ set_result_cb (void *cls, | |||
875 | 875 | ||
876 | setop = &task->cls.setop; | 876 | setop = &task->cls.setop; |
877 | 877 | ||
878 | 878 | ||
879 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 879 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
880 | "P%u: got set result for {%s}, status %u\n", | 880 | "P%u: got set result for {%s}, status %u\n", |
881 | session->local_peer_idx, | 881 | session->local_peer_idx, |
@@ -1097,7 +1097,7 @@ get_evilness (struct ConsensusSession *session, enum Evilness *ret_type, unsigne | |||
1097 | if (ret != 3) | 1097 | if (ret != 3) |
1098 | { | 1098 | { |
1099 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Malformed field '%s' in EVIL_SPEC, behaving like a good peer.\n", | 1099 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Malformed field '%s' in EVIL_SPEC, behaving like a good peer.\n", |
1100 | field); | 1100 | field); |
1101 | goto not_evil; | 1101 | goto not_evil; |
1102 | } | 1102 | } |
1103 | 1103 | ||
@@ -1114,7 +1114,7 @@ get_evilness (struct ConsensusSession *session, enum Evilness *ret_type, unsigne | |||
1114 | } | 1114 | } |
1115 | else | 1115 | else |
1116 | { | 1116 | { |
1117 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Malformed field '%s' in EVIL_SPEC (unknown type), behaving like a good peer.\n"); | 1117 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Malformed field '%s' in EVIL_SPEC (unknown type), behaving like a good peer.\n"); |
1118 | goto not_evil; | 1118 | goto not_evil; |
1119 | } | 1119 | } |
1120 | goto cleanup; | 1120 | goto cleanup; |
@@ -1317,7 +1317,7 @@ diff_create () | |||
1317 | struct DiffEntry *d = GNUNET_new (struct DiffEntry); | 1317 | struct DiffEntry *d = GNUNET_new (struct DiffEntry); |
1318 | 1318 | ||
1319 | d->changes = GNUNET_CONTAINER_multihashmap_create (8, GNUNET_NO); | 1319 | d->changes = GNUNET_CONTAINER_multihashmap_create (8, GNUNET_NO); |
1320 | 1320 | ||
1321 | return d; | 1321 | return d; |
1322 | } | 1322 | } |
1323 | 1323 | ||
@@ -1329,7 +1329,7 @@ diff_compose (struct DiffEntry *diff_1, | |||
1329 | struct DiffEntry *diff_new; | 1329 | struct DiffEntry *diff_new; |
1330 | struct GNUNET_CONTAINER_MultiHashMapIterator *iter; | 1330 | struct GNUNET_CONTAINER_MultiHashMapIterator *iter; |
1331 | struct DiffElementInfo *di; | 1331 | struct DiffElementInfo *di; |
1332 | 1332 | ||
1333 | diff_new = diff_create (); | 1333 | diff_new = diff_create (); |
1334 | 1334 | ||
1335 | iter = GNUNET_CONTAINER_multihashmap_iterator_create (diff_1->changes); | 1335 | iter = GNUNET_CONTAINER_multihashmap_iterator_create (diff_1->changes); |
@@ -2203,8 +2203,8 @@ set_listen_cb (void *cls, | |||
2203 | GNUNET_SET_RESULT_SYMMETRIC, | 2203 | GNUNET_SET_RESULT_SYMMETRIC, |
2204 | set_result_cb, | 2204 | set_result_cb, |
2205 | task); | 2205 | task); |
2206 | 2206 | ||
2207 | /* If the task hasn't been started yet, | 2207 | /* If the task hasn't been started yet, |
2208 | we wait for that until we commit. */ | 2208 | we wait for that until we commit. */ |
2209 | 2209 | ||
2210 | if (GNUNET_YES == task->is_started) | 2210 | if (GNUNET_YES == task->is_started) |
@@ -2563,7 +2563,7 @@ construct_task_graph (struct ConsensusSession *session) | |||
2563 | // XXX: introduce first step, | 2563 | // XXX: introduce first step, |
2564 | // where we wait for all insert acks | 2564 | // where we wait for all insert acks |
2565 | // from the set service | 2565 | // from the set service |
2566 | 2566 | ||
2567 | /* faster but brittle all-to-all */ | 2567 | /* faster but brittle all-to-all */ |
2568 | 2568 | ||
2569 | // XXX: Not implemented yet | 2569 | // XXX: Not implemented yet |