[GNUnet-SVN] r30119 - in gnunet/src: include psycstore

[gnunet]

Author: tg
Date: 2013-10-10 20:08:47 +0200 (Thu, 10 Oct 2013)
New Revision: 30119

Modified:
   gnunet/src/include/gnunet_psycstore_service.h
   gnunet/src/psycstore/gnunet-service-psycstore.c
   gnunet/src/psycstore/psycstore.h
   gnunet/src/psycstore/psycstore_api.c
   gnunet/src/psycstore/test_psycstore.c
Log:
PSYCstore: result_code arg for CountersCallback

Modified: gnunet/src/include/gnunet_psycstore_service.h
===================================================================
--- gnunet/src/include/gnunet_psycstore_service.h       2013-10-10 18:08:42 UTC 
(rev 30118)
+++ gnunet/src/include/gnunet_psycstore_service.h       2013-10-10 18:08:47 UTC 
(rev 30119)
@@ -285,6 +285,10 @@
  * @see GNUNET_PSYCSTORE_counters_get()
  *
  * @param cls Closure.
+ * @param result_code Status code for the operation:
+ *        #GNUNET_OK: success, counter values are returned.
+ *        #GNUNET_NO: no message has been sent to the channel yet.
+ *        #GNUNET_SYSERR: an error occurred.
  * @param max_fragment_id Latest message fragment ID, used by multicast.
  * @param max_message_id Latest message ID, used by PSYC.
  * @param max_group_generation Latest group generation, used by PSYC.
@@ -293,6 +297,7 @@
  */
 typedef void
 (*GNUNET_PSYCSTORE_CountersCallback) (void *cls,
+                                      int result_code,
                                       uint64_t max_fragment_id,
                                       uint64_t max_message_id,
                                       uint64_t max_group_generation,

Modified: gnunet/src/psycstore/gnunet-service-psycstore.c
===================================================================
--- gnunet/src/psycstore/gnunet-service-psycstore.c     2013-10-10 18:08:42 UTC 
(rev 30118)
+++ gnunet/src/psycstore/gnunet-service-psycstore.c     2013-10-10 18:08:47 UTC 
(rev 30119)
@@ -346,7 +346,7 @@
                                       &res.max_group_generation);
   switch (ret)
   {
-  case GNUNET_YES:
+  case GNUNET_OK:
     ret = db->counters_state_get (db->cls, &req->channel_key,
                                   &res.max_state_message_id);
   case GNUNET_NO:

Modified: gnunet/src/psycstore/psycstore.h
===================================================================
--- gnunet/src/psycstore/psycstore.h    2013-10-10 18:08:42 UTC (rev 30118)
+++ gnunet/src/psycstore/psycstore.h    2013-10-10 18:08:47 UTC (rev 30119)
@@ -74,11 +74,6 @@
    */
   uint32_t op_id GNUNET_PACKED;
 
-  /**
-   * Status code for the operation.
-   */
-  int64_t result_code GNUNET_PACKED;
-
   uint64_t max_fragment_id GNUNET_PACKED;
 
   uint64_t max_message_id GNUNET_PACKED;
@@ -86,6 +81,14 @@
   uint64_t max_group_generation GNUNET_PACKED;
 
   uint64_t max_state_message_id GNUNET_PACKED;
+
+  /**
+   * Status code for the operation:
+   * #GNUNET_OK: success, counter values are returned.
+   * #GNUNET_NO: no message has been sent to the channel yet.
+   * #GNUNET_SYSERR: an error occurred.
+   */
+  int32_t result_code GNUNET_PACKED;
 };
 
 

Modified: gnunet/src/psycstore/psycstore_api.c
===================================================================
--- gnunet/src/psycstore/psycstore_api.c        2013-10-10 18:08:42 UTC (rev 
30118)
+++ gnunet/src/psycstore/psycstore_api.c        2013-10-10 18:08:47 UTC (rev 
30119)
@@ -348,7 +348,7 @@
       GNUNET_CONTAINER_DLL_remove (h->op_head, h->op_tail, op);
       if (NULL != op->data_cb)
         ((GNUNET_PSYCSTORE_CountersCallback)
-         op->data_cb) (op->cls,
+         op->data_cb) (op->cls, ntohl (cres->result_code),
                        GNUNET_ntohll (cres->max_fragment_id),
                        GNUNET_ntohll (cres->max_message_id),
                        GNUNET_ntohll (cres->max_group_generation),

Modified: gnunet/src/psycstore/test_psycstore.c
===================================================================
--- gnunet/src/psycstore/test_psycstore.c       2013-10-10 18:08:42 UTC (rev 
30118)
+++ gnunet/src/psycstore/test_psycstore.c       2013-10-10 18:08:47 UTC (rev 
30119)
@@ -231,14 +231,16 @@
 
 
 void
-counters_result (void *cls, uint64_t max_fragment_id, uint64_t max_message_id,
-                 uint64_t max_group_generation, uint64_t max_state_message_id)
+counters_result (void *cls, int status, uint64_t max_fragment_id,
+                 uint64_t max_message_id, uint64_t max_group_generation,
+                 uint64_t max_state_message_id)
 {
   struct FragmentClosure *fcls = cls;
   int result = 0;
   op = NULL;
 
-  if (max_fragment_id == GNUNET_ntohll (fcls->msg[2]->fragment_id)
+  if (GNUNET_OK == status
+      && max_fragment_id == GNUNET_ntohll (fcls->msg[2]->fragment_id)
       && max_message_id == GNUNET_ntohll (fcls->msg[2]->message_id)
       && max_group_generation == GNUNET_ntohll (fcls->msg[2]->group_generation)
       && max_state_message_id == GNUNET_ntohll (fcls->msg[0]->message_id))