diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-11-27 10:04:14 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-11-27 10:04:14 +0000 |
commit | 47c52147dac6bc423b43aa8e2721585df893440b (patch) | |
tree | f70838a0ad5400cc100ec948a6ccb6295a509379 /src/consensus | |
parent | 4d376fad783520443f21216de0eed2d8cfc43c97 (diff) | |
download | gnunet-47c52147dac6bc423b43aa8e2721585df893440b.tar.gz gnunet-47c52147dac6bc423b43aa8e2721585df893440b.zip |
rename element's type field to 'element_type'
Diffstat (limited to 'src/consensus')
-rw-r--r-- | src/consensus/consensus_api.c | 5 | ||||
-rw-r--r-- | src/consensus/gnunet-service-consensus.c | 17 |
2 files changed, 13 insertions, 9 deletions
diff --git a/src/consensus/consensus_api.c b/src/consensus/consensus_api.c index 6988c7b6d..7b52c2041 100644 --- a/src/consensus/consensus_api.c +++ b/src/consensus/consensus_api.c | |||
@@ -116,9 +116,10 @@ handle_new_element (void *cls, | |||
116 | = (const struct GNUNET_CONSENSUS_ElementMessage *) mh; | 116 | = (const struct GNUNET_CONSENSUS_ElementMessage *) mh; |
117 | struct GNUNET_SET_Element element; | 117 | struct GNUNET_SET_Element element; |
118 | 118 | ||
119 | LOG (GNUNET_ERROR_TYPE_DEBUG, "received new element\n"); | 119 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
120 | "received new element\n"); | ||
120 | 121 | ||
121 | element.type = msg->element_type; | 122 | element.element_type = msg->element_type; |
122 | element.size = ntohs (msg->header.size) - sizeof (struct GNUNET_CONSENSUS_ElementMessage); | 123 | element.size = ntohs (msg->header.size) - sizeof (struct GNUNET_CONSENSUS_ElementMessage); |
123 | element.data = &msg[1]; | 124 | element.data = &msg[1]; |
124 | 125 | ||
diff --git a/src/consensus/gnunet-service-consensus.c b/src/consensus/gnunet-service-consensus.c index adf81ac17..2659b939d 100644 --- a/src/consensus/gnunet-service-consensus.c +++ b/src/consensus/gnunet-service-consensus.c | |||
@@ -377,12 +377,12 @@ destroy_session (struct ConsensusSession *session) | |||
377 | 377 | ||
378 | 378 | ||
379 | /** | 379 | /** |
380 | * Iterator for set elements. | 380 | * Iterator for set elements. [FIXME: bad comment] |
381 | * | 381 | * |
382 | * @param cls closure | 382 | * @param cls closure |
383 | * @param element the current element, NULL if all elements have been | 383 | * @param element the current element, NULL if all elements have been |
384 | * iterated over | 384 | * iterated over |
385 | * @return GNUNET_YES to continue iterating, GNUNET_NO to stop. | 385 | * @return #GNUNET_YES to continue iterating, #GNUNET_NO to stop. |
386 | */ | 386 | */ |
387 | static int | 387 | static int |
388 | send_to_client_iter (void *cls, | 388 | send_to_client_iter (void *cls, |
@@ -395,17 +395,20 @@ send_to_client_iter (void *cls, | |||
395 | { | 395 | { |
396 | struct GNUNET_CONSENSUS_ElementMessage *m; | 396 | struct GNUNET_CONSENSUS_ElementMessage *m; |
397 | 397 | ||
398 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%d: got element for client\n", | 398 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
399 | "P%d: got element for client\n", | ||
399 | session->local_peer_idx); | 400 | session->local_peer_idx); |
400 | 401 | ||
401 | ev = GNUNET_MQ_msg_extra (m, element->size, GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_RECEIVED_ELEMENT); | 402 | ev = GNUNET_MQ_msg_extra (m, element->size, |
402 | m->element_type = htons (element->type); | 403 | GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_RECEIVED_ELEMENT); |
404 | m->element_type = htons (element->element_type); | ||
403 | memcpy (&m[1], element->data, element->size); | 405 | memcpy (&m[1], element->data, element->size); |
404 | GNUNET_MQ_send (session->client_mq, ev); | 406 | GNUNET_MQ_send (session->client_mq, ev); |
405 | } | 407 | } |
406 | else | 408 | else |
407 | { | 409 | { |
408 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%d: finished iterating elements for client\n", | 410 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
411 | "P%d: finished iterating elements for client\n", | ||
409 | session->local_peer_idx); | 412 | session->local_peer_idx); |
410 | ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_CONCLUDE_DONE); | 413 | ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_CONCLUDE_DONE); |
411 | GNUNET_MQ_send (session->client_mq, ev); | 414 | GNUNET_MQ_send (session->client_mq, ev); |
@@ -1252,7 +1255,7 @@ client_insert (void *cls, | |||
1252 | } | 1255 | } |
1253 | 1256 | ||
1254 | element = GNUNET_malloc (sizeof (struct GNUNET_SET_Element) + element_size); | 1257 | element = GNUNET_malloc (sizeof (struct GNUNET_SET_Element) + element_size); |
1255 | element->type = msg->element_type; | 1258 | element->element_type = msg->element_type; |
1256 | element->size = element_size; | 1259 | element->size = element_size; |
1257 | memcpy (&element[1], &msg[1], element_size); | 1260 | memcpy (&element[1], &msg[1], element_size); |
1258 | element->data = &element[1]; | 1261 | element->data = &element[1]; |