3 files changed, 38 insertions, 17 deletions

diff --git a/src/cadet/gnunet-cadet.c b/src/cadet/gnunet-cadet.c
index f3ccd9883..9b7538ae7 100644
--- a/src/cadet/gnunet-cadet.c
+++ b/src/cadet/gnunet-cadet.c
@@ -840,7 +840,7 @@ main (int argc, char *const *argv)
                             &run,
                             NULL);
 
-  GNUNET_free ((void *) argv);
+  GNUNET_free_nz ((void *) argv);
 
   if (GNUNET_OK == res)
     return 0;
diff --git a/src/cadet/gnunet-service-cadet_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c
index ae201ed2d..f1f2ec81f 100644
--- a/src/cadet/gnunet-service-cadet_tunnels.c
+++ b/src/cadet/gnunet-service-cadet_tunnels.c
@@ -677,8 +677,7 @@ new_ephemeral (struct CadetTunnelAxolotl *ax)
 {
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Creating new ephemeral ratchet key (DHRs)\n");
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CRYPTO_ecdhe_key_create2 (&ax->DHRs));
+  GNUNET_CRYPTO_ecdhe_key_create (&ax->DHRs);
 }
 
 
@@ -3186,8 +3185,7 @@ GCT_create_tunnel (struct CadetPeer *destination)
 
   t->kx_retry_delay = INITIAL_KX_RETRY_DELAY;
   new_ephemeral (&t->ax);
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CRYPTO_ecdhe_key_create2 (&t->ax.kx_0));
+  GNUNET_CRYPTO_ecdhe_key_create (&t->ax.kx_0);
   t->destination = destination;
   t->channels = GNUNET_CONTAINER_multihashmap32_create (8);
   t->maintain_connections_task
diff --git a/src/cadet/test_cadeT.c b/src/cadet/test_cadeT.c
index 3bf8e2ad9..97f315167 100644
--- a/src/cadet/test_cadeT.c
+++ b/src/cadet/test_cadeT.c
@@ -62,29 +62,50 @@
 /****************************** TEST LOGIC ********************************/
 
 static int kx_initiator;
-
-void 
-handle_message (void *cls, 
-                const struct GNUNET_MessageHeader *msg)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "%s\n", __func__);
-}
+static struct GNUNET_TESTBED_UnderlayLinkModel *model;
 
 static void
 send_message ()
 {
   struct GNUNET_MQ_Envelope *envelope;
   struct GNUNET_MessageHeader *msg;
+  int *data;
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "%s\n", __func__);
 
-  envelope = GNUNET_MQ_msg (msg, 
-                            GNUNET_MESSAGE_TYPE_DUMMY);
+  envelope = GNUNET_MQ_msg_extra (msg, 10000,
+                                  GNUNET_MESSAGE_TYPE_DUMMY);
+  data = (int *) &msg[1];
+  *data = 1000;
 
   GNUNET_MQ_send (GNUNET_CADET_get_mq (test_peers[0].channel), 
                   envelope);
 }
 
+int
+check_message (void *cls,
+               const struct GNUNET_MessageHeader *message)
+{
+  return GNUNET_OK;             /* all is well-formed */
+}
+
+void 
+handle_message (void *cls, 
+                const struct GNUNET_MessageHeader *msg)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "%s\n", __func__);
+
+/*
+  model = GNUNET_TESTBED_underlaylinkmodel_create (test_peers[1].testbed_peer,
+                                                   GNUNET_TESTBED_UNDERLAYLINKMODELTYPE_BLACKLIST);
+  GNUNET_TESTBED_underlaylinkmodel_set_link (model,
+                                             test_peers[0].testbed_peer,
+                                             0, 100, 0);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "%s: Modified link model.\n", __func__);
+*/
+  send_message();
+}
+
 /**
  * This function is called after all testbed management is done and the 
  * testbed peers are ready for the actual test logic.
@@ -98,10 +119,12 @@ run_test ()
   kx_initiator = (0 < GNUNET_memcmp (&test_peers[0].id, &test_peers[1].id)) ? 1 : 0;
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
-              "KX initiator is peer %s\n", 
-              GNUNET_i2s (&test_peers[kx_initiator].id));
+              "KX initiator is peer %s (idx:%i)\n", 
+              GNUNET_i2s (&test_peers[kx_initiator].id),
+              kx_initiator);
 
-  send_message();
+  for (int i=0; i<10; i++)
+    send_message();
 }