X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fcore%2Ftest_core_api.c;h=38aaf63b175afdb1944448fa8e20d73d47d4ede1;hb=30082674cb0bb93bb8d636baef7d72fc7850bbdf;hp=004486525049130f995ff37ce9a5aae6bbe67b74;hpb=214424c6576d922dd5076ac5377294d81ccca647;p=oweals%2Fgnunet.git

diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c
index 004486525..38aaf63b1 100644
--- a/src/core/test_core_api.c
+++ b/src/core/test_core_api.c
@@ -35,7 +35,6 @@
 #include "gnunet_transport_service.h"
 
 #define VERBOSE GNUNET_NO
-
 #define START_ARM GNUNET_YES
 
 #define MTYPE 12345
@@ -123,25 +122,34 @@ connect_notify (void *cls,
 		const struct GNUNET_TRANSPORT_ATS_Information *atsi)
 {
   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;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Encrypted connection established to peer `%4s'\n",
-              GNUNET_i2s (peer));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-	      "Asking core (1) for transmission to peer `%4s'\n",
-	      GNUNET_i2s (&p2.id));
-  if (NULL == GNUNET_CORE_notify_transmit_ready (p1.ch,
-						 0,
-						 GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 45),
-						 &p2.id,
-						 sizeof (struct GNUNET_MessageHeader),
-						 &transmit_ready, &p1))
+  if (pc == &p1)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-		  "RECEIVED NULL when asking core (1) for transmission to peer `%4s'\n",
+		  "Encrypted connection established to peer `%4s'\n",
+		  GNUNET_i2s (peer));
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "Asking core (1) for transmission to peer `%4s'\n",
 		  GNUNET_i2s (&p2.id));
-    }  
+      if (NULL == GNUNET_CORE_notify_transmit_ready (p1.ch,
+						     GNUNET_YES,
+						     0,
+						     GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 45),
+						     &p2.id,
+						     sizeof (struct GNUNET_MessageHeader),
+						     &transmit_ready, &p1))
+	{
+	  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		      "RECEIVED NULL when asking core (1) for transmission to peer `%4s'\n",
+		      GNUNET_i2s (&p2.id));
+	}  
+    }
 }
 
 
@@ -150,6 +158,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;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Encrypted connection to `%4s' cut\n", GNUNET_i2s (peer));
@@ -263,14 +276,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);
 }
 
 
@@ -314,7 +327,6 @@ run (void *cls,
                        GNUNET_YES, &outbound_notify, GNUNET_YES, handlers);
 }
 
-
 static void
 stop_arm (struct PeerContext *p)
 {