[GNUnet-SVN] r25808 - gnunet/src/include

[gnunet]

Author: dold
Date: 2013-01-17 01:59:46 +0100 (Thu, 17 Jan 2013)
New Revision: 25808

Modified:
   gnunet/src/include/gnunet_consensus_service.h
   gnunet/src/include/gnunet_protocols.h
Log:
-public api


Modified: gnunet/src/include/gnunet_consensus_service.h
===================================================================
--- gnunet/src/include/gnunet_consensus_service.h       2013-01-17 00:55:58 UTC 
(rev 25807)
+++ gnunet/src/include/gnunet_consensus_service.h       2013-01-17 00:59:46 UTC 
(rev 25808)
@@ -77,7 +77,7 @@
  *         GNUNET_SYSERR if the element should be ignored and not be propagated
  */
 typedef int (*GNUNET_CONSENSUS_ElementCallback) (void *cls,
-                                                    struct 
GNUNET_CONSENSUS_Element *element);
+                                                 struct 
GNUNET_CONSENSUS_Element *element);
 
 
 
@@ -116,6 +116,8 @@
  * Called when an insertion (transmission to consensus service,
  * which does not imply fully consensus on this element with
  * all other peers) was successful.
+ * May not call GNUNET_CONSENSUS_destroy; schedule a task to call
+ * GNUNET_CONSENSUS_destroy instead.
  *
  * @param cls
  * @param success GNUNET_OK on success, GNUNET_SYSERR if 
@@ -129,6 +131,8 @@
  * Insert an element in the set being reconsiled.  Only transmit changes to
  * other peers if "GNUNET_CONSENSUS_begin" has been called.
  * Must not be called after "GNUNET_CONSENSUS_conclude".
+ * May not call GNUNET_CONSENSUS_destroy; schedule a task to call
+ * GNUNET_CONSENSUS_destroy instead.
  *
  * @param consensus handle for the consensus session
  * @param element the element to be inserted
@@ -179,7 +183,6 @@
 
 struct GNUNET_CONSENSUS_Group
 {
-  uint32_t group_id; /* offset into groups? */
   unsigned int num_members;
   uint64_t total_elements_in_group;
   const struct GNUNET_PeerIdentity **members;
@@ -190,12 +193,10 @@
  * Called when a conclusion was successful.
  *
  * @param cls
- * @param num_peers_in_consensus
- * @param peers_in_consensus
+ * @param group
+ * @return GNUNET_YES if more consensus groups should be offered, GNUNET_NO if 
not
  */
-typedef void (*GNUNET_CONSENSUS_ConcludeCallback) (void *cls, 
-                                                   unsigned int 
consensus_group_count,
-                                                   const struct 
GNUNET_CONSENSUS_Group *groups);
+typedef int (*GNUNET_CONSENSUS_ConcludeCallback) (void *cls, const struct 
GNUNET_CONSENSUS_Group *group);
 
 
 /**

Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h       2013-01-17 00:55:58 UTC (rev 
25807)
+++ gnunet/src/include/gnunet_protocols.h       2013-01-17 00:59:46 UTC (rev 
25808)
@@ -1681,9 +1681,14 @@
 /**
  * Elements, and requests for further elements
  */
-#define GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_ELEMENTS_AND_REQUESTS 543
+#define GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_ELEMENTS 543
 
+/*
+ * Initialization message for consensus p2p communication.
+ */
+#define GNUNET_MESSAGE_TYPE_CONSENSUS_P2P_HELLO 544
 
+
 /**
  *  Next available: 570
  */