PSYCstore: result_code arg for CountersCallback

4 files changed, 15 insertions, 10 deletions

diff --git a/src/psycstore/gnunet-service-psycstore.c b/src/psycstore/gnunet-service-psycstore.c
index a00d653b0..8a70bb22f 100644
--- a/src/psycstore/gnunet-service-psycstore.c
+++ b/src/psycstore/gnunet-service-psycstore.c
@@ -346,7 +346,7 @@ handle_counters_get (void *cls,
                                       &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:
diff --git a/src/psycstore/psycstore.h b/src/psycstore/psycstore.h
index f28d1ba78..16d898a45 100644
--- a/src/psycstore/psycstore.h
+++ b/src/psycstore/psycstore.h
@@ -74,11 +74,6 @@ struct CountersResult
    */
   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 @@ struct CountersResult
   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;
 };
 
 
diff --git a/src/psycstore/psycstore_api.c b/src/psycstore/psycstore_api.c
index 55d7f73ec..02f29ecb1 100644
--- a/src/psycstore/psycstore_api.c
+++ b/src/psycstore/psycstore_api.c
@@ -348,7 +348,7 @@ message_handler (void *cls, const struct GNUNET_MessageHeader *msg)
       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),
diff --git a/src/psycstore/test_psycstore.c b/src/psycstore/test_psycstore.c
index cca3c808d..ff4e208eb 100644
--- a/src/psycstore/test_psycstore.c
+++ b/src/psycstore/test_psycstore.c
@@ -231,14 +231,16 @@ state_get_result (void *cls, int64_t result, const char *err_msg)
 
 
 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))