aboutsummaryrefslogtreecommitdiff
path: root/src/consensus
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2013-01-24 11:37:31 +0000
committerFlorian Dold <florian.dold@gmail.com>2013-01-24 11:37:31 +0000
commit7a3915c443c2448c9c998a82a394fea49ff2d443 (patch)
treee4316033db22412398f8fbd25e7c633b24983e63 /src/consensus
parent68953a2747692e86cd6d3eb49abf457904768529 (diff)
downloadgnunet-7a3915c443c2448c9c998a82a394fea49ff2d443.tar.gz
gnunet-7a3915c443c2448c9c998a82a394fea49ff2d443.zip
-fix
Diffstat (limited to 'src/consensus')
-rw-r--r--src/consensus/gnunet-service-consensus.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/consensus/gnunet-service-consensus.c b/src/consensus/gnunet-service-consensus.c
index 94baacb51..d3f65be63 100644
--- a/src/consensus/gnunet-service-consensus.c
+++ b/src/consensus/gnunet-service-consensus.c
@@ -681,6 +681,7 @@ handle_p2p_element (struct ConsensusPeerInformation *cpi, const struct GNUNET_Me
681 element = GNUNET_malloc (size + sizeof *element); 681 element = GNUNET_malloc (size + sizeof *element);
682 element->size = size; 682 element->size = size;
683 memcpy (&element[1], &element_msg[1], size); 683 memcpy (&element[1], &element_msg[1], size);
684 element->data = &element[1];
684 685
685 pending_element = GNUNET_malloc (sizeof *pending_element); 686 pending_element = GNUNET_malloc (sizeof *pending_element);
686 pending_element->element = element; 687 pending_element->element = element;
@@ -1296,6 +1297,8 @@ client_insert (void *cls,
1296 memcpy (&element[1], &msg[1], element_size); 1297 memcpy (&element[1], &msg[1], element_size);
1297 element->data = &element[1]; 1298 element->data = &element[1];
1298 1299
1300 GNUNET_assert (NULL != element->data);
1301
1299 GNUNET_CRYPTO_hash (element, element_size, &key); 1302 GNUNET_CRYPTO_hash (element, element_size, &key);
1300 1303
1301 GNUNET_CONTAINER_multihashmap_put (session->values, &key, element, 1304 GNUNET_CONTAINER_multihashmap_put (session->values, &key, element,
@@ -1542,8 +1545,15 @@ write_values (void *cls, enum GNUNET_STREAM_Status status, size_t size)
1542 element_msg->size = htons (msize); 1545 element_msg->size = htons (msize);
1543 element_msg->type = htons (GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_ELEMENTS); 1546 element_msg->type = htons (GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_ELEMENTS);
1544 1547
1548
1549 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "copying element, size=%d\n", element->size);
1550 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "element at %p\n", element);
1551 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "data at %p\n", element->data);
1552
1545 memcpy (&element_msg[1], element->data, element->size); 1553 memcpy (&element_msg[1], element->data, element->size);
1546 1554
1555 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "copying done\n");
1556
1547 cpi->wh = GNUNET_STREAM_write (cpi->socket, element_msg, msize, GNUNET_TIME_UNIT_FOREVER_REL, 1557 cpi->wh = GNUNET_STREAM_write (cpi->socket, element_msg, msize, GNUNET_TIME_UNIT_FOREVER_REL,
1548 write_values, cpi); 1558 write_values, cpi);
1549 1559