[GNUnet-SVN] r25876 - gnunet/src/consensus

[gnunet]

Author: dold
Date: 2013-01-24 12:37:31 +0100 (Thu, 24 Jan 2013)
New Revision: 25876

Modified:
   gnunet/src/consensus/gnunet-service-consensus.c
Log:
-fix


Modified: gnunet/src/consensus/gnunet-service-consensus.c
===================================================================
--- gnunet/src/consensus/gnunet-service-consensus.c     2013-01-24 11:23:06 UTC 
(rev 25875)
+++ gnunet/src/consensus/gnunet-service-consensus.c     2013-01-24 11:37:31 UTC 
(rev 25876)
@@ -681,6 +681,7 @@
   element = GNUNET_malloc (size + sizeof *element);
   element->size = size;
   memcpy (&element[1], &element_msg[1], size);
+  element->data = &element[1];
 
   pending_element = GNUNET_malloc (sizeof *pending_element);
   pending_element->element = element;
@@ -1296,6 +1297,8 @@
   memcpy (&element[1], &msg[1], element_size);
   element->data = &element[1];
 
+  GNUNET_assert (NULL != element->data);
+
   GNUNET_CRYPTO_hash (element, element_size, &key);
 
   GNUNET_CONTAINER_multihashmap_put (session->values, &key, element,
@@ -1542,8 +1545,15 @@
   element_msg->size = htons (msize);
   element_msg->type = htons (GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_ELEMENTS);
 
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "copying element, size=%d\n", 
element->size);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "element at %p\n", element);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "data at %p\n", element->data);
+
   memcpy (&element_msg[1], element->data, element->size);
 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "copying done\n");
+
   cpi->wh = GNUNET_STREAM_write (cpi->socket, element_msg, msize, 
GNUNET_TIME_UNIT_FOREVER_REL,
                                  write_values, cpi);