[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r26471 - gnunet/src/consensus
From: |
gnunet |
Subject: |
[GNUnet-SVN] r26471 - gnunet/src/consensus |
Date: |
Mon, 18 Mar 2013 12:49:52 +0100 |
Author: grothoff
Date: 2013-03-18 12:49:52 +0100 (Mon, 18 Mar 2013)
New Revision: 26471
Modified:
gnunet/src/consensus/consensus.h
gnunet/src/consensus/consensus_api.c
gnunet/src/consensus/gnunet-service-consensus.c
Log:
-fix uninitialized sendto
Modified: gnunet/src/consensus/consensus.h
===================================================================
--- gnunet/src/consensus/consensus.h 2013-03-18 11:31:11 UTC (rev 26470)
+++ gnunet/src/consensus/consensus.h 2013-03-18 11:49:52 UTC (rev 26471)
@@ -37,10 +37,10 @@
*/
struct GNUNET_MessageHeader header;
+ uint32_t num_peers GNUNET_PACKED;
+
struct GNUNET_HashCode session_id;
- uint16_t num_peers;
-
/* GNUNET_PeerIdentity[num_peers] */
};
@@ -52,15 +52,16 @@
*/
struct GNUNET_MessageHeader header;
+
/**
- * Timeout for conclude
+ * Minimum group size required for a consensus group.
*/
- struct GNUNET_TIME_RelativeNBO timeout;
+ uint32_t min_group_size GNUNET_PACKED;
/**
- * Minimum group size required for a consensus group.
+ * Timeout for conclude
*/
- uint32_t min_group_size;
+ struct GNUNET_TIME_RelativeNBO timeout;
};
@@ -71,11 +72,11 @@
*/
struct GNUNET_MessageHeader header;
- uint32_t group_id;
+ uint32_t group_id GNUNET_PACKED;
- uint32_t num_elements;
+ uint32_t num_elements GNUNET_PACKED;
- uint16_t num_peers;
+ uint32_t num_peers GNUNET_PACKED;
/** PeerIdentity[num_peers] */
};
@@ -97,7 +98,7 @@
/**
* Type: GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_NEW_ELEMENT
*/
- uint16_t element_type;
+ uint16_t element_type GNUNET_PACKED; /* FIXME: alignment? */
/* rest: element data */
};
@@ -112,7 +113,7 @@
/**
* Do we want to keep and propagate the element?
*/
- uint8_t keep;
+ uint8_t keep; /* FIXME: alignment!? */
/* FIXME: add message hash? */
};
Modified: gnunet/src/consensus/consensus_api.c
===================================================================
--- gnunet/src/consensus/consensus_api.c 2013-03-18 11:31:11 UTC (rev
26470)
+++ gnunet/src/consensus/consensus_api.c 2013-03-18 11:49:52 UTC (rev
26471)
@@ -366,14 +366,11 @@
msg->header.type = htons (GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_JOIN);
msg->header.size = htons (msize);
msg->session_id = consensus->session_id;
- msg->num_peers = htons (consensus->num_peers);
- if (0 != msg->num_peers)
- memcpy(&msg[1],
- consensus->peers,
- consensus->num_peers * sizeof (struct GNUNET_PeerIdentity));
-
+ msg->num_peers = htonl (consensus->num_peers);
+ memcpy(&msg[1],
+ consensus->peers,
+ consensus->num_peers * sizeof (struct GNUNET_PeerIdentity));
send_next (consensus);
-
GNUNET_CLIENT_receive (consensus->client, &message_handler, consensus,
GNUNET_TIME_UNIT_FOREVER_REL);
Modified: gnunet/src/consensus/gnunet-service-consensus.c
===================================================================
--- gnunet/src/consensus/gnunet-service-consensus.c 2013-03-18 11:31:11 UTC
(rev 26470)
+++ gnunet/src/consensus/gnunet-service-consensus.c 2013-03-18 11:49:52 UTC
(rev 26471)
@@ -1405,15 +1405,15 @@
static void
initialize_session_peer_list (struct ConsensusSession *session)
{
- int local_peer_in_list;
- int listed_peers;
+ unsigned int local_peer_in_list;
+ uint32_t listed_peers;
const struct GNUNET_PeerIdentity *msg_peers;
unsigned int i;
GNUNET_assert (NULL != session->join_msg);
/* peers in the join message, may or may not include the local peer */
- listed_peers = ntohs (session->join_msg->num_peers);
+ listed_peers = ntohl (session->join_msg->num_peers);
session->num_peers = listed_peers;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r26471 - gnunet/src/consensus,
gnunet <=