[GNUnet-SVN] r17243 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2011-10-06 13:06:42 +0200 (Thu, 06 Oct 2011)
New Revision: 17243

Modified:
   gnunet/src/transport/test_transport_api.c
Log:


Modified: gnunet/src/transport/test_transport_api.c
===================================================================
--- gnunet/src/transport/test_transport_api.c   2011-10-06 11:01:23 UTC (rev 
17242)
+++ gnunet/src/transport/test_transport_api.c   2011-10-06 11:06:42 UTC (rev 
17243)
@@ -194,15 +194,41 @@
   return sizeof (struct GNUNET_MessageHeader);
 }
 
+struct PeerContext * sender;
+struct PeerContext * receiver;
 
 static void
+sendtask (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  send_task = GNUNET_SCHEDULER_NO_TASK;
+
+  if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
+    return;
+  char * receiver_s = strdup(GNUNET_i2s (&receiver->id));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Sending message from peer %u (`%4s') -> peer %u (`%s') !\n",
+              sender->no,
+              GNUNET_i2s (&sender->id), receiver->no, receiver_s);
+  GNUNET_free (receiver_s);
+
+  th = GNUNET_TRANSPORT_notify_transmit_ready (sender->th, &receiver->id, 256, 
0,
+                                               TIMEOUT_TRANSMIT, &notify_ready,
+                                               receiver);
+}
+
+
+static void
 notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
                 const struct GNUNET_TRANSPORT_ATS_Information *ats,
                 uint32_t ats_count)
 {
+  static int c;
+  c++;
   struct PeerContext *p = cls;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%4s') connected to us!\n",
               p->no, GNUNET_i2s (peer));
+  if (c == 2)
+      send_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, 
&sendtask, NULL);
 }
 
 
@@ -217,29 +243,8 @@
   th = NULL;
 }
 
-struct PeerContext * sender;
-struct PeerContext * receiver;
 
 static void
-sendtask (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  send_task = GNUNET_SCHEDULER_NO_TASK;
-
-  if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
-    return;
-  char * receiver_s = strdup(GNUNET_i2s (&receiver->id));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Sending message from peer %u (`%4s') -> peer %u (`%s') !\n",
-              sender->no,
-              GNUNET_i2s (&sender->id), receiver->no, receiver_s);
-  GNUNET_free (receiver_s);
-
-  th = GNUNET_TRANSPORT_notify_transmit_ready (sender->th, &receiver->id, 256, 
0,
-                                               TIMEOUT_TRANSMIT, &notify_ready,
-                                               receiver);
-}
-
-static void
 testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
 {
   cc = NULL;
@@ -249,10 +254,6 @@
               p1->no, p1_c,
               p2->no, GNUNET_i2s (&p2->id));
   GNUNET_free (p1_c);
-
-  // FIXME: THIS IS REQUIRED! SEEMS TO BE A BUG!
-  send_task =
-      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &sendtask, NULL);
 }
 
 static void