minor fixes

3 files changed, 19 insertions, 0 deletions

diff --git a/src/peerstore/peerstore_api.c b/src/peerstore/peerstore_api.c
index 5a2455014..edf506f10 100644
--- a/src/peerstore/peerstore_api.c
+++ b/src/peerstore/peerstore_api.c
@@ -148,6 +148,21 @@ handle_client_error (void *cls, enum GNUNET_MQ_Error error)
 }
 
 /**
+ * Should be called only after destroying MQ and connection
+ */
+static void
+cleanup_handle(struct GNUNET_PEERSTORE_Handle *h)
+{
+  struct GNUNET_PEERSTORE_StoreContext *sc;
+
+  while (NULL != (sc = h->store_head))
+  {
+    GNUNET_CONTAINER_DLL_remove(h->store_head, h->store_tail, sc);
+    GNUNET_free(sc);
+  }
+}
+
+/**
  * Close the existing connection to PEERSTORE and reconnect.
  *
  * @param h handle to the service
@@ -167,6 +182,7 @@ reconnect (struct GNUNET_PEERSTORE_Handle *h)
     GNUNET_CLIENT_disconnect (h->client);
     h->client = NULL;
   }
+  cleanup_handle(h);
   h->client = GNUNET_CLIENT_connect ("peerstore", h->cfg);
   h->mq = GNUNET_MQ_queue_for_connection_client(h->client,
       mq_handlers,
@@ -225,6 +241,7 @@ GNUNET_PEERSTORE_disconnect(struct GNUNET_PEERSTORE_Handle *h)
     GNUNET_CLIENT_disconnect (h->client);
     h->client = NULL;
   }
+  cleanup_handle(h);
   GNUNET_free(h);
   LOG(GNUNET_ERROR_TYPE_DEBUG, "Disconnected, BYE!\n");
 }
diff --git a/src/peerstore/peerstore_common.c b/src/peerstore/peerstore_common.c
index 6c91d9802..2cb9d0077 100644
--- a/src/peerstore/peerstore_common.c
+++ b/src/peerstore/peerstore_common.c
@@ -113,6 +113,7 @@ PEERSTORE_create_record_mq_envelope(const char *sub_system,
   size_t msg_size;
   void *dummy;
 
+  GNUNET_assert(NULL != sub_system);
   ss_size = strlen(sub_system) + 1;
   if(NULL == key)
     key_size = 0;
diff --git a/src/peerstore/test_peerstore_api.c b/src/peerstore/test_peerstore_api.c
index 74f3e70db..d17c6fff0 100644
--- a/src/peerstore/test_peerstore_api.c
+++ b/src/peerstore/test_peerstore_api.c
@@ -36,6 +36,7 @@ void store_cont(void *cls, int success)
     ok = 0;
   else
     ok = 1;
+  printf("Success: %d\n", success);
   GNUNET_PEERSTORE_disconnect(h);
 }