[GNUnet-SVN] r36282 - in gnunet/src: consensus include

[gnunet]

Author: dold
Date: 2015-08-30 14:24:18 +0200 (Sun, 30 Aug 2015)
New Revision: 36282

Modified:
   gnunet/src/consensus/gnunet-service-consensus.c
   gnunet/src/include/gnunet_protocols.h
   gnunet/src/include/gnunet_set_service.h
Log:
missing changes to headers


Modified: gnunet/src/consensus/gnunet-service-consensus.c
===================================================================
--- gnunet/src/consensus/gnunet-service-consensus.c     2015-08-30 00:44:11 UTC 
(rev 36281)
+++ gnunet/src/consensus/gnunet-service-consensus.c     2015-08-30 12:24:18 UTC 
(rev 36282)
@@ -324,8 +324,6 @@
 static void
 destroy_session (struct ConsensusSession *session)
 {
-  int i;
-
   GNUNET_CONTAINER_DLL_remove (sessions_head, sessions_tail, session);
   if (NULL != session->element_set)
   {
@@ -359,6 +357,7 @@
   }
   if (NULL != session->info)
   {
+    int i;
     for (i = 0; i < session->num_peers; i++)
     {
       struct ConsensusPeerInformation *cpi;
@@ -1349,9 +1348,9 @@
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "client disconnected, destroying 
session\n");
     destroy_session (session);
+    return;
   }
-  else
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "client disconnected, but waiting for 
consensus to finish\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "client disconnected, but waiting for 
consensus to finish\n");
 }
 
 

Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h       2015-08-30 00:44:11 UTC (rev 
36281)
+++ gnunet/src/include/gnunet_protocols.h       2015-08-30 12:24:18 UTC (rev 
36282)
@@ -1918,7 +1918,23 @@
  */
 #define GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_DONE 593
 
+/**
+ * Ask the set service to prepare a copy of a set.
+ */
+#define GNUNET_MESSAGE_TYPE_SET_COPY_LAZY_PREPARE 594
 
+/**
+ * Give the client an ID for connecting to the set's copy.
+ */
+#define GNUNET_MESSAGE_TYPE_SET_COPY_LAZY_RESPONSE 595
+
+/**
+ * Sent by the client to the server to connect to an existing,
+ * lazily copied set.
+ */
+#define GNUNET_MESSAGE_TYPE_SET_COPY_LAZY_CONNECT 596
+
+
 
/*******************************************************************************
  * TESTBED LOGGER message types
  
******************************************************************************/

Modified: gnunet/src/include/gnunet_set_service.h
===================================================================
--- gnunet/src/include/gnunet_set_service.h     2015-08-30 00:44:11 UTC (rev 
36281)
+++ gnunet/src/include/gnunet_set_service.h     2015-08-30 12:24:18 UTC (rev 
36282)
@@ -223,6 +223,11 @@
 
 
 
+typedef void
+(*GNUNET_SET_CopyReadyCallback) (void *cls,
+                                 struct GNUNET_SET_Handle *copy);
+
+
 /**
  * Create an empty set, supporting the specified operation.
  *
@@ -279,6 +284,12 @@
                            void *cont_cls);
 
 
+void
+GNUNET_SET_copy_lazy (struct GNUNET_SET_Handle *set,
+                      GNUNET_SET_CopyReadyCallback cb,
+                      void *cls);
+
+
 /**
  * Destroy the set handle, and free all associated resources.
  * Iterations must have completed (or be explicitly canceled)