PEERSTORE api fix

4 files changed, 29 insertions, 11 deletions

diff --git a/src/peerstore/gnunet-peerstore.c b/src/peerstore/gnunet-peerstore.c
index 750cc5636..9b26cf36c 100644
--- a/src/peerstore/gnunet-peerstore.c
+++ b/src/peerstore/gnunet-peerstore.c
@@ -58,7 +58,9 @@ shutdown_task (void *cls,
 
 void test_cont(void *cls, const char *emsg)
 {
-  printf("Received a response\n");
+  char *req = cls;
+
+  printf("Received a response to request: %s\n", req);
   if(NULL != emsg)
   {
     printf("Response: %s\n", emsg);
@@ -97,7 +99,15 @@ run (void *cls,
         5,
         GNUNET_TIME_UNIT_FOREVER_REL,
         &test_cont,
-        NULL);
+        "Req1");
+    GNUNET_PEERSTORE_store(peerstore_handle,
+            &pid,
+            "subsub",
+            "value",
+            5,
+            GNUNET_TIME_UNIT_FOREVER_REL,
+            &test_cont,
+            "Req2");
   }
 
   ret = 0;
diff --git a/src/peerstore/gnunet-service-peerstore.c b/src/peerstore/gnunet-service-peerstore.c
index f56860971..35eee01b1 100644
--- a/src/peerstore/gnunet-service-peerstore.c
+++ b/src/peerstore/gnunet-service-peerstore.c
@@ -102,13 +102,17 @@ void handle_store (void *cls,
   //TODO: do the actual storage
   //create a fake response for testing
   char *response = "This is a response";
+  uint16_t resp_size = strlen(response);
   tc = GNUNET_SERVER_transmit_context_create (client);
-  sresm = malloc(sizeof(struct StoreResponseMessage) + strlen(response));
+  msg_size = sizeof(struct StoreResponseMessage) + resp_size;
+  sresm = malloc(msg_size);
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Sending a response to client of size: %u, response size: %u\n", msg_size, resp_size);
   sresm->header.type = htons(GNUNET_MESSAGE_TYPE_PEERSTORE_STORE_RESULT);
-  sresm->header.size = htons(sizeof(struct StoreResponseMessage) + strlen(response));
+  sresm->header.size = htons(msg_size);
   sresm->success = htons(GNUNET_NO);
-  sresm->emsg_size = htons(strlen(response));
-  memcpy(&sresm[1], response, strlen(response));
+  sresm->emsg_size = htons(resp_size);
+  char *msg_ptr = (char *)&sresm[1];
+  memcpy(msg_ptr, response, resp_size);
   GNUNET_SERVER_transmit_context_append_message(tc, (struct GNUNET_MessageHeader *)sresm);
   GNUNET_SERVER_transmit_context_run (tc, GNUNET_TIME_UNIT_FOREVER_REL);
 }
diff --git a/src/peerstore/peerstore.h b/src/peerstore/peerstore.h
index 255afc82c..33d31870c 100644
--- a/src/peerstore/peerstore.h
+++ b/src/peerstore/peerstore.h
@@ -76,12 +76,12 @@ struct StoreResponseMessage
   /**
    * Was the store operation successful (#GNUNET_YES / #GNUNET_NO)
    */
-  uint16_t success;
+  uint16_t success GNUNET_PACKED;
 
   /**
    * Size of the error message (0 if no error)
    */
-  size_t emsg_size;
+  size_t emsg_size GNUNET_PACKED;
 };
 
 GNUNET_NETWORK_STRUCT_END
diff --git a/src/peerstore/peerstore_api.c b/src/peerstore/peerstore_api.c
index f31a3b848..2ab7a7d34 100644
--- a/src/peerstore/peerstore_api.c
+++ b/src/peerstore/peerstore_api.c
@@ -204,6 +204,7 @@ reconnect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_PEERSTORE_Handle *h = cls;
 
+  LOG(GNUNET_ERROR_TYPE_DEBUG, "Reconnect task executed\n");
   h->r_task = GNUNET_SCHEDULER_NO_TASK;
   reconnect (h);
 }
@@ -225,6 +226,7 @@ GNUNET_PEERSTORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg)
   h = GNUNET_new (struct GNUNET_PEERSTORE_Handle);
   h->client = client;
   h->cfg = cfg;
+  LOG(GNUNET_ERROR_TYPE_DEBUG, "New connection created\n");
   return h;
 }
 
@@ -242,6 +244,7 @@ GNUNET_PEERSTORE_disconnect(struct GNUNET_PEERSTORE_Handle *h)
     h->client = NULL;
   }
   GNUNET_free (h);
+  LOG(GNUNET_ERROR_TYPE_DEBUG, "Disconnected, BYE!\n");
 }
 
 /**
@@ -252,6 +255,7 @@ GNUNET_PEERSTORE_disconnect(struct GNUNET_PEERSTORE_Handle *h)
 static void
 reconnect (struct GNUNET_PEERSTORE_Handle *h)
 {
+  LOG(GNUNET_ERROR_TYPE_DEBUG, "Reconnecting...\n");
   if (GNUNET_SCHEDULER_NO_TASK != h->r_task)
   {
     GNUNET_SCHEDULER_cancel (h->r_task);
@@ -403,6 +407,7 @@ peerstore_handler (void *cls, const struct GNUNET_MessageHeader *msg)
     trigger_transmit (h);
     if (NULL != h->sc_head)
     {
+      LOG(GNUNET_ERROR_TYPE_DEBUG, "Another store request awaiting response, triggering receive for it\n");
       h->in_receive = GNUNET_YES;
       GNUNET_CLIENT_receive (h->client,
           &peerstore_handler,
@@ -411,15 +416,14 @@ peerstore_handler (void *cls, const struct GNUNET_MessageHeader *msg)
     }
     if(NULL != cont)
     {
-      srm = (struct StoreResponseMessage *)&msg[1];
+      LOG(GNUNET_ERROR_TYPE_DEBUG, "Calling continuation of store request\n");
+      srm = (struct StoreResponseMessage *)msg;
       emsg = NULL;
       if(GNUNET_NO == ntohs(srm->success))
       {
-        LOG(GNUNET_ERROR_TYPE_DEBUG, "Calling user callback with message: %s\n", emsg);
         emsg = GNUNET_malloc(ntohs(srm->emsg_size));
         memcpy(emsg, &srm[1], ntohs(srm->emsg_size));
       }
-      LOG(GNUNET_ERROR_TYPE_DEBUG, "Calling user callback without a message\n");
       cont(cont_cls, emsg);
     }
     break;