the key entry in GNUNET_SCALARPRODUCT_ComputationHandle is now a struct, not a pointer.

re-added scheduler shutdown to SP-client

2 files changed, 4 insertions, 1 deletions

diff --git a/src/scalarproduct/gnunet-scalarproduct.c b/src/scalarproduct/gnunet-scalarproduct.c
index c32bfdaa1..7fe6cf75c 100644
--- a/src/scalarproduct/gnunet-scalarproduct.c
+++ b/src/scalarproduct/gnunet-scalarproduct.c
@@ -104,6 +104,7 @@ responder_callback (void *cls,
   default:
     LOG (GNUNET_ERROR_TYPE_ERROR, "Session %s failed: return code %d\n", GNUNET_h2s (&closure->key), status);
   }
+  GNUNET_SCHEDULER_shutdown();
 }
 
 
@@ -149,6 +150,7 @@ requester_callback (void *cls,
   default:
     LOG (GNUNET_ERROR_TYPE_ERROR, "Session %s with peer %s failed: return code %d\n", GNUNET_h2s (&closure->key), GNUNET_i2s (&closure->peer), status);
   }
+  GNUNET_SCHEDULER_shutdown();
 }
 
 /**
diff --git a/src/scalarproduct/scalarproduct_api.c b/src/scalarproduct/scalarproduct_api.c
index 89cb4db17..95aaaf86a 100644
--- a/src/scalarproduct/scalarproduct_api.c
+++ b/src/scalarproduct/scalarproduct_api.c
@@ -78,7 +78,7 @@ struct GNUNET_SCALARPRODUCT_ComputationHandle
   /**
    * The shared session key identifying this computation
    */
-  struct GNUNET_HashCode * key;
+  struct GNUNET_HashCode key;
 
   /**
    * Current transmit handle.
@@ -249,6 +249,7 @@ receive_cb (void *cls, const struct GNUNET_MessageHeader *msg)
   if (qe->cont_datum != NULL)
     qe->response_proc (qe, msg, status);
 
+  GNUNET_CONTAINER_DLL_remove (head, tail, qe);
   GNUNET_free (qe);
 }