WiP

[oweals/gnunet.git] / src / core / test_core_quota_compliance.c

diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c
index f5b5c0d9220f0499b2a9d1b7cebbb129ac52762a..d3b49d880cf676e7c11876a6dfb5cc7f1be928e7 100644 (file)
--- a/src/core/test_core_quota_compliance.c
+++ b/src/core/test_core_quota_compliance.c
@@ -20,9 +20,6 @@
 /**
  * @file core/test_core_quota_compliance.c
  * @brief testcase for core_api.c focusing quota compliance on core level
- *
- * FIXME:
- * - make sure connect callback is invoked properly as well!
  */
 #include "platform.h"
 #include "gnunet_common.h"
@@ -122,10 +119,14 @@ struct TestMessage
 static void
 terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_CORE_disconnect (p1.ch);
+  struct GNUNET_CORE_Handle *ch;
+
+  ch = p1.ch;
   p1.ch = NULL;
-  GNUNET_CORE_disconnect (p2.ch);
+  GNUNET_CORE_disconnect (ch);
+  ch = p2.ch;
   p2.ch = NULL;
+  GNUNET_CORE_disconnect (ch);
   GNUNET_TRANSPORT_disconnect (p1.th);
   p1.th = NULL;
   GNUNET_TRANSPORT_disconnect (p2.th);
@@ -314,9 +315,11 @@ transmit_ready (void *cls, size_t size, void *buf)
   GNUNET_assert (size <= GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE);
   if (buf == NULL)
     {
-      if (p1.ch != NULL)
+      if ( (p1.ch != NULL) &&
+          (p1.connect_status == 1) )
        GNUNET_break (NULL !=
                      GNUNET_CORE_notify_transmit_ready (p1.ch,
+                                                        GNUNET_NO,
                                                         0,
                                                         FAST_TIMEOUT,
                                                         &p2.id,
@@ -368,6 +371,10 @@ connect_notify (void *cls,
 {
   struct PeerContext *pc = cls;
 
+  if (0 == memcmp (&pc->id,
+                  peer,
+                  sizeof (struct GNUNET_PeerIdentity)))
+    return;
   GNUNET_assert (pc->connect_status == 0);
   pc->connect_status = 1;
   if (pc == &p1)
@@ -389,11 +396,12 @@ connect_notify (void *cls,
       measure_task = GNUNET_SCHEDULER_add_delayed(MEASUREMENT_LENGTH, &measurement_stop, NULL);
 
       GNUNET_break (NULL != GNUNET_CORE_notify_transmit_ready (p1.ch,
-                                                      0,
-                                                      TIMEOUT,
-                                                      &p2.id,
-                                                      MESSAGESIZE,
-                                                      &transmit_ready, &p1));
+                                                              GNUNET_NO,
+                                                              0,
+                                                              TIMEOUT,
+                                                              &p2.id,
+                                                              MESSAGESIZE,
+                                                              &transmit_ready, &p1));
     }
 }
 
@@ -403,6 +411,11 @@ disconnect_notify (void *cls,
                    const struct GNUNET_PeerIdentity *peer)
 {
   struct PeerContext *pc = cls;
+
+  if (0 == memcmp (&pc->id,
+                  peer,
+                  sizeof (struct GNUNET_PeerIdentity)))
+    return;
   pc->connect_status = 0;
 #if DEBUG_TRANSMISSION
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -492,6 +505,7 @@ process_mtype (void *cls,
   if (running == GNUNET_YES)
        GNUNET_break (NULL !=
                      GNUNET_CORE_notify_transmit_ready (p1.ch,
+                                                        GNUNET_NO,
                                                         0,
                                                         FAST_TIMEOUT,
                                                         &p2.id,
@@ -572,14 +586,14 @@ process_hello (void *cls,
   p->hello = GNUNET_malloc (ntohs (message->size));
   memcpy (p->hello, message, ntohs (message->size));
   if ((p == &p1) && (p2.th != NULL))
-    GNUNET_TRANSPORT_offer_hello (p2.th, message);
+    GNUNET_TRANSPORT_offer_hello (p2.th, message, NULL, NULL);
   if ((p == &p2) && (p1.th != NULL))
-    GNUNET_TRANSPORT_offer_hello (p1.th, message);
+    GNUNET_TRANSPORT_offer_hello (p1.th, message, NULL, NULL);
 
   if ((p == &p1) && (p2.hello != NULL))
-    GNUNET_TRANSPORT_offer_hello (p1.th, p2.hello);
+    GNUNET_TRANSPORT_offer_hello (p1.th, p2.hello, NULL, NULL);
   if ((p == &p2) && (p1.hello != NULL))
-    GNUNET_TRANSPORT_offer_hello (p2.th, p1.hello);
+    GNUNET_TRANSPORT_offer_hello (p2.th, p1.hello, NULL, NULL);
 }